buildr 1.4.9 → 1.4.10

data/bin/buildr

@@ -15,5 +15,6 @@
 # the License.
 
 require 'rubygems'
+require 'bundler/setup'
 require 'buildr'
 Buildr.application.run

data/buildr.gemspec

@@ -66,7 +66,7 @@ for those one-off tasks, with a language that's a joy to use.
   spec.add_dependency 'rubyforge',            '2.0.4'
   spec.add_dependency 'hoe',                  '3.1.0'
   spec.add_dependency 'rjb',                  '1.4.2' if ($platform.to_s == 'x86-mswin32' || $platform.to_s == 'ruby')
-  spec.add_dependency 'atoulme-Antwrap',      '~> 0.7.2'
+  spec.add_dependency 'atoulme-Antwrap',      '~> 0.7.4'
   spec.add_dependency 'diff-lcs',             '1.1.3'
   spec.add_dependency 'rspec-expectations',   '2.11.3'
   spec.add_dependency 'rspec-mocks',          '2.11.3'
@@ -74,7 +74,8 @@ for those one-off tasks, with a language that's a joy to use.
   spec.add_dependency 'rspec',                '2.11.0'
   spec.add_dependency 'xml-simple',           '1.1.1'
   spec.add_dependency 'minitar',              '0.5.3'
-  spec.add_dependency 'jruby-openssl',        '>= 0.7' if $platform.to_s == 'java'
+  spec.add_dependency 'jruby-openssl',        '~> 0.8.2' if $platform.to_s == 'java'
+  spec.add_dependency 'bundler'
 
   # Unable to get this consistently working under jruby on windows
   unless $platform.to_s == 'java'
@@ -89,7 +90,6 @@ for those one-off tasks, with a language that's a joy to use.
 
   # NOTE: Must update all-in-one.rake if this is updated
   spec.add_development_dependency 'ffi-ncurses', '0.4.0' if $platform.to_s == 'java'
-  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'win32console' if $platform.to_s == 'x86-mswin32'
   # Ideally we would depend on psych when the platform has >= 1.9.2 support and jruby platform version > 1.6.6
   #spec.add_development_dependency 'psych' if RUBY_VERSION >= '1.9.2'

data/doc/download.textile

@@ -20,16 +20,28 @@ The source code is included in both source and binary distribution, the Gem dist
 
 h2(#dist).  Binaries and Source Code
 
+h3. buildr 1.4.9 (2012-11-08)
+
+|_. Package |_. MD5 Checksum |_. PGP |
+| "buildr-1.4.9-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.9/buildr-1.4.9-java.gem | "5ef4ce3e4b44049842f16db642d6d4d4":http://www.apache.org/dist/buildr/1.4.9/buildr-1.4.9-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.9/buildr-1.4.9-java.gem.asc |
+| "buildr-1.4.9-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.9/buildr-1.4.9-x86-mswin32.gem | "24f6f063eea5c7d1aa60fedb4ec5f85e":http://www.apache.org/dist/buildr/1.4.9/buildr-1.4.9-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.9/buildr-1.4.9-x86-mswin32.gem.asc |
+| "buildr-1.4.9.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.9/buildr-1.4.9.gem | "e028943fa3342964c40b8a0bf1477b45":http://www.apache.org/dist/buildr/1.4.9/buildr-1.4.9.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.9/buildr-1.4.9.gem.asc |
+| "buildr-1.4.9.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.4.9/buildr-1.4.9.tgz | "8c4b43b79d4f446cfd713d994451a76e":http://www.apache.org/dist/buildr/1.4.9/buildr-1.4.9.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.9/buildr-1.4.9.tgz.asc |
+| "buildr-1.4.9.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.4.9/buildr-1.4.9.zip | "d879312ac99d46a66d816df119d71e17":http://www.apache.org/dist/buildr/1.4.9/buildr-1.4.9.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.9/buildr-1.4.9.zip.asc |
+
+p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.4.9/KEYS)
+
+
 h3. buildr 1.4.8 (2012-11-01)
 
 |_. Package |_. MD5 Checksum |_. PGP |
