buildr 1.2.3 → 1.2.4

data/CHANGELOG

@@ -1,7 +1,24 @@
+1.2.4 (8/3/2007)
+* Added: Forking option for JUnit test framework: :once to fork for each project, :each to fork for each test case, and false to not fork. (Tammo van Lessen)
+* Added: Path traversal in Zip, so zip.path("foo/bar").path("..") returns zip.path("foo").
+* Fixed: JUnit test framework output shows errors in console, more readable when forking is on (Tammo van Lessen).
+* Fixed: Cobertura reports not working (Anatol Pomozov).
+* Fixed: Zip creates funky directory name when using :as (Tommy Mason).
+* Fixed: package_as_tar incorrectly calling with(options) (Tommy Mason).
+* Fixed: Loading of everything which should get rid of "already initialized constant VERSION" warning.
+* Fixed: --requires option now works properly when using buildr.
+* Fixed: MANIFEST.MF lines must not be longer than 72 characters (Tommy Mason).
+* Fixed: Creating manifest from array does not place Name first.
+* Fixed: Complain if no remote repositories defined, add at least one repository when creating from POM, POM reader fails if dependencyManagement missing (Jean-Baptiste Quenot).
+* Fixed: Not looking for buildfile in parent directory.
+* Fixed: Project's compile/test task looking for options in local task of same name.
+* Fixed: ZIP/JAR/WAR include directory entries in some cases and not others.
+* Fixed: Computation of relative paths in Eclipse project generation (Cameron Pope)
+
 1.2.3 (7/26/2007)
-* Added: Get your buildfile created form existing POM, just run buildr on existing Maven project (Anatol Pomozov). 
+* Added: Get your buildfile created form existing POM, just run buildr on existing Maven project (Anatol Pomozov).
 * Added: package(:tar), package(:tgz), TarballTask dn TarTask (Tommy Knowlton).
-* Changed: The ArchiveTask needs no introduction: it's a base task that provides common functionality for ZipTask, TarTask and friends. 
+* Changed: The ArchiveTask needs no introduction: it's a base task that provides common functionality for ZipTask, TarTask and friends.
 * Fixed: Release runs buildr instead of buildr.cmd on Windows (Chris Power).
 * Fixed: Cobertura reports broken (Anatol Pomozov).
 

data/lib/buildr.rb

@@ -24,159 +24,25 @@ require "builder"
 
 
 module Buildr
-  VERSION = "1.2.3".freeze
+  VERSION = "1.2.4".freeze # unless const_defined?(:VERSION)
 end
 
+# Now it's safe to load Buildr, after we set up the Rake Application.
+require "core/application"
+require "core/project"
+require "core/build"
+require "core/help"
+require "core/generate"
 
