buildr 1.4.1-x86-mswin32 → 1.4.2-x86-mswin32

data/lib/buildr/core/filter.rb

@@ -188,9 +188,9 @@ module Buildr
             File.open(dest, 'wb') { |file| file.write mapped }
           else # no mapping
             cp source, dest
-            File.chmod(0664, dest)
           end
         end
+        File.chmod(File.stat(source).mode | 0200, dest)
       end
       touch target.to_s
       true

data/lib/buildr/core/progressbar.rb

@@ -23,7 +23,7 @@ class ProgressBar
     end
 
     def width
-      @width ||= $terminal.output_cols || 80
+      @width ||= $terminal.output_cols || 0
     end
 
   end
@@ -66,6 +66,7 @@ class ProgressBar
   end
 
   def title
+    return @title if ProgressBar.width <= 10
     @title.size > ProgressBar.width / 5 ? (@title[0, ProgressBar.width / 5 - 2] + '..') : @title
   end
 
@@ -126,7 +127,7 @@ class ProgressBar
 protected
 
   def clear
-    return unless @output
+    return if @output == nil || ProgressBar.width <= 0
     @output.print "\r", " " * (ProgressBar.width - 1), "\r"
     @output.flush
   end
@@ -135,7 +136,11 @@ protected
     return unless @output
     format, *args = @format
     line = format % args.map { |arg| send(arg) }
-    @output.print line.sub('|--|') { progress(ProgressBar.width - line.size + 3) }
+    if ProgressBar.width >= line.size
+      @output.print line.sub('|--|') { progress(ProgressBar.width - line.size + 3) }
+    else
+      @output.print line.sub('|--|', '')
+    end
     @output.print @finished ? "\n" : "\r"
     @output.flush
     @previous = @count

data/lib/buildr/core/test.rb

@@ -171,7 +171,7 @@ module Buildr
 
       # Used by the test/integration rule to only run tests that match the specified names.
       def only_run(tests) #:nodoc:
-        tests = tests.map { |name| name =~ /\*/ ? name : "*#{name}*" }
+        tests = wildcardify(tests)
         # 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, tests }
@@ -183,6 +183,37 @@ module Buildr
         # all sub-projects, but only invoke test on the local project.
         Project.projects.each { |project| project.test.send :only_run_failed }
       end
+
+      # Used by the test/integration rule to clear all previously included/excluded tests.
+      def clear()
+        Project.projects.each do |project|
+          project.test.send :clear
+        end
+      end
+
+      # Used by the test/integration to include specific tests
+      def include(includes)
+        Project.projects.each do |project|
+          includes = wildcardify(includes)
+          project.test.send :include, *includes if includes.size > 0
+          project.test.send :forced_need=, true
+        end
+      end
+
+      # Used by the test/integration to exclude specific tests
+      def exclude(excludes)
+        Project.projects.each do |project|
+          excludes = wildcardify(excludes)
+          project.test.send :exclude, *excludes if excludes.size > 0
+          project.test.send :forced_need=, true
+        end
+      end
+
+    private
+
+      def wildcardify(strings)
+        strings.map { |name| name =~ /\*/ ? name : "*#{name}*" }
+      end
     end
 
     # Default options already set on each test task.
@@ -367,6 +398,13 @@ module Buildr
       self
     end
 
+    # Clear all test includes and excludes and returns self
+    def clear
+      @include = []
+      @exclude = []
+      self
+    end
+
     # *Deprecated*: Use tests instead.
     def classes
       Buildr.application.deprecated 'Call tests instead of classes'
@@ -423,7 +461,7 @@ module Buildr
     # 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') : []
+      @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.
@@ -439,6 +477,9 @@ module Buildr
     # The project this task belongs to.
     attr_reader :project
 
+    # Whether the tests are forced
+    attr_accessor :forced_need
+
   protected
 
     def associate_with(project)
@@ -460,7 +501,7 @@ module Buildr
     # Returns true if the specified test name matches the inclusion/exclusion pattern. Used to determine
     # which tests to execute.
     def include?(name)
-      (@include.empty? || @include.any? { |pattern| File.fnmatch(pattern, name) }) &&
+      ((@include.empty? && !@forced_need)|| @include.any? { |pattern| File.fnmatch(pattern, name) }) &&
         !@exclude.any? { |pattern| File.fnmatch(pattern, name) }
     end
 
