buildr 1.3.4-java → 1.3.5-java

data/lib/buildr/java/test_result.rb

@@ -68,6 +68,53 @@ module Buildr #:nodoc:
           module_eval "def #{meth}(*args); end"
         end
 
+        def example_group_started(example_group)
+          @example_group = example_group
+        end
+
+        def example_passed(example)
+          result.succeeded << example_group.location.gsub(/:\d+$/, '')
+        end
+
+        def example_pending(example, counter, failure)
+          result.succeeded << example_group.location.gsub(/:\d+$/, '')
+        end
+
+        def example_failed(example, counter, failure)
+          result.failed << example_group.location.gsub(/:\d+$/, '')
+        end
+
+        def start(example_count)
+          @result = TestResult.new
+        end
+
+        def close
+          result.succeeded = result.succeeded - result.failed
+          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
@@ -108,7 +155,7 @@ module Buildr #:nodoc:
           FileUtils.mkdir_p File.dirname(where)
           File.open(where, 'w') { |f| f.puts YAML.dump(result) }
         end
-      end # YamlFormatter
+      end # JtestRYamlFormatter
 
       # A JtestR ResultHandler
       # Using this handler we can use RSpec formatters, like html/ci_reporter with JtestR

data/lib/buildr/java/tests.rb

@@ -46,6 +46,7 @@ module Buildr
     # * :interfaces -- List of java interfaces or java classes
     # * :class_annotations -- List of annotations on class level
     # * :method_annotations -- List of annotations on method level
+    # * :fields -- List of java field names
     #
     def filter_classes(dependencies, criteria = {})
       return [] unless task.compile.target
@@ -69,13 +70,14 @@ module Buildr
         if criteria[:method_annotations]
           filter.add_method_annotations(criteria[:method_annotations].to_java(Java.java.lang.String))
         end
+        if criteria[:fields]
+          filter.add_fields(criteria[:fields].to_java(Java.java.lang.String))
+        end
         result.concat filter.filter(candidates.to_java(Java.java.lang.String)).map(&:to_s)
       rescue =>ex
         info "#{ex.class}: #{ex.message}"
         raise
       end
-      # We strip Scala singleton objects whose .class ends with $
-      result.map { |c| (c =~ /\$$/) ? c[0..(c.size - 2)] : c  }.uniq
     end
     
   end
@@ -165,7 +167,7 @@ module Buildr
     end
 
     # JUnit version number.
-    VERSION = '4.4'
+    VERSION = '4.5'
 
     class << self
       # :call-seq:
@@ -276,7 +278,7 @@ module Buildr
   # * :java_args -- Arguments passed to the JVM.
   class TestNG < TestFramework::Java
 
-    VERSION = '5.7'
+    VERSION = '5.10'
 
     class << self
       def version
@@ -315,7 +317,8 @@ module Buildr
       rescue
         # testng-failed.xml contains the list of failed tests *only*
         report = File.read(File.join(task.report_to.to_s, 'testng-failed.xml'))
-        failed = report.scan(/<class name="(.*)">/im).flatten
+        failed = report.scan(/<class name="(.*?)">/im).flatten
+        error "TestNG regexp returned unexpected failed tests #{failed.inspect}" unless (failed - tests).empty?
         # return the list of passed tests
         return tests - failed
       end

data/lib/buildr/packaging/artifact_namespace.rb

@@ -736,7 +736,7 @@ module Buildr
 
     # Like Hash#fetch
     def fetch(name, default = nil, &block)
-      block ||= lambda { raise IndexError.new("No artifact found by name #{name.inspect} in namespace #{self}") }
+      block ||= proc { raise IndexError.new("No artifact found by name #{name.inspect} in namespace #{self}") }
       real_name = name.to_s[/^[\w\-\.]+$/] ? name : ArtifactRequirement.unversioned_spec(name)
       get(real_name.to_sym) || default || block.call(name)
     end

data/lib/buildr/packaging/package.rb

@@ -129,6 +129,7 @@ module Buildr
     #   end
     def package(*args)
       spec = Hash === args.last ? args.pop.dup : {}
+      no_options = spec.empty? # since spec is mutated
       if spec[:file]
         rake_check_options spec, :file, :type
         spec[:type] = args.shift || spec[:type] || spec[:file].split('.').last
@@ -147,7 +148,10 @@ module Buildr
           spec = send("package_as_#{spec[:type]}_spec", spec) if respond_to?("package_as_#{spec[:type]}_spec")
           file_name = path_to(:target, Artifact.hash_to_file_name(spec))
         end