-# When running from +rake+, we already have an Application setup and must plug into it,
-# since the top-level tasks come from there. When running from +buildr+, we get to load
-# Rake and set everything up, and we use our own Application full of cool Buildr features.
-unless defined?(Rake)
-  require "rake"
-
-  module Buildr
-    class Application < Rake::Application #:nodoc:
-
-      DEFAULT_BUILDFILES = ["buildfile", "Buildfile"] + DEFAULT_RAKEFILES
-
-      OPTIONS = [     # :nodoc:
-        ['--help',     '-H', GetoptLong::NO_ARGUMENT,
-          "Display this help message."],
-        ['--nosearch', '-N', GetoptLong::NO_ARGUMENT,
-          "Do not search parent directories for the buildfile."],
-        ['--quiet',    '-q', GetoptLong::NO_ARGUMENT,
-          "Do not log messages to standard output."],
-        ['--buildfile', '-f', GetoptLong::OPTIONAL_ARGUMENT,
-          "Use FILE as the buildfile."],
-        ['--require',  '-r', GetoptLong::REQUIRED_ARGUMENT,
-          "Require MODULE before executing buildfile."],
-        ['--trace',    '-t', GetoptLong::NO_ARGUMENT,
-          "Turn on invoke/execute tracing, enable full backtrace."],
-        ['--verbose',  '-v', GetoptLong::NO_ARGUMENT,
-          "Log message to standard output (default)."],
-        ['--version',  '-V', GetoptLong::NO_ARGUMENT,
-          "Display the program version."],
-        ['--freeze',   "-F",  GetoptLong::NO_ARGUMENT,
-         "Freezes the Buildfile so it always uses Buildr version #{Buildr::VERSION}"],
-        ['--unfreeze', "-U",  GetoptLong::NO_ARGUMENT,
-         "Unfreezes the Buildfile to use the latest version of Buildr"]
-      ]
-
-      def initialize()
-        super
-        @rakefiles = DEFAULT_BUILDFILES
-        @name = "Buildr"
-        opts = GetoptLong.new(*command_line_options)
-        opts.each { |opt, value| do_option(opt, value) }
-        collect_tasks
-      end
-
-      def run()
-        standard_exception_handling do
-          load_buildfile
-          top_level
-        end
-      end
-
-      def do_option(opt, value)
-        case opt
-        when '--help'
-          help
-          exit
-        when "--buildfile"
-          @rakefiles.clear
-          @rakefiles << value
-        when '--version'
-          puts "Buildr, version #{Buildr::VERSION}"
-          exit
-        when "--freeze" 
-          find_buildfile
-          puts "Freezing the Buildfile so it always uses Buildr version #{Buildr::VERSION}"
-          gem = 
-          original = File.read(rakefile)
-          if original =~ /gem\s*(["'])buildr\1/
-            modified = original.sub(/gem\s*(["'])buildr\1\s*,\s*(["']).*\2/, %{gem "buildr", "#{Buildr::VERSION}"})
-          else
-            modified = %{gem "buildr", "#{Buildr::VERSION}"\n} + original
-          end
-          File.open(rakefile, "w") { |file| file.write modified }
-          exit
-        when "--unfreeze"
-          find_buildfile
-          puts "Unfreezing the Buildfile to use the latest version of Buildr from your Gems repository."
-          modified = File.read(rakefile).sub(/^\s*gem\s*(["'])buildr\1.*\n/, "")
-          File.open(rakefile, "w") { |file| file.write modified }
-          exit
-        when '--require', "--nosearch", "--quiet", "--trace", "--verbose"
-          super
-        end
-      end
-
-      def find_buildfile()
-        here = Dir.pwd
-        while ! have_rakefile
-          Dir.chdir("..")
-          if Dir.pwd == here || options.nosearch
-            error = "No Buildfile found (looking for: #{@rakefiles.join(', ')})"
-            if STDIN.isatty
-              chdir(original_dir) { task("generate").invoke }
-              exit 1
-            else
-              raise error
-            end
-          end
-          here = Dir.pwd
-        end
-      end
-
-      def load_buildfile()
-        find_buildfile
-        puts "(in #{Dir.pwd})"
-        load File.expand_path(@rakefile) if @rakefile != ''
-        load_imports
-      end
-
-      def usage()
-        puts "Buildr #{Buildr::VERSION}"
-        puts
-        puts "Usage:"
-        puts "  buildr [-f buildfile] {options} targets..."
-      end
-
-      def help()
-        usage
-        puts
-        puts "Options:"
-        OPTIONS.sort.each do |long, short, mode, desc|
-          if mode == GetoptLong::REQUIRED_ARGUMENT
-            if desc =~ /\b([A-Z]{2,})\b/
-              long = long + "=#{$1}"
-            end
-          end
-          printf "  %-20s (%s)\n", long, short
-          printf "      %s\n", desc
-        end
-        puts
-        puts "For help with your buildfile:"
-        puts "  buildr help"
-      end
-
-      def command_line_options
-        OPTIONS.collect { |lst| lst[0..-2] }
-      end
-
-    end
-
-    Rake.application = Application.new
-  end
-end
-
+require "tasks/concat.rb"
+require "tasks/zip.rb"
+require "tasks/tar.rb"
 
-# Now it's safe to load Buildr, after we set up the Rake Application.
-$LOAD_PATH.unshift __DIR__
-["core", "tasks", "java"].each do |dir|
-  Dir[File.join(__DIR__, dir, "*.rb")].map { |file| File.basename(file) }.each { |file| require "#{dir}/#{file}" }
-end
+require "java/compile"
+require "java/test"
+require "java/packaging"
+require "java/eclipse"
+require "java/idea"
 
 
 # Methods defined in Buildr are both instance methods (e.g. when included in Project)
@@ -190,24 +56,5 @@ end
 # Project has visibility to everything in the Buildr namespace. (See above for constants)
 class Project ; include Buildr ; end
 
-
-module Buildr
-  @loaded_features_to_ignore = $LOADED_FEATURES
-end
-
-# Load the settings files.
-[ File.expand_path("buildr.rb", Gem::user_home), "buildr.rb" ].each { |file| load file if File.exist?(file) }
-[ File.expand_path("buildr.rake", Gem::user_home), File.expand_path("buildr.rake") ].each do |file|
-  if File.exist?(file)
-    warn "Please use '#{file.ext('rb')}' instead of '#{file}'"
-    load file
-  end
-end
-
-#Load local tasks that can be used in the Buildfile.
-Dir["#{Dir.pwd}/tasks/*.rake"].each do |file|
-  unless $LOADED_FEATURES.include?(file)
-    load file
-    $LOADED_FEATURES << file
-  end
-end
+# Load .rake files form tasks directory, and buildr.rb files.
+Buildr.load_tasks_and_local_files

data/lib/buildr/cobertura.rb

@@ -6,7 +6,8 @@ module Buildr
 
     class << self
 
-      REQUIRES = ["cobertura:cobertura:jar:1.8", "log4j:log4j:jar:1.2.9", "asm:asm:jar:2.2.1", "oro:oro:jar:2.0.8"]
+      REQUIRES = ["net.sourceforge.cobertura:cobertura:jar:1.9", "log4j:log4j:jar:1.2.9",
+        "asm:asm:jar:2.2.1", "asm:asm-tree:jar:2.2.1", "oro:oro:jar:2.0.8"]
 
       def requires()
         @requires ||= Buildr.artifacts(REQUIRES).each(&:invoke).map(&:to_s)
@@ -41,15 +42,16 @@ module Buildr
             # We now have two target directories with bytecode. It would make sense to remove compile.target
             # and add instrumented instead, but apparently Cobertura only creates some of the classes, so
             # we need both directories and instrumented must come first.
-            project.test.classpath.unshift file(instrumented)
+            project.test.classpath.unshift instrumented
             project.test.with requires
+            project.test.options[:properties]["net.sourceforge.cobertura.datafile"] = data_file
             project.clean { rm_rf instrumented.to_s, :verbose=>false }
           end
         end
       end
 
       desc "Run the test cases and produce code coverage reports in #{report_to(:html)}"
-      task "html"=>["instrument", "test:all"] do
+      task "html"=>["instrument", "test"] do
         puts "Creating test coverage reports in #{report_to(:html)}"
         Buildr.ant "cobertura" do |ant|
           ant.taskdef :classpath=>requires.join(File::PATH_SEPARATOR), :resource=>"tasks.properties"
@@ -62,7 +64,7 @@ module Buildr
       end
 
       desc "Run the test cases and produce code coverage reports in #{report_to(:xml)}"
-      task "xml"=>["instrument", "test:all"] do
+      task "xml"=>["instrument", "test"] do
         puts "Creating test coverage reports in #{report_to(:xml)}"
         Buildr.ant "cobertura" do |ant|
           ant.taskdef :classpath=>requires.join(File::PATH_SEPARATOR), :resource=>"tasks.properties"

data/lib/core/application.rb

@@ -0,0 +1,180 @@
+module Buildr
+
+  # When running from +rake+, we already have an Application setup and must plug into it,
+  # since the top-level tasks come from there. When running from +buildr+, we get to load
+  # Rake and set everything up, and we use our own Application full of cool Buildr features.
+  unless defined?(Rake)
+    require "rake"
+
+    class Application < Rake::Application #:nodoc:
+
+      DEFAULT_BUILDFILES = ["buildfile", "Buildfile"] + DEFAULT_RAKEFILES
+
+      OPTIONS = [     # :nodoc:
+        ['--help',     '-H', GetoptLong::NO_ARGUMENT,
+          "Display this help message."],
+        ['--nosearch', '-N', GetoptLong::NO_ARGUMENT,
+          "Do not search parent directories for the buildfile."],
+        ['--quiet',    '-q', GetoptLong::NO_ARGUMENT,
+          "Do not log messages to standard output."],
+        ['--buildfile', '-f', GetoptLong::OPTIONAL_ARGUMENT,
+          "Use FILE as the buildfile."],
+        ['--require',  '-r', GetoptLong::REQUIRED_ARGUMENT,
+          "Require MODULE before executing buildfile."],
+        ['--trace',    '-t', GetoptLong::NO_ARGUMENT,
+          "Turn on invoke/execute tracing, enable full backtrace."],
+        ['--verbose',  '-v', GetoptLong::NO_ARGUMENT,
+          "Log message to standard output (default)."],
+        ['--version',  '-V', GetoptLong::NO_ARGUMENT,
+          "Display the program version."],
+        ['--freeze',   "-F",  GetoptLong::NO_ARGUMENT,
+         "Freezes the Buildfile so it always uses Buildr version #{Buildr::VERSION}"],
+        ['--unfreeze', "-U",  GetoptLong::NO_ARGUMENT,
+         "Unfreezes the Buildfile to use the latest version of Buildr"]
+      ]
+
+      def initialize()
+        super
+        @rakefiles = DEFAULT_BUILDFILES
+        @name = "Buildr"
+        @requires = []
+        opts = GetoptLong.new(*command_line_options)
+        opts.each { |opt, value| do_option(opt, value) }
+        collect_tasks
+      end
+
+      def run()
+        standard_exception_handling do
+          find_buildfile
+          load_buildfile
+          top_level
+        end
+      end
+
+      def do_option(opt, value)
+        case opt
+        when '--help'
+          help
+          exit
+        when "--buildfile"
+          @rakefiles.clear
+          @rakefiles << value
+        when '--version'
+          puts "Buildr, version #{Buildr::VERSION}"
+          exit
+        when "--freeze" 
+          find_buildfile
+          puts "Freezing the Buildfile so it always uses Buildr version #{Buildr::VERSION}"
+          gem = 
+          original = File.read(rakefile)
+          if original =~ /gem\s*(["'])buildr\1/
+            modified = original.sub(/gem\s*(["'])buildr\1\s*,\s*(["']).*\2/, %{gem "buildr", "#{Buildr::VERSION}"})
+          else
+            modified = %{gem "buildr", "#{Buildr::VERSION}"\n} + original
+          end
+          File.open(rakefile, "w") { |file| file.write modified }
+          exit
+        when "--unfreeze"
+          find_buildfile
+          puts "Unfreezing the Buildfile to use the latest version of Buildr from your Gems repository."
+          modified = File.read(rakefile).sub(/^\s*gem\s*(["'])buildr\1.*\n/, "")
+          File.open(rakefile, "w") { |file| file.write modified }
+          exit
+        when "--require"
+          @requires << value
+        when "--nosearch", "--quiet", "--trace", "--verbose"
+          super
+        end
+      end
+
+      def find_buildfile()
+        unless have_rakefile
+          here = Dir.pwd
+          Dir.chdir("..") do
+            if Dir.pwd == here || options.nosearch
+              error = "No Buildfile found (looking for: #{@rakefiles.join(', ')})"
+              if STDIN.isatty
+                chdir(original_dir) { task("generate").invoke }
+                exit 1
+              else
+                raise error
+              end
+            end
+            find_buildfile
+          end
+        end
+      end
+
+      def load_buildfile()
+        @requires.each { |name| require name }
+        puts "(in #{Dir.pwd})"
+        load File.expand_path(@rakefile) if @rakefile != ''
+        load_imports
+      end
+
+      def usage()
+        puts "Buildr #{Buildr::VERSION}"
+        puts
+        puts "Usage:"
+        puts "  buildr [-f buildfile] {options} targets..."
+      end
+
+      def help()
+        usage
+        puts
+        puts "Options:"
+        OPTIONS.sort.each do |long, short, mode, desc|
+          if mode == GetoptLong::REQUIRED_ARGUMENT
+            if desc =~ /\b([A-Z]{2,})\b/
+              long = long + "=#{$1}"
+            end
+          end
+          printf "  %-20s (%s)\n", long, short
+          printf "      %s\n", desc
+        end
+        puts
+        puts "For help with your buildfile:"
+        puts "  buildr help"
+      end
+
+      def command_line_options
+        OPTIONS.collect { |lst| lst[0..-2] }
+      end
+    end
+
+    Rake.application = Buildr::Application.new
+
+  end
+
+
+  class << self
+
+    # Loads buildr.rake files from users home directory and project directory.
+    # Loads custom tasks from .rake files in tasks directory.
+    def load_tasks_and_local_files() #:nodoc:
+      return false if @build_files
+      # Load the settings files.
+      @build_files = [ File.expand_path("buildr.rb", Gem::user_home), "buildr.rb" ].select { |file| File.exist?(file) }
+      @build_files += [ File.expand_path("buildr.rake", Gem::user_home), File.expand_path("buildr.rake") ].
+        select { |file| File.exist?(file) }.each { |file| warn "Please use '#{file.ext('rb')}' instead of '#{file}'" }
+      #Load local tasks that can be used in the Buildfile.
+      @build_files += Dir["#{Dir.pwd}/tasks/*.rake"]
+      @build_files.each do |file|
+        unless $LOADED_FEATURES.include?(file)
+          load file
+          $LOADED_FEATURES << file
+        end
+      end
+      true
+    end
+
+    # :call-seq:
+    #   build_files() => files
+    #
+    # Returns a list of build files. These are files used by the build, 
+    def build_files()
+      [Rake.application.rakefile].compact + @build_files
+    end
+
+  end
+end

data/lib/core/checks.rb

@@ -212,8 +212,8 @@ module Rake #:nodoc:
     end
 
     # :call-seq:
-    #   contain(pattern*) => boolean
-    #   contain(file*) => boolean
+    #   contain?(pattern*) => boolean
+    #   contain?(file*) => boolean
     #
     # For a file, returns true if the file content matches against all the arguments. An argument may be
     # a string or regular expression.

data/lib/core/common.rb

@@ -19,7 +19,8 @@ class Hash
     def from_java_properties(string)
       string.gsub(/\\\n/, "").split("\n").select { |line| line =~ /^[^#].*=.*/ }.
         map { |line| line.gsub(/\\[trnf\\]/) { |escaped| {?t=>"\t", ?r=>"\r", ?n=>"\n", ?f=>"\f", ?\\=>"\\"}[escaped[1]] } }.
-        inject({}) { |hash, line| name, value = line.split("=") ; hash[name] = value ; hash }
+        map { |line| line.split("=") }.
+        inject({}) { |hash, (name, value)| hash.merge(name=>value) }
     end
 
   end
@@ -31,9 +32,9 @@ class Hash
   #
   # For example:
   #   { :a=>1, :b=>2, :c=>3, :d=>4 }.only(:a, :c)
-  #   => { :b=>2, :d=>4 }
+  #   => { :a=>1, :c=>3 }
   def only(*keys)
-    self.inject({}) { |hash, pair| hash[pair[0]] = pair[1] if keys.include?(pair[0]) ; hash }
+    keys.inject({}) { |hash, key| has_key?(key) ? hash.merge(key=>self[key]) : hash }
   end
 
 
@@ -44,9 +45,9 @@ class Hash
   #
   # For example:
   #   { :a=>1, :b=>2, :c=>3, :d=>4 }.except(:a, :c)
-  #   => { :a=>1, :c=>3 }
+  #   => { :b=>2, :d=>4 }
   def except(*keys)
-    self.inject({}) { |hash, pair| hash[pair[0]] = pair[1] unless keys.include?(pair[0]) ; hash }
+    (self.keys - keys).inject({}) { |hash, key| hash.merge(key=>self[key]) }
   end
 
   # :call-seq:

data/lib/core/generate.rb

@@ -1,3 +1,5 @@
+require 'java/pom'
+
 module Buildr
   module Generate #:nodoc:
 
@@ -76,13 +78,14 @@ EOF
         pom = Buildr::POM.load('pom.xml')
         project = pom.project
 
-        artifactId = project['artifactId']
+        artifactId = project['artifactId'].first
         description = project['name'] || "The #{artifactId} project"
+        project_name = File.basename(Dir.pwd)
 
         if root
           script = HEADER.split("\n")
 
-          settings_file = ENV["m2_settings"] || File.join(Gem::user_home, ".m2/settings.xml")
+          settings_file = ENV["M2_SETTINGS"] || File.join(Gem::user_home, ".m2/settings.xml")
           settings = XmlSimple.xml_in(IO.read(settings_file)) if File.exists?(settings_file)
 
           if settings
@@ -97,8 +100,8 @@ EOF
               script << "options.proxy.exclude << '#{exclude}'" if exclude
               script << ''
               # In addition, we need to use said proxies to download artifacts.
-              options.proxy.http = url
-              options.proxy.exclude << exclude if exclude
+              Buildr.options.proxy.http = url
+              Buildr.options.proxy.exclude << exclude if exclude
             end
           end
 
@@ -106,22 +109,21 @@ EOF
             legacy = repository["layout"].to_s =~ /legacy/
             !legacy
           } rescue nil
-          unless repositories.nil? || repositories.empty?
-            repositories.each do |repository|
-              name, url = repository["name"], repository["url"]
-              script << "# #{name}"
-              script << "repositories.remote << '#{url}'"
-              # In addition we need to use said repositores to download artifacts.
-              Buildr.repositories.remote << url.to_s
-            end
-            script << ""
+          repositories = [{"name" => "Standard maven2 repository", "url" => "http://www.ibiblio.org/maven2/"}] if repositories.nil? || repositories.empty?
+          repositories.each do |repository|
+            name, url = repository["name"], repository["url"]
+            script << "# #{name}"
+            script << "repositories.remote << '#{url}'"
+            # In addition we need to use said repositores to download artifacts.
+            Buildr.repositories.remote << url.to_s
           end
+          script << ""
         else
           script = []
         end
 
         script << "desc '#{description}'"
-        script << "define '#{artifactId}' do"
+        script << "define '#{project_name}' do"
 
         groupId = project['groupId']
         script << "  project.group = '#{groupId}'" if groupId
@@ -140,11 +142,20 @@ EOF
           script << "  compile.options.target = '#{target}'" if target
         end
 
-        dependencies = pom.dependencies.map{|d| "'#{d}'"}.join(', ')
+        compile_dependencies = pom.dependencies
+        dependencies = compile_dependencies.sort.map{|d| "'#{d}'"}.join(', ')
         script <<  "  compile.with #{dependencies}" unless dependencies.empty?
 
-        test_dependencies = pom.dependencies(['test']).map{|d| "'#{d}'"}.join(', ')
-        script <<  "  test.compile.with #{test_dependencies}" unless test_dependencies.empty?
+        test_dependencies = (pom.dependencies(['test']) - compile_dependencies).reject{|d| d =~ /^junit:junit:jar:/ }
+        #check if we have testng
+        use_testng = test_dependencies.find{|d| d =~ /^org.testng:testng:jar:/}
+        if use_testng
+          script <<  "  test.using :testng"
+          test_dependencies = pom.dependencies(['test']).reject{|d| d =~ /^org.testng:testng:jar:/ }
+        end
+
+        test_dependencies = test_dependencies.sort.map{|d| "'#{d}'"}.join(', ')
+        script <<  "  test.with #{test_dependencies}" unless test_dependencies.empty?
 
         packaging = project['packaging'].first
         if %w(jar war).include?(packaging)
@@ -153,6 +164,7 @@ EOF
 
         modules = project['modules'].first['module'] rescue nil
         if modules
+          script << ""
           modules.each do |mod|
             chdir(mod) { script << from_maven2_pom.flatten.map { |line| "  " + line } << "" }
           end

data/lib/core/project.rb

@@ -284,6 +284,19 @@ module Buildr
         end
       end
 
+      # :call-seq:
+      #   task_in_parent_project(task_name) => task_name or nil
+      #
+      # Assuming the task name is prefixed with the current project, finds and returns a task with the
+      # same name in a parent project.  Call this with "foo:bar:test" will return "foo:test", but call
+      # this with "foo:test" will return nil.
+      def task_in_parent_project(task_name)
+        namespace = task_name.split(":")
+        last_name = namespace.pop
+        namespace.pop
+        Rake.application.lookup((namespace + [last_name]).join(":"), []) unless namespace.empty?
+      end
+
     end
 
     include InheritedAttributes

data/lib/java/ant.rb

@@ -48,6 +48,7 @@ module Buildr
     def ant(name, options=nil, &block)
       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
         AntProject.new(options).tap do |project|
           # Set Ant logging level to debug (--trace), info (default) or error only (--quiet).

data/lib/java/artifact.rb

@@ -269,6 +269,7 @@ module Buildr
     def download()
       puts "Downloading #{to_spec}" if Rake.application.options.trace
       remote = Buildr.repositories.remote
+      fail "No remote repositories defined!" if remote.empty?
       remote.find do |repo_url|
         repo_url = URI.parse(repo_url) unless URI === repo_url
         repo_url.path += "/" unless repo_url.path[-1] == "/"

data/lib/java/compile.rb

@@ -111,7 +111,7 @@ module Buildr
 
       def initialize(*args) #:nodoc:
         super
-        parent = Rake::Task["^compile"] if name[":"] # Only if in namespace
+        parent = Project.task_in_parent_project(name)
         if parent && parent.respond_to?(:options)
           @options = Options.new(parent.options)
         else

data/lib/java/eclipse.rb

@@ -19,8 +19,7 @@ module Buildr
       # the Buildfile (buildr.rb, separate file listing dependencies, etc), so we add anything required
       # after the Buildfile. So which don't know where Buildr shows up exactly, ignore files that show
       # in $LOADED_FEATURES that we cannot resolve.
-      sources = ($LOADED_FEATURES - Buildr.instance_eval("@loaded_features_to_ignore")).
-        map { |file| File.expand_path(file) }.select { |file| File.exist?(file) }
+      sources = Buildr.build_files.map { |file| File.expand_path(file) }.select { |file| File.exist?(file) }
       sources << File.expand_path(Rake.application.rakefile, root_path) if Rake.application.rakefile
 
       # Only for projects that are Eclipse packagable.
@@ -35,7 +34,7 @@ module Buildr
           relative = lambda do |path|
             msg = [:to_path, :to_str, :to_s].find { |msg| path.respond_to? msg }
             path = path.__send__(msg)
-            Pathname.new(path).relative_path_from(Pathname.new(project.path_to)).to_s
+            Pathname.new(File.expand_path(path)).relative_path_from(Pathname.new(project.path_to)).to_s
           end
 
           m2repo = Buildr::Repositories.instance.local

data/lib/java/idea.rb

@@ -21,8 +21,7 @@ module Buildr
       # the Buildfile (buildr.rb, separate file listing dependencies, etc), so we add anything required
       # after the Buildfile. So which don't know where Buildr shows up exactly, ignore files that show
       # in $LOADED_FEATURES that we cannot resolve.
-      sources = ($LOADED_FEATURES - Buildr.instance_eval("@loaded_features_to_ignore")).
-        map { |file| File.expand_path(file) }.select { |file| File.exist?(file) }
+      sources = Buildr.build_files.map { |file| File.expand_path(file) }.select { |file| File.exist?(file) }
       sources << File.expand_path(Rake.application.rakefile, root_path) if Rake.application.rakefile
 
       # Find a path relative to the project's root directory.

data/lib/java/packaging.rb

@@ -15,7 +15,7 @@ module Buildr
     # the project definition, since it does all the heavy lifting.
     module Packaging
 
-      MANIFEST_HEADER = "Manifest-Version: 1.0\nCreated-By: Buildr\n"
+      MANIFEST_HEADER = ["Manifest-Version: 1.0", "Created-By: Buildr"]
 
       # Adds support for MANIFEST.MF and other META-INF files.
       module WithManifest
@@ -49,6 +49,10 @@ module Buildr
               # 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|
+                lines = String === manifest || Rake::Task === manifest ? manifest_lines_from(File.read(manifest.to_s)) :
+                  manifest_lines_from(manifest)
+                @manifest_tmp.write((MANIFEST_HEADER + lines).join("\n"))
+=begin
                 @manifest_tmp.write MANIFEST_HEADER
                 case manifest
                 when Hash
@@ -64,12 +68,40 @@ module Buildr
                 else
                   fail "Invalid manifest, expecting Hash, Array, file name/task or proc/method."
                 end
+=end
                 meta_inf_path.include @manifest_tmp.path, :as=>"MANIFEST.MF"
               end
             end
           end
         end
 
+      private
+
+        def manifest_lines_from(arg)
+          case arg
+          when Hash
+            arg.map { |name, value| "#{name}: #{value}" }.sort.
+              map { |line| manifest_wrap_at_72(line) }.flatten
+          when Array
+            arg.map { |section|
+              name = section.has_key?("Name") ? ["Name: #{section["Name"]}"] : []
+              name + section.except("Name").map { |name, value| "#{name}: #{value}" }.sort + [""]
+            }.flatten.map { |line| manifest_wrap_at_72(line) }.flatten
+          when Proc, Method
+            manifest_lines_from(arg.call)
+          when String
+            arg.split("\n").map { |line| manifest_wrap_at_72(line) }.flatten
+          else
+            fail "Invalid manifest, expecting Hash, Array, file name/task or proc/method."
+          end
+        end
+
+        def manifest_wrap_at_72(arg)
+          #return arg.map { |line| manifest_wrap_at_72(line) }.flatten.join("\n") if Array === arg
+          return arg if arg.size < 72
+          [ arg[0..70], manifest_wrap_at_72(" " + arg[71..-1]) ]
+        end
+
       end
 
       class ::Buildr::ZipTask
@@ -413,14 +445,14 @@ module Buildr
 
     def package_as_tar(file_name, options) #:nodoc:
       unless Rake::Task.task_defined?(file_name)
-        TarballTask.define_task(file_name).with(options)
+        TarballTask.define_task(file_name)
       end
       file(file_name)
     end
 
     def package_as_tgz(file_name, options) #:nodoc:
       unless Rake::Task.task_defined?(file_name)
-        TarballTask.define_task(file_name).with(options)
+        TarballTask.define_task(file_name)
       end
       file(file_name)
     end

data/lib/java/pom.rb

@@ -26,10 +26,14 @@ module Buildr
         when Hash
           load(Buildr.artifact(source).pom)
         when Artifact
-          load(source.pom.to_s)
-        when String, Rake::FileTask
+          pom = source.pom
+          pom.invoke
+          load(pom.to_s)
+        when Rake::FileTask
+          source.invoke
+          load(source.to_s)
+        when String
           filename = File.expand_path(source)
-          file(filename).invoke
           unless pom = cache[filename]
             puts "Loading m2 pom file from #{filename}" if Rake.application.options.trace
             pom = POM.new(IO.read(filename))
@@ -118,11 +122,14 @@ module Buildr
     # The second form uses a single spec hash and expands it from the current/parent POM. Used to determine
     # the version number if specified in dependencyManagement instead of dependencies.
     def managed(spec = nil)
-      return managed.detect { |dep| [:group, :id, :type, :classifier].all? { |key| spec[key] == dep[key] } } ||
-        (parent ? parent.managed(spec) : nil) if spec
-      @managed ||= begin
-        managed = project["dependencyManagement"].first["dependencies"].first["dependency"] rescue []
-        managed.map { |dep| pom_to_hash(dep, properties) } 
+      if spec
+        managed.detect { |dep| [:group, :id, :type, :classifier].all? { |key| spec[key] == dep[key] } } ||
+          (parent ? parent.managed(spec) : nil)
+      else
+        @managed ||= begin
+          managed = project["dependencyManagement"].first["dependencies"].first["dependency"] rescue nil
+          managed ? managed.map { |dep| pom_to_hash(dep, properties) } : []
+        end
       end
     end
 

data/lib/java/test.rb

@@ -142,7 +142,7 @@ module Buildr
       TEST_FRAMEWORKS = []
 
       # Default options already set on each test task.
-      DEFAULT_OPTIONS = { :fail_on_failure=>true }
+      DEFAULT_OPTIONS = { :fail_on_failure=>true, :fork=>:once, :properties=>{} }
 
       # JMock version..
       JMOCK_VERSION = "1.2.0"
@@ -159,7 +159,7 @@ module Buildr
         @classpath = []
         @include = []
         @exclude = []
-        parent = Rake::Task["^test"] if name[":"] # Only if in namespace
+        parent = Project.task_in_parent_project(name)
         @options = parent && parent.respond_to?(:options) ? parent.options.clone : DEFAULT_OPTIONS.clone
         enhance { run_tests }
       end
@@ -251,15 +251,21 @@ module Buildr
       #
       # Sets various test options and returns self. Accepts a hash of options, or symbols (a symbol sets that
       # option to true). For example:
-      #   test.using :testng, :properties=>{ "url"=>"http://localhost:8080" }
+      #   test.using :testng, :fork=>:each, :properties=>{ "url"=>"http://localhost:8080" }
       #
       # Currently supports the following options:
-      # * :properties -- System properties.
-      # * :java_args -- Java arguments when forking a new JVM.
       # * :fail_on_failure -- True to fail on test failure (default is true).
+      # * :fork -- Fork test cases (JUnit only).
+      # * :java_args -- Java arguments when forking a new JVM.
+      # * :properties -- System properties.
+      #
+      # The :fork option takes the following values:
+      # * :once -- Fork one JVM for each project (default).
+      # * :each -- Fork one JVM for each test case.
+      # * false -- Do not fork, running all test cases in the same JVM.
       def using(*args)
-        args.pop.each { |key, value| @options[key.to_sym] = value } if Hash === args.last
-        args.each { |key| @options[key.to_sym] = true }
+        args.pop.each { |key, value| options[key.to_sym] = value } if Hash === args.last
+        args.each { |key| options[key.to_sym] = true }
         self
       end
 
@@ -467,11 +473,23 @@ module Buildr
         rm_rf report_to.to_s ; mkpath report_to.to_s
         # Use Ant to execute the Junit tasks, gives us performance and reporting.
         Buildr.ant("junit") do |ant|
-          ant.junit :printsummary=>"withOutAndErr" do
+          case options[:fork]
+          when false
+            forking = {}
+          when :each
+            forking = { :fork=>true, :forkmode=>"perTest" }
+          when true, :once
+            forking = { :fork=>true, :forkmode=>"once" }
+          else
+            fail "Option fork must be :once, :each or false."
+          end
+          ant.junit forking 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 }
             ant.formatter :type=>"plain"
             ant.formatter :type=>"xml"
+            ant.formatter :type=>"plain", :usefile=>false # log test
+            ant.formatter :type=>"xml"
             ant.batchtest :todir=>report_to.to_s, :failureproperty=>"failed" do
               ant.fileset :dir=>compile.target.to_s do
                 args[:classes].each { |cls| ant.include :name=>cls.gsub(".", "/").ext("class") }

data/lib/tasks/zip.rb

@@ -16,14 +16,13 @@ module Buildr
       
       def initialize(root, path)
         @root = root
-        @path = "#{path}/" if path
+        @path = path.blank? ? path : "#{path}/"
         @files = FileList[]
         # Expand source files added to this path.
         expand_src = proc { @files.map{ |file| file.to_s }.uniq }
         @sources = [ expand_src ]
         # Add files and directories added to this path.
         @actions = [] << proc do |file_map|
-          file_map[@path] = nil if @path
           expand_src.call.each do |path|
             if File.directory?(path)
               in_directory(path, @files) do |file, rel_path|
@@ -104,7 +103,9 @@ module Buildr
 
       # Returns a Path relative to this one.
       def path(path)
-        path.blank? ? self : @root.path("#{@path}#{path}")
+        return self if path.blank?
+        return root.path(path[1..-1]) if path[0] == ?/
+        root.path("#{@path}#{path}")
       end
 
       # Returns all the source files.
@@ -117,7 +118,7 @@ module Buildr
       end
 
       def to_s()
-        @path || ""
+        @path
       end
 
     protected
@@ -126,10 +127,11 @@ module Buildr
         @sources << proc { source }
         @actions << proc do |file_map|
           file = source.to_s
-          file_map[@path] = nil if @path
           if File.directory?(file)
             in_directory(file) do |file, rel_path|
-              dest = as == "." ? (@path || "") + rel_path.split("/")[1..-1].join("/") : "#{@path}#{as}#{rel_path}"
+              path = rel_path.split("/")[1..-1]
+              path.unshift as unless as == "."
+              dest = "#{@path}#{path.join('/')}"
               puts "Adding #{dest}" if Rake.application.options.trace
               file_map[dest] = file
             end
@@ -188,7 +190,7 @@ module Buildr
 
     def initialize(*args) #:nodoc:
       super
-      @paths = { nil=>Path.new(self, nil) }
+      @paths = { ""=>Path.new(self, "") }
       @prepares = []
 
       # Make sure we're the last enhancements, so other enhancements can add content.
@@ -202,7 +204,10 @@ module Buildr
           rm name, :verbose=>false rescue nil
           mkpath File.dirname(name), :verbose=>false
           begin
-            @paths.each { |name, object| object.add_files(@file_map) }
+            @paths.each do |name, object|
+              @file_map[name] = nil unless name.blank?
+              object.add_files(@file_map)
+            end
             create_from @file_map
           rescue
             rm name, :verbose=>false rescue nil
@@ -245,7 +250,7 @@ module Buildr
     #   zip(..).include("foo.zip", :merge=>true).include("bar.zip")
     # You can also use the method #merge.
     def include(*files)
-      @paths[nil].include *files
+      @paths[""].include *files
       self
     end 
     alias :add :include
@@ -255,7 +260,7 @@ module Buildr
     # 
     # Excludes files and returns self. Can be used in combination with include to prevent some files from being included.
     def exclude(*files)
-      @paths[nil].exclude *files
+      @paths[""].exclude *files
       self
     end 
 
@@ -269,7 +274,7 @@ module Buildr
     # only specific files. For example:
     #   zip(..).merge("src.zip").include("module1/*")
     def merge(*files)
-      @paths[nil].merge *files
+      @paths[""].merge *files
     end 
 
     # :call-seq:
@@ -284,8 +289,18 @@ module Buildr
     #   path("foo").path("bar") == path("foo/bar")
     #   path("foo").root == root
     def path(name)
-      return @paths[nil] if name.blank?
-      @paths[name] ||= Path.new(self, name)
+      return @paths[""] if name.blank?
+      normalized = name.split("/").inject([]) do |path, part|
+        case part
+        when ".", nil, ""
+          path
+        when ".."
+          path[0...-1]
+        else
+          path << part
+        end
+      end.join("/")
+      @paths[normalized] ||= Path.new(self, normalized)
     end
 
     # :call-seq:
@@ -381,9 +396,16 @@ module Buildr
       Zip::ZipFile.open(name, Zip::ZipFile::CREATE) do |zip|
         zip.restore_permissions = true
         file_map.each do |path, content|
-          zip.mkdir path unless content || zip.find_entry(path)
-          zip.add path, content if String === content
-          zip.get_output_stream(path) { |output| content.call(output) } if content.respond_to?(:call)
+          if content
+            File.dirname(path).tap { |dir| zip.mkdir dir unless zip.find_entry(dir) }
+            if content.respond_to?(:call)
+              zip.get_output_stream(path) { |output| content.call(output) }
+            else
+              zip.add path, content.to_s
+            end
+          else
+            zip.mkdir path unless zip.find_entry(path)
+          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.3
-date: 2007-07-26 00:00:00 -07:00
+  version: 1.2.4
+date: 2007-08-03 00:00:00 -07:00
 summary: A build system that doesn't suck
 require_paths: 
 - lib
@@ -36,6 +36,7 @@ files:
 - lib/core
 - lib/core/generate.rb
 - lib/core/transports.rb
+- lib/core/application.rb
 - lib/core/build.rb
 - lib/core/checks.rb
 - lib/core/help.rb