@@ -480,7 +521,7 @@ module Buildr
           @passed_tests = @framework.run(@tests, dependencies)
         rescue Exception=>ex
           error "Test framework error: #{ex.message}"
-          error ex.backtrace.join("\n") if Buildr.application.options.trace
+          error ex.backtrace.join("\n") if trace?
           @passed_tests = []
         end
         @failed_tests = @tests - @passed_tests
@@ -509,7 +550,6 @@ module Buildr
     # Limit running tests to those who failed the last time.
     def only_run_failed()
       @include = Array(last_failures)
-      @exclude.clear
       @forced_need = true
     end
 
@@ -597,7 +637,18 @@ module Buildr
       # (* 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.
-        TestTask.only_run task.name.scan(/test:(.*)/)[0][0].split(',').map { |t| "#{t}" }
+        tests = task.name.scan(/test:(.*)/)[0][0].split(',').map(&:to_s)
+        excludes, includes = tests.partition { |t| t =~ /^-/ }
+        if excludes.empty?
+          TestTask.only_run includes
+        else
+          # remove leading '-'
+          excludes.map! { |t| t[1..-1] }
+
+          TestTask.clear
+          TestTask.include(includes.empty? ? '*' : includes)
+          TestTask.exclude excludes
+        end
         task('test').invoke
       end
 

data/lib/buildr/core/transports.rb

@@ -396,25 +396,23 @@ module URI
       ssh_options[:password] ||= SFTP.passwords[host]
       begin
         trace "Connecting to #{host}"
-        result = nil
+        if block
+          result = nil
+        else
+          result = ''
+          block = lambda { |chunk| result << chunk }
+        end
         Net::SFTP.start(host, user, ssh_options) do |sftp|
           SFTP.passwords[host] = ssh_options[:password]
           trace 'connected'
 
           with_progress_bar options[:progress] && options[:size], path.split('/'), options[:size] || 0 do |progress|
-            trace "Downloading to #{path}"
+            trace "Downloading from #{path}"
             sftp.file.open(path, 'r') do |file|
-              if block
-                while chunk = file.read(RW_CHUNK_SIZE)
-                  block.call chunk
-                  progress << chunk
-                end
-              else
-                result = ''
-                while chunk = file.read(RW_CHUNK_SIZE)
-                  result << chunk
-                  progress << chunk
-                end
+              while chunk = file.read(RW_CHUNK_SIZE)
+                block.call chunk
+                progress << chunk
+                break if chunk.size < RW_CHUNK_SIZE
               end
             end
           end
@@ -486,6 +484,13 @@ module URI
 
     COMPONENT = [ :host, :path ].freeze
 
+    def upload(source, options = nil)
+      super
+      if File === source then
+        File.chmod(source.stat.mode, real_path)
+      end
+    end
+
     def initialize(*args)
       super
       # file:something (opaque) becomes file:///something

data/lib/buildr/core/util.rb

@@ -54,7 +54,7 @@ module Buildr
     def ruby(*args)
       options = Hash === args.last ? args.pop : {}
       cmd = []
-      ruby_bin = File.expand_path(Config::CONFIG['ruby_install_name'], Config::CONFIG['bindir'])
+      ruby_bin = File.normalize_path(Config::CONFIG['ruby_install_name'], Config::CONFIG['bindir'])
       if options.delete(:sudo) && !(win_os? || Process.uid == File.stat(ruby_bin).uid)
         cmd << 'sudo' << '-u' << "##{File.stat(ruby_bin).uid}"
       end
@@ -115,6 +115,22 @@ module Buildr
       FileList[dirs.map { |dir| File.join(dir, '/**/{*,.*}') }].reject { |file| File.basename(file) =~ /^[.]{1,2}$/ }
     end
 
+    # :call-seq:
+    #   replace_extension(filename) => filename_with_updated_extension
+    #
+    # Replace the file extension, e.g.,
+    #   replace_extension("foo.zip", "txt") => "foo.txt"
+    def replace_extension(filename, new_ext)
+      ext = File.extname(filename)
+      if filename =~ /\.$/
+        filename + new_ext
+      elsif ext == ""
+        filename + "." + new_ext
+      else
+        filename[0..-ext.length] + new_ext
+      end
+    end
+
     # Utility methods for running gem commands
     module Gems #:nodoc:
       extend self
