buildr 1.3.5 → 1.4.0

data/lib/buildr/java/packaging.rb

@@ -166,18 +166,19 @@ module Buildr
             @prerequisites << manifest if String === manifest || Rake::Task === manifest
             [meta_inf].flatten.map { |file| file.to_s }.uniq.each { |file| path('META-INF').include file }
           end
-        
+
           enhance do
             if manifest
               # Tempfiles gets deleted on garbage collection, so we're going to hold on to it
               # through instance variable not closure variable.
               @manifest_tmp = Tempfile.new('MANIFEST.MF')
+              File.chmod 0644, @manifest_tmp.path
               self.manifest = File.read(manifest.to_s) if String === manifest || Rake::Task === manifest
               self.manifest = Manifest.new(manifest) unless Manifest === manifest
               #@manifest_tmp.write Manifest::STANDARD_HEADER
               @manifest_tmp.write manifest.to_s
               @manifest_tmp.write "\n"
-              @manifest_tmp.rewind
+              @manifest_tmp.close
               path('META-INF').include @manifest_tmp.path, :as=>'MANIFEST.MF'
             end
           end
@@ -217,7 +218,7 @@ module Buildr
         # :call-seq:
         #   with(options) => self
         #
-        # Additional 
+        # Additional
         # Pass options to the task. Returns self. ZipTask itself does not support any options,
         # but other tasks (e.g. JarTask, WarTask) do.
         #
@@ -225,7 +226,8 @@ module Buildr
         #   package(:jar).with(:manifest=>'MANIFEST_MF')
         def with(*args)
           super args.pop if Hash === args.last
-          include :from=>args
+          fail "package.with() should not contain nil values" if args.include? nil
+          include :from=>args if args.size > 0
           self
         end
 
@@ -267,7 +269,7 @@ module Buildr
         def classes=(value) #:nodoc:
           @classes = [value].flatten.map { |dir| file(dir.to_s) }
         end
-  
+
       end
 
 
@@ -340,18 +342,18 @@ module Buildr
       # * :map -- A Hash used to map component type to paths within the EAR.
       #     By default each component type is mapped to a directory with the same name,
       #     for example, EJBs are stored in the /ejb path.  To customize:
-      #                       package(:ear).map[:war] = 'web-applications' 
+      #                       package(:ear).map[:war] = 'web-applications'
       #                       package(:ear).map[:lib] = nil # store shared libraries on root of archive
       #
       # EAR components are added by means of the EarTask#add, EarTask#<<, EarTask#push methods
-      # Component type is determined from the artifact's type. 
+      # Component type is determined from the artifact's type.
       #
       #      package(:ear) << project('coolWebService').package(:war)
       #
       # The << method is just an alias for push, with the later you can add multiple components
-      # at the same time. For example.. 
+      # at the same time. For example..
       #
-      #      package(:ear).push 'org.springframework:spring:jar:2.6', 
+      #      package(:ear).push 'org.springframework:spring:jar:2.6',
       #                                   projects('reflectUtils', 'springUtils'),
       #                                   project('coolerWebService').package(:war)
       #
@@ -363,7 +365,7 @@ module Buildr
       #
       #      # will add an ejb entry for the-cool-ejb-2.5.jar in application.xml
       #      package(:ear).add 'org.coolguys:the-cool-ejb:jar:2.5', :type=>:ejb
-      #      # A better syntax for this is: 
+      #      # A better syntax for this is:
       #      package(:ear).add :ejb=>'org.coolguys:the-cool-ejb:jar:2.5'
       #
       # By default, every JAR package is assumed to be a library component, so you need to specify
@@ -372,13 +374,13 @@ module Buildr
       # For WebApplications (:war)s, you can customize the context-root that appears in application.xml.
       # The following example also specifies a different directory inside the EAR where to store the webapp.
       #
-      #      package(:ear).add project(:remoteService).package(:war), 
+      #      package(:ear).add project(:remoteService).package(:war),
       #                                 :path=>'web-services', :context_root=>'/Some/URL/Path'
       #
       # [1] http://java.sun.com/j2ee/sdk_1.2.1/techdocs/guides/ejb/html/Overview5.html#10106
       # [2] http://java.sun.com/j2ee/verified/packaging.html
       class EarTask < JarTask
