buildr 1.3.2 → 1.3.3

data/lib/buildr/core/generate.rb

@@ -50,8 +50,6 @@ module Buildr
           header = <<-EOF
 # Version number for this release
 VERSION_NUMBER = "1.0.0"
-# Version number for the next release
-NEXT_VERSION = "1.0.1"
 # Group identifier for your projects
 GROUP = "#{name}"
 COPYRIGHT = ""
@@ -150,13 +148,15 @@ EOF
 
         #get plugins configurations
         plugins = project['build'].first['plugins'].first['plugin'] rescue {}
-        compile_plugin = plugins.find{|pl| (pl['groupId'].nil? or pl['groupId'].first == 'org.apache.maven.plugins') and pl['artifactId'].first == 'maven-compiler-plugin'}
-        if compile_plugin
-          source = compile_plugin.first['configuration'].first['source'] rescue nil
-          target = compile_plugin.first['configuration'].first['target'] rescue nil
-
-          script << "  compile.options.source = '#{source}'" if source
-          script << "  compile.options.target = '#{target}'" if target
+        if plugins
+          compile_plugin = plugins.find{|pl| (pl['groupId'].nil? or pl['groupId'].first == 'org.apache.maven.plugins') and pl['artifactId'].first == 'maven-compiler-plugin'}
+          if compile_plugin
+            source = compile_plugin.first['configuration'].first['source'] rescue nil
+            target = compile_plugin.first['configuration'].first['target'] rescue nil
+
+            script << "  compile.options.source = '#{source}'" if source
+            script << "  compile.options.target = '#{target}'" if target
+          end
         end
 
         compile_dependencies = pom.dependencies

data/lib/buildr/core/progressbar.rb

@@ -143,7 +143,7 @@ protected
   end
 
   def changed?
-    return false unless @output
+    return false unless @output && Time.now - @last_time > 0.1 
     return human(@count) != human(@previous) if @total == 0
     return true if (@count - @previous) >= @total / 100
     return Time.now - @last_time > 1

data/lib/buildr/core/project.rb

@@ -319,7 +319,7 @@ module Buildr
       def local_task(args, &block)
         task args do |task|
           local_projects do |project|
-            puts block.call(project.name) if block && verbose
+            info block.call(project.name) if block
             task("#{project.name}:#{task.name}").invoke
           end
         end
@@ -337,12 +337,13 @@ module Buildr
 
       def local_projects(dir = nil, &block) #:nodoc:
         dir = File.expand_path(dir || Buildr.application.original_dir)
-        projects = Project.projects.select { |project| project.base_dir == dir }
+        projects = @projects ? @projects.values : []
+        projects = projects.select { |project| project.base_dir == dir }
         if projects.empty? && dir != Dir.pwd && File.dirname(dir) != dir
           local_projects(File.dirname(dir), &block)
         elsif block
           if projects.empty?
-            warn "No projects defined for directory #{Buildr.application.original_dir}" if verbose
+            warn "No projects defined for directory #{Buildr.application.original_dir}"
           else
             projects.each { |project| block[project] }
           end
@@ -514,8 +515,8 @@ module Buildr
     def task(*args, &block)
       task_name, arg_names, deps = Buildr.application.resolve_args(args)
       if task_name =~ /^:/
-        Buildr.application.switch_to_namespace [] do
-          task = Rake::Task.define_task(task_name[1..-1])
+        task = Buildr.application.switch_to_namespace [] do
+          Rake::Task.define_task(task_name[1..-1])
         end
       elsif Buildr.application.current_scope == name.split(':')
         task = Rake::Task.define_task(task_name)
@@ -867,7 +868,7 @@ module Buildr
       projects
     end
 
-    desc "Freezes the Buildfile so it always uses Buildr version #{Buildr::VERSION}"
+    desc "Freeze the Buildfile so it always uses Buildr version #{Buildr::VERSION}"
     task 'freeze' do
       puts "Freezing the Buildfile so it always uses Buildr version #{Buildr::VERSION}"
       original = File.read(Buildr.application.buildfile)
@@ -879,7 +880,7 @@ module Buildr
       File.open(Buildr.application.buildfile, "w") { |file| file.write modified }
     end
 