-        package = packages.find { |pkg| pkg.name == file_name } || packager.call(file_name)
+        package = (no_options && packages.detect { |pkg| pkg.type == spec[:type] && 
+                  (spec[:classifier].nil? || pkg.classifier == spec[:classifier])}) ||
+          packages.find { |pkg| pkg.name == file_name }                             ||
+          packager.call(file_name)
       else
         Buildr.application.deprecated "We changed the way package_as methods are implemented.  See the package method documentation for more details."
         file_name ||= path_to(:target, Artifact.hash_to_file_name(spec))
@@ -164,7 +168,7 @@ module Buildr
 
         if spec[:file]
           class << package ; self ; end.send(:define_method, :type) { spec[:type] }
-        elsif !package.respond_to?(:install)
+        else
           # Make it an artifact using the specifications, and tell it how to create a POM.
           package.extend ActsAsArtifact
           package.send :apply_spec, spec.only(*Artifact::ARTIFACT_ATTRIBUTES)

data/lib/buildr/packaging/zip.rb

@@ -14,7 +14,16 @@
 # the License.
 
 
-$LOADED_FEATURES.unshift 'ftools' if RUBY_VERSION >= '1.9.0' # Required to properly load RubyZip under Ruby 1.9
+if RUBY_VERSION >= '1.9.0' # Required to properly load RubyZip under Ruby 1.9
+  $LOADED_FEATURES.unshift 'ftools'
+  require 'fileutils'
+  def File.move(source, dest)
+    FileUtils.move source, dest
+  end
+  def File.rm_rf(path)
+    FileUtils.rm_rf path
+  end
+end
 require 'zip/zip'
 require 'zip/zipfilesystem'
 

data/lib/buildr/packaging/ziptask.rb

@@ -74,8 +74,9 @@ module Buildr
           elsif content.nil? || File.directory?(content.to_s)
             mkpath.call path
           else
-            zip.put_next_entry(path, compression_level)
+            entry = zip.put_next_entry(path, compression_level)
             File.open content.to_s, 'rb' do |is|
+              entry.unix_perms = is.stat.mode & 07777
               while data = is.read(4096)
                 zip << data
               end
@@ -122,7 +123,8 @@ module Buildr
 
     # Initialize with hash argument of the form target=>zip_file.
     def initialize(args)
-      @target, arg_names, @zip_file = Buildr.application.resolve_args([args])
+      @target, arg_names, zip_file = Buildr.application.resolve_args([args])
+      @zip_file = zip_file.first
       @paths = {}
     end
 
@@ -154,6 +156,7 @@ module Buildr
             dest = File.expand_path(dest, target.to_s)
             trace "Extracting #{dest}"
             mkpath File.dirname(dest) rescue nil
+            entry.restore_permissions = true
             entry.extract(dest) { true }
           end
         end

data/lib/buildr/scala.rb

@@ -20,5 +20,6 @@ Buildr.repositories.remote << 'http://scala-tools.org/repo-releases'
 require 'buildr/scala/compiler'
 require 'buildr/scala/tests'
 require 'buildr/scala/bdd'
+require 'buildr/scala/shell'
 
 Object::Scala = Buildr::Scala

data/lib/buildr/scala/bdd.rb

@@ -32,7 +32,7 @@ module Buildr::Scala
     @lang = :scala
     @bdd_dir = :spec
 
-    VERSION = '1.4.3'
+    VERSION = '1.5.0'
     
     class << self
       def version
@@ -40,8 +40,7 @@ module Buildr::Scala
       end
       
       def dependencies
-        ["org.specs:specs:jar:#{version}"] + Check.dependencies + 
-          JMock.dependencies + JUnit.dependencies
+        ["org.scala-tools.testing:specs:jar:#{version}"] + Check.dependencies + JUnit.dependencies
       end
       
       def applies_to?(project)  #:nodoc:
@@ -68,20 +67,30 @@ module Buildr::Scala
     
     def tests(dependencies)
       dependencies += [task.compile.target.to_s]
-      filter_classes(dependencies, :interfaces => ['org.specs.Specification'])
+      candidates = filter_classes(dependencies, :interfaces => ['org.specs.Specification'])
+      
+      Java.load   # Java is already loaded, but just in case
+      
+      filter = Java.org.apache.buildr.JavaTestFilter.new(dependencies.to_java(Java.java.lang.String))
+      filter.add_fields ['MODULE$'].to_java(Java.java.lang.String)
+      filter.filter(candidates.to_java(Java.java.lang.String))      # we only want singletons
     end
     
     def run(specs, dependencies)  #:nodoc:
-      dependencies += [task.compile.target.to_s] + Scalac.dependencies
+      dependencies += [task.compile.target.to_s, File.join(File.dirname(__FILE__))] + Scalac.dependencies
       
       cmd_options = { :properties => options[:properties],
                       :java_args => options[:java_args],
                       :classpath => dependencies}
-      
+
+      runner = 'org.apache.buildr.SpecsSingletonRunner'
       specs.inject [] do |passed, spec|
         begin
-          Java.load
-          Java::Commands.java(spec, cmd_options)
+          unless Util.win_os?
+            Java::Commands.java(runner, task.compile.target.to_s, '-c', spec, cmd_options)
+          else
+            Java::Commands.java(runner, task.compile.target.to_s, spec, cmd_options)
+          end
         rescue => e
           passed
         else

data/lib/buildr/scala/compiler.rb

@@ -19,18 +19,31 @@ require 'buildr/core/compile'
 require 'buildr/packaging'
 
 module Buildr::Scala
-
+  DEFAULT_VERSION = '2.7.5'   # currently the latest (Jun 19, 2009)
+  
   class << self
+    
+    # Retrieves the Scala version string from the 
+    # standard library or nil if Scala is not
+    # available.
     def version_str
-      # Scala version string normally looks like "version 2.7.3.final"
-      Java.scala.util.Properties.versionString.sub 'version ', ''
+      begin
+        # Scala version string normally looks like "version 2.7.3.final"
+        Java.scala.util.Properties.versionString.sub 'version ', ''
+      rescue
+        nil
+      end
     end
     
     def version
-      # any consecutive sequence of numbers followed by dots
-      match = version_str.match(/\d+\.\d[\d\.]*/) or
-        fail "Unable to parse Scala version: #{version_str} "
-      match[0].sub(/.$/, "") # remove trailing dot, if any
+      if version_str
+        # any consecutive sequence of numbers followed by dots
+        match = version_str.match(/\d+\.\d[\d\.]*/) or
+          fail "Unable to parse Scala version: #{version_str} "
+        match[0].sub(/.$/, "") # remove trailing dot, if any
+      else
+        DEFAULT_VERSION       # TODO return the version installed from Maven repo
+      end
     end
   end
 
@@ -47,17 +60,44 @@ module Buildr::Scala
   # * :debug       -- Generate debugging info.
   # * :other       -- Array of options to pass to the Scalac compiler as is, e.g. -Xprint-types
   class Scalac < Buildr::Compiler::Base
+    
+    # The scalac compiler jars are added to classpath at load time,
+    # if you want to customize artifact versions, you must set them on the
+    #
+    #      artifact_ns['Buildr::Compiler::Scalac'].library = '2.7.5'
+    #
+    # namespace before this file is required.  This is of course, only
+    # if SCALA_HOME is not set or invalid.
+    REQUIRES = ArtifactNamespace.for(self) do |ns|
+      ns.library!      'org.scala-lang:scala-library:jar:>=' + DEFAULT_VERSION
+      ns.compiler!     'org.scala-lang:scala-compiler:jar:>=' + DEFAULT_VERSION
+    end
+    
     class << self
       def scala_home
-        @home ||= ENV['SCALA_HOME']
+        env_home = ENV['SCALA_HOME']
+        
+        @home ||= (if !env_home.nil? && File.exists?(env_home + '/lib/scala-library.jar') && File.exists?(env_home + '/lib/scala-compiler.jar')
+          env_home
+        else
+          nil
+        end)
+      end
+      
+      def installed?
+        !scala_home.nil?
       end
 
       def dependencies
-        [ 'scala-library.jar', 'scala-compiler.jar'].map { |jar| File.expand_path("lib/#{jar}", scala_home) }
+        if installed?
+          ['scala-library', 'scala-compiler'].map { |s| File.expand_path("lib/#{s}.jar", scala_home) }
+        else
+          REQUIRES.artifacts.map(&:to_s)
+        end
       end
 
       def use_fsc
-        ENV["USE_FSC"] =~ /^(yes|on|true)$/i
+        installed? && ENV["USE_FSC"] =~ /^(yes|on|true)$/i
       end
       
       def applies_to?(project, task) #:nodoc:
@@ -101,32 +141,37 @@ module Buildr::Scala
       cmd_args += files_from_sources(sources)
 
       unless Buildr.application.options.dryrun
-        Scalac.scala_home or fail 'Are we forgetting something? SCALA_HOME not set.'
         trace((['scalac'] + cmd_args).join(' '))
+        
         if Scalac.use_fsc
           system(([File.expand_path('bin/fsc', Scalac.scala_home)] + cmd_args).join(' ')) or
             fail 'Failed to compile, see errors above'
         else
           Java.load
-          Java.scala.tools.nsc.Main.process(cmd_args.to_java(Java.java.lang.String))
+          begin
+            Java.scala.tools.nsc.Main.process(cmd_args.to_java(Java.java.lang.String))
+          rescue => e
+            fail "Scala compiler crashed:\n#{e.inspect}" 
+          end
           fail 'Failed to compile, see errors above' if Java.scala.tools.nsc.Main.reporter.hasErrors
         end
-        
-        if java_applies? sources
+ 
+        java_sources = java_sources(sources)
+        unless java_sources.empty?
           trace 'Compiling mixed Java/Scala sources'
           
-          deps = dependencies + [ File.expand_path('lib/scala-library.jar', Scalac.scala_home),
-                                  File.expand_path(target) ]
-          @java.compile(sources, target, deps)
+          # TODO  includes scala-compiler.jar
+          deps = dependencies + Scalac.dependencies + [ File.expand_path(target) ]
+          @java.compile(java_sources, target, deps)
         end
       end
     end
 
   private
-  
-    def java_applies?(sources)
-      not sources.flatten.map { |source| File.directory?(source) ? FileList["#{source}/**/*.java"] : source }.
-        flatten.reject { |file| File.directory?(file) }.map { |file| File.expand_path(file) }.uniq.empty?
+
+    def java_sources(sources)
+      sources.flatten.map { |source| File.directory?(source) ? FileList["#{source}/**/*.java"] : source } .
+        flatten.reject { |file| File.directory?(file) || File.extname(file) != '.java' }.map { |file| File.expand_path(file) }.uniq
     end
 
     # Returns Scalac command line arguments from the set of options.

data/lib/buildr/scala/org/apache/buildr/SpecsSingletonRunner.scala

@@ -0,0 +1,35 @@
+package org.apache.buildr
+
+import java.net.{URL, URLClassLoader}
+import java.io.File
+
+/**
+ * @author Daniel Spiewak
+ */
+object SpecsSingletonRunner {
+  type Spec = { def main(args: Array[String]) }
+  
+  // Incompatible with JVM 1.4 target
+  // @throws(classOf[Throwable])
+  def main(args: Array[String]) {
+    val (colors, spec) = if (args.length > 1 && args(1) == "-c")
+      (true, args(2))
+    else
+      (false, args(1))
+    
+    run(args(0), colors, spec)
+  }
+  
+  // Incompatible with JVM 1.4 target
+  // @throws(classOf[Throwable])
+  def run(path: String, colors: Boolean, spec: String) = {
+    val parent = new File(path)
+    val specURL = new File(parent, spec.replace('.', '/') + ".class").toURL
+    val loader = new URLClassLoader(Array(specURL), getClass.getClassLoader)
+    
+    val clazz = loader.loadClass(spec)
+    val instance = clazz.getField("MODULE$").get(null).asInstanceOf[Spec]
+    
+    instance.main(if (colors) Array("-c") else Array())
+  }
+}

data/lib/buildr/scala/shell.rb

@@ -0,0 +1,55 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+
+require 'buildr/shell'
+require 'buildr/java/commands'
+
+module Buildr
+  module Scala
+    class ScalaShell < Buildr::Shell::Base
+      include Buildr::Shell::JavaRebel
+      
+      class << self
+        def lang
+          :scala
+        end
+        
+        def to_sym
+          :scala
+        end
+      end
+      
+      def launch
+        cp = project.compile.dependencies + 
+          Scalac.dependencies +
+          [project.path_to(:target, :classes)]
+        
+        props = {
+          'env.classpath' => cp.join(File::PATH_SEPARATOR),
+          'scala.home' => Scalac.scala_home
+        }
+        
+        Java::Commands.java 'scala.tools.nsc.MainGenericRunner', {
+          :properties => props.merge(rebel_props(project)),
+          :classpath => cp,
+          :java_args => rebel_args
+        }
+      end
+    end
+  end
+end
+
+Buildr::ShellProviders << Buildr::Scala::ScalaShell