@@ -126,8 +142,8 @@ module 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) }
+        remote = dependencies.map{ |dep| Gem.source_index.search(dep).last || Gem::SpecFetcher.fetcher.fetch( dep, true ).map{ |spec, source| spec }.last } 
+        not_found_deps, to_install = remote.partition { |gem| gem.is_a?(Gem::Dependency) || gem.nil? }
         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

data/lib/buildr/groovy/compiler.rb

@@ -53,7 +53,7 @@ module Buildr::Groovy
     # 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.7.1'
+    #      artifact_ns(Buildr::Groovy::Groovyc).groovy = '1.7.1'
     #
     # namespace before this file is required.
     REQUIRES = ArtifactNamespace.for(self) do |ns|
@@ -95,7 +95,7 @@ module Buildr::Groovy
       options[:debug] = Buildr.options.debug if options[:debug].nil?
       options[:deprecation] ||= false
       options[:optimise] ||= false
-      options[:verbose] ||= Buildr.application.options.trace if options[:verbose].nil?
+      options[:verbose] ||= trace?(:groovyc) if options[:verbose].nil?
       options[:warnings] = verbose if options[:warnings].nil?
       options[:javac] = OpenObject.new if options[:javac].nil?
     end

data/lib/buildr/ide/eclipse.rb

@@ -25,14 +25,21 @@ module Buildr
     class Eclipse
 
       attr_reader :options
+      attr_writer :name
 
       def initialize(project)
         @project = project
         @options = Options.new(project)
       end
 
+      def name
+        return @name if @name
+        return @project.id.split('-').last if @options.short_names
+        @project.id
+      end
+
       # :call-seq:
-      #   classpath_variables { :VAR => '/path/to/location' }
+      #   classpath_variables :VAR => '/path/to/location'
       # Sets classpath variables to be used for library path substitution
       # on the project.
       #
@@ -156,7 +163,7 @@ module Buildr
 
     class Options
 
-      attr_writer :m2_repo_var
+      attr_writer :m2_repo_var, :short_names
 
       def initialize(project)
         @project = project
@@ -173,6 +180,10 @@ module Buildr
           @m2_repo_var || (@project.parent ? @project.parent.eclipse.options.m2_repo_var : 'M2_REPO')
         end
       end
+
+      def short_names
+        @short_names || (@project.parent ? @project.parent.eclipse.options.short_names : false)
+      end
     end
 
     def eclipse
@@ -265,7 +276,7 @@ module Buildr
             File.open(task.name, 'w') do |file|
               xml = Builder::XmlMarkup.new(:target=>file, :indent=>2)
               xml.projectDescription do
-                xml.name project.id
+                xml.name project.eclipse.name
                 xml.projects
                 unless project.eclipse.builders.empty?
                   xml.buildSpec do
@@ -330,8 +341,8 @@ module Buildr
       # Write a classpathentry of kind 'src' for dependent projects.
       # Accept an array of projects.
       def src_projects project_libs
-        project_libs.map(&:id).sort.uniq.each do |project_id|
-          @xml.classpathentry :kind=>'src', :combineaccessrules=>'false', :path=>"/#{project_id}"
+        project_libs.map { |project| project.eclipse.name }.sort.uniq.each do |eclipse_name|
+          @xml.classpathentry :kind=>'src', :combineaccessrules=>'false', :path=>"/#{eclipse_name}"
         end
       end
 
@@ -347,18 +358,27 @@ module Buildr
       def var(libs)
         libs.each do |lib_path, var_name, var_value|
           lib_artifact = file(lib_path)
-          relative_lib_path = lib_path.sub(var_value, var_name.to_s)
+
+          attribs = { :kind => 'var', :path => lib_path }
+
           if lib_artifact.respond_to? :sources_artifact
-            source_path = lib_artifact.sources_artifact.to_s
-            relative_source_path = source_path.sub(var_value, var_name)
-            @xml.classpathentry :kind=>'var', :path=>relative_lib_path, :sourcepath=>relative_source_path
-          else
-            @xml.classpathentry :kind=>'var', :path=>relative_lib_path
+            attribs[:sourcepath] = lib_artifact.sources_artifact
           end