-    desc 'Unfreezes the Buildfile to use the latest version of Buildr'
+    desc 'Unfreeze the Buildfile to use the latest version of Buildr'
     task 'unfreeze' do
       puts 'Unfreezing the Buildfile to use the latest version of Buildr from your Gems repository.'
       modified = File.read(Buildr.application.buildfile).sub(/^\s*gem\s*(["'])buildr\1.*\n/, "")

data/lib/buildr/core/test.rb

@@ -24,7 +24,7 @@ module Buildr
   # The underlying test framework used by TestTask.
   # To add a new test framework, extend TestFramework::Base and add your framework using:
   #   Buildr::TestFramework << MyFramework
-  class TestFramework
+  module TestFramework
 
     class << self
 
@@ -82,10 +82,10 @@ module Buildr
           raise 'Not implemented'
         end
 
-        # Returns a list of dependencies for this framework.  Defaults to obtaining a list of
-        # artifact specifications from the REQUIRES constant.
+        # Returns a list of dependencies for this framework.  Default is an empty list,
+        # override to add dependencies.
         def dependencies
-          @dependencies ||= FileList[*(const_get('REQUIRES') rescue [])]
+          @dependencies ||= []
         end
 
       end
@@ -159,7 +159,7 @@ module Buildr
           # !(foo ^ bar) tests for equality and accepts nil as false (and select is less obfuscated than reject on ^).
           projects = ([project] + project.projects).select { |project| !(project.test.options[:integration] ^ integration) }
           projects.each do |project|
-            puts "Testing #{project.name}" if verbose
+            info "Testing #{project.name}"
             begin
               project.test.invoke
             rescue
@@ -179,20 +179,23 @@ module Buildr
     end
 
     # Default options already set on each test task.
-    DEFAULT_OPTIONS = { :fail_on_failure=>true, :fork=>:once, :properties=>{}, :environment=>{} }
+    def default_options
+      { :fail_on_failure=>true, :fork=>:once, :properties=>{}, :environment=>{} }
+    end
 
     def initialize(*args) #:nodoc:
       super
       @dependencies = FileList[]
       @include = []
       @exclude = []
+      @forced_need = false
       parent_task = Project.parent_task(name)
       if parent_task.respond_to?(:options)
-        @options = OpenObject.new { |hash, key| parent_task.options[key] }
+        @options = OpenObject.new { |hash, key| hash[key] = parent_task.options[key].clone rescue hash[key] = parent_task.options[key] }
       else
-        @options = OpenObject.new(DEFAULT_OPTIONS)
+        @options = OpenObject.new(default_options)
       end
-      enhance do
+      enhance [application.buildfile.name] do
         run_tests if framework
       end
     end
@@ -215,6 +218,10 @@ module Buildr
     end
 
     def execute(args) #:nodoc:
+      if Buildr.options.test == false
+        info "Skipping tests for #{project.name}"
+        return
+      end
       setup.invoke
       begin
         super
@@ -272,7 +279,7 @@ module Buildr
     # :call-seq:
     #   with(*specs) => self
     #
-    # Specify artifacts (specs, tasks, files, etc) to include in the depdenenciest list
+    # Specify artifacts (specs, tasks, files, etc) to include in the dependencies list
     # when compiling and running tests.
     def with(*artifacts)
       @dependencies |= Buildr.artifacts(artifacts.flatten).uniq
@@ -388,6 +395,16 @@ module Buildr
       @report_to ||= file(@project.path_to(:reports, framework)=>self)
     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
 
@@ -424,20 +441,28 @@ module Buildr
       if @tests.empty?
         @passed_tests, @failed_tests = [], []
       else
-        puts "Running tests in #{@project.name}" if verbose
+        info "Running tests in #{@project.name}"
         @passed_tests = @framework.run(@tests, dependencies)
         @failed_tests = @tests - @passed_tests
         unless @failed_tests.empty?
-          warn "The following tests failed:\n#{@failed_tests.join("\n")}" if verbose
+          error "The following tests failed:\n#{@failed_tests.join("\n")}"
           fail 'Tests failed!'
         end
       end
+      record_successful_run unless @forced_need
     end
 
+    # Call this method when a test run is successful to record the current system time.
+    def record_successful_run #:nodoc:
+      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)
       @exclude.clear
+      @forced_need = true
     end
 
     def invoke_prerequisites(args, chain) #:nodoc:
@@ -445,6 +470,14 @@ module Buildr
       super
     end
 
+    def needed? #:nodoc:
+      latest_prerequisite = @prerequisites.map { |p| application[p, @scope] }.max { |a,b| a.timestamp<=>b.timestamp }
+      needed = (timestamp == Rake::EARLY) || latest_prerequisite.timestamp > timestamp
+      trace "Testing#{needed ? ' ' : ' not '}needed. " +
+        "Latest prerequisite change: #{latest_prerequisite.timestamp} (#{latest_prerequisite.to_s}). " +
+        "Last successful test run: #{timestamp}."
+      return needed || @forced_need || Buildr.options.test == :all
+    end
   end
 
 
@@ -458,7 +491,7 @@ module Buildr
       @setup = task("#{name}:setup")
       @teardown = task("#{name}:teardown")
       enhance do
-        puts 'Running integration tests...'  if verbose
+        info 'Running integration tests...'
         TestTask.run_local_tests true
       end
     end
@@ -506,7 +539,7 @@ module Buildr
       #   buildr test:MyTest
       # will run the test com.example.MyTest, if such a test exists for this project.
       #
-      # If you want to run multiple test, separate tham with a comma. You can also use glob
+      # If you want to run multiple test, separate them with a comma. You can also use glob
       # (* and ?) patterns to match multiple tests, see the TestTask#include method.
       rule /^test:.*$/ do |task|
         # The map works around a JRuby bug whereby the string looks fine, but fails in fnmatch.
@@ -514,14 +547,6 @@ module Buildr
         task('test').invoke
       end
 
-      task 'build' do |task|
-        # Make sure this happens as the last action on the build, so all other enhancements
-        # are made to run before starting the tests.
-        task.enhance do
-          task('test').invoke unless Buildr.options.test == false
-        end
-      end
-
       IntegrationTestsTask.define_task('integration')
 
       # Similar to test:[pattern] but for integration tests.
@@ -563,12 +588,12 @@ module Buildr
       test.with project.compile.dependencies
       # Picking up the test frameworks adds further dependencies.
       test.framework
+      
+      project.build test unless test.options[:integration]
 
       project.clean do
-        verbose(false) do
-          rm_rf test.compile.target.to_s if test.compile.target
-          rm_rf test.report_to.to_s
-        end
+        rm_rf test.compile.target.to_s, :verbose=>false if test.compile.target
+        rm_rf test.report_to.to_s, :verbose=>false
       end
     end
 

data/lib/buildr/core/transports.rb

@@ -18,8 +18,7 @@ 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'
+$LOADED_FEATURES << 'net/ssh/authentication/pageant.rb' if RUBY_PLATFORM =~ /java/
 require 'net/sftp'
 require 'uri'
 require 'digest/md5'
@@ -29,24 +28,6 @@ require 'tempfile'
 require 'buildr/core/progressbar'
 
 
-# Monkeypatching: SFTP never defines the mkdir method on its session or the underlying
-# driver, it just redirect calls through method_missing. Rake, on the other hand, decides
-# to define mkdir on Object, and so routes our calls to FileUtils.
-module Net #:nodoc:all
-  class Session
-    def mkdir(path, attrs = {})
-      method_missing :mkdir, path, attrs
-    end
-  end
-
-  class SFTP::Protocol::Driver
-    def mkdir(first, path, attrs = {})
-      method_missing :mkdir, first, path, attrs
-    end
-  end
-end
-
-
 # Not quite open-uri, but similar. Provides read and write methods for the resource represented by the URI.
 # Currently supports reads for URI::HTTP and writes for URI::SFTP. Also provides convenience methods for
 # downloads and uploads.
@@ -56,6 +37,9 @@ module URI
   class NotFoundError < RuntimeError
   end
 
+  # How many bytes to read/write at once.
+  RW_CHUNK_SIZE = 2 ** 20 #:nodoc:
+
   class << self
 
     # :call-seq:
@@ -292,7 +276,7 @@ module URI
     def read(options = nil, &block)
       options ||= {}
       connect do |http|
-        puts "Requesting #{self}"  if Buildr.application.options.trace
+        trace "Requesting #{self}"
         headers = { 'If-Modified-Since' => CGI.rfc1123_date(options[:modified].utc) } if options[:modified]
         request = Net::HTTP::Get.new(request_uri.empty? ? '/' : request_uri, headers)
         request.basic_auth self.user, self.password if self.user
@@ -300,14 +284,14 @@ module URI
           case response
           when Net::HTTPNotModified
             # No modification, nothing to do.
-            puts 'Not modified since last download' if Buildr.application.options.trace
+            trace 'Not modified since last download'
             return nil
           when Net::HTTPRedirection
             # Try to download from the new URI, handle relative redirects.
-            puts "Redirected to #{response['Location']}" if Buildr.application.options.trace
+            trace "Redirected to #{response['Location']}"
             return (self + URI.parse(response['location'])).read(options, &block)
           when Net::HTTPOK
-            puts "Downloading #{self}" if verbose
+            info "Downloading #{self}"
             result = nil
             with_progress_bar options[:progress], path.split('/').last, response.content_length do |progress|
               if block
@@ -338,9 +322,9 @@ module URI
     def write_internal(options, &block) #:nodoc:
       options ||= {}
       connect do |http|
-        puts "Uploading to #{path}" if Buildr.application.options.trace
+        trace "Uploading to #{path}"
         content = StringIO.new
-        while chunk = yield(32 * 4096)
+        while chunk = yield(RW_CHUNK_SIZE)
           content << chunk
         end
         headers = { 'Content-MD5'=>Digest::MD5.hexdigest(content.string) }
@@ -363,7 +347,7 @@ module URI
         case response
         when Net::HTTPRedirection
           # Try to download from the new URI, handle relative redirects.
-          puts "Redirected to #{response['Location']}" if Buildr.application.options.trace
+          trace "Redirected to #{response['Location']}"
           content.rewind
           return (self + URI.parse(response['location'])).write_internal(options) { |bytes| content.read(bytes) }
         when Net::HTTPSuccess
@@ -408,23 +392,23 @@ module URI
       ssh_options = { :port=>port, :password=>password }.merge(options[:ssh_options] || {})
       ssh_options[:password] ||= SFTP.passwords[host]
       begin
-        puts "Connecting to #{host}" if Buildr.application.options.trace
+        trace "Connecting to #{host}"
         result = nil
         Net::SFTP.start(host, user, ssh_options) do |sftp|
           SFTP.passwords[host] = ssh_options[:password]
-          puts 'connected' if Buildr.application.options.trace
+          trace 'connected'
 
           with_progress_bar options[:progress] && options[:size], path.split('/'), options[:size] || 0 do |progress|
-            puts "Downloading to #{path}" if Buildr.application.options.trace
+            trace "Downloading to #{path}"
             sftp.file.open(path, 'r') do |file|
               if block
-                while chunk = file.read(32 * 4096)
+                while chunk = file.read(RW_CHUNK_SIZE)
                   block.call chunk
                   progress << chunk
                 end
               else
                 result = ''
-                while chunk = file.read(32 * 4096)
+                while chunk = file.read(RW_CHUNK_SIZE)
                   result << chunk
                   progress << chunk
                 end
@@ -451,14 +435,14 @@ module URI
       ssh_options = { :port=>port, :password=>password }.merge(options[:ssh_options] || {})
       ssh_options[:password] ||= SFTP.passwords[host]
       begin
-        puts "Connecting to #{host}" if Buildr.application.options.trace
+        trace "Connecting to #{host}"
         Net::SFTP.start(host, user, ssh_options) do |sftp|
           SFTP.passwords[host] = ssh_options[:password]
-          puts 'connected' if Buildr.application.options.trace
+          trace 'Connected'
 
           # 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
+          trace "Creating path #{path}"
           File.dirname(path).split('/').reject(&:empty?).inject('/') do |base, part|
             combined = base + part
             sftp.close(sftp.opendir!(combined)) rescue sftp.mkdir! combined, {}
@@ -466,9 +450,9 @@ module URI
           end
 
           with_progress_bar options[:progress] && options[:size], path.split('/'), options[:size] || 0 do |progress|
-            puts "Uploading to #{path}" if Buildr.application.options.trace
+            trace "Uploading to #{path}"
             sftp.file.open(path, 'w') do |file|
-              while chunk = yield(32 * 4096)
+              while chunk = yield(RW_CHUNK_SIZE)
                 file.write chunk
                 progress << chunk
               end
@@ -555,7 +539,7 @@ module URI
       Tempfile.open File.basename(path) do |temp|
         temp.binmode
         with_progress_bar options[:progress] && options[:size], path.split('/'), options[:size] || 0 do |progress|
-          while chunk = yield(32 * 4096)
+          while chunk = yield(RW_CHUNK_SIZE)
             temp.write chunk
             progress << chunk
           end

data/lib/buildr/core/util.rb

@@ -108,36 +108,77 @@ module Buildr
       FileList[dirs.map { |dir| File.join(dir, '/**/{*,.*}') }].reject { |file| File.basename(file) =~ /^[.]{1,2}$/ }
     end
 
-  end
-end
+    # Utility methods for running gem commands
+    module Gems
+      extend self
+
+      # 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)
+        raise ArgumentError, "Expected at least one argument" if dependencies.empty?
+        remote = dependencies.map { |dep| Gem::SourceInfoCache.search(dep).last || dep }
+        not_found_deps, to_install = remote.partition { |gem| gem.is_a?(Gem::Dependency) }
+        fail Gem::LoadError, "Build requires the gems #{not_found_deps.join(', ')}, which cannot be found in local or remote repository." unless not_found_deps.empty?
+        uses = "This build requires the gems #{to_install.map(&:full_name).join(', ')}:"
+        fail Gem::LoadError, "#{uses} to install, run Buildr interactively." unless $stdout.isatty
+        unless agree("#{uses} do you want me to install them? [Y/n]", true)
+          fail Gem::LoadError, 'Cannot build without these gems.'
+        end
+        to_install.each do |spec|
+          say "Installing #{spec.full_name} ... " if verbose
+          command 'install', spec.name, '-v', spec.version.to_s, :verbose => false
+          Gem.source_index.load_gems_in Gem::SourceIndex.installed_spec_directories
+        end
+        to_install
+      end
 
+      # Execute a GemRunner command
+      def command(cmd, *args)
+        options = Hash === args.last ? args.pop : {}
+        gem_home = ENV['GEM_HOME'] || Gem.path.find { |f| File.writable?(f) }
+        options[:sudo] = :root unless Util.win_os? || gem_home
+        options[:command] = 'gem'
+        args << options
+        args.unshift '-i', gem_home if cmd == 'install' && gem_home && !args.any?{ |a| a[/-i|--install-dir/] }
+        Util.ruby cmd, *args
+      end
 
-module Kernel #:nodoc:
-  # Borrowed from Ruby 1.9.
-  def tap
-    yield self if block_given?
-    self
-  end unless method_defined?('tap')
+    end # Gems
+
+  end # Util
 end
 
 
-class Symbol #:nodoc:
-  # Borrowed from Ruby 1.9.
-  def to_proc
-    Proc.new{|*args| args.shift.__send__(self, *args)}
-  end unless method_defined?('to_proc')
-end
+if RUBY_VERSION < '1.9.0'
+  module Kernel #:nodoc:
+    # Borrowed from Ruby 1.9.
+    def tap
+      yield self if block_given?
+      self
+    end unless method_defined?('tap')
+  end
 
 
-# Also borrowed from Ruby 1.9.
-class BasicObject #:nodoc:
-  (instance_methods - ['__send__', '__id__', '==', 'send', 'send!', 'respond_to?', 'equal?', 'object_id']).
-    each do |method|
-      undef_method method
-    end
+  class Symbol #:nodoc:
+    # Borrowed from Ruby 1.9.
+    def to_proc
+      Proc.new{|*args| args.shift.__send__(self, *args)}
+    end unless method_defined?('to_proc')
+  end
+
+  # Also borrowed from Ruby 1.9.
+  class BasicObject #:nodoc:
+    (instance_methods - ['__send__', '__id__', '==', 'send', 'send!', 'respond_to?', 'equal?', 'object_id']).
+      each do |method|
+        undef_method method
+      end
 
-  def self.ancestors
-    [Kernel]
+    def self.ancestors
+      [Kernel]
+    end
   end
 end
 
@@ -187,10 +228,21 @@ class Hash
     #   Hash.from_properties(str)
     #   => { 'foo'=>'bar', 'baz'=>'fab' }.to_properties
     def from_java_properties(string)
-      string.gsub(/\\\n/, '').split("\n").select { |line| line =~ /^[^#].*=.*/ }.
-        map { |line| line.gsub(/\\[trnf\\]/) { |escaped| {?t=>"\t", ?r=>"\r", ?n=>"\n", ?f=>"\f", ?\\=>"\\"}[escaped[1]] } }.
-        map { |line| line.split('=') }.
-        inject({}) { |hash, (name, value)| hash.merge(name=>value) }
+      hash = {}
+      input_stream = Java.java.io.StringBufferInputStream.new(string)
+      java_properties = Java.java.util.Properties.new
+      java_properties.load input_stream
+      keys = java_properties.keySet.iterator
+      while keys.hasNext
+        # Calling key.next in JRuby returns a java.lang.String, behaving as a Ruby string and life is good.
+        # MRI, unfortunately, treats next() like the interface says returning an object that's not a String,
+        # and the Hash doesn't work the way we need it to.  Unfortunately, we can call toString on MRI's object,
+        # but not on the JRuby one; calling to_s on the JRuby object returns what we need, but ... you guessed it.
+        #  So this seems like the one hack to unite them both.
+        key = Java.java.lang.String.valueOf(keys.next)
+        hash[key] = java_properties.getProperty(key)
+      end
+      hash
     end
 
   end