buildr 1.2.5 → 1.2.6

data/lib/core/application.rb

@@ -20,16 +20,16 @@ module Buildr
           "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,
+        ['--buildfile', '-f', GetoptLong::REQUIRED_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."],
+        ['--environment', '-e', GetoptLong::REQUIRED_ARGUMENT,
+          "Environment name (e.g. development, test, production)."],
         ['--freeze',   "-F",  GetoptLong::NO_ARGUMENT,
          "Freezes the Buildfile so it always uses Buildr version #{Buildr::VERSION}"],
         ['--unfreeze', "-U",  GetoptLong::NO_ARGUMENT,
@@ -66,6 +66,8 @@ module Buildr
         when '--version'
           puts "Buildr, version #{Buildr::VERSION}"
           exit
+        when '--environment'
+          ENV['BUILDR_ENV'] = value
         when "--freeze" 
           find_buildfile
           puts "Freezing the Buildfile so it always uses Buildr version #{Buildr::VERSION}"
@@ -85,7 +87,7 @@ module Buildr
           exit
         when "--require"
           @requires << value
-        when "--nosearch", "--quiet", "--trace", "--verbose"
+        when "--nosearch", "--quiet", "--trace"
           super
         end
       end
@@ -109,7 +111,7 @@ module Buildr
 
       def load_buildfile()
         @requires.each { |name| require name }
-        puts "(in #{Dir.pwd})"
+        puts Buildr.environment ? "(in #{Dir.pwd}, #{Buildr.environment})" : "(in #{Dir.pwd})"
         load File.expand_path(@rakefile) if @rakefile != ''
         load_imports
       end

data/lib/core/build.rb

@@ -113,7 +113,9 @@ module Buildr
       # Make a release.
       def make()
         check
-        version = with_next_version { |filename, version| sh "#{command} clean upload DEBUG=no --buildfile #{filename}" }
+        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(' ')}" }
         tag version
         commit version + "-SNAPSHOT"
       end
@@ -130,6 +132,7 @@ module Buildr
       # Check that we don't have any local changes in the working copy. Fails if it finds anything
       # in the working copy that is not checked into source control.
       def check()
+        fail "SVN URL must end with 'trunk' or 'branches/...'" unless svn_url =~ /(trunk)|(branches.*)$/
         # Status check reveals modified file, but also SVN externals which we can safely ignore.
         status = svn("status", "--ignore-externals").reject { |line| line =~ /^X\s/ }
         fail "Uncommitted SVN files violate the First Principle Of Release!\n#{status}" unless
@@ -201,7 +204,7 @@ module Buildr
       #
       # Tags the current working copy with the release version number.
       def tag(version)
-        url = svn("info").scan(/URL: (.*)/)[0][0].sub(/trunk$/, "tags/#{version}")
+        url = svn_url.sub(/(trunk$)|(branches.*)$/, "tags/#{version}")
         svn "remove", url, "-m", "Removing old copy" rescue nil
         svn "copy", Dir.pwd, url, "-m", "Release #{version}"
       end
@@ -226,6 +229,11 @@ module Buildr
         puts cmd if verbose
         `#{cmd}`.tap { fail "SVN command failed" unless $?.exitstatus == 0 }
       end
+
+      # Return the current SVN URL
+      def svn_url
+        url = svn("info").scan(/URL: (.*)/)[0][0]
+      end
     end
 
   end

data/lib/core/common.rb

@@ -169,6 +169,25 @@ module Buildr
     Buildr.options
   end
 
+  # :call-seq:
+  #   environment() => string or nil
+  #
+  # Returns the environment name.  Use this when your build depends on the environment,
+  # for example, development, production, etc.  The value comes from the BUILDR_ENV environment variable.
+  # 
+  # For example:
+  #   buildr -e production
+  def environment()
+    ENV['BUILDR_ENV']
+  end
+
+  # :call-seq:
+  #   environment(env)
+  #
+  # Sets the environment name.
+  def environment=(env)
+    ENV['BUILDR_ENV'] = env
+  end
 
   # :call-seq:
   #   struct(hash) => Struct
@@ -334,7 +353,7 @@ module Buildr
     # For example:
     #   filter.from("src").into("target").using("build"=>Time.now)
     def into(dir)
-      @target = file(File.expand_path(dir.to_s))
+      @target = file(File.expand_path(dir.to_s)) { |task| run if target == task && !sources.empty? }
       self
     end
 
@@ -417,7 +436,7 @@ module Buildr
 
       copy_map = sources.flatten.map(&:to_s).inject({}) do |map, source|
         base = Pathname.new(source)
-        files = FileList[File.join(source, "**/*")].reject { |file| File.directory?(file) }.
+        files = FileList.recursive(source).
           map { |file| Pathname.new(file).relative_path_from(base).to_s }.
           select { |file| @include.empty? || @include.any? { |pattern| File.fnmatch(pattern, file) } }.
           reject { |file| @exclude.any? { |pattern| File.fnmatch(pattern, file) } }
@@ -434,24 +453,28 @@ module Buildr
         mkpath target.to_s
         copy_map.each do |path, source|
           dest = File.expand_path(path, target.to_s)
-          mkpath File.dirname(dest) rescue nil
-          case mapping
-          when Proc, Method # Call on input, accept output.
-            mapped = mapping.call(path, File.open(source, "rb") { |file| file.read })
-            File.open(dest, "wb") { |file| file.write mapped }
-          when Hash # Map ${key} to value
-            content = File.open(source, "rb") { |file| file.read }
-            if Symbol === @mapper
-              mapped = send("#{@mapper}_mapper", content) { |key| mapping[key] }
+          if File.directory?(source)
+            mkpath dest
+          else
+            mkpath File.dirname(dest)
+            case mapping
+            when Proc, Method # Call on input, accept output.
+              mapped = mapping.call(path, File.open(source, "rb") { |file| file.read })
+              File.open(dest, "wb") { |file| file.write mapped }
+            when Hash # Map ${key} to value
+              content = File.open(source, "rb") { |file| file.read }
+              if Symbol === @mapper
+                mapped = send("#{@mapper}_mapper", content) { |key| mapping[key] }
+              else
+                mapped = regexp_mapper(content) { |key| mapping[key] }
+              end
+                #gsub(/\$\{[^}]*\}/) { |str| mapping[str[2..-2]] || str }
+              File.open(dest, "wb") { |file| file.write mapped }
+            when nil # No mapping.
+              cp source, dest
             else
-              mapped = regexp_mapper(content) { |key| mapping[key] }
+              fail "Filter can be a hash (key=>value), or a proc/method; I don't understand #{mapping}"
             end
-              #gsub(/\$\{[^}]*\}/) { |str| mapping[str[2..-2]] || str }
-            File.open(dest, "wb") { |file| file.write mapped }
-          when nil # No mapping.
-            cp source, dest
-          else
-            fail "Filter can be a hash (key=>value), or a proc/method; I don't understand #{mapping}"
           end
         end
         touch target.to_s 

data/lib/core/rake_ext.rb

@@ -17,6 +17,16 @@ module Rake #:nodoc
       end
     end
 
+    def execute
+      if application.options.dryrun
+        puts "** Execute (dry run) #{name}"
+        return
+      end
+      puts "** Execute #{name}" if application.options.trace
+      application.enhance_with_matching_rule(name) if @actions.empty?
+      @actions.each { |act| result = act.call(self) }
+    end
+
     def invoke_prerequisites()
       prerequisites.each { |n| application[n, @scope].invoke }
     end
@@ -61,4 +71,11 @@ module Rake #:nodoc
 
   end
 
+  class FileList
+    class << self
+      def recursive(*dirs)
+        FileList[dirs.map { |dir| File.join(dir, "/**/{*,.*}") }].reject { |file| File.basename(file) =~ /^[.]{1,2}$/ }
+      end
+    end
+  end
 end

data/lib/java/artifact.rb

@@ -546,6 +546,29 @@ module Buildr
     end
   end
 
+  def transitive(*specs)
+    specs.flatten.inject([]) do |set, spec|
+      case spec
+      when /([^:]+:){2,4}/ # A spec as opposed to a file name.
+        artifact = artifact(spec)
+        set |= [artifact] unless artifact.type == :pom
+        set |= POM.load(artifact.pom).dependencies.map { |spec| artifact(spec) }
+      when Hash
+        set |= [transitive(spec)]
+      when String # Must always expand path.
+        set |= transitive(file(File.expand_path(spec)))
+      when Project
+        set |= transitive(spec.packages)
+      when Rake::Task
+        set |= spec.respond_to?(:to_spec) ? transitive(spec.to_spec) : [spec]
+      when Struct
+        set |= transitive(spec.values)
+      else
+        fail "Invalid artifact specification in: #{specs.to_s}"
+      end
+    end
+  end
+
   # :call-seq:
   #   groups(ids, :under=>group_name, :version=>number) => artifacts
   #

data/lib/java/compile.rb

@@ -229,10 +229,10 @@ module Buildr
           target_dir = target.to_s
           if File.directory?(source)
             base = Pathname.new(source)
-            FileList["#{source}/**/*.java"].
-              each { |file| map[file] = File.join(target_dir, Pathname.new(file).relative_path_from(base).to_s.ext(".class")) }
+            FileList["#{source}/**/*.java"].reject { |file| File.directory?(file) }.
+              each { |file| map[file] = File.join(target_dir, Pathname.new(file).relative_path_from(base).to_s.ext('.class')) }
           else
-            map[source] = File.join(target_dir, File.basename(source).ext(".class"))
+            map[source] = File.join(target_dir, File.basename(source).ext('.class'))
           end
           map
         end

data/lib/java/java.rb

@@ -232,13 +232,10 @@ module Buildr
               cmd_args << "-#{key}"
             when false
               cmd_args << "-no#{key}"
-            when Array
-              cmd_args << "-#{key}"
-              cmd_args += value.map(&:to_s)
             when Hash
               value.each { |k,v| cmd_args << "-#{key}" << k.to_s << v.to_s }
             else
-              cmd_args << "-#{key}" << value.to_s
+              cmd_args += Array(value).map { |item| ["-#{key}", item.to_s] }.flatten
             end
           end
         [:sourcepath, :classpath].each do |option|
@@ -378,7 +375,7 @@ module Buildr
     #
     # Returns the Java arguments.
     def java_args()
-      @java_args ||= (ENV["JAVA_OPTIONS"] || ENV["java_options"] || "").split(" ")
+      @java_args ||= (ENV["JAVA_OPTS"] || ENV["JAVA_OPTIONS"] || "").split(" ")
     end
 
     # :call-seq:
@@ -386,12 +383,12 @@ module Buildr
     #
     # Sets the Java arguments. These arguments are used when creating a JVM, including for use with RJB
     # for most tasks (e.g. Ant, compile) and when forking a separate JVM (e.g. JUnit tests). You can also
-    # use the JAVA_OPTIONS environment variable.
+    # use the JAVA_OPTS environment variable.
     #
     # For example:
     #   options.java_args = "-verbose"
     # Or:
-    #   $ set JAVA_OPTIONS = "-Xms1g"
+    #   $ set JAVA_OPTS = "-Xms1g"
     #   $ buildr
     def java_args=(args)
       args = args.split if String === args

data/lib/java/packaging.rb

@@ -170,10 +170,54 @@ module Buildr
   
       end
 
+      # Extends the JarTask to create an AAR file (Axis2 service archive).
+      #
+      # Supports all the same options as JarTask, with the addition of :wsdls, :services_xml and :libs.
+      #
+      # * :wsdls -- WSDL files to include (under META-INF).  By default packaging will include all WSDL
+      #   files found under src/main/axis2.
+      # * :services_xml -- Location of services.xml file (included under META-INF).  By default packaging
+      #   takes this from src/main/axis2/services.xml.  Use a different path if you genereate the services.xml
+      #   file as part of the build.
+      # * :libs -- Array of files, tasks, artifact specifications, etc that will be added to the /lib directory.
+      #
+      # For example:
+      #   package(:aar).with(:libs=>"log4j:log4j:jar:1.1")
+      #
+      #   filter.from("src/main/axis2").into("target").include("services.xml", "*.wsdl").using("http_port"=>"8080")
+      #   package(:aar).wsdls.clear
+      #   package(:aar).with(:services_xml=>_("target/services.xml"), :wsdls=>_("target/*.wsdl"))
+      class AarTask < JarTask
+        # Artifacts to include under /lib.
+        attr_accessor :libs
+        # WSDLs to include under META-INF (defaults to all WSDLs under src/main/axis2).
+        attr_accessor :wsdls
+        # Location of services.xml file (defaults to src/main/axis2/services.xml).
+        attr_accessor :services_xml
+
+        def initialize(*args) #:nodoc:
+          super
+          @libs = []
+          @wsdls = []
+          prepare do
+            path("META-INF").include @wsdls
+            path("META-INF").include @services_xml, :as=>["services.xml"] if @services_xml
+            path("lib").include Buildr.artifacts(@libs) unless @libs.nil? || @libs.empty?
+          end
+        end
+
+        def libs=(value) #:nodoc:
+          @libs = Buildr.artifacts(value)
+        end
+
+        def wsdls=(value) #:nodoc:
+          @wsdls |= Array(value)
+        end
+      end
+
     end
   end
 
-
   Project.on_define do |project|
     # Need to run buildr before package, since package is often used as a dependency by tasks that
     # expect build to happen.
@@ -364,6 +408,7 @@ module Buildr
             jar.include options[:include]
           else
             jar.with compile.target unless compile.sources.empty?
+            jar.with resources.target unless resources.sources.empty?
           end
         end
       else
@@ -389,6 +434,7 @@ module Buildr
             war.with :classes=>options[:classes]
           else
             war.with :classes=>compile.target unless compile.sources.empty?
+            war.with :classes=>resources.target unless resources.sources.empty?
           end
           if options.has_key?(:libs)
             warn_deprecated "The :libs option in package(:war) is deprecated, please use package(:war).with(:libs=>) instead."
@@ -410,6 +456,21 @@ module Buildr
       file(file_name)
     end
 
+    def package_as_aar(file_name, options) #:nodoc:
+      rake_check_options options, *PACKAGE_OPTIONS
+      unless Rake::Task.task_defined?(file_name)
+        Java::Packaging::AarTask.define_task(file_name).tap do |aar|
+          aar.with :manifest=>manifest, :meta_inf=>meta_inf
+          aar.with :wsdls=>path_to("src/main/axis2/*.wsdl")
+          aar.with :services_xml=>path_to("src/main/axis2/services.xml") 
+          aar.with compile.target unless compile.sources.empty?
+          aar.with resources.target unless resources.sources.empty?
+          aar.with :libs=>compile.classpath
+        end
+      end
+      file(file_name)
+    end
+
     def package_as_zip(file_name, options) #:nodoc:
       unless Rake::Task.task_defined?(file_name)
         rake_check_options options, *PACKAGE_OPTIONS + [:include]
@@ -426,18 +487,13 @@ module Buildr
     end
 
     def package_as_tar(file_name, options) #:nodoc:
+      rake_check_options options, *PACKAGE_OPTIONS
       unless Rake::Task.task_defined?(file_name)
-        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)
+        TarTask.define_task(file_name)
       end
       file(file_name)
     end