+
+          if lib_artifact.respond_to? :javadoc_artifact
+            attribs[:javadocpath] = lib_artifact.javadoc_artifact
+          end
+
+          # make all paths relative
+          attribs.each_key do |k|
+            attribs[k] = attribs[k].to_s.sub(var_value, var_name.to_s) if k.to_s =~ /path/
+          end
+
+          @xml.classpathentry attribs
         end
       end
 
-      private
+    private
 
       # Find a path relative to the project's root directory if possible. If the
       # two paths do not share the same root the absolute path is returned. This

data/lib/buildr/java/ant.rb

@@ -14,7 +14,7 @@
 # the License.
 
 
-gem 'Antwrap'
+gem 'atoulme-Antwrap'
 autoload :Antwrap, 'antwrap'
 autoload :Logger, 'logger'
 require 'buildr/core/project'
@@ -69,12 +69,12 @@ module Buildr
     #   end
     def ant(name, &block)
       options = { :name=>name, :basedir=>Dir.pwd, :declarative=>true }
-      options.merge!(:logger=> Logger.new(STDOUT), :loglevel=> Logger::DEBUG) if Buildr.application.options.trace
+      options.merge!(:logger=> Logger.new(STDOUT), :loglevel=> Logger::DEBUG) if trace?(:ant)
       Java.load
       Antwrap::AntProject.new(options).tap do |project|
         # Set Ant logging level to debug (--trace), info (default) or error only (--quiet).
         project.project.getBuildListeners().get(0).
-          setMessageOutputLevel((Buildr.application.options.trace && 4) || (verbose && 2) || 0)
+          setMessageOutputLevel((trace?(:ant) && 4) || (verbose && 2) || 0)
         yield project if block_given?
       end
     end

data/lib/buildr/java/bdd.rb

@@ -48,7 +48,7 @@ module Buildr
   module TestFramework::JRubyBased
     extend self
 
-    VERSION = '1.5.1'
+    VERSION = '1.5.2'
 
     class << self
       def version
@@ -177,7 +177,6 @@ module Buildr
             Kernel.send :gem, name, version
           rescue LoadError, Gem::LoadError => e
             require 'rubygems/gem_runner'
-            Gem.manage_gems
             args = ['install', name, '--version', version] + args
             Gem::GemRunner.new.run(args)
             Kernel.send :gem, name, version

data/lib/buildr/java/cobertura.rb

@@ -223,8 +223,7 @@ module Buildr
 
             task :check => [:instrument, :test] do
               Buildr.ant "cobertura" do |ant|
-                ant.taskdef :classpath=>Cobertura.requires.join(File::PATH_SEPARATOR), :resource=>"tasks.properties"
-
+                ant.taskdef :classpath=>Cobertura.dependencies.join(File::PATH_SEPARATOR), :resource=>"tasks.properties"
                 params = { :datafile => Cobertura.data_file }
 
                 # oh so ugly...
@@ -270,13 +269,15 @@ module Buildr
         report_target = report_to(format)
         desc "Run the test cases and produce code coverage reports in #{report_target}"
         task format => ["instrument", "test"] do
-          info "Creating test coverage reports in #{report_target}"
-          Buildr.ant "cobertura" do |ant|
-            ant.taskdef :resource=>"tasks.properties",
-              :classpath=>Buildr.artifacts(Cobertura.dependencies).each(&:invoke).map(&:to_s).join(File::PATH_SEPARATOR)
-            ant.send "cobertura-report", :destdir=>report_target, :format=>format, :datafile=>data_file do
-              Buildr.projects.map(&:cobertura).map(&:sources).flatten.each do |src|
-                ant.fileset :dir=>src.to_s if File.exist?(src.to_s)
+          if Buildr.projects.detect { |project| !project.compile.sources.empty? }
+            info "Creating test coverage reports in #{report_target}"
+            Buildr.ant "cobertura" do |ant|
+              ant.taskdef :resource=>"tasks.properties",
+                :classpath=>Buildr.artifacts(Cobertura.dependencies).each(&:invoke).map(&:to_s).join(File::PATH_SEPARATOR)
+              ant.send "cobertura-report", :destdir=>report_target, :format=>format, :datafile=>data_file do
+                Buildr.projects.map(&:cobertura).map(&:sources).flatten.each do |src|
+                  ant.fileset :dir=>src.to_s if File.exist?(src.to_s)
+                end
               end
             end
           end