buildr 1.3.5 → 1.4.0

data/lib/buildr/core/test.rb

@@ -49,7 +49,7 @@ module Buildr
       end
 
       # Adds a test framework to the list of supported frameworks.
-      #   
+      #
       # For example:
       #   Buildr::TestFramework << Buildr::JUnit
       def add(framework)
@@ -126,7 +126,7 @@ module Buildr
       end
 
     end
-  
+
   end
 
 
@@ -176,6 +176,13 @@ module Buildr
         # all sub-projects, but only invoke test on the local project.
         Project.projects.each { |project| project.test.send :only_run, tests }
       end
+
+      # Used by the test/integration rule to only run tests that failed the last time.
+      def only_run_failed() #:nodoc:
+        # Since the tests may reside in a sub-project, we need to set the include/exclude pattern on
+        # all sub-projects, but only invoke test on the local project.
+        Project.projects.each { |project| project.test.send :only_run_failed }
+      end
     end
 
     # Default options already set on each test task.
@@ -195,7 +202,12 @@ module Buildr
       else
         @options = OpenObject.new(default_options)
       end
-      enhance [application.buildfile.name] do
+
+      unless ENV["IGNORE_BUILDFILE"] =~ /(true)|(yes)/i
+        enhance [ application.buildfile.name ]
+        enhance application.buildfile.prerequisites
+      end
+      enhance do
         run_tests if framework
       end
     end
@@ -203,18 +215,18 @@ module Buildr
     # The dependencies used for running the tests. Includes the compiled files (compile.target)
     # and their dependencies. Will also include anything you pass to #with, shared between the
     # testing compile and run dependencies.
-    attr_reader :dependencies
+    attr_accessor :dependencies
 
     # *Deprecated*: Use dependencies instead.
     def classpath
       Buildr.application.deprecated 'Use dependencies instead.'
-      dependencies
+      @dependencies
     end
 
     # *Deprecated*: Use dependencies= instead.
     def classpath=(artifacts)
       Buildr.application.deprecated 'Use dependencies= instead.'
-      self.dependencies = artifacts
+      @dependencies = artifacts
     end
 
     def execute(args) #:nodoc:
@@ -226,7 +238,7 @@ module Buildr
       begin
         super
       rescue RuntimeError
-        raise if options[:fail_on_failure]
+        raise if options[:fail_on_failure] && Buildr.options.test != :all
       ensure
         teardown.invoke
       end
@@ -247,7 +259,7 @@ module Buildr
     def compile(*sources, &block)
       @project.task('test:compile').from(sources).enhance &block
     end
- 
+
     # :call-seq:
     #   resources(*prereqs) => ResourcesTask
     #   resources(*prereqs) { |task| .. } => ResourcesTask
@@ -323,7 +335,7 @@ module Buildr
           Buildr.application.deprecated "Please replace with using(:#{name}=>true)"
           options[name.to_sym] = true
         end
-      end 
+      end
       self
     end
 
@@ -395,16 +407,35 @@ module Buildr
       @report_to ||= file(@project.path_to(:reports, framework)=>self)
     end
 
+    # :call-seq:
+    #   failures_to => file
+    #
+    # We record the list of failed tests for the current framework in this file.
+    #
+    #
+    def failures_to
+      @failures_to ||= file(@project.path_to(:target, "#{framework}-failed")=>self)
+    end
+
+    # :call-seq:
+    #    last_failures => array
+    #
+    # We read the last test failures if any and return them.
+    #
+    def last_failures
+      @last_failures ||= failures_to.exist? ? File.read(failures_to.to_s).split('\n') : []
+    end
+
     # The path to the file that stores the time stamp of the last successful test run.
     def last_successful_run_file #:nodoc:
       File.join(report_to.to_s, 'last_successful_run')
     end