-| "buildr-1.4.8-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.8/buildr-1.4.8-java.gem | "68679f89f7e0f90bb4446965d1184e0a":http://www.apache.org/dist/buildr/1.4.8/buildr-1.4.8-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.8/buildr-1.4.8-java.gem.asc |
-| "buildr-1.4.8-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.8/buildr-1.4.8-x86-mswin32.gem | "40abdb4c2ff2bb7232822198e6882ee0":http://www.apache.org/dist/buildr/1.4.8/buildr-1.4.8-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.8/buildr-1.4.8-x86-mswin32.gem.asc |
-| "buildr-1.4.8.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.8/buildr-1.4.8.gem | "0e92c281a59d3fc475f1a0184200a70f":http://www.apache.org/dist/buildr/1.4.8/buildr-1.4.8.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.8/buildr-1.4.8.gem.asc |
-| "buildr-1.4.8.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.4.8/buildr-1.4.8.tgz | "f19029a7dba62917978b42652328bf6c":http://www.apache.org/dist/buildr/1.4.8/buildr-1.4.8.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.8/buildr-1.4.8.tgz.asc |
-| "buildr-1.4.8.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.4.8/buildr-1.4.8.zip | "8a484f5ec930eba0b93fe9079fd41079":http://www.apache.org/dist/buildr/1.4.8/buildr-1.4.8.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.8/buildr-1.4.8.zip.asc |
+| "buildr-1.4.8-java.gem":http://archive.apache.org/dist/buildr/1.4.8/buildr-1.4.8-java.gem | "68679f89f7e0f90bb4446965d1184e0a":http://archive.apache.org/dist/buildr/1.4.8/buildr-1.4.8-java.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.8/buildr-1.4.8-java.gem.asc |
+| "buildr-1.4.8-x86-mswin32.gem":http://archive.apache.org/dist/buildr/1.4.8/buildr-1.4.8-x86-mswin32.gem | "40abdb4c2ff2bb7232822198e6882ee0":http://archive.apache.org/dist/buildr/1.4.8/buildr-1.4.8-x86-mswin32.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.8/buildr-1.4.8-x86-mswin32.gem.asc |
+| "buildr-1.4.8.gem":http://archive.apache.org/dist/buildr/1.4.8/buildr-1.4.8.gem | "0e92c281a59d3fc475f1a0184200a70f":http://archive.apache.org/dist/buildr/1.4.8/buildr-1.4.8.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.8/buildr-1.4.8.gem.asc |
+| "buildr-1.4.8.tgz":http://archive.apache.org/dist/buildr/1.4.8/buildr-1.4.8.tgz | "f19029a7dba62917978b42652328bf6c":http://archive.apache.org/dist/buildr/1.4.8/buildr-1.4.8.tgz.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.8/buildr-1.4.8.tgz.asc |
+| "buildr-1.4.8.zip":http://archive.apache.org/dist/buildr/1.4.8/buildr-1.4.8.zip | "8a484f5ec930eba0b93fe9079fd41079":http://archive.apache.org/dist/buildr/1.4.8/buildr-1.4.8.zip.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.8/buildr-1.4.8.zip.asc |
 
