buildr 1.3.2 → 1.3.3

data/lib/buildr/packaging/artifact.rb

@@ -120,7 +120,7 @@ module Buildr
           mkpath File.dirname(installed)
           cp name, installed
         end
-        puts "Installed #{installed}" if verbose
+        info "Installed #{installed}"
       end
     end
 
@@ -161,7 +161,7 @@ module Buildr
       uri.password = upload_to[:password] if upload_to[:password]
 
       # Upload artifact relative to base URL, need to create path before uploading.
-      puts "Deploying #{to_spec}" if verbose
+      info "Deploying #{to_spec}"
       path = group.gsub('.', '/') + "/#{id}/#{version}/#{File.basename(name)}"
       URI.upload uri + path, name, :permissions=>upload_to[:permissions]
     end
@@ -298,7 +298,7 @@ module Buildr
         # so don't perform it if the task found a different way to create the artifact.
         task.enhance do
           unless File.exist?(name)
-            puts "Downloading #{to_spec}" if verbose
+            info "Downloading #{to_spec}"
             download
             pom.invoke rescue nil if pom && pom != self
           end
@@ -320,7 +320,7 @@ module Buildr
           mkpath File.dirname(name)
           pom.invoke unless type == :pom
           cp path, name
-          puts "Installed #{path} as #{to_spec}" if verbose
+          info "Installed #{path} as #{to_spec}"
         end
       end
       unless type == :pom
@@ -346,7 +346,7 @@ module Buildr
     # This method attempts to download the artifact from each repository in the order in
     # which they are returned from #remote, until successful. It always downloads the POM first.
     def download
-      puts "Downloading #{to_spec}" if Buildr.application.options.trace
+      trace "Downloading #{to_spec}"
       remote = Buildr.repositories.remote.map { |repo_url| URI === repo_url ? repo_url : URI.parse(repo_url) }
       remote = remote.each { |repo_url| repo_url.path += '/' unless repo_url.path[-1] == '/' }
       fail 'No remote repositories defined!' if remote.empty?
@@ -358,8 +358,8 @@ module Buildr
         rescue URI::NotFoundError
           false
         rescue Exception=>error
-          puts error if verbose
-          puts error.backtrace.join("\n") if Buildr.application.options.trace
+          info error
+          trace error.backtrace.join("\n")
           false
         end
       end
@@ -602,7 +602,7 @@ module Buildr
   #   artifacts(*spec) => artifacts
   #
   # Handles multiple artifacts at a time. This method is the plural equivalent of
-  # #artifacts, but can do more things.
+  # #artifact, but can do more things.
   #
   # Returns an array of artifacts built using the supplied
   # specifications, each of which can be:
@@ -671,10 +671,11 @@ module Buildr
   # :call-seq:
   #   group(ids, :under=>group_name, :version=>number) => artifacts
   #
-  # Convenience method for defining multiple artifacts that belong to the same group and version.
-  # Accepts multiple artifact identifiers follows by two hash values:
+  # Convenience method for defining multiple artifacts that belong to the same group, type and version.
+  # Accepts multiple artifact identifiers followed by two or three hash values:
   # * :under -- The group identifier
   # * :version -- The version number
+  # * :type -- The artifact type (optional)
   #
   # For example:
   #   group 'xbean', 'xbean_xpath', 'xmlpublic', :under=>'xmlbeans', :version=>'2.1.0'
@@ -682,7 +683,7 @@ module Buildr
   #   group %w{xbean xbean_xpath xmlpublic}, :under=>'xmlbeans', :version=>'2.1.0'
   def group(*args)
     hash = args.pop
-    args.flatten.map { |id| artifact :group=>hash[:under], :version=>hash[:version], :id=>id }
+    args.flatten.map { |id| artifact :group=>hash[:under], :type=>hash[:type], :version=>hash[:version], :id=>id }
   end 
 
   # :call-seq:

data/lib/buildr/packaging/artifact_namespace.rb

@@ -697,10 +697,13 @@ module Buildr
               raise "Unsatisfied dependency #{previous} " +
                 "not satisfied by #{artifact}" unless satisfied
               previous.version = artifact.version # OK, set new version
+              artifact = previous # use the same object for aliases  
             else # not a requirement, set the new values
-              previous.copy_attrs(artifact)
+              unless artifact.id == previous.id && name != previous.name
+                previous.copy_attrs(artifact)
+                artifact = previous
+              end
             end
-            artifact = previous # use the same object for aliases
           else
             if unvers.nil? && # we only have the version
                 (previous = get(unvers, true, false, false))
@@ -722,8 +725,8 @@ module Buildr
           group(name, *(names + [{:namespace => self}]))
         elsif artifact.id
           unvers = artifact.unversioned_spec
