buildr 1.2.6 → 1.2.7

data/CHANGELOG

@@ -1,3 +1,14 @@
+1.2.7 (10/29/2007)
+* Added: You can create an artifact from a given file using artifact(<spec>).from(<path>).  You can then install it into the local repository or upload it to the release server using install(<artifacts>) and upload(<artifacts>). (Idea: Shane Witbeck and Tommy Mason).
+* Added: ANTLR support.
+* Changed: Speed boost to ZIP packaging.
+* Changed: RjbWrapper is now JavaWrapper, and revised to nicely support JRuby.  A few other minor tweaks to make JRuby support possible in the future. (Travis Tilley)
+* Changed: JUnit now runs tests with clonevm false by default, you can change with test.using :clonevm=>true (Karel)
+* Changed: JUnit now switches over to project's base directory.
+* Changed: package(:war).with(:libs, :classes) uses only these specified libs and class directories, replacing any previous value.
+* Fixed: Jetty task no longer sets "log4j.configuration" system property
+* Fixed: release task didn't work
+
 1.2.6 (9/26/2007)
 * Added: Option for setting environment name (-e) and attribute accessor (Buildr.environment).  Default taken from BUILDR_ENV environment variable.
 * Added: AAR packaging for Axis2 service archives (Alex Boisvert)

data/Rakefile

@@ -5,38 +5,63 @@ require "spec/rake/spectask"
 
 
 # Gem specification comes first, other tasks rely on it.
-spec = Gem::Specification.new do |spec|
-  spec.name         = "buildr"
-  spec.version      = File.read(__FILE__.pathmap("%d/lib/buildr.rb")).scan(/VERSION\s*=\s*(['"])(.*)\1/)[0][1]
-  spec.author       = "Assaf Arkin"
-  spec.email        = "arkin@intalio.com"
-  spec.homepage     = "http://#{spec.name}.rubyforge.org"
-  spec.summary      = "A build system that doesn't suck"
-  spec.files        = FileList["lib/**/*", "CHANGELOG", "README", "LICENSE", "Rakefile"].collect
-  spec.require_path = "lib"
-  spec.autorequire  = "buildr.rb"
-  spec.has_rdoc     = true
-  spec.extra_rdoc_files = ["README", "CHANGELOG", "LICENSE"]
-  spec.rdoc_options << "--title" << "Buildr -- #{spec.summary}" <<
-                       "--main" << "README" << "--line-numbers" << "-inline-source"
-  spec.rubyforge_project = "buildr"
-
-  spec.bindir = "bin"                               # Use these for applications.
-  spec.executables = ["buildr"]
-
-  # Tested against these dependencies.
-  spec.add_dependency "rake",                 "= 0.7.3"
-  spec.add_dependency "facets",               "= 1.8.54"
-  spec.add_dependency "builder",              "= 2.1.2"
-  spec.add_dependency "net-ssh",              "= 1.1.2"
-  spec.add_dependency "net-sftp",             "= 1.1.0"
-  spec.add_dependency "rubyzip",              "= 0.9.1"
-  spec.add_dependency "highline",             "= 1.4.0"
-  spec.add_dependency "rjb",                  "= 1.0.6"
-  spec.add_dependency "Antwrap",              "= 0.6.0"
-  spec.add_dependency "rspec",                "= 1.0.8"
-  spec.add_dependency "xml-simple",           "= 1.0.11"
-  spec.add_dependency "archive-tar-minitar",  "= 0.5.1"
+def specify(platform)
+  Gem::Specification.new do |spec|
+    spec.name         = "buildr"
+    spec.version      = File.read(__FILE__.pathmap("%d/lib/buildr.rb")).scan(/VERSION\s*=\s*(['"])(.*)\1/)[0][1]
+    spec.author       = "Assaf Arkin"
+    spec.email        = "arkin@intalio.com"
+    spec.homepage     = "http://#{spec.name}.rubyforge.org"
+    spec.summary      = "A build system that doesn't suck"
+    spec.files        = FileList["lib/**/*", "CHANGELOG", "README", "LICENSE", "Rakefile"].collect
+    spec.require_path = "lib"
+    spec.autorequire  = "buildr.rb"
+    spec.has_rdoc     = true
+    spec.extra_rdoc_files = ["README", "CHANGELOG", "LICENSE"]
+    spec.rdoc_options << "--title" << "Buildr -- #{spec.summary}" <<
+                         "--main" << "README" << "--line-numbers" << "-inline-source"
+    spec.rubyforge_project = "buildr"
+
+    spec.bindir = "bin"                               # Use these for applications.
+    spec.executables = ["buildr"]
+
+    # Tested against these dependencies.
+    spec.add_dependency "rake",                 "= 0.7.3"
+    spec.add_dependency "facets",               "= 1.8.54"
+    spec.add_dependency "builder",              "= 2.1.2"
+    spec.add_dependency "net-ssh",              "= 1.1.2"
+    spec.add_dependency "net-sftp",             "= 1.1.0"
+    spec.add_dependency "rubyzip",              "= 0.9.1"
+    spec.add_dependency "highline",             "= 1.4.0"
+    spec.add_dependency "Antwrap",              "= 0.6.0"
+    spec.add_dependency "rspec",                "= 1.0.8"
+    spec.add_dependency "xml-simple",           "= 1.0.11"
+    spec.add_dependency "archive-tar-minitar",  "= 0.5.1"
+    
+    spec.platform = platform
+
+    yield spec if block_given?
+  end
+end
+
+spec = specify(Gem::Platform::RUBY) { |spec| spec.add_dependency "rjb", "= 1.0.6" }
+jruby_spec = specify('java')
+package = Rake::GemPackageTask.new(spec) do |pkg|
+  pkg.need_tar = true
+  pkg.need_zip = true
+end
+jruby_package = Rake::GemPackageTask.new(jruby_spec)
+
+desc "Install the package locally"
+task :install=>:package do |task|
+  install = RUBY_PLATFORM == 'java' ? jruby_package : package
+  system 'gem', 'install', File.expand_path(install.gem_file, install.package_dir)
+end
+
+desc "Uninstall previously installed packaged"
+task :uninstall do |task|
+  install = RUBY_PLATFORM == 'java' ? jruby_package : package
+  system "gem", "uninstall", install.name, "-v", install.version.to_s
 end
 
 
@@ -55,23 +80,6 @@ Spec::Rake::SpecTask.new(:rcov) do |task|
 end
 
 
-# Packaging and local installation.
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.need_tar = true
-  pkg.need_zip = true
-end
-
-desc "Install the package locally"
-task :install=>:package do |task|
-  system "gem", "install", "pkg/#{spec.name}-#{spec.version}.gem"
-end
-
-desc "Uninstall previously installed packaged"
-task :uninstall do |task|
-  system "gem", "uninstall", spec.name, "-v", spec.version.to_s
-end
-
-
 # Documentation.
 begin
   require "rake/rdoctask"
@@ -124,7 +132,6 @@ rescue LoadError=>error
 end
 
 
-
 # Commit to SVN, upload and do the release cycle.
 namespace :svn do
   task :clean? do |task|
@@ -159,7 +166,7 @@ namespace :upload do
     fail "No changeset found for version #{spec.version}" unless current
 
     puts "Uploading #{spec.name} #{spec.version}"
-    files = %w( gem tgz zip ).map { |ext| "pkg/#{spec.name}-#{spec.version}.#{ext}" }
+    files = Dir.glob('pkg/*.{gem,tgz,zip}')
     rubyforge = RubyForge.new
     rubyforge.login    
     File.open(".changes", 'w'){|f| f.write(current)}
@@ -203,7 +210,6 @@ desc "Upload release to RubyForge including docs, tag SVN"
 task :release=>[ "release:ready?", "release:meat", "release:post" ]
 
 
-
 # Misc, may not survive so don't rely on these.
 task :report do |task|
   puts "#{spec.name} #{spec.version}"

data/lib/buildr.rb

@@ -1,3 +1,9 @@
+# in order to work around a bug in jruby (1.0.1 and trunk as of oct11, 2007)
+# needle and net/ssh need to be loaded before -anything- else. please see
+# http://jira.codehaus.org/browse/JRUBY-1188 for more info.
+require 'needle'
+require 'net/ssh'
+
 require "highline"
 require "highline/import"
 # &:symbol goodness.
@@ -24,7 +30,7 @@ require "builder"
 
 
 module Buildr
-  VERSION = "1.2.6".freeze # unless const_defined?(:VERSION)
+  VERSION = "1.2.7".freeze # unless const_defined?(:VERSION)
 end
 
 

data/lib/buildr/antlr.rb

@@ -0,0 +1,52 @@
+require "java/java"
+
+module Buildr
+  # Provides ANTLR grammar generation tasks. Require explicitly using <code>require "buildr/antlr"</code>.
+  module ANTLR
+    REQUIRES = [ "org.antlr:antlr:jar:3.0", "antlr:antlr:jar:2.7.7", "org.antlr:stringtemplate:jar:3.0" ]
+
+    Java.wrapper.classpath << REQUIRES
+
+    class << self
+      def antlr(*args)
+        options = Hash === args.last ? args.pop : {}
+        rake_check_options options, :output, :token
+
+        args = args.flatten.map(&:to_s).collect { |f| File.directory?(f) ? FileList[f + "/**/*.g"] : f }.flatten
+        args = ["-o",  options[:output]] + args if options[:output]
+        if options[:token]
+          # antlr expects the token directory to exist when it starts
+          mkdir_p options[:token] 
+          args = ["-lib",  options[:token]] + args 
+        end
+        Java.wrapper do |wrapper|
+          antlr_class = wrapper.import("org.antlr.Tool")
+          antlr_tool = antlr_class.new_with_sig("[Ljava.lang.String;", args)
+          antlr_tool.process
+          #wrapper.import("org.antlr.Tool").main(args) == 0 or
+          #  fail "Failed to run ANTLR, see errors above."
+        end
+      end
+    end
+
+    def antlr(*args)
+      if Hash === args.last
+        options = args.pop 
+        in_package = options[:in_package].split(".")
+        token = options[:token].split(".") if options[:token]
+      else
+        in_package = []; token = nil
+      end
+      file(path_to(:target, "generated/antlr")=>args.flatten) do |task|
+        args = {:output=>File.join(task.name, in_package)}
+        args.merge!({:token=>File.join(task.name, token)}) if token
+        ANTLR.antlr task.prerequisites, args
+      end         
+    end
+
+  end
+  
+  class Project
+    include ANTLR
+  end
+end

data/lib/buildr/javacc.rb

@@ -6,7 +6,7 @@ module Buildr
 
     REQUIRES = [ "net.java.dev.javacc:javacc:jar:4.0", "net.java.dev.javacc:javacc:jar:4.0" ]
 
-    Java.rjb.classpath << REQUIRES
+    Java.wrapper.classpath << REQUIRES
 
     class << self
 
@@ -16,8 +16,8 @@ module Buildr
 
         args = args.flatten.map(&:to_s).collect { |f| File.directory?(f) ? FileList[f + "/**/*.jj"] : f }.flatten
         args.unshift "-OUTPUT_DIRECTORY=#{options[:output]}" if options[:output]
-        Java.rjb do |rjb|
-          rjb.import("org.javacc.parser.Main").mainProgram(args) == 0 or
+        Java.wrapper do |jw|
+          jw.import("org.javacc.parser.Main").mainProgram(args) == 0 or
             fail "Failed to run JavaCC, see errors above."
         end
       end
@@ -29,8 +29,8 @@ module Buildr
         args = args.flatten.map(&:to_s).collect { |f| File.directory?(f) ? FileList[f + "**/*.jjt"] : f }.flatten
         args.unshift "-OUTPUT_DIRECTORY=#{options[:output]}" if options[:output]
         args.unshift "-BUILD_NODE_FILES=#{options[:build_node_files] || false}"
-        Java.rjb do |rjb|
-          rjb.import("org.javacc.jjtree.JJTree").new.main(args) == 0 or
+        Java.wrapper do |jw|
+          jw.import("org.javacc.jjtree.JJTree").new.main(args) == 0 or
             fail "Failed to run JJTree, see errors above."
         end
       end

data/lib/buildr/jetty.rb

@@ -36,7 +36,7 @@ module Buildr
       "org.mortbay.jetty:servlet-api-2.5:jar:#{VERSION}", "org.slf4j:slf4j-api:jar:#{SLF4J_VERSION}", 
       "org.slf4j:slf4j-simple:jar:#{SLF4J_VERSION}", "org.slf4j:jcl104-over-slf4j:jar:#{SLF4J_VERSION}" ]
       
-    Java.rjb.onload { |rjb| rjb.classpath << REQUIRES << File.join(__DIR__, "jetty") }
+    Java.wrapper.setup { |jw| jw.classpath << REQUIRES << File.join(__DIR__, "jetty") }
     
     # Default URL for Jetty (change with options.jetty.url).
     URL = "http://localhost:8080"
@@ -74,13 +74,11 @@ module Buildr
     # invoke the #use task instead.
     def start(sync = nil)
       begin
-        Java.rjb do
-          puts "RJB classpath #{Java.rjb.classpath.inspect}"
-          props = Rjb::import('java.lang.System').getProperties
-          props.setProperty("log4j.configuration", "file:./log4j.properties")
+        Java.wrapper do |jw|
+          puts "classpath #{jw.classpath.inspect}"
           port = URI.parse(url).port
           puts "Starting Jetty at http://localhost:#{port}" if verbose
-          jetty = Rjb::import("JettyWrapper").new(port)
+          jetty = jw.import("JettyWrapper").new(port)
           sync << "Started" if sync
           sleep # Forever
         end

data/lib/buildr/openjpa.rb

@@ -17,7 +17,7 @@ module Buildr
       "org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec:jar:1.0",
       "net.sourceforge.serp:serp:jar:1.11.0" ]
 
-    Java.rjb.classpath << REQUIRES
+    Java.wrapper.classpath << REQUIRES
 
     class << self
 

data/lib/buildr/scala.rb

@@ -44,8 +44,8 @@ module Buildr
           if use_fsc
             system ([ENV["SCALA_HOME"]+"/bin/fsc"] + cmd_args).join(" ")
             else
-            Java.rjb do |rjb|
-              rjb.import("scala.tools.nsc.Main").main(cmd_args) == 0 or
+            Java.wrapper do |jw|
+              jw.import("scala.tools.nsc.Main").main(cmd_args) == 0 or
               fail "Failed to compile, see errors above"
             end
           end

data/lib/core/build.rb

@@ -113,9 +113,11 @@ module Buildr
       # Make a release.
       def make()
         check
-        options = ['--buildfile', filename, 'DEBUG=no']
-        options << '--environment' << Buildr.environment unless Buildr.environment.to_s.empty?
-        version = with_next_version { |filename, version| sh "#{command} clean upload #{option.join(' ')}" }
+        version = with_next_version do |filename, version| 
+          options = ['--buildfile', filename, 'DEBUG=no']
+          options << '--environment' << Buildr.environment unless Buildr.environment.to_s.empty?
+          sh "#{command} clean upload #{options.join(' ')}"
+        end
         tag version
         commit version + "-SNAPSHOT"
       end

data/lib/java/ant.rb

@@ -12,7 +12,7 @@ module Buildr
 
     # Libraries used by Ant.
     REQUIRES = [ "org.apache.ant:ant:jar:#{VERSION}", "org.apache.ant:ant-launcher:jar:#{VERSION}", "xerces:xercesImpl:jar:2.6.2" ]
-    Java.rjb.onload { |rjb| rjb.classpath << REQUIRES }
+    Java.wrapper.setup { |jw| jw.classpath << REQUIRES }
 
     class << self
 
@@ -49,7 +49,7 @@ module Buildr
       warn_deprecated "Options are ignored." if options
       options = { :name=>name, :basedir=>Dir.pwd, :declarative=>true }
       options.merge!(:logger=> Logger.new(STDOUT), :loglevel=> Logger::DEBUG) if Rake.application.options.trace
-      Java.rjb do
+      Java.wrapper do
         AntProject.new(options).tap do |project|
           # Set Ant logging level to debug (--trace), info (default) or error only (--quiet).
           project.project.getBuildListeners().get(0).

data/lib/java/artifact.rb

@@ -6,7 +6,6 @@ module Buildr
 
   desc "Download all artifacts"
   task "artifacts"
-  task "artifacts:refresh"
 
   # Mixin with a task to make it behave like an artifact. Implemented by the packaging tasks.
   #
@@ -255,6 +254,34 @@ module Buildr
       end
     end
 
+    # :call-seq:
+    #   from(path) => self
+    #
+    # Use this when you want to install or upload an artifact from a given file, for example:
+    #   test = artifact('group:id:jar:1.0').from('test.jar')
+    #   install test
+    # See also Buildr#install and Buildr#deploy.
+    def from(path)
+      path = File.expand_path(path.to_s)
+      enhance [path] do
+        verbose false do
+          mkpath File.dirname(name)
+          pom.invoke unless type == :pom
+          cp path, name
+          puts "Installed #{path} as #{to_spec}" if verbose
+        end
+      end
+      unless type == :pom
+        pom.enhance do
+          verbose false do
+            mkpath File.dirname(pom.name)
+            File.open(pom.name, 'w') { |file| file.write pom.pom_xml }
+          end
+        end
+      end
+      self
+    end
+
   protected
 
     # :call-seq:
@@ -586,6 +613,48 @@ module Buildr
     args.flatten.map { |id| artifact :group=>hash[:under], :version=>hash[:version], :id=>id }
   end 
 
+  # :call-seq:
+  #   install(artifacts)
+  #
+  # Installs the specified artifacts in the local repository as part of the install task.
+  #
+  # You can use this to install various files in the local repository, for example:
+  #   install artifact('group:id:jar:1.0').from('some_jar.jar')
+  #   $ buildr install
+  def install(*args, &block)
+    artifacts = artifacts(args)
+    raise ArgumentError, 'This method can only install artifacts' unless artifacts.all? { |f| f.respond_to?(:to_spec) }
+    all = (artifacts + artifacts.map { |artifact| artifact.pom }).uniq
+    task('install').tap do |task|
+      task.enhance all, &block
+      task 'uninstall' do
+        verbose false do
+          all.map(&:to_s ).each { |file| rm file if File.exist?(file) }
+        end
+      end
+    end
+  end
+
+  # :call-seq:
+  #   upload(artifacts)
+  #
+  # Uploads the specified artifacts to the release server as part of the upload task.
+  #
+  # You can use this to upload various files to the release server, for example:
+  #   upload artifact('group:id:jar:1.0').from('some_jar.jar')
+  #   $ buildr upload
+  def upload(*args, &block)
+    artifacts = artifacts(args)
+    raise ArgumentError, 'This method can only upload artifacts' unless artifacts.all? { |f| f.respond_to?(:to_spec) }
+    all = (artifacts + artifacts.map { |artifact| artifact.pom }).uniq
+    task('upload').tap do |task|
+      task.enhance &block if block
+      task.enhance all do
+        all.each { |artifact| artifact.upload }
+      end
+    end
+  end
+
   # *Deprecated* For artifact, call it's upload method; for anything else, use URI.upload.
   def deploy(*args)
     warn_deprecated "If it's an artifact, call it's upload method directly. Otherwise, use URI.upload."

data/lib/java/java.rb

@@ -1,4 +1,5 @@
-require "rjb"
+require "rjb" if RUBY_PLATFORM != 'java'
+require "java" if RUBY_PLATFORM == 'java'
 require "core/project"
 
 module Buildr
@@ -9,7 +10,7 @@ module Buildr
     # Options accepted by #java and other methods here.
     JAVA_OPTIONS = [ :verbose, :classpath, :name, :java_args, :properties ]
 
-    # Returned by Java#rjb, you can use this object to set the RJB classpath, specify blocks to be invoked
+    # Returned by Java#wrapper, you can use this object to set the classpath, specify blocks to be invoked
     # after loading RJB, and load RJB itself.
     #
     # RJB can be loaded exactly once, and once loaded, you cannot change its classpath. Of course you can
@@ -17,52 +18,77 @@ module Buildr
     # classpath dependencies you need in advance, before loading it.
     #
     # For that reason, you should not load RJB until the moment you need it. You can call #load or call
-    # Java#rjb with a block. For the same reason, you may need to specify code to execute when loading
-    # (see #onload).
-    class RjbWrapper #:nodoc:
+    # Java#wrapper with a block. For the same reason, you may need to specify code to execute when loading
+    # (see #setup).
+    #
+    # JRuby doesn't have the above limitation, but uses the same API regardless.
+    class JavaWrapper #:nodoc:
 
       include Singleton
 
       def initialize() #:nodoc:
         @classpath = [Java.tools_jar].compact
-        @onload = []
-        onload do
-          onload do
-            classpath = Buildr.artifacts(@classpath).each { |task| task.invoke if task.respond_to?(:invoke) }.map(&:to_s)
-            ::Rjb.load classpath.join(File::PATH_SEPARATOR), Buildr.options.java_args.flatten
+        @setup = []
+        setup do
+          setup do
+            classpath = Buildr.artifacts(@classpath).
+              each { |task| task.invoke if task.respond_to?(:invoke) }.
+              map(&:to_s)
+
+            if RUBY_PLATFORM != 'java'
+              ::Rjb.load classpath.join(File::PATH_SEPARATOR),
+                Buildr.options.java_args.flatten
+            else
+              classpath.each do |jlib|
+                require jlib
+              end
+            end
           end
         end
       end
 
-      # The classpath used when loading RJB.
-      attr_accessor :classpath
+      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
 
-      # :call-seq:
-      #   onload { |rjb| ... }
-      #
-      # Adds a block to call when loading RJB and returns self.
-      #
-      # You can only load RJB once, and you may need to do some tasks after the initial load.
-      # For example, the Ant module requires Antwrap which can only be loaded after RJB.
-      def onload(&block)
-        @onload << block
+      def setup(&block)
+        @setup << block
         self
       end
 
-      # :call-seq:
-      #   load()
-      #
-      # Loads RJB. You can also call Java#ejb with a block to get the same effect.
       def load()
-        @onload.each { |block| block.call self }
-        @onload.clear
+        @setup.each { |block| block.call self }
+        @setup.clear
+      end
+
+      def import(jlib)
+        if RUBY_PLATFORM == 'java'
+          Java.send(jlib)
+        else
+          ::Rjb.import jlib
+        end
       end
 
       def method_missing(sym, *args, &block) #:nodoc:
-        ::Rjb.send sym, *args, &block
+        # 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
+        else
+          ::Rjb.send sym, *args, &block
+        end
       end
     end
-
+    
     class << self
 
       # :call-seq:
@@ -74,7 +100,7 @@ module Buildr
       #   puts Java.version
       #   => 1.5.0_10
       def version()
-        @version ||= Java.rjb { |rjb| rjb.import("java.lang.System").getProperty("java.version") }
+        @version ||= Java.wrapper { |jw| jw.import("java.lang.System").getProperty("java.version") }
       end
 
       # :call-seq:
@@ -160,8 +186,8 @@ module Buildr
         unless Rake.application.options.dryrun
           puts "Running apt" if verbose
           puts (["apt"] + cmd_args).join(" ") if Rake.application.options.trace
-          Java.rjb do |rjb|
-            rjb.import("com.sun.tools.apt.Main").process(cmd_args) == 0 or
+          Java.wrapper do |jw|
+            jw.import("com.sun.tools.apt.Main").process(cmd_args) == 0 or
               fail "Failed to process annotations, see errors above"
           end
         end
@@ -197,8 +223,8 @@ module Buildr
         unless Rake.application.options.dryrun
           puts "Compiling #{files.size} source files in #{name}" if verbose
           puts (["javac"] + cmd_args).join(" ") if Rake.application.options.trace
-          Java.rjb do |rjb|
-            rjb.import("com.sun.tools.javac.Main").compile(cmd_args) == 0 or
+          Java.wrapper do |jw|
+            jw.import("com.sun.tools.javac.Main").compile(cmd_args) == 0 or
               fail "Failed to compile, see errors above"
           end
         end
@@ -248,8 +274,8 @@ module Buildr
         unless Rake.application.options.dryrun
           puts "Generating Javadoc for #{name}" if verbose
           puts (["javadoc"] + cmd_args).join(" ") if Rake.application.options.trace
-          Java.rjb do |rjb|
-            rjb.import("com.sun.tools.javadoc.Main").execute(cmd_args) == 0 or
+          Java.wrapper do |jw|
+            jw.import("com.sun.tools.javadoc.Main").execute(cmd_args) == 0 or
               fail "Failed to generate Javadocs, see errors above"
           end
         end
@@ -292,27 +318,28 @@ module Buildr
 
 
       # :call-seq:
-      #   rjb() => RjbWrapper
-      #   rjb() { ... }
+      #   wrapper() => JavaWrapper
+      #   wrapper() { ... }
       #
-      # This method can be used in two ways. Without a block, returns the RjbWrapper
-      # object which you can use to configure the RJB classpath or call other RJB methods.
-      # With a block, loads RJB and yields to the block, returning its result.
+      # This method can be used in two ways. Without a block, returns the
+      # JavaWrapper object which you can use to configure the classpath or call
+      # other methods. With a block, loads RJB or sets up JRuby and yields to
+      # the block, returning its result.
       #
       # For example:
-      #   Java.rjb.classpath << REQUIRES
-      #   Java.rjb.onload { require "antwrap" }
+      #   Java.wrapper.classpath << REQUIRES
+      #   Java.wrapper.setup { require "antwrap" }
       #
       #  def execute(name, options)
       #    options = options.merge(:name=>name, :base_dir=>Dir.pwd, :declarative=>true)
-      #    Java.rjb { AntProject.new(options) }
+      #    Java.wrapper { AntProject.new(options) }
       #  end
-      def rjb()
+      def wrapper()
         if block_given?
-          RjbWrapper.instance.load
-          yield RjbWrapper.instance
+          JavaWrapper.instance.load
+          yield JavaWrapper.instance
         else
-          RjbWrapper.instance
+          JavaWrapper.instance
         end
       end
 

data/lib/java/packaging.rb

@@ -21,7 +21,8 @@ module Buildr
       module WithManifest
 
         class << self
-        protected
+        # jruby issue
+        #protected
           def included(mod)
             mod.alias_method_chain :initialize, :manifest
           end
@@ -161,11 +162,11 @@ module Buildr
         end
 
         def libs=(value) #:nodoc:
-          @libs |= Buildr.artifacts(value)
+          @libs = Buildr.artifacts(value)
         end
 
         def classes=(value) #:nodoc:
-          @classes |= [value].flatten.map { |dir| file(dir.to_s) }
+          @classes = [value].flatten.map { |dir| file(dir.to_s) }
         end
   
       end

data/lib/java/pom.rb

@@ -85,7 +85,7 @@ module Buildr
                 exclusions.find {|ex| dep.index("#{dep['groupdId'].first}:#{dep['artifactId'].first}:") == 0}
               } if exclusions
 
-              [Artifact.to_spec(spec.except(:scope))] + transitive_deps
+              [Artifact.to_spec(spec)] + transitive_deps
             end
           }.flatten.compact.uniq_by{|spec| art = spec.split(':'); "#{art[0]}:#{art[1]}"}
 

data/lib/java/test.rb

@@ -369,7 +369,7 @@ module Buildr
           @failed_tests = send("#{framework}_run",
             :classes    => classes,
             :classpath  => @classpath + [compile.target],
-            :properties => { "baseDir" => compile.target.to_s }.merge(options[:properties] || {}),
+            :properties => { 'baseDir' => compile.target.to_s }.merge(options[:properties] || {}),
             :environment=> options[:environment] || {},
             :java_args  => options[:java_args] || Buildr.options.java_args)
           unless @failed_tests.empty?
@@ -395,7 +395,7 @@ module Buildr
       class Report
 
         # Ant-Trax required for running the JUnitReport task.
-        Java.rjb.onload { |rjb| rjb.classpath << "org.apache.ant:ant-trax:jar:#{Ant::VERSION}" }
+        Java.wrapper.setup { |jw| jw.classpath << "org.apache.ant:ant-trax:jar:#{Ant::VERSION}" }
 
         # Parameters passed to the Ant JUnitReport task.
         attr_reader :params
@@ -447,7 +447,7 @@ module Buildr
       JUNIT_TESTS_PATTERN = [ "Test*", "*Test" ]
 
       # Ant-JUnit requires for JUnit and JUnit reports tasks.
-      Java.rjb.onload { |rjb| rjb.classpath << "org.apache.ant:ant-junit:jar:#{Ant::VERSION}" }
+      Java.wrapper.setup { |jw| jw.classpath << "org.apache.ant:ant-junit:jar:#{Ant::VERSION}" }
 
       class << self
 
@@ -485,7 +485,7 @@ module Buildr
           else
             fail "Option fork must be :once, :each or false."
           end
-          ant.junit forking.merge(:clonevm=>true) do
+          ant.junit forking.merge(:clonevm=>options[:clonevm] || false, :dir=>@project.path_to) do
             ant.classpath :path=>args[:classpath].map(&:to_s).each { |path| file(path).invoke }.join(File::PATH_SEPARATOR)
             args[:properties].each { |key, value| ant.sysproperty :key=>key, :value=>value }
             args[:environment].each { |key, value| ant.env :key=>key, :value=>value }

data/lib/tasks/zip.rb

@@ -401,23 +401,30 @@ module Buildr
   private
 
     def create_from(file_map)
-      Zip::ZipFile.open(name, Zip::ZipFile::CREATE) do |zip|
-        zip.restore_permissions = true
+      Zip::ZipOutputStream.open name do |zip|
+        seen = {}
         mkpath = lambda do |dir|
-          unless dir == "." || zip.find_entry(dir)
+          unless dir == "." || seen[dir]
             mkpath.call File.dirname(dir)
-            zip.mkdir dir
+            zip.put_next_entry dir + '/'
+            seen[dir] = true
           end
         end
-
+      
         file_map.each do |path, content|
           mkpath.call File.dirname(path)
           if content.respond_to?(:call)
-            zip.get_output_stream(path) { |output| content.call(output) }
+            zip.put_next_entry path
+            content.call zip
           elsif content.nil? || File.directory?(content.to_s)
             mkpath.call path
           else
-            zip.add path, content.to_s
+            zip.put_next_entry path
+            File.open content.to_s, "rb" do |is|
+              while data = is.read(4096)
+                zip << data
+              end
+            end
           end
         end
       end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: buildr
 version: !ruby/object:Gem::Version 
-  version: 1.2.6
-date: 2007-09-26 00:00:00 -07:00
+  version: 1.2.7
+date: 2007-10-29 00:00:00 -07:00
 summary: A build system that doesn't suck
 require_paths: 
 - lib
@@ -53,6 +53,7 @@ files:
 - lib/buildr/cobertura.rb
 - lib/buildr/jdepend.rb
 - lib/buildr/openjpa.rb
+- lib/buildr/antlr.rb
 - lib/buildr/jetty
 - lib/buildr/jetty/JettyWrapper.java
 - lib/buildr/jetty/JettyWrapper$1.class
@@ -156,15 +157,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.4.0
     version: 
-- !ruby/object:Gem::Dependency 
-  name: rjb
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 1.0.6
-    version: 
 - !ruby/object:Gem::Dependency 
   name: Antwrap
   version_requirement: 
@@ -201,3 +193,12 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.5.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rjb
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.0.6
+    version: