buildr 1.3.1.1 → 1.3.2

data/doc/scripts/install-jruby.sh

@@ -18,7 +18,7 @@ if [ -z `which jruby` ] ; then
   target=/opt/jruby
   echo "Installing JRuby ${version} in ${target}"
   sudo mkdir -p $(dirname ${target})
-  curl -OL http://dist.codehaus.org/jruby/jruby-bin-${version}.tar.gz
+  wget http://dist.codehaus.org/jruby/jruby-bin-${version}.tar.gz
   tar -xz < jruby-bin-${version}.tar.gz
   sudo mv jruby-${version} ${target}
   rm jruby-bin-${version}.tar.gz

data/doc/scripts/install-linux.sh

@@ -26,12 +26,12 @@ if [ -z `which ruby` ] ; then
     sudo apt-get install ruby-full ruby1.8-dev libopenssl-ruby build-essential 
     # RubyGems broken on Ubunutu, installing directly from source.
     echo "Installing RubyGems from RubyForge"
-    curl -OL http://rubyforge.org/frs/download.php/29548/rubygems-1.0.1.tgz
-    tar xzf rubygems-1.0.1.tgz
-    cd rubygems-1.0.1
+    wget http://rubyforge.org/frs/download.php/38646/rubygems-1.2.0.tgz 
+    tar xzf rubygems-1.2.0.tgz
+    cd rubygems-1.2.0
     sudo ruby setup.rb
     cd ..
-    rm -rf rubygems-1.0.1
+    rm -rf rubygems-1.2.0
     # ruby is same as ruby1.8, we need gem that is same as gem1.8
     sudo ln -s /usr/bin/gem1.8 /usr/bin/gem
   else

data/lib/buildr.rb

@@ -15,16 +15,8 @@
 
 
 $KCODE = 'utf8'
-# in order to work around a bug in jruby (1.0.1 and trunk as of oct11, 2007)
-# needle and net/ssh need to be loaded before -anything- else. please see
-# http://jira.codehaus.org/browse/JRUBY-1188 for more info.
-require 'net/ssh'
-
-require 'highline/import'
-require 'builder' # A different kind of buildr, one we use to create XML.
-
 module Buildr
-  VERSION = '1.3.1.1'.freeze # unless const_defined?(:VERSION)
+  VERSION = '1.3.2'.freeze # unless const_defined?(:VERSION)
 end
 
 require 'buildr/core'

data/lib/buildr/core/application.rb

@@ -35,6 +35,7 @@
 # SOFTWARE.
 
 
+require 'highline/import'
 require 'benchmark'
 require 'rake'
 require 'rubygems/source_info_cache'
@@ -272,6 +273,16 @@ module Buildr
     end
     private :load_tasks
 
+    def display_prerequisites
+      invoke_task('buildr:initialize')
+      tasks.each do |task|
+        if task.name =~ options.show_task_pattern
+          puts "buildr #{task.name}"
+          task.prerequisites.each { |prereq| puts "    #{prereq}" }
+        end
+      end
+    end
+
     # :call-seq:
     #   deprecated(message)
     #

data/lib/buildr/core/application_cli.rb

@@ -54,6 +54,8 @@ module Buildr
           'Require MODULE before executing buildfile.'],
         ['--trace',    '-t', GetoptLong::NO_ARGUMENT,
           'Turn on invoke/execute tracing, enable full backtrace.'],
+        ['--prereqs',  '-P', GetoptLong::OPTIONAL_ARGUMENT,
+          'Display tasks and dependencies, then exit.'],
         ['--version',  '-v', GetoptLong::NO_ARGUMENT,
           'Display the program version.'],
         ['--environment', '-e', GetoptLong::REQUIRED_ARGUMENT,
@@ -92,6 +94,9 @@ module Buildr
         ENV['BUILDR_ENV'] = value
       when '--require'
         requires << value
+      when '--prereqs'
+        options.show_prereqs = true
+        options.show_task_pattern = Regexp.new(value || '.')
       when '--nosearch', '--quiet', '--trace'
         super
       end
@@ -129,6 +134,6 @@ module Buildr
       puts 'For help with your buildfile:'
       puts '  buildr help'
     end
-    
+   
   end
 end

data/lib/buildr/core/build.rb

@@ -125,7 +125,7 @@ module Buildr
         version = with_next_version do |filename, version| 
           options = ['--buildfile', filename, 'DEBUG=no']
           options << '--environment' << Buildr.environment unless Buildr.environment.to_s.empty?
-          sh "#{command} clean upload #{options.join(' ')}"
+          sh "#{command} _#{Buildr::VERSION}_ clean upload #{options.join(' ')}"
         end
         tag version
         commit version + '-SNAPSHOT'

data/lib/buildr/core/compile.rb

@@ -168,17 +168,17 @@ module Buildr
       def compile_map(sources, target)
         target_ext = self.class.target_ext
         ext_glob = Array(self.class.source_ext).join(',')
-        sources.flatten.inject({}) do |map, source|
+        sources.flatten.map{|f| File.expand_path(f)}.inject({}) do |map, source|
           if File.directory?(source)
             FileList["#{source}/**/*.{#{ext_glob}}"].reject { |file| File.directory?(file) }.
-              each { |file| map[file] = File.join(target, Util.relative_path(source, file).ext(target_ext)) }
+              each { |file| map[file] = File.join(target, Util.relative_path(file, source).ext(target_ext)) }
           else
             map[source] = File.join(target, File.basename(source).ext(target_ext))
           end
           map
         end
       end
-
+      
     end
 
   end
@@ -223,7 +223,7 @@ module Buildr
           raise 'No compiler selected and can\'t determine which compiler to use' unless compiler
           raise 'No target directory specified' unless target
           mkpath target.to_s, :verbose=>false
-          puts "Compiling #{task.name.gsub(/:[^:]*$/, '')}" if verbose
+          puts "Compiling #{task.name.gsub(/:[^:]*$/, '')} into #{target.to_s}" if verbose
           @compiler.compile(sources.map(&:to_s), target.to_s, dependencies.map(&:to_s))
           # By touching the target we let other tasks know we did something,
           # and also prevent recompiling again for dependencies.
@@ -451,12 +451,12 @@ module Buildr
       filter.target
     end
 
-  protected
-
     def prerequisites #:nodoc:
       super + filter.sources.flatten
     end
 
+  protected
+
     # Associates this task with project and particular usage (:main, :test).
     def associate_with(project, usage) #:nodoc:
       @project, @usage = project, usage

data/lib/buildr/core/project.rb

@@ -64,6 +64,7 @@ module Buildr
     #   puts default.expand(:source, :main, :java)
     #   => "src/main/java"
     def expand(*args)
+      args = args.compact.reject { |s| s.to_s.empty? }.map(&:to_sym)
       return '' if args.empty?
       @mapping[args] ||= File.join(*[expand(*args[0..-2]), args.last.to_s].reject(&:empty?)) if args.size > 1
       return @mapping[args] || args.first.to_s

data/lib/buildr/core/test.rb

@@ -556,11 +556,11 @@ module Buildr
 
     after_define do |project|
       test = project.test
-      # Dependency on compiled code, its dependencies and resources.
-      test.with project.compile.dependencies
-      test.with [project.compile.target, project.resources.target].compact
       # Dependency on compiled tests and resources.  Dependencies added using with.
       test.dependencies.concat [test.compile.target, test.resources.target].compact
+      # Dependency on compiled code, its dependencies and resources.
+      test.with [project.compile.target, project.resources.target].compact
+      test.with project.compile.dependencies
       # Picking up the test frameworks adds further dependencies.
       test.framework
 

data/lib/buildr/core/transports.rb

@@ -17,6 +17,8 @@
 require 'cgi'
 require 'net/http'
 require 'net/https'
+# PATCH:  On Windows, Net::SSH 2.0.2 attempts to load the Pageant DLLs which break on JRuby.
+$LOAD_PATH << 'net/ssh/authentication/pageant' if RUBY_PLATFORM =~ /java/
 require 'net/ssh'
 require 'net/sftp'
 require 'uri'
@@ -457,9 +459,9 @@ module URI
           # To create a path, we need to create all its parent. We use realpath to determine if
           # the path already exists, otherwise mkdir fails.
           puts "Creating path #{path}" if Buildr.application.options.trace
-          File.dirname(path).split('/').inject('') do |base, part|
+          File.dirname(path).split('/').reject(&:empty?).inject('/') do |base, part|
             combined = base + part
-            sftp.realpath combined rescue sftp.mkdir combined, {}
+            sftp.close(sftp.opendir!(combined)) rescue sftp.mkdir! combined, {}
             "#{combined}/"
           end
 

data/lib/buildr/core/util.rb

@@ -13,8 +13,10 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+
 require 'rbconfig'
 require 'pathname'
+require 'builder' # A different kind of buildr, one we use to create XML.
 
 
 module Buildr

data/lib/buildr/ide/idea7x.rb

@@ -76,9 +76,6 @@ module Buildr
         # Separate artifacts from Maven2 repository
         m2_libs, others = others.partition { |path| path.to_s.index(m2repo) == 0 }
 
-        # Generated: classpath elements in the project are assumed to be generated
-        generated, libs = others.partition { |path| path.to_s.index(project.path_to.to_s) == 0 }
-
         # Project type is going to be the first package type
         if package = project.packages.first
           puts "Writing #{task.name}" if verbose
@@ -89,13 +86,15 @@ module Buildr
 
                 Buildr::Idea7x.generate_compile_output(project, xml, relative)
 
-                Buildr::Idea7x.generate_content(project, xml, generated, relative)
+                Buildr::Idea7x.generate_content(project, xml, relative)
 
                 Buildr::Idea7x.generate_order_entries(project_libs, xml)
 
-                ext_libs = libs.map {|path| "#{MODULE_DIR}/#{path.to_s}" } + m2_libs.map { |path| path.to_s.sub(m2repo, "$M2_REPO$") }
+                ext_libs = m2_libs.map { |path| "jar://#{path.to_s.sub(m2repo, "$M2_REPO$")}!/" }
+                ext_libs << "#{MODULE_DIR_URL}/#{relative[project.test.resources.target.to_s]}" if project.test.resources.target
+                ext_libs << "#{MODULE_DIR_URL}/#{relative[project.resources.target.to_s]}" if project.resources.target
+                
                 Buildr::Idea7x.generate_module_libs(xml, ext_libs)
-
                 xml.orderEntryProperties
               end
             end
@@ -124,13 +123,14 @@ module Buildr
 
       def generate_compile_output(project, xml, relative)
         xml.output(:url=>"#{MODULE_DIR_URL}/#{relative[project.compile.target.to_s]}") if project.compile.target
-        xml.tag!("output-test", :url=>"#{MODULE_DIR_URL}/#{relative[project.test.compile.target.to_s]}") if project.test.compile.target  
+        xml.tag!("output-test", :url=>"#{MODULE_DIR_URL}/#{relative[project.test.compile.target.to_s]}") if project.test.compile.target
+        xml.tag!("exclude-output")
       end
 
-      def generate_content(project, xml, generated, relative)
+      def generate_content(project, xml, relative)
         xml.content(:url=>"#{MODULE_DIR_URL}") do
           unless project.compile.sources.empty?
-            srcs = project.compile.sources.map { |src| relative[src.to_s] } + generated.map { |src| relative[src.to_s] }
+            srcs = project.compile.sources.map { |src| relative[src.to_s] }
             srcs.sort.uniq.each do |path|
               xml.sourceFolder :url=>"#{MODULE_DIR_URL}/#{path}", :isTestSource=>"false"
             end
@@ -142,7 +142,7 @@ module Buildr
                 xml.sourceFolder :url=>"#{MODULE_DIR_URL}/#{path}", :isTestSource=>"true"
               end
             end
-          end          
+          end
           [project.resources=>false, project.test.resources=>true].each do |resources, test|
             resources.each do |path|
               path[0].sources.each do |srcpath|
@@ -150,7 +150,8 @@ module Buildr
               end
             end
           end
-          xml.excludeFolder :url=>"#{MODULE_DIR_URL}/#{relative[project.compile.target.to_s]}" if project.compile.target
+          xml.excludeFolder :url=>"#{MODULE_DIR_URL}/#{relative[project.resources.target.to_s]}" if project.resources.target
+          xml.excludeFolder :url=>"#{MODULE_DIR_URL}/#{relative[project.test.resources.target.to_s]}" if project.test.resources.target
         end
       end
 
@@ -159,7 +160,7 @@ module Buildr
           xml.orderEntry :type=>"module-library" do
             xml.library do
               xml.CLASSES do
-                xml.root :url=>"jar://#{path}!/"
+                xml.root :url=> path
               end
               xml.JAVADOC
               xml.SOURCES

data/lib/buildr/java/compilers.rb

@@ -100,7 +100,6 @@ module Buildr
     # * :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.
-    # * :source      -- Source compatibility with specified release.
     # * :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
@@ -119,8 +118,8 @@ module Buildr
         end
       end
 
-      OPTIONS = [:warnings, :deprecation, :optimise, :source, :target, :debug, :other]
-      Java.classpath << dependencies unless Scalac.use_fsc
+      OPTIONS = [:warnings, :deprecation, :optimise, :target, :debug, :other]
+      Java.classpath << dependencies
 
       specify :language=>:scala, :target=>'classes', :target_ext=>'class', :packaging=>:jar
 
@@ -167,7 +166,6 @@ module Buildr
         args << "-g" if options[:debug]
         args << "-deprecation" if options[:deprecation]
         args << "-optimise" if options[:optimise]
-        args << "-source" << options[:source].to_s if options[:source]
         args << "-target:jvm-" + options[:target].to_s if options[:target]
         args + Array(options[:other])
       end

data/lib/buildr/java/org/apache/buildr/JavaTestFilter.java

@@ -18,6 +18,7 @@
 package org.apache.buildr;
 
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
@@ -70,6 +71,8 @@ public class JavaTestFilter {
   }
   
   private boolean isTest(Class cls) {
+    if (Modifier.isAbstract(cls.getModifiers()) || !Modifier.isPublic(cls.getModifiers()))
+      return false;
     if (interfaces != null) {
       for (Iterator it = interfaces.iterator(); it.hasNext(); ) {
         Class iface = (Class) it.next();
@@ -113,4 +116,4 @@ public class JavaTestFilter {
  * indent-tabs-mode: nil
  * c-basic-offset: 2
  * End:
- */
+ */

data/lib/buildr/java/test_frameworks.rb

@@ -90,7 +90,22 @@ module Buildr
     REQUIRES = ["jmock:jmock:jar:#{VERSION}"]
   end
 
+  # Specs is available when using ScalaTest
+  module ScalaSpecs
+    # Specs version number.
+    VERSION = '1.2.9' unless const_defined?('VERSION')
+    # Specs artifact(s)
+    REQUIRES = ["org.specs:specs:jar:#{VERSION}"]
+  end
 
+  # ScalaCheck is available when using ScalaTest
+  module ScalaCheck
+    # ScalaCheck version number.
+    VERSION = '1.3' unless const_defined?('VERSION')
+    # ScalaCheck artifact(s)
+    REQUIRES = ["org.scalacheck:scalacheck:jar:#{VERSION}"]
+  end
+  
   # JUnit test framework, the default test framework for Java tests.
   #
   # Support the following options:
@@ -167,7 +182,7 @@ module Buildr
     end
 
     # JUnit version number.
-    VERSION = '4.3.1' unless const_defined?('VERSION')
+    VERSION = '4.4' unless const_defined?('VERSION')
     
     REQUIRES = ["junit:junit:jar:#{VERSION}"] + JMock::REQUIRES
 
@@ -249,7 +264,7 @@ module Buildr
   class TestNG < TestFramework::Base
 
     # TestNG version number.
-    VERSION = '5.5' unless const_defined?('VERSION')
+    VERSION = '5.7' unless const_defined?('VERSION')
     # TestNG specification.
     REQUIRES = ["org.testng:testng:jar:jdk15:#{VERSION}"] + JMock::REQUIRES
 
@@ -278,11 +293,155 @@ module Buildr
 
   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::Base
+    
+    class << self
+      # ScalaTest version number.
+      VERSION = '0.9.3' unless const_defined?('VERSION')
+
+      # ScalaTest dependencies
+      DEPENDS = ["org.scalatest:scalatest:jar:#{VERSION}"] + 
+                 JMock::REQUIRES + 
+                 ScalaSpecs::REQUIRES + 
+                 ScalaCheck::REQUIRES
+
+      ENABLED = DEPENDS.all? { |d| File.exist?(Buildr::Repositories.instance.locate(d)) } 
+
+      desc "Download Scala artifacts"
+      task "buildr:scala:download" do
+        ScalaTest.download_dependencies
+      end
+        
+      def required_artifacts
+        ENABLED ? DEPENDS : []
+      end
+      
+      def download_dependencies
+        DEPENDS.each { |d| Buildr.artifact(d).invoke }
+      end
+      
+      def applies_to?(project) #:nodoc:
+        if project.test.compile.language == :scala && !ENABLED
+          download_dependencies
+          fail "You must re-run buildr after downloading Scala artifacts for the first time"
+        end
+        project.test.compile.language == :scala
+      end  
+
+      def available?(artifact_spec) #:nodoc:
+        File.exist?(Buildr::Repositories.instance.locate(artifact_spec))
+      end
+    end
+
+    REQUIRES = required_artifacts
+    
+    # ScalaTest ant task
+    Java.classpath << "org.apache.ant:ant-junit:jar:#{Ant::VERSION}"
+    Java.classpath << REQUIRES
+
+    include TestFramework::JavaTest
+
+    # 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
+      #options = { :nostacktrace => false }.merge(options)
+      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, {:classpath => dependencies})
+        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|
+        puts "ScalaTest #{suite.inspect}" if verbose
+        # Use Ant to execute the ScalaTest task, gives us performance and reporting.
+        reportFile = File.join(task.report_to.to_s, "TEST-#{suite}.txt")
+        Buildr.ant('scalatest') do |ant|
+          ant.taskdef :name=>'scalatest', :classname=>'org.scalatest.tools.ScalaTestTask'
+          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 # Buildr
 
 
 Buildr::TestFramework << Buildr::JUnit
 Buildr::TestFramework << Buildr::TestNG
+Buildr::TestFramework << Buildr::ScalaTest
 
 # Backward compatibility crap.
 Buildr::JUnit::JUNIT_REQUIRES = Buildr::JUnit::REQUIRES