-          registry[unvers] = artifact
-          registry.alias name, unvers unless name.to_s[/^\s*$/]
+          registry[name] = artifact
+          registry.alias unvers, name
         else
           registry[name] = artifact
         end

data/lib/buildr/packaging/gems.rb

@@ -40,11 +40,11 @@ module Buildr
     end
 
     def install
-      Util.ruby 'install', name, :command => 'gem', :sudo => true
+      Util::Gems.command 'install', name
     end
 
     def uninstall
-      Util.ruby 'uninstall', spec.name, '-v', spec.version.to_s, :command => 'gem', :sudo => true
+      Util::Gems.command 'uninstall', spec.name, '-v', spec.version.to_s
     end
 
     def upload
@@ -79,7 +79,7 @@ module Buildr
 
     def package_as_gem(file_name) #:nodoc:
       PackageGemTask.define_task(file_name).tap do |gem|
-        %{ lib test doc }.each do |dir|
+        %w{ lib test doc }.each do |dir|
           gem.include :from=>_(dir), :path=>dir if File.directory?(_(dir))
         end
         gem.spec do |spec|

data/lib/buildr/packaging/zip.rb

@@ -14,6 +14,7 @@
 # the License.
 
 
+$LOADED_FEATURES.unshift 'ftools' if RUBY_VERSION >= '1.9.0'
 require 'zip/zip'
 require 'zip/zipfilesystem'
 
@@ -45,11 +46,11 @@ module Buildr
               if File.directory?(path)
                 in_directory path do |file, rel_path|
                   dest = "#{@path}#{rel_path}"
-                  puts "Adding #{dest}" if Buildr.application.options.trace
+                  trace "Adding #{dest}"
                   file_map[dest] = file
                 end
               else
-                puts "Adding #{@path}#{File.basename(path)}" if Buildr.application.options.trace
+                trace "Adding #{@path}#{File.basename(path)}"
                 file_map["#{@path}#{File.basename(path)}"] = path
               end
             end
@@ -150,11 +151,11 @@ module Buildr
                 path = rel_path.split('/')[1..-1]
                 path.unshift as unless as == '.'
                 dest = "#{@path}#{path.join('/')}"
-                puts "Adding #{dest}" if Buildr.application.options.trace
+                trace "Adding #{dest}"
                 file_map[dest] = file
               end
             else
-              puts "Adding #{@path}#{as}" if Buildr.application.options.trace
+              trace "Adding #{@path}#{as}"
               file_map["#{@path}#{as}"] = file
             end
           end
@@ -218,7 +219,7 @@ module Buildr
             if @includes.any? { |pattern| File.fnmatch(pattern, entry.name, File::FNM_PATHNAME) } &&
                !@excludes.any? { |pattern| File.fnmatch(pattern, entry.name, File::FNM_PATHNAME) }
               dest = path =~ /^\/?$/ ? entry.name : Util.relative_path(path + "/" + entry.name)
-              puts "Adding #{dest}" if Buildr.application.options.trace
+              trace "Adding #{dest}"
               file_map[dest] = lambda { |output| output.write source.read(entry) }
             end
           end
@@ -546,7 +547,7 @@ module Buildr
           patterns.map(entries).each do |dest, entry|
             next if entry.directory?
             dest = File.expand_path(dest, target.to_s)
-            puts "Extracting #{dest}" if Buildr.application.options.trace
+            trace "Extracting #{dest}"
             mkpath File.dirname(dest), :verbose=>false rescue nil
             entry.extract(dest) { true }
           end
@@ -653,10 +654,12 @@ module Buildr
         includes = @include || ['**/*']
         excludes = @exclude || []
         entries.inject({}) do |map, entry|
-          short = entry.name.sub(@path, '')
-          if includes.any? { |pat| File.fnmatch(pat, short, File::FNM_PATHNAME) } &&
-             !excludes.any? { |pat| File.fnmatch(pat, short, File::FNM_PATHNAME) }
-            map[short] = entry
+          if entry.name =~ /^#{@path}/
+            short = entry.name.sub(@path, '')
+            if includes.any? { |pat| File.fnmatch(pat, short, File::FNM_PATHNAME) } &&
+               !excludes.any? { |pat| File.fnmatch(pat, short, File::FNM_PATHNAME) }
+              map[short] = entry
+            end
           end
           map
         end

data/lib/buildr/scala.rb

@@ -0,0 +1,19 @@
+# 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/scala/compiler'
+require 'buildr/scala/tests'
+Object::Scala = Buildr::Scala

data/lib/buildr/scala/compiler.rb