-        
+
         SUPPORTED_TYPES = [:war, :ejb, :jar, :rar, :lib]
 
         # The display-name entry for application.xml
@@ -416,7 +418,7 @@ module Buildr
               rescue # not an artifact spec, it must me a filename
                 file(pkg)
               end
-            else 
+            else
               raise "Invalid EAR component #{pkg.class}: #{pkg}"
             end
           end
@@ -438,7 +440,7 @@ module Buildr
               end
               raise "Unknown EAR component type: #{type}. Perhaps you may explicity tell what component type to use." unless
                 SUPPORTED_TYPES.include?(type)
-              component = options.merge(:artifact => artifact, :type => type, 
+              component = options.merge(:artifact => artifact, :type => type,
                 :id=>artifact.respond_to?(:to_spec) ? artifact.id : artifact.to_s.pathmap('%n'),
                 :path=>options[:path] || dirs[type].to_s)
               component[:clone] = component_clone(component) unless :lib == type
@@ -448,7 +450,7 @@ module Buildr
           end
           self
         end
-        
+
         alias_method :push, :add
         alias_method :<<, :push
 
@@ -482,7 +484,7 @@ module Buildr
 
         def update_classpath(component)
           package = file(component[:artifact].to_s)
-          package.manifest = (package.manifest || {}).dup # avoid mofifying parent projects manifest  
+          package.manifest = (package.manifest || {}).dup # avoid mofifying parent projects manifest
           package.prepare do
             header = case package.manifest
               when Hash then package.manifest
@@ -506,7 +508,7 @@ module Buildr
         def libs_classpath(component)
           from = component[:path]
           @classpath = @components.select { |comp| comp[:type] == :lib }.
-            map do |lib| 
+            map do |lib|
             basename = lib[:artifact].to_s.pathmap('%f')
             full_path = lib[:path].empty? ? basename : File.join(lib[:path], basename)
             Util.relative_path(full_path, from)
@@ -516,7 +518,7 @@ module Buildr
         def descriptor_xml
           buffer = ""
           xml = Builder::XmlMarkup.new(:target=>buffer, :indent => 2)
-          xml.declare! :DOCTYPE, :application, :PUBLIC, 
+          xml.declare! :DOCTYPE, :application, :PUBLIC,
           "-//Sun Microsystems, Inc.//DTD J2EE Application 1.2//EN",
           "http://java.sun.com/j2ee/dtds/application_1_2.dtd"
           xml.application do
@@ -527,7 +529,7 @@ module Buildr
               case comp[:type]
               when :war
                 xml.module :id=>comp[:id] do
-                  xml.web do 
+                  xml.web do
                     xml.tag! 'web-uri', uri
                     xml.tag! 'context-root', File.join('', (comp[:context_root] || comp[:id])) unless comp[:context_root] == false
                   end
@@ -543,7 +545,7 @@ module Buildr
           end
           buffer
         end
-        
+
         # return a FileTask to build the ear application.xml file
         def descriptor
           return @descriptor if @descriptor
@@ -559,7 +561,7 @@ module Buildr
             def xml
               @xml ||= ear.send :descriptor_xml
             end
-            
+
             def needed?
               super || xml != File.read(self.to_s) rescue true
             end
@@ -567,18 +569,17 @@ module Buildr
           @descriptor.ear = self
           @descriptor
         end
-        
+
       end
 
 
       include Extension
 
-      before_define do |project|
-        ::Java.load
-        if project.parent && project.parent.manifest 
+      before_define(:package => :build) do |project|
+        if project.parent && project.parent.manifest
           project.manifest = project.parent.manifest.dup
         else
-          project.manifest = { 
+          project.manifest = {
             'Build-By'=>ENV['USER'], 'Build-Jdk'=>ENV_JAVA['java.version'],
             'Implementation-Title'=>project.comment || project.name,
             'Implementation-Version'=>project.version }
@@ -681,7 +682,7 @@ module Buildr
         Java::AarTask.define_task(file_name).tap do |aar|
           aar.with :manifest=>manifest, :meta_inf=>meta_inf
           aar.with :wsdls=>path_to(:source, :main, :axis2, '*.wsdl')
-          aar.with :services_xml=>path_to(:source, :main, :axis2, 'services.xml') 
+          aar.with :services_xml=>path_to(:source, :main, :axis2, 'services.xml')
           aar.with [compile.target, resources.target].compact
           aar.with :libs=>compile.dependencies
         end
@@ -700,8 +701,8 @@ module Buildr
 
       def package_as_javadoc(file_name) #:nodoc:
         ZipTask.define_task(file_name).tap do |zip|
-          zip.include :from=>javadoc.target
-          javadoc.options[:windowtitle] ||= project.comment || project.name
+          zip.include :from=>doc.target
+          doc.options[:windowtitle] ||= project.comment || project.name
         end
       end
 

data/lib/buildr/java/pom.rb

@@ -28,7 +28,7 @@ module Buildr
     attr_reader :parent
 
     class << self
-      
+
       # :call-seq:
       #   POM.load(arg)
       #
@@ -82,8 +82,8 @@ module Buildr
       unless depends = @depends_for_scopes[scopes]
         declared = project["dependencies"].first["dependency"] rescue nil
         depends = (declared || []).reject { |dep| value_of(dep["optional"]) =~ /true/ }.
-          map { |dep| 
-            spec = pom_to_hash(dep, properties) 
+          map { |dep|
+            spec = pom_to_hash(dep, properties)
             apply = managed(spec)
             spec = apply.merge(spec) if apply
 
@@ -93,7 +93,7 @@ module Buildr
 
               exclusions = dep["exclusions"]["exclusion"] rescue nil
               transitive_deps = POM.load(spec).dependencies(SCOPES_TRANSITIVE)
-              transitive_deps = transitive_deps.reject{|dep| 
+              transitive_deps = transitive_deps.reject{|dep|
                 exclusions.find {|ex| dep.index("#{dep['groupdId'].first}:#{dep['artifactId'].first}:") == 0}
               } if exclusions
 

data/lib/buildr/java/rjb.rb

@@ -71,13 +71,13 @@ module Java
     end
 
   end
-  
+
   # On OS X we know where the default JDK is. We can try to guess for other OS.
   # We set JAVA_HOME early so we can use it without calling Java.load first.
   ENV['JAVA_HOME'] ||= '/System/Library/Frameworks/JavaVM.framework/Home' if Config::CONFIG['host_os'] =~ /darwin/i
 
   class << self
-    
+
     # Returns the classpath, an array listing directories, JAR files and
     # artifacts.  Use when loading the extension to add any additional
     # libraries used by that extension.
@@ -87,7 +87,7 @@ module Java
     def classpath
       @classpath ||= []
     end
-    
+
     # Most platforms requires tools.jar to be on the classpath, tools.jar contains the
     # Java compiler (OS X and AIX are two exceptions we know about, may be more).
     # Guess where tools.jar is from JAVA_HOME, which hopefully points to the JDK,
@@ -99,7 +99,7 @@ module Java
           find { |path| File.exist?(path) }
       end
     end
-    
+
     # Loads the JVM and all the libraries listed on the classpath.  Call this
     # method before accessing any Java class, but only call it from methods
     # used in the build, giving the Buildfile a chance to load all extensions
@@ -107,14 +107,14 @@ module Java
     def load
       return self if @loaded
       classpath << tools_jar if tools_jar
-      
+
       classpath.map! { |path| Proc === path ? path.call : path }
       cp = Buildr.artifacts(classpath).map(&:to_s).each { |path| file(path).invoke }
       java_opts = (ENV['JAVA_OPTS'] || ENV['JAVA_OPTIONS']).to_s.split
       ::Rjb.load cp.join(File::PATH_SEPARATOR), java_opts
 
       props = ::Rjb.import('java.lang.System').getProperties
-      enum = props.propertyNames 
+      enum = props.propertyNames
       while enum.hasMoreElements
         name = enum.nextElement.toString
         ENV_JAVA[name] = props.getProperty(name)

data/lib/buildr/java/test_result.rb

@@ -13,11 +13,13 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+# necessary to require YAML even if it is mentioned by autoload as it fails on some platforms.
+require 'yaml' 
 require 'fileutils'
 module Buildr #:nodoc:
   module TestFramework
-    
-    # A class used by buildr for jruby based frameworks, so that buildr can know 
+
+    # A class used by buildr for jruby based frameworks, so that buildr can know
     # which tests succeeded/failed.
     class TestResult
 
@@ -35,14 +37,14 @@ module Buildr #:nodoc:
         end
 
         def self.guard(file)
-          begin 
+          begin
             yield
           rescue => e
             dump_yaml(file, e)
           end
         end
       end
-      
+
       attr_accessor :failed, :succeeded
 
       def initialize
@@ -54,7 +56,7 @@ module Buildr #:nodoc:
         attr_reader :result
 
         attr_accessor :example_group, :options, :where
-        
+
         def initialize(options, where)
           @options = options
           @where = where
@@ -62,7 +64,7 @@ module Buildr #:nodoc:
           @result[:succeeded] = []
           @result[:failed] = []
         end
-        
+
         %w[ example_started
             start_dump dump_failure dump_summary dump_pending ].each do |meth|
           module_eval "def #{meth}(*args); end"
@@ -73,15 +75,15 @@ module Buildr #:nodoc:
         end
 
         def example_passed(example)
-          result.succeeded << example_group.location.gsub(/:\d+$/, '')
+          result.succeeded << example_name(example)
         end
 
-        def example_pending(example, counter, failure)
-          result.succeeded << example_group.location.gsub(/:\d+$/, '')
+        def example_pending(example, counter)
+          result.succeeded << example_name(example)
         end
 
         def example_failed(example, counter, failure)
-          result.failed << example_group.location.gsub(/:\d+$/, '')
+          result.failed << example_name(example)
         end
 
         def start(example_count)
@@ -93,69 +95,16 @@ module Buildr #:nodoc:
           FileUtils.mkdir_p File.dirname(where)
           File.open(where, 'w') { |f| f.puts YAML.dump(result) }
         end
-      end # YamlFormatter
-
-      # Rspec formatter used for JtestR
-      # (JtestR provides its own version of rspec)
-      class JtestRYamlFormatter
-        attr_reader :result
-
-        attr_accessor :example_group, :options, :where
-        
-        def initialize(options, where)
-          @options = options
-          @where = where
-          @result = Hash.new
-          @result[:succeeded] = []
-          @result[:failed] = []
-        end
-        
-        %w[ example_started
-            start_dump dump_failure dump_summary dump_pending ].each do |meth|
-          module_eval "def #{meth}(*args); end"
-        end
-
-        def add_example_group(example_group)
-          @example_group = example_group
-        end
 
-        def example_passed(example)
-        end
-
-        def example_pending(example, counter, failure)
-        end
-
-        def example_failed(example, counter, failure)
-          if example_group.respond_to?(:spec_path)
-            result.failed << example_group.spec_path.gsub(/:\d+$/, '')
+      private
+        def example_name(example)
+          if Spec::Example::ExampleProxy === example
+            example_group.location.gsub(/:\d+$/, '')
           else
-            path = path_from_bt(failure.exception.backtrace)
-            result.failed << path if path
+            example.name.gsub(/(.+)(\..+\(\))/, '\1')
           end
         end
-
-        def start(example_count)
-          @result = TestResult.new
-        end
-
-        def path_from_bt(ary)
-          files = options.files
-          test = nil
-          ary.find do |bt|
-            bt = bt.split(':').first.strip
-            test = bt if files.include?(bt)
-          end
-          test
-        end
-
-        def close
-          files = options.files
-          result.succeeded = files - result.failed
-          
-          FileUtils.mkdir_p File.dirname(where)
-          File.open(where, 'w') { |f| f.puts YAML.dump(result) }
-        end
-      end # JtestRYamlFormatter
+      end # YamlFormatter
 
       # A JtestR ResultHandler
       # Using this handler we can use RSpec formatters, like html/ci_reporter with JtestR
@@ -177,7 +126,7 @@ module Buildr #:nodoc:
             ignore_patterns << /org\.jruby\.javasupport\.JavaMethod\./
             ignore_patterns << /jtestr.*\.jar!/i << /runner\.rb/
           end
-          
+
           def clean_up_double_slashes(line)
             line.gsub!('//','/')
           end
@@ -197,10 +146,11 @@ module Buildr #:nodoc:
             error.backtrace.compact!
           end
         end
-        
+
         class << self
           # an rspec reporter used to proxy events to rspec formatters
           attr_reader :reporter
+          attr_accessor :test_files
 
           def init(argv = [], out = STDOUT, err = STDERR)
             ::JtestR::TestNGResultHandler.module_eval { include TestNGResultHandlerMixin }
@@ -218,10 +168,11 @@ module Buildr #:nodoc:
             reporter.end
             reporter.dump
           end
+
         end
 
         module ExampleMethods
-          attr_accessor :name, :description, :__full_description
+          attr_accessor :name, :description, :__full_description, :location
         end
 
         def reporter
@@ -239,9 +190,10 @@ module Buildr #:nodoc:
           else
             example_group.description = name.to_s
           end
-          reporter.add_example_group(example_group)
+          reporter.example_group_started(example_group)
         end
 
+
         def starting
         end
 
@@ -261,8 +213,8 @@ module Buildr #:nodoc:
           current_example.extend ::Spec::Example::ExampleMethods
           current_example.extend ExampleMethods
           name = name.to_s
-          name[/\((pen?ding|error|failure|success)\)?$/]
-          name = $`
+          current_example.location = name.to_s
+          current_example.name = name.gsub(/(.*)\((.+)\)/, '\2')
           current_example.description = name
           if example_group.name[/Spec/]
             current_example.__full_description = "#{example_group.description} #{name}"
@@ -270,31 +222,56 @@ module Buildr #:nodoc:
             current_example.__full_description = "#{example_group.name}: #{name}"
           end
           reporter.example_started(current_example)
-          #puts "STARTED #{name} #{current_example.__full_description}"
         end
 
         def succeed_single(name = nil)
-          #puts "SUCC SINGLE #{name}"
           reporter.example_finished(current_example, nil)
         end
-        
+
         def fail_single(name = nil)
-          #puts "FAIL SINGLE #{name}"
+          current_example.name = current_name
           reporter.example_finished(current_example, current_error)
         end
 
         def error_single(name = nil)
-          #puts "ERR SINGLE #{name}"
+          current_example.name = current_name
           reporter.example_finished(current_example, current_error)
         end
 
         def pending_single(name = nil)
-          #puts "PEND SINGLE #{name}"
           error = ::Spec::Example::ExamplePendingError.new(name)
           reporter.example_finished(current_example, error)
         end
 
       private
+        def detect_file(trace)
+          # find first matching test file in stacktrace
+          file = nil
+          first_pos = nil
+          RSpecResultHandler.test_files.each do |f|
+            pos = trace.index(f)
+            if pos && (first_pos.nil? || pos < first_pos)
+              file = f
+              first_pos = pos
+            end
+          end
+          file || fail("RSpecResultHandler.detect_file failed: #{trace}")
+        end
+
+        def current_name(example = current_example, fault = current_failure)
+          return example.name unless fault
+          case fault
+          when Test::Unit::Error
+            detect_file(fault.long_display)
+          when Test::Unit::Failure
+            detect_file(fault.location.to_s)
+          when Spec::Runner::Reporter::Failure
+            detect_file(fault.exception.backtrace.to_s)
+          else
+            example.name
+          end
+        end
+
         def current_error(fault = current_failure)
           case fault
           when nil
@@ -314,8 +291,7 @@ module Buildr #:nodoc:
             fault.exception
           when Spec::Runner::Reporter::Failure
             ex = fault.exception
-            fault.example.instance_variable_get(:@_implementation).to_s =~ /@(.+:\d+)/
-            Error.new(ex.message, [$1.to_s] + ex.backtrace)
+            Error.new(ex.message, ex.backtrace)
           when Expectations::Results
             file = fault.file
             line = fault.line
@@ -326,7 +302,7 @@ module Buildr #:nodoc:
               test_cls, test_meth = $1.to_s, $`.to_s
               exception = fault.exception
               (class << exception; self; end).module_eval do
-                define_method(:backtrace) do 
+                define_method(:backtrace) do
                   (["#{test_cls}:in `#{test_meth}'"] + stackTrace).map { |s| s.to_s }
                 end
               end
@@ -335,7 +311,7 @@ module Buildr #:nodoc:
               test_cls, test_meth = fault.method.test_class.name, fault.method.method_name
               exception = fault.throwable
               (class << exception; self; end).module_eval do
-                define_method(:backtrace) do 
+                define_method(:backtrace) do
                   (["#{test_cls}:in `#{test_meth}'"] + stackTrace).map { |s| s.to_s }
                 end
               end