-    
+
     # The time stamp of the last successful test run.  Or Rake::EARLY if no successful test run recorded.
     def timestamp #:nodoc:
       File.exist?(last_successful_run_file) ? File.mtime(last_successful_run_file) : Rake::EARLY
     end
-    
+
     # The project this task belongs to.
     attr_reader :project
 
@@ -435,8 +466,9 @@ module Buildr
 
     # Runs the tests using the selected test framework.
     def run_tests
-      dependencies = Buildr.artifacts(self.dependencies).map(&:to_s).uniq
+      dependencies = (Buildr.artifacts(self.dependencies + compile.dependencies) + [compile.target]).map(&:to_s).uniq
       rm_rf report_to.to_s
+      rm_rf failures_to.to_s
       @tests = @framework.tests(dependencies).select { |test| include?(test) }.sort
       if @tests.empty?
         @passed_tests, @failed_tests = [], []
@@ -444,7 +476,7 @@ module Buildr
         info "Running tests in #{@project.name}"
         begin
           # set the baseDir system property if not set
-          @framework.options[:properties] = { 'baseDir' => @project.test.compile.target.to_s }.merge(@framework.options[:properties] || {})
+          @framework.options[:properties] = { 'baseDir' => compile.target.to_s }.merge(@framework.options[:properties] || {})
           @passed_tests = @framework.run(@tests, dependencies)
         rescue Exception=>ex
           error "Test framework error: #{ex.message}"
@@ -453,6 +485,7 @@ module Buildr
         end
         @failed_tests = @tests - @passed_tests
         unless @failed_tests.empty?
+          Buildr::write(failures_to.to_s, @failed_tests.join("\n"))
           error "The following tests failed:\n#{@failed_tests.join("\n")}"
           fail 'Tests failed!'
         end
@@ -465,7 +498,7 @@ module Buildr
       mkdir_p report_to.to_s
       touch last_successful_run_file
     end
-    
+
     # Limit running tests to specific list.
     def only_run(tests)
       @include = Array(tests)
@@ -473,6 +506,13 @@ module Buildr
       @forced_need = true
     end
 
+    # Limit running tests to those who failed the last time.
+    def only_run_failed()
+      @include = Array(last_failures)
+      @exclude.clear
+      @forced_need = true
+    end
+
     def invoke_prerequisites(args, chain) #:nodoc:
       @prerequisites |= FileList[@dependencies.uniq]
       super
@@ -543,6 +583,12 @@ module Buildr
       desc 'Run all tests'
       task('test') { TestTask.run_local_tests false }
 
+      desc 'Run failed tests'
+      task('test:failed') {
+        TestTask.only_run_failed
+        task('test').invoke
+      }
+
       # This rule takes a suffix and runs that tests in the current project. For example;
       #   buildr test:MyTest
       # will run the test com.example.MyTest, if such a test exists for this project.
@@ -567,8 +613,8 @@ module Buildr
       end
 
     end
-    
-    before_define do |project|
+
+    before_define(:test) do |project|
       # Define a recursive test task, and pass it a reference to the project so it can discover all other tasks.
       test = TestTask.define_task('test')
       test.send :associate_with, project
@@ -578,8 +624,26 @@ module Buildr
       resources.send :associate_with, project, :test
       project.path_to(:source, :test, :resources).tap { |dir| resources.from dir if File.exist?(dir) }
 
+      # We define a module inline that will inject cancelling the task if tests are skipped.
+      module SkipIfNoTest
+
+        def self.extended(base)
+          base.instance_eval {alias :execute_before_skip_if_no_test :execute}
+          base.instance_eval {alias :execute :execute_after_skip_if_no_test}
+        end
+
+        def execute_after_skip_if_no_test(args) #:nodoc:
+          if Buildr.options.test == false
+            trace "Skipping #{to_s} for #{project.name} as tests are skipped"
+            return
+          end
+          execute_before_skip_if_no_test(args)
+        end
+      end
+
       # Similar to the regular compile task but using different paths.
       compile = CompileTask.define_task('test:compile'=>[project.compile, resources])