@@ -0,0 +1,109 @@
+# 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/core/project'
+require 'buildr/core/common'
+require 'buildr/core/compile'
+require 'buildr/packaging'
+
+
+module Buildr::Scala
+    
+  # Scalac compiler:
+  #   compile.using(:scalac)
+  # Used by default if .scala files are found in the src/main/scala directory (or src/test/scala)
+  # and sets the target directory to target/classes (or target/test/classes).
+  #
+  # Accepts the following options:
+  # * :warnings    -- Generate warnings if true (opposite of -nowarn).
+  # * :deprecation -- Output source locations where deprecated APIs are used.
+  # * :optimise    -- Generates faster bytecode by applying optimisations to the program.
+  # * :target      -- Class file compatibility with specified release.
+  # * :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
+    class << self
+      def scala_home
+        @home ||= ENV['SCALA_HOME']
+      end
+
+      def dependencies
+        [ 'scala-library.jar', 'scala-compiler.jar'].map { |jar| File.expand_path("lib/#{jar}", scala_home) }
+      end
+
+      def use_fsc
+        ENV["USE_FSC"] =~ /^(yes|on|true)$/i
+      end
+    end
+
+    OPTIONS = [:warnings, :deprecation, :optimise, :target, :debug, :other]
+    Java.classpath << dependencies
+
+    specify :language=>:scala, :target=>'classes', :target_ext=>'class', :packaging=>:jar
+
+    def initialize(project, options) #:nodoc:
+      super
+      options[:debug] = Buildr.options.debug if options[:debug].nil?
+      options[:warnings] = verbose if options[:warnings].nil?
+      options[:deprecation] ||= false
+      options[:optimise] ||= false
+    end
+
+    def compile(sources, target, dependencies) #:nodoc:
+      check_options options, OPTIONS
+
+      cmd_args = []
+      cmd_args << '-classpath' << (dependencies + Scalac.dependencies).join(File::PATH_SEPARATOR)
+      source_paths = sources.select { |source| File.directory?(source) }
+      cmd_args << '-sourcepath' << source_paths.join(File::PATH_SEPARATOR) unless source_paths.empty?
+      cmd_args << '-d' << File.expand_path(target)
+      cmd_args += scalac_args
+      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))
+          fail 'Failed to compile, see errors above' if Java.scala.tools.nsc.Main.reporter.hasErrors
+        end
+      end
+    end
+
+  private
+
+    # Returns Scalac command line arguments from the set of options.
+    def scalac_args #:nodoc:
+      args = []
+      args << "-nowarn" unless options[:warnings]
+      args << "-verbose" if Buildr.application.options.trace
+      args << "-g" if options[:debug]
+      args << "-deprecation" if options[:deprecation]
+      args << "-optimise" if options[:optimise]
+      args << "-target:jvm-" + options[:target].to_s if options[:target]
+      args + Array(options[:other])
+    end
+
+  end
+    
+end
+
+# Scala compiler comes first, ahead of Javac, this allows it to pick
+# projects that mix Scala and Java code by spotting Scala code first.
+Buildr::Compiler.compilers.unshift Buildr::Scala::Scalac

data/lib/buildr/scala/tests.rb

