Author: assaf
Date: Wed Aug 27 18:47:42 2008
New Revision: 689694
URL: http://svn.apache.org/viewvc?rev=689694&view=rev
Log:
Minor tweaks to get code working with Ruby 1.9.
Modified:
incubator/buildr/trunk/Rakefile
incubator/buildr/trunk/addon/buildr/jetty.rb
incubator/buildr/trunk/addon/buildr/nailgun.rb
incubator/buildr/trunk/doc/scripts/buildr-git.rb
incubator/buildr/trunk/lib/buildr.rb
incubator/buildr/trunk/lib/buildr/core/util.rb
incubator/buildr/trunk/lib/buildr/java.rb
incubator/buildr/trunk/lib/buildr/java/packaging.rb
incubator/buildr/trunk/lib/buildr/packaging/gems.rb
incubator/buildr/trunk/lib/buildr/packaging/zip.rb
incubator/buildr/trunk/rakelib/apache.rake
incubator/buildr/trunk/spec/java_bdd_frameworks_spec.rb
Modified: incubator/buildr/trunk/Rakefile
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/Rakefile?rev=689694&r1=689693&r2=689694&view=diff
==============================================================================
--- incubator/buildr/trunk/Rakefile (original)
+++ incubator/buildr/trunk/Rakefile Wed Aug 27 18:47:42 2008
@@ -17,7 +17,10 @@
require 'rake/gempackagetask'
def spec(platform = RUBY_PLATFORM[/java/] || 'ruby')
- @specs ||= ['ruby', 'java'].inject({}) { |hash, $platform|
hash.update($platform=>Gem::Specification.load('buildr.gemspec')) }
+ @specs ||= ['ruby', 'java'].inject({}) { |hash, platform|
+ $platform = platform
+ hash.update(platform=>Gem::Specification.load('buildr.gemspec'))
+ }
@specs[platform]
end
Modified: incubator/buildr/trunk/addon/buildr/jetty.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/addon/buildr/jetty.rb?rev=689694&r1=689693&r2=689694&view=diff
==============================================================================
--- incubator/buildr/trunk/addon/buildr/jetty.rb (original)
+++ incubator/buildr/trunk/addon/buildr/jetty.rb Wed Aug 27 18:47:42 2008
@@ -44,7 +44,7 @@
class Jetty
# Which version of Jetty we're using by default (change with
options.jetty.version).
- VERSION = "6.1.3" unless const_defined?('VERSION')
+ VERSION = "6.1.3"
SLF4J_VERSION = "1.4.3"
# Libraries used by Jetty.
Modified: incubator/buildr/trunk/addon/buildr/nailgun.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/addon/buildr/nailgun.rb?rev=689694&r1=689693&r2=689694&view=diff
==============================================================================
--- incubator/buildr/trunk/addon/buildr/nailgun.rb (original)
+++ incubator/buildr/trunk/addon/buildr/nailgun.rb Wed Aug 27 18:47:42 2008
@@ -39,7 +39,7 @@
attr_accessor :server, :port, :jruby_queue_size, :buildr_queue_size
attr_accessor :jruby_home, :home
- self.jruby_home = if PLATFORM =~ /java/
+ self.jruby_home = if RUBY_PLATFORM =~ /java/
Config::CONFIG['prefix']
else
ENV['JRUBY_HOME'] || File.join(ENV['HOME'], '.jruby')
Modified: incubator/buildr/trunk/doc/scripts/buildr-git.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/doc/scripts/buildr-git.rb?rev=689694&r1=689693&r2=689694&view=diff
==============================================================================
--- incubator/buildr/trunk/doc/scripts/buildr-git.rb (original)
+++ incubator/buildr/trunk/doc/scripts/buildr-git.rb Wed Aug 27 18:47:42 2008
@@ -28,7 +28,7 @@
# Pager from http://nex-3.com/posts/73-git-style-automatic-paging-in-ruby
def run_pager
- return if PLATFORM =~ /win32/
+ return if RUBY_PLATFORM =~ /win32/
return unless STDOUT.tty?
read, write = IO.pipe
Modified: incubator/buildr/trunk/lib/buildr.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr.rb?rev=689694&r1=689693&r2=689694&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr.rb (original)
+++ incubator/buildr/trunk/lib/buildr.rb Wed Aug 27 18:47:42 2008
@@ -14,7 +14,6 @@
# the License.
-$KCODE = 'utf8'
module Buildr
VERSION = '1.3.3'.freeze # unless const_defined?(:VERSION)
end
Modified: incubator/buildr/trunk/lib/buildr/core/util.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/core/util.rb?rev=689694&r1=689693&r2=689694&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/core/util.rb (original)
+++ incubator/buildr/trunk/lib/buildr/core/util.rb Wed Aug 27 18:47:42 2008
@@ -112,32 +112,33 @@
end
-module Kernel #:nodoc:
- # Borrowed from Ruby 1.9.
- def tap
- yield self if block_given?
- self
- end unless method_defined?('tap')
-end
-
+if RUBY_VERSION < '1.9.0'
+ module Kernel #:nodoc:
+ # Borrowed from Ruby 1.9.
+ def tap
+ yield self if block_given?
+ self
+ end unless method_defined?('tap')
+ end
-class Symbol #:nodoc:
- # Borrowed from Ruby 1.9.
- def to_proc
- Proc.new{|*args| args.shift.__send__(self, *args)}
- end unless method_defined?('to_proc')
-end
+ class Symbol #:nodoc:
+ # Borrowed from Ruby 1.9.
+ def to_proc
+ Proc.new{|*args| args.shift.__send__(self, *args)}
+ end unless method_defined?('to_proc')
+ end
+
+ # Also borrowed from Ruby 1.9.
+ class BasicObject #:nodoc:
+ (instance_methods - ['__send__', '__id__', '==', 'send', 'send!',
'respond_to?', 'equal?', 'object_id']).
+ each do |method|
+ undef_method method
+ end
-# Also borrowed from Ruby 1.9.
-class BasicObject #:nodoc:
- (instance_methods - ['__send__', '__id__', '==', 'send', 'send!',
'respond_to?', 'equal?', 'object_id']).
- each do |method|
- undef_method method
+ def self.ancestors
+ [Kernel]
end
-
- def self.ancestors
- [Kernel]
end
end
Modified: incubator/buildr/trunk/lib/buildr/java.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/java.rb?rev=689694&r1=689693&r2=689694&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/java.rb (original)
+++ incubator/buildr/trunk/lib/buildr/java.rb Wed Aug 27 18:47:42 2008
@@ -15,7 +15,7 @@
ENV['JAVA_HOME'] ||= '/System/Library/Frameworks/JavaVM.framework/Home' if
Config::CONFIG['host_os'] =~ /darwin/i
-require PLATFORM == 'java' ? 'buildr/java/jruby' : 'buildr/java/rjb'
+require RUBY_PLATFORM == 'java' ? 'buildr/java/jruby' : 'buildr/java/rjb'
require 'buildr/java/compilers'
Modified: incubator/buildr/trunk/lib/buildr/java/packaging.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/java/packaging.rb?rev=689694&r1=689693&r2=689694&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/java/packaging.rb (original)
+++ incubator/buildr/trunk/lib/buildr/java/packaging.rb Wed Aug 27 18:47:42 2008
@@ -168,14 +168,14 @@
if manifest
# Tempfiles gets deleted on garbage collection, so we're going
to hold on to it
# through instance variable not closure variable.
- Tempfile.open 'MANIFEST.MF' do |@manifest_tmp|
- self.manifest = File.read(manifest.to_s) if String ===
manifest || Rake::Task === manifest
- self.manifest = Manifest.new(manifest) unless Manifest ===
manifest
- @manifest_tmp.write Manifest::STANDARD_HEADER
- @manifest_tmp.write manifest.to_s
- @manifest_tmp.write "\n"
- path('META-INF').include @manifest_tmp.path, :as=>'MANIFEST.MF'
- end
+ @manifest_tmp = Tempfile.new('MANIFEST.MF')
+ self.manifest = File.read(manifest.to_s) if String === manifest
|| Rake::Task === manifest
+ self.manifest = Manifest.new(manifest) unless Manifest ===
manifest
+ @manifest_tmp.write Manifest::STANDARD_HEADER
+ @manifest_tmp.write manifest.to_s
+ @manifest_tmp.write "\n"
+ @manifest_tmp.rewind
+ path('META-INF').include @manifest_tmp.path, :as=>'MANIFEST.MF'
end
end
end
Modified: incubator/buildr/trunk/lib/buildr/packaging/gems.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/packaging/gems.rb?rev=689694&r1=689693&r2=689694&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/packaging/gems.rb (original)
+++ incubator/buildr/trunk/lib/buildr/packaging/gems.rb Wed Aug 27 18:47:42 2008
@@ -79,7 +79,7 @@
def package_as_gem(file_name) #:nodoc:
PackageGemTask.define_task(file_name).tap do |gem|
- %{ lib test doc }.each do |dir|
+ %w{ lib test doc }.each do |dir|
gem.include :from=>_(dir), :path=>dir if File.directory?(_(dir))
end
gem.spec do |spec|
Modified: incubator/buildr/trunk/lib/buildr/packaging/zip.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/packaging/zip.rb?rev=689694&r1=689693&r2=689694&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/packaging/zip.rb (original)
+++ incubator/buildr/trunk/lib/buildr/packaging/zip.rb Wed Aug 27 18:47:42 2008
@@ -14,6 +14,7 @@
# the License.
+$LOADED_FEATURES.unshift 'ftools' if RUBY_VERSION >= '1.9.0'
require 'zip/zip'
require 'zip/zipfilesystem'
Modified: incubator/buildr/trunk/rakelib/apache.rake
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/rakelib/apache.rake?rev=689694&r1=689693&r2=689694&view=diff
==============================================================================
--- incubator/buildr/trunk/rakelib/apache.rake (original)
+++ incubator/buildr/trunk/rakelib/apache.rake Wed Aug 27 18:47:42 2008
@@ -14,8 +14,8 @@
# the License.
-require 'md5'
-require 'sha1'
+require 'digest/md5'
+require 'digest/sha1'
# Tasks specific to Apache projects (license, release, etc).
Modified: incubator/buildr/trunk/spec/java_bdd_frameworks_spec.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/spec/java_bdd_frameworks_spec.rb?rev=689694&r1=689693&r2=689694&view=diff
==============================================================================
--- incubator/buildr/trunk/spec/java_bdd_frameworks_spec.rb (original)
+++ incubator/buildr/trunk/spec/java_bdd_frameworks_spec.rb Wed Aug 27 18:47:42
2008
@@ -43,7 +43,7 @@
end
-end if PLATFORM =~ /java/ # RSpec
+end if RUBY_PLATFORM =~ /java/ # RSpec
describe Buildr::JtestR do