+    alias :package_as_tgz :package_as_tar
 
     def package_as_sources(file_name, options) #:nodoc:
       rake_check_options options, *PACKAGE_OPTIONS

data/lib/java/pom.rb

@@ -86,8 +86,6 @@ module Buildr
               } if exclusions
 
               [Artifact.to_spec(spec.except(:scope))] + transitive_deps
-            else
-              nil
             end
           }.flatten.compact.uniq_by{|spec| art = spec.split(':'); "#{art[0]}:#{art[1]}"}
 

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, :fork=>:once, :properties=>{} }
+      DEFAULT_OPTIONS = { :fail_on_failure=>true, :fork=>:once, :properties=>{}, :environment=>{} }
 
       # JMock version..
       JMOCK_VERSION = "1.2.0"
@@ -258,6 +258,7 @@ module Buildr
       # * :fork -- Fork test cases (JUnit only).
       # * :java_args -- Java arguments when forking a new JVM.
       # * :properties -- System properties.
+      # * :environment -- Environment variables.
       #
       # The :fork option takes the following values:
       # * :once -- Fork one JVM for each project (default).
@@ -310,7 +311,7 @@ module Buildr
         patterns = self.class.const_get("#{framework.to_s.upcase}_TESTS_PATTERN").to_a
         FileList[patterns.map { |pattern| "#{base}/**/#{pattern}.class" }].
           map { |file| Pathname.new(file).relative_path_from(base).to_s.ext("").gsub(File::SEPARATOR, ".") }.
-          select { |name| include?(name) }.flatten.sort
+          select { |name| include?(name) }.reject { |name| name =~ /\$/ }.sort
       end
 
       # List of failed test classes. Set after running the tests.
@@ -369,7 +370,8 @@ module Buildr
             :classes    => classes,
             :classpath  => @classpath + [compile.target],
             :properties => { "baseDir" => compile.target.to_s }.merge(options[:properties] || {}),
-            :java_args  => options[:java_args])
+            :environment=> options[:environment] || {},
+            :java_args  => options[:java_args] || Buildr.options.java_args)
           unless @failed_tests.empty?
             warn "The following tests failed:\n#{@failed_tests.join("\n")}" if verbose
             fail "Tests failed!"
@@ -483,9 +485,13 @@ module Buildr
           else
             fail "Option fork must be :once, :each or false."
           end
-          ant.junit forking do
+          ant.junit forking.merge(:clonevm=>true) 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 }
+            java_args = args[:java_args]
+            java_args = java_args.split(" ") if String === java_args
+            java_args.each { |value| ant.jvmarg :value=>value } if java_args
             ant.formatter :type=>"plain"
             ant.formatter :type=>"xml"
             ant.formatter :type=>"plain", :usefile=>false # log test