@@ -0,0 +1,203 @@
+# 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/core/build'
+require 'buildr/core/compile'
+require 'buildr/java/ant'
+require 'buildr/java/tests'
+
+
+module Buildr::Scala
+
+  # Scala::Specs is available when using Scala::Test
+  module ScalaSpecs
+    VERSION = '1.2.9'
+    
+    class << self
+      def version
+        Buildr.settings.build['scala.specs'] || VERSION
+      end
+      
+      def dependencies
+        ["org.specs:specs:jar:#{version}"]
+      end  
+
+    private
+      def const_missing(const)
+        return super unless const == :REQUIRES # TODO: remove in 1.5
+        Buildr.application.deprecated "Please use Scala::Specs.dependencies/.version instead of ScalaSpecs::REQUIRES/VERSION"
+        dependencies
+      end
+    end
+  end
+
+
+  # Scala::Check is available when using Scala::Test
+  module ScalaCheck
+    VERSION = '1.3'
+    
+    class << self
+      def version
+        Buildr.settings.build['scala.check'] || VERSION
+      end
+      
+      def dependencies
+        ["org.scalacheck:scalacheck:jar:#{version}"]
+      end  
+
+    private
+      def const_missing(const)
+        return super unless const == :REQUIRES # TODO: remove in 1.5
+        Buildr.application.deprecated "Please use Scala::Check.dependencies/.version instead of ScalaCheck::REQUIRES/VERSION"
+        dependencies
+      end
+    end
+  end
+  
+  
+  # ScalaTest framework, the default test framework for Scala tests.
+  #
+  # Support the following options:
+  # * :properties  -- Hash of system properties available to the test case.
+  # * :environment -- Hash of environment variables available to the test case.
+  # * :java_args   -- Arguments passed as is to the JVM.
+  class ScalaTest < TestFramework::Java
+
+    VERSION = '0.9.3'
+
+    class << self
+      def version
+        Buildr.settings.build['scala.test'] || VERSION
+      end
+      
+      def dependencies
+        ["org.scalatest:scalatest:jar:#{version}"] + ScalaSpecs.dependencies +
+          ScalaCheck.dependencies + JMock.dependencies
+      end  
+
+      def applies_to?(project) #:nodoc:
+        project.test.compile.language == :scala
+      end 
+      
+    private
+      def const_missing(const)
+        return super unless const == :REQUIRES # TODO: remove in 1.5
+        Buildr.application.deprecated "Please use Scala::Test.dependencies/.version instead of ScalaTest::REQUIRES/VERSION"
+        dependencies
+      end
+    end          
+
+    # annotation-based group inclusion
+    attr_accessor :group_includes
+    
+    # annotation-based group exclusion
+    attr_accessor :group_excludes
+    
+    def initialize(test_task, options)
+      super
+      @group_includes = []
+      @group_excludes = []
+    end
+
+    def tests(dependencies) #:nodoc:
+      suites = filter_classes(dependencies, :interfaces => %w{org.scalatest.Suite})
+      # we should really filter using :class => %w{org.specs.Specification} instead of naming convention
+      specs = filter_classes(dependencies, :class_names => [/Specs?$/])
+      [suites, specs].flatten
+    end
+
+    def run(tests, dependencies) #:nodoc:
+      mkpath task.report_to.to_s
+      success = []
+      scalatest = tests.select { |t| t !~ /Specs?$/ }
+      specs = tests.select { |t| t =~ /Specs?$/ }
+
+      # Specs
+      nostacktrace = (options[:nostacktrace]) ? "-ns" : ""
+      cmd_options = { :properties => options[:properties],
+                      :java_args => options[:java_args],
+                      :classpath => dependencies}
+      specs.each do |spec|
+        Java.load
+        begin
+          Java::Commands.java(spec, cmd_options)
+        rescue => e
+          print e.message
+        else
+          success << spec
+        end
+      end
+
+      # ScalaTest
+      reporter_options = 'TFGBSAR' # testSucceeded, testFailed, testIgnored, suiteAborted, runStopped, runAborted, runCompleted
+      scalatest.each do |suite|
+        info "ScalaTest #{suite.inspect}"
+        # Use Ant to execute the ScalaTest task, gives us performance and reporting.
+        reportFile = File.join(task.report_to.to_s, "TEST-#{suite}.txt")
+        taskdef = Buildr.artifacts(self.class.dependencies).each(&:invoke).map(&:to_s)
+        Buildr.ant('scalatest') do |ant|
+          ant.taskdef :name=>'scalatest', :classname=>'org.scalatest.tools.ScalaTestTask',
+            :classpath=>taskdef.join(File::PATH_SEPARATOR)
+          ant.scalatest :runpath=>dependencies.join(File::PATH_SEPARATOR) do
+            ant.suite    :classname=>suite
+            ant.reporter :type=>'stdout', :config=>reporter_options
+            ant.reporter :type=>'file', :filename=> reportFile, :config=>reporter_options
+            ant.includes group_includes.join(" ") if group_includes
+            ant.excludes group_excludes.join(" ") if group_excludes
+            (options[:properties] || []).each { |name, value| ant.property :name=>name, :value=>value }
+          end
+        end
+        
+        # Parse for failures, errors, etc.
+        # This is a bit of a pain right now because ScalaTest doesn't flush its
+        # output synchronously before the Ant test finishes so we have to loop 
+        # and wait for an indication that the test run was completed. 
+        failed = false
+        completed = false
+        wait = 0
+        while (!completed) do
+          File.open(reportFile, "r") do |input|
+            while (line = input.gets) do
+              failed = (line =~ /(TEST FAILED -)|(RUN STOPPED)|(RUN ABORTED)/) unless failed
+              completed |= (line =~ /Run completed\./)
+              break if (failed || completed)
+            end
+          end
+          wait += 1
+          break if (failed || wait > 10) 
+          unless completed
+            sleep(1)
+          end
+        end
+        success << suite if (completed && !failed)
+      end
+      
+      success
+    end # run
+
+  end # ScalaTest
+  
+end
+
+
+# Backwards compatibility stuff.  Remove in 1.5.
+module Buildr
+  ScalaSpecs = Scala::ScalaSpecs
+  ScalaCheck = Scala::ScalaCheck
+  ScalaTest = Scala::ScalaTest
+end
+
+Buildr::TestFramework << Buildr::Scala::ScalaTest