-p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.4.8/KEYS)
+p>. ("Release signing keys":http://archive.apache.org/dist/buildr/1.4.8/KEYS)
 
 
 h3. buildr 1.4.7 (2012-05-29)

data/doc/index.textile

@@ -46,7 +46,14 @@ So let's get started.  You can "read the documentation online":quick_start.html,
 
 h2(#news).  What's New
 
-Highlights from Buildr 1.4.8 (Nov 11th, 2012)
+Highlights from Buildr 1.4.9 (Nov 8th, 2012)
+
+* Fixed:  Fixed the interaction with the FileUtils classes. The last release
+          introduced a non-deterministic bug that sometimes caused logging
+          preferences to be ignored and the install method to be
+          inadvertently overwritten.
+
+Highlights from Buildr 1.4.8 (Nov 1st, 2012)
 
 * Change: Revert to importing non-verbose FileUtils utility methods to match buildr 1.4.6 release and earlier.
 * Added:  Experimental support for jacoco code coverage tool.

data/etc/KEYS

@@ -231,3 +231,90 @@ ApsiYNbEfoq0U4Fj3PFsWXMHngom5lNWLlVSpn7zvhAIwpXY/Np3YFx5BVchCDBG
 IAU=
 =dNyx
 -----END PGP PUBLIC KEY BLOCK-----
+pub   4096R/D6969DDE 2013-02-10 [expires: 2015-02-10]
+uid                  Peter Donald <peter@realityforge.org>
+sub   4096R/FC72F8B1 2013-02-10 [expires: 2015-02-10]
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.12 (Darwin)
+Comment: GPGTools - http://gpgtools.org
+
+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
+vNcZccHdEbAhg06FGA6u16Jc
+=Kl2l
+-----END PGP PUBLIC KEY BLOCK-----

data/lib/buildr/core/application.rb

@@ -91,7 +91,7 @@ module Buildr
     def load_from(name, path = nil)
       unless path
         fail "Internal error: attempting to access local setting before buildfile located" unless @application.rakefile
-        path = File.dirname(@application.rakefile)
+        path = File.expand_path(File.dirname(@application.rakefile))
       end
       file_name = ['yaml', 'yml'].map { |ext| File.join(path, "#{name}.#{ext}") }.find { |fn| File.exist?(fn) }
       return {} unless file_name
@@ -483,7 +483,7 @@ module Buildr
       files = [ File.exist?(new) ? new : old, 'buildr.rb' ].select { |file| File.exist?(file) }
       files += [ File.expand_path('buildr.rake', ENV['HOME']), File.expand_path('buildr.rake') ].
         select { |file| File.exist?(file) }.each { |file| warn "Please use '#{file.ext('rb')}' instead of '#{file}'" }
-      files += (options.rakelib || []).collect { |rlib| Dir["#{rlib}/*.rake"] }.flatten
+      files += (options.rakelib || []).collect { |rlib| Dir["#{File.expand_path(rlib)}/*.rake"] }.flatten
 
       # Load .buildr/_buildr.rb same directory as buildfile
       %w{.buildr.rb _buildr.rb}.each do |f|
@@ -492,6 +492,7 @@ module Buildr
       end
 
       files.each do |file|
+        file = File.expand_path(file)
         unless $LOADED_FEATURES.include?(file)
           load file
           $LOADED_FEATURES << file

data/lib/buildr/ide/idea.rb

@@ -90,14 +90,14 @@ module Buildr
 
       def create_component(name, attrs = {})
         target = StringIO.new
-        Builder::XmlMarkup.new(:target => target, :indent => 2).component(attrs.merge({:name => name})) do |xml|
+        Builder::XmlMarkup.new(:target => target, :indent => 2).component({:name => name}.merge(attrs)) do |xml|
           yield xml if block_given?
         end
         Buildr::IntellijIdea.new_document(target.string).root
       end
 
       def components
-        @components ||= self.default_components.compact
+        @components ||= []
       end
 
       def create_composite_component(name, components)
@@ -135,7 +135,15 @@ module Buildr
             inject_component(doc, element)
           end
         end
-        inject_components(doc, self.components)
+        inject_components(doc, self.default_components.compact + self.components)
+
+        # Sort the components in the same order the idea sorts them
+        sorted = doc.root.get_elements('//component').sort { |s1, s2| s1.attribute('name').value <=> s2.attribute('name').value }
+        doc = base_document
+        sorted.each do |element|
+          doc.root.add_element element
+        end
+
         doc
       end
 
@@ -161,6 +169,7 @@ module Buildr
       attr_accessor :type
       attr_accessor :group
       attr_reader :facets
+      attr_writer :jdk_version
 
       def initialize
         super()
@@ -174,6 +183,10 @@ module Buildr
         @buildr_project = buildr_project
       end
 
+      def jdk_version
+        @jdk_version || buildr_project.compile.options.source || "1.6"
+      end
+
       def extension
         "iml"
       end
@@ -474,7 +487,7 @@ module Buildr
 
       def generate_initial_order_entries(xml)
         xml.orderEntry :type => "sourceFolder", :forTests => "false"
-        xml.orderEntry :type => "inheritedJdk"
+        xml.orderEntry :type => "jdk", :jdkName => jdk_version, :jdkType => "JavaSDK"
       end
 
       def generate_project_dependency(xml, other_project, export, test = false)
@@ -716,7 +729,7 @@ module Buildr
 
       def base_document
         target = StringIO.new
-        Builder::XmlMarkup.new(:target => target).project(:version => "4", :relativePaths => "false")
+        Builder::XmlMarkup.new(:target => target).project(:version => "4")
         Buildr::IntellijIdea.new_document(target.string)
       end
 
@@ -725,10 +738,17 @@ module Buildr
           lambda { modules_component },
           vcs_component,
           artifacts_component,
-          configurations_component
+          configurations_component,
+          lambda { framework_detection_exclusion_component }
         ]
       end
 
+      def framework_detection_exclusion_component
+        create_component('FrameworkDetectionExcludesConfiguration') do |xml|
+          xml.file :url => file_path(buildr_project._(:artifacts))
+        end
+      end
+
       def initial_components
         [
           lambda { project_root_manager_component },
@@ -737,12 +757,13 @@ module Buildr
       end
 
       def project_root_manager_component
-        attribs = {"version" => "2",
-                   "assert-keyword" => "true",
-                   "jdk-15" => "true",
-                   "project-jdk-name" => self.jdk_version,
-                   "project-jdk-type" => "JavaSDK",
-                   "languageLevel" => "JDK_#{self.jdk_version.gsub('.', '_')}"}
+        attribs = {}
+        attribs["version"] = "2"
+        attribs["languageLevel"] = "JDK_#{self.jdk_version.gsub('.', '_')}"
+        attribs["assert-keyword"] = "true"
+        attribs["jdk-15"] = "true"
+        attribs["project-jdk-name"] = self.jdk_version
+        attribs["project-jdk-type"] = "JavaSDK"
         create_component("ProjectRootManager", attribs) do |xml|
           xml.output("url" => "file://$PROJECT_DIR$/out")
         end

data/lib/buildr/java/commands.rb

@@ -33,6 +33,7 @@ module Java
       #       "-o", "src/main/webapp/styles/styles-all-min.css")
       #
       # The last argument may be a Hash with additional options:
+      # * :dir -- The working directory from which to execute task..
       # * :classpath -- One or more file names, tasks or artifact specifications.
       #   These are all expanded into artifacts, and all tasks are invoked.
       # * :java_args -- Any additional arguments to pass (e.g. -hotspot, -xms)
@@ -49,7 +50,18 @@ module Java
           name = "java #{args.first}"
         end
 
-        cmd_args = [path_to_bin('java')]
+        cmd_args = []
+        if options[:dir]
+          pwd = options[:dir]
+          if Buildr::Util.win_os?
+            # Ruby uses forward slashes regardless of platform,
+            # unfortunately cd c:/some/path fails on Windows
+            cmd_args << "cd /d \"#{pwd.gsub(%r{/}, '\\')}\" && "
+          else
+            cmd_args << "cd '#{pwd}' && "
+          end
+        end
+        cmd_args << path_to_bin('java')
         cp = classpath_from(options)
         cmd_args << '-classpath' << cp.join(File::PATH_SEPARATOR) unless cp.empty?
         options[:properties].each { |k, v| cmd_args << "-D#{k}=#{v}" } if options[:properties]

data/lib/buildr/java/pom.rb

@@ -99,15 +99,14 @@ module Buildr
             apply = managed(spec)
             spec = apply.merge(spec) if apply
 
+            next if options[:exclusions] && options[:exclusions].any? { |ex| dep['groupId'] == ex['groupId'] && dep['artifactId'] == ex['artifactId'] }
+
             # calculate transitive dependencies
             if options[:scopes].include?(spec[:scope])
               spec.delete(:scope)
 
               exclusions = dep["exclusions"].first["exclusion"] rescue nil
-              transitive_deps = POM.load(spec).dependencies(options[:scopes_transitive] || SCOPES_TRANSITIVE)
-              transitive_deps = transitive_deps.reject{|dep|
-                exclusions.find {|ex| dep.index("#{ex['groupId'].first}:#{ex['artifactId'].first}:") == 0}
-              } if exclusions
+              transitive_deps = POM.load(spec).dependencies(:exclusions => exclusions, :scopes => (options[:scopes_transitive] || SCOPES_TRANSITIVE) ) rescue []
 
               [Artifact.to_spec(spec)] + transitive_deps
             end

data/lib/buildr/java/tests.rb

@@ -293,9 +293,10 @@ module Buildr
   # Support the following options:
   # * :properties -- Hash of properties passed to the test suite.
   # * :java_args -- Arguments passed to the JVM.
+  # * :args -- Arguments passed to the TestNG command line runner.
   class TestNG < TestFramework::Java
 
-    VERSION = '5.10'
+    VERSION = '6.8'
 
     class << self
       def version
@@ -303,7 +304,8 @@ module Buildr
       end
 
       def dependencies
-        ["org.testng:testng:jar:jdk15:#{version}"]+ JMock.dependencies
+        return ["org.testng:testng:jar:jdk15:#{version}"] + JMock.dependencies if version < "6.0"
+        ["org.testng:testng:jar:#{version}",'com.beust:jcommander:jar:1.27'] + JMock.dependencies
       end
 
     private
@@ -321,7 +323,10 @@ module Buildr
     end
 
     def run(tests, dependencies) #:nodoc:
-      cmd_args = ['-log', '2', '-sourcedir', task.compile.sources.join(';'), '-suitename', task.project.id ]
+      cmd_args = []
+      cmd_args << '-suitename' << task.project.id
+      cmd_args << '-sourcedir' << task.compile.sources.join(';') if TestNG.version < "6.0"
+      cmd_args << '-log' << '2'
       cmd_args << '-d' << task.report_to.to_s
       exclude_args = options[:excludegroups] || []
       if !exclude_args.empty?
@@ -334,6 +339,8 @@ module Buildr
       # run all tests in the same suite
       cmd_args << '-testclass' << tests
 
+      cmd_args += options[:args] if options[:args]
+
       cmd_options = { :properties=>options[:properties], :java_args=>options[:java_args],
         :classpath=>dependencies, :name => "TestNG in #{task.send(:project).name}" }
 

data/lib/buildr/packaging/artifact.rb

@@ -139,14 +139,16 @@ module Buildr
     #
     # Creates POM XML for this artifact.
     def pom_xml
-      xml = Builder::XmlMarkup.new(:indent=>2)
-      xml.instruct!
-      xml.project do
-        xml.modelVersion  '4.0.0'
-        xml.groupId       group
-        xml.artifactId    id
-        xml.version       version
-        xml.classifier    classifier if classifier
+      Proc.new do
+        xml = Builder::XmlMarkup.new(:indent=>2)
+        xml.instruct!
+        xml.project do
+          xml.modelVersion  '4.0.0'
+          xml.groupId       group
+          xml.artifactId    id
+          xml.version       version
+          xml.classifier    classifier if classifier
+        end
       end
     end
 
@@ -372,6 +374,7 @@ module Buildr
 
     # :call-seq:
     #   content(string) => self
+    #   content(Proc) => self
     #
     # Use this when you want to install or upload an artifact from a given content, for example:
     #   readme = artifact('com.example:readme:txt:1.0').content(<<-EOF
@@ -379,13 +382,17 @@ module Buildr
     #   <<EOF
     #   install readme
     #
-    # If the argument is not a string, it will be converted to a string using to_s
+    # If the argument is a Proc the it will be called when the artifact is written out. If the result is not a proc
+    # and not a string, it will be converted to a string using to_s
     def content(string = nil)
-      return @content unless string
+      unless string
+        @content = @content.call if @content.is_a?(Proc)
+        return @content
+      end
 
       unless @content
         enhance do
-          write name, @content
+          write name, self.content
         end
 
         class << self