+      compile.extend SkipIfNoTest
       compile.send :associate_with, project, :test
       test.enhance [compile]
 
@@ -587,17 +651,20 @@ module Buildr
       test.setup ; test.teardown
     end
 
-    after_define do |project|
+
+
+    after_define(:test => :compile) do |project|
       test = project.test
       # Dependency on compiled tests and resources.  Dependencies added using with.
       test.dependencies.concat [test.compile.target, test.resources.target].compact
+      test.dependencies.concat test.compile.dependencies
       # 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
-      
-      project.build test unless test.options[:integration]
+
+      project.build test unless test.options[:integration] || Buildr.options.test == :only
 
       project.clean do
         rm_rf test.compile.target.to_s if test.compile.target
@@ -629,7 +696,7 @@ module Buildr
     def test(*prereqs, &block)
       task('test').enhance prereqs, &block
     end
-  
+
     # :call-seq:
     #   integration { |task| .... }
     #   integration => IntegrationTestTask
@@ -682,6 +749,8 @@ module Buildr
         false
       when /^all$/i
         :all
+      when /^only$/i
+        :only
       when /^(yes|on|true)$/i, nil
         true
       else

data/lib/buildr/core/transports.rb

@@ -76,7 +76,7 @@ module URI
       uri = URI.parse(uri.to_s) unless URI === uri
       uri.download target, options
     end
-      
+
     # :call-seq:
     #   write(uri, content, options?)
     #   write(uri, options?) { |bytes| .. }
@@ -98,7 +98,7 @@ module URI
       uri = URI.parse(uri.to_s) unless URI === uri
       uri.write *args, &block
     end
-      
+
     # :call-seq:
     #   upload(uri, source, options?)
     #
@@ -162,7 +162,7 @@ module URI
         target.flush
       end
     end
-    
+
     # :call-seq:
     #   write(content, options?)
     #   write(options?) { |bytes| .. }
@@ -527,11 +527,12 @@ module URI
       "file://#{host}#{path}"
     end
 
-    # The URL path always starts with a backslash. On most operating systems (Linux, Darwin, BSD) it points
-    # to the absolute path on the file system. But on Windows, it comes before the drive letter, creating an
-    # unusable path, so real_path fixes that. Ugly but necessary hack.
+    # Returns the file system path based that corresponds to the URL path.
+    # On windows this method strips the leading slash off of the path.
+    # On all platforms this method unescapes the URL path.
     def real_path #:nodoc:
-      RUBY_PLATFORM =~ /win32/ && path =~ /^\/[a-zA-Z]:\// ? path[1..-1] : path
+      real_path = Buildr::Util.win_os? && path =~ /^\/[a-zA-Z]:\// ? path[1..-1] : path
+      URI.unescape(real_path)
     end
 
   protected

data/lib/buildr/core/util.rb

@@ -25,7 +25,7 @@ require 'highline/import'
 
 
 module Buildr
-  
+
   module Util
     extend self
 
@@ -37,7 +37,7 @@ module Buildr
     # prefer this function instead of using Gem.win_platform?.
     #
     # Gem.win_platform? only checks these RUBY_PLATFORM global,
-    # that in some cases like when running on JRuby is not 
+    # that in some cases like when running on JRuby is not
     # succifient for our purpose:
     #
     # For JRuby, the value for RUBY_PLATFORM will always be 'java'
@@ -77,7 +77,7 @@ module Buildr
         path
       end
     end
-    
+
     # Return the timestamp of file, without having to create a file task
     def timestamp(file)
       if File.exist?(file)
@@ -121,7 +121,7 @@ module Buildr
 
       # Install gems specified by each Gem::Dependency if they are missing. This method prompts the user
       # for permission before installing anything.
-      # 
+      #
       # Returns the installed Gem::Dependency objects or fails if permission not granted or when buildr
       # is not running interactively (on a tty)
       def install(*dependencies)
@@ -334,11 +334,11 @@ if Buildr::Util.java_platform?
     end
     private :mv
   end
-  
+
   module RakeFileUtils #:nodoc:
     def rake_merge_option(args, defaults)
       defaults[:verbose] = false if defaults[:verbose] == :default
-      
+
       if Hash === args.last
         defaults.update(args.last)
         args.pop
@@ -348,56 +348,56 @@ if Buildr::Util.java_platform?
     end
     private :rake_merge_option
   end
-  
+
   module Buildr
     class ProcessStatus
       attr_reader :pid, :termsig, :stopsig, :exitstatus
-      
+
       def initialize(pid, success, exitstatus)
         @pid = pid
         @success = success
         @exitstatus = exitstatus
-        
+
         @termsig = nil
         @stopsig = nil
       end
-      
+
       def &(num)
         pid & num
       end
-      
+
       def ==(other)
         pid == other.pid
       end
-      
+
       def >>(num)
         pid >> num
       end
-      
+
       def coredump?
         false
       end
-      
+
       def exited?
         true
       end
-      
+
       def stopped?
         false
       end
-      
+
       def success?
         @success
       end
-      
+
       def to_i
         pid
       end
-      
+
       def to_int
         pid
       end
-      
+
       def to_s
         pid.to_s
       end
@@ -406,18 +406,21 @@ if Buildr::Util.java_platform?
 
   module FileUtils
     extend FFI::Library
+
+    ffi_lib FFI::Platform::LIBC
+
     alias_method :__jruby_system__, :system
     attach_function :system, [:string], :int
     alias_method :__native_system__, :system
     alias_method :system, :__jruby_system__
-    
+
     # code "borrowed" directly from Rake
     def sh(*cmd, &block)
       options = (Hash === cmd.last) ? cmd.pop : {}
       unless block_given?
         show_command = cmd.join(" ")
         show_command = show_command[0,42] + "..."
-        
+
         block = lambda { |ok, status|
           ok or fail "Command failed with status (#{status.exitstatus}): [#{show_command}]"
         }
@@ -431,9 +434,16 @@ if Buildr::Util.java_platform?
       rake_check_options options, :noop, :verbose
       rake_output_message cmd.join(" ") if options[:verbose]
       unless options[:noop]
-        cd = "cd '#{Dir.pwd}' && "
+        if Buildr::Util.win_os?
+          # Ruby uses forward slashes regardless of platform,
+          # unfortunately cd c:/some/path fails on Windows
+          pwd = Dir.pwd.gsub(%r{/}, '\\')
+          cd = "cd /d \"#{pwd}\" && "
+        else
+          cd = "cd '#{Dir.pwd}' && "
+        end
         args = if cmd.size > 1 then cmd[1..cmd.size] else [] end
-        
+
         res = if Buildr::Util.win_os? && cmd.size == 1
           __native_system__("#{cd} call #{cmd.first}")
         else
@@ -446,4 +456,48 @@ if Buildr::Util.java_platform?
     end
 
   end
+else
+  module FileUtils
+    # code "borrowed" directly from Rake
+    def sh(*cmd, &block)
+      options = (Hash === cmd.last) ? cmd.pop : {}
+      unless block_given?
+        show_command = cmd.join(" ")
+        show_command = show_command[0,42] + "..."
+
+        block = lambda { |ok, status|
+          ok or fail "Command failed with status (#{status.exitstatus}): [#{show_command}]"
+        }
+      end
+      if RakeFileUtils.verbose_flag == :default
+        options[:verbose] = false
+      else
+        options[:verbose] ||= RakeFileUtils.verbose_flag
+      end
+      options[:noop]    ||= RakeFileUtils.nowrite_flag
+      rake_check_options options, :noop, :verbose
+      rake_output_message cmd.join(" ") if options[:verbose]
+      unless options[:noop]
+        if Buildr::Util.win_os?
+          # Ruby uses forward slashes regardless of platform,
+          # unfortunately cd c:/some/path fails on Windows
+          pwd = Dir.pwd.gsub(%r{/}, '\\')
+          cd = "cd /d \"#{pwd}\" && "
+        else
+          cd = "cd '#{Dir.pwd}' && "
+        end
+
+        args = if cmd.size > 1 then cmd[1..cmd.size] else [] end
+
+        res = if Buildr::Util.win_os? && cmd.size == 1
+          system("#{cd} call #{cmd.first}")
+        else
+          arg_str = args.map { |a| "'#{a}'" }
+          system(cd + cmd.first + ' ' + arg_str.join(' '))
+        end
+
+        block.call(res, $?)
+      end
+    end
+  end
 end

data/lib/buildr/core.rb

@@ -32,4 +32,5 @@ require 'buildr/core/shell'
 require 'buildr/core/checks'
 require 'buildr/core/transports'
 require 'buildr/core/generate'
+require 'buildr/core/cc'
 require 'buildr/core/osx' if RUBY_PLATFORM =~ /darwin/

data/lib/buildr/groovy/bdd.rb

@@ -20,7 +20,7 @@ module Buildr::Groovy
   # To use in your project:
   #
   #   test.using :easyb
-  # 
+  #
   # This framework will search in your project for:
   #   src/spec/groovy/**/*Story.groovy
   #   src/spec/groovy/**/*Specification.groovy
@@ -69,7 +69,7 @@ module Buildr::Groovy
 
     def run(tests, dependencies) #:nodoc:
       options = { :format => :txt }.merge(self.options).only(*OPTIONS)
-    
+
       if :txt == options[:format]
         easyb_format, ext = 'txtstory', '.txt'
       elsif :xml == options[:format]
@@ -77,7 +77,7 @@ module Buildr::Groovy
       else
         raise "Invalid format #{options[:format]} expected one of :txt :xml"
       end
-    
+
       cmd_args = [ 'org.disco.easyb.BehaviorRunner' ]
       cmd_options = { :properties => options[:properties],
                       :java_args => options[:java_args],
@@ -98,9 +98,9 @@ module Buildr::Groovy
         end
       end
     end
-  
+
   end # EasyB
-  
+
 end
 
 Buildr::TestFramework << Buildr::Groovy::EasyB

data/lib/buildr/groovy/compiler.rb

@@ -33,9 +33,9 @@ module Buildr::Groovy
   # * :encoding          -- Encoding of source files
   # * :verbose           -- Asks the compiler for verbose output, true when running in verbose mode.
   # * :fork              -- Whether to execute groovyc using a spawned instance of the JVM; defaults to no
-  # * :memoryInitialSize -- The initial size of the memory for the underlying VM, if using fork mode; ignored otherwise. 
+  # * :memoryInitialSize -- The initial size of the memory for the underlying VM, if using fork mode; ignored otherwise.
   #                                     Defaults to the standard VM memory setting. (Examples: 83886080, 81920k, or 80m)
-  # * :memoryMaximumSize -- The maximum size of the memory for the underlying VM, if using fork mode; ignored otherwise. 
+  # * :memoryMaximumSize -- The maximum size of the memory for the underlying VM, if using fork mode; ignored otherwise.
   #                                     Defaults to the standard VM memory setting. (Examples: 83886080, 81920k, or 80m)
   # * :listfiles         -- Indicates whether the source files to be compiled will be listed; defaults to no
   # * :stacktrace        -- If true each compile error message will contain a stacktrace
@@ -49,20 +49,20 @@ module Buildr::Groovy
   # * :javac             -- Hash of options passed to the ant javac task
   #
   class Groovyc < Compiler::Base
-    
+
     # The groovyc 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::Groovyc'].groovy = '1.5.4'
+    #      artifact_ns['Buildr::Compiler::Groovyc'].groovy = '1.7.1'
     #
     # namespace before this file is required.
     REQUIRES = ArtifactNamespace.for(self) do |ns|
-      ns.groovy!       'org.codehaus.groovy:groovy:jar:>=1.5.3'
-      ns.commons_cli!  'commons-cli:commons-cli:jar:>=1.0'
-      ns.asm!          'asm:asm:jar:>=2.2'
+      ns.groovy!       'org.codehaus.groovy:groovy:jar:>=1.7.1'
+      ns.commons_cli!  'commons-cli:commons-cli:jar:>=1.2'
+      ns.asm!          'asm:asm:jar:>=3.2'
       ns.antlr!        'antlr:antlr:jar:>=2.7.7'
     end
-    
+
     ANT_TASK = 'org.codehaus.groovy.ant.Groovyc'
     GROOVYC_OPTIONS = [:encoding, :verbose, :fork, :memoryInitialSize, :memoryMaximumSize, :listfiles, :stacktrace]
     JAVAC_OPTIONS = [:optimise, :warnings, :debug, :deprecation, :source, :target, :javac]
@@ -80,10 +80,14 @@ module Buildr::Groovy
         paths.any? { |path| !Dir["#{path}/**/*.groovy"].empty? }
       end
     end
-    
-    Java.classpath << dependencies
-    
-    specify :language => :groovy, :sources => [:groovy, :java], :source_ext => [:groovy, :java], 
+
+    # Groovy dependencies don't need to go into JVM's system classpath.
+    # In fact, if they end up there it causes trouble because Groovy has issues
+    # loading other classes such as test frameworks (e.g. JUnit).
+    #
+    # Java.classpath << lambda { dependencies }
+
+    specify :language => :groovy, :sources => [:groovy, :java], :source_ext => [:groovy, :java],
             :target => 'classes', :target_ext => 'class', :packaging => :jar
 
     def initialize(project, options) #:nodoc:
@@ -100,7 +104,7 @@ module Buildr::Groovy
     def compile(sources, target, dependencies) #:nodoc:
       return if Buildr.application.options.dryrun
       Buildr.ant 'groovyc' do |ant|
-        classpath = dependencies | self.class.dependencies.map(&:to_s)
+        classpath = dependencies
         ant.taskdef :name => 'groovyc', :classname => ANT_TASK, :classpath => classpath.join(File::PATH_SEPARATOR)
         ant.groovyc groovyc_options(sources, target) do
           sources.each { |src| ant.src :path => src }
@@ -112,7 +116,7 @@ module Buildr::Groovy
       end
     end
 
-   private 
+   private
     def groovyc_options(sources, target)
       check_options options, OPTIONS
       groovyc_options = options.to_hash.only(*GROOVYC_OPTIONS)
@@ -129,7 +133,7 @@ module Buildr::Groovy
       javac_options.merge!(other)
       javac_options
     end
-    
+
   end
 end
 

data/lib/buildr/groovy/shell.rb

@@ -19,24 +19,24 @@ module Buildr
   module Groovy
     class GroovySH < Buildr::Shell::Base
       SUFFIX = if Util.win_os? then '.bat' else '' end
-      
+
       class << self
         def lang
           :groovy
         end
       end
-      
+
       def launch
         fail 'Are we forgetting something? GROOVY_HOME not set.' unless groovy_home
-        
-        cp = project.compile.dependencies.join(File::PATH_SEPARATOR) + 
+
+        cp = project.compile.dependencies.join(File::PATH_SEPARATOR) +
           File::PATH_SEPARATOR + project.path_to(:target, :classes)
-        
+
         cmd_args = " -classpath '#{cp}'"
         trace "groovysh #{cmd_args}"
         system(File.expand_path("bin#{File::SEPARATOR}groovysh#{SUFFIX}", groovy_home) + cmd_args)
       end
-      
+
     private
       def groovy_home
         @home ||= ENV['GROOVY_HOME']