buildr 1.2.8 → 1.2.9

data/CHANGELOG

@@ -1,3 +1,7 @@
+1.2.9 (11/8/2007)
+* Changed: Upgraded to RJB 1.0.11.
+* Fixed: Backward compatibility in Java.rjb/wrapper.
+
 1.2.8 (11/1/2007)
 * Added: Resolving Maven snapshots from remote repository (Rhett Sutphin)
 * Changed: scala options.target now takes number, e.g. "1.5" instead of "jvm-1.5" (Nathan Hamblen)

data/Rakefile

@@ -44,7 +44,7 @@ def specify(platform)
   end
 end
 
-spec = specify(Gem::Platform::RUBY) { |spec| spec.add_dependency "rjb", ">= 1.0.9" }
+spec = specify(Gem::Platform::RUBY) { |spec| spec.add_dependency "rjb", ">= 1.0.11" }
 jruby_spec = specify('java')
 package = Rake::GemPackageTask.new(spec) do |pkg|
   pkg.need_tar = true

data/lib/buildr.rb

@@ -30,7 +30,7 @@ require "builder"
 
 
 module Buildr
-  VERSION = "1.2.8".freeze # unless const_defined?(:VERSION)
+  VERSION = "1.2.9".freeze # unless const_defined?(:VERSION)
 end
 
 

data/lib/java/java.rb

@@ -28,51 +28,48 @@ module Buildr
 
       def initialize() #:nodoc:
         @classpath = [Java.tools_jar].compact
+        if RUBY_PLATFORM == 'java'
+          # in order to get a complete picture, we need to add a few jars to the list.
+          @classpath += java.lang.System.getProperty('java.class.path').split(':').compact
+        end
         @setup = []
+
         setup do
           setup do
-            classpath = Buildr.artifacts(@classpath).
-              each { |task| task.invoke if task.respond_to?(:invoke) }.
-              map(&:to_s)
+            cp = Buildr.artifacts(@classpath).map(&:to_s)
+            cp.each { |path| file(path).invoke }
 
-            if RUBY_PLATFORM != 'java'
-              ::Rjb.load classpath.join(File::PATH_SEPARATOR),
-                Buildr.options.java_args.flatten
-            else
-              classpath.each do |jlib|
+            if RUBY_PLATFORM == 'java'
+              cp.each do |jlib|
                 require jlib
               end
+            else
+              ::Rjb.load cp.join(File::PATH_SEPARATOR), Buildr.options.java_args.flatten
             end
           end
         end
       end
 
-      def classpath
-        if RUBY_PLATFORM == 'java'
-          # in order to get a complete picture, we need to add a few jars to the
-          # list.
-          java.lang.System.getProperty('java.class.path').split(':') +
-            @classpath
-        else
-          @classpath
-        end
-      end
-
-      attr_writer :classpath
+      attr_accessor :classpath
 
       def setup(&block)
         @setup << block
         self
       end
+      
+      def onload(&block)
+        warn_deprecated "use setup { |wrapper| ... } instead"
+        setup &block
+      end
 
-      def load()
+      def load(&block)
         @setup.each { |block| block.call self }
         @setup.clear
       end
 
       def import(jlib)
         if RUBY_PLATFORM == 'java'
-          Java.send(jlib)
+          ::Java.send(jlib)
         else
           ::Rjb.import jlib
         end
@@ -82,7 +79,7 @@ module Buildr
         # these aren't the same, but depending on method_missing while
         # supporting two unrelated systems is asking for trouble anyways.
         if RUBY_PLATFORM == 'java'
-          Java.send sym, *args, &block
+          ::Java.send sym, *args, &block
         else
           ::Rjb.send sym, *args, &block
         end
@@ -327,11 +324,14 @@ module Buildr
       # the block, returning its result.
       #
       # For example:
+      #   # Add class path dependency.
       #   Java.wrapper.classpath << REQUIRES
+      #   # Require AntWrap when loading RJB/JRuby.
       #   Java.wrapper.setup { require "antwrap" }
       #
       #  def execute(name, options)
       #    options = options.merge(:name=>name, :base_dir=>Dir.pwd, :declarative=>true)
+      #    # Load RJB/JRuby and run AntWrap.
       #    Java.wrapper { AntProject.new(options) }
       #  end
       def wrapper()
@@ -343,6 +343,11 @@ module Buildr
         end
       end
 
+      def rjb(&block)
+        warn_deprecated "please use Java.wrapper() instead"
+        wrapper &block
+      end
+
       # :call-seq:
       #   path_to_bin(cmd?) => path
       #

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: buildr
 version: !ruby/object:Gem::Version 
-  version: 1.2.8
-date: 2007-11-01 00:00:00 -07:00
+  version: 1.2.9
+date: 2007-11-08 00:00:00 -08:00
 summary: A build system that doesn't suck
 require_paths: 
 - lib
@@ -200,5 +200,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.9
+        version: 1.0.11
     version: