buildr 1.3.3-java → 1.3.4-java

data/lib/buildr/core/progressbar.rb

@@ -153,4 +153,4 @@ protected
     @total == 0 ? ['%s %8s %s', :title, :count, :elapsed] : ['%s: %s |--| %8s/%s %s', :title, :percentage, :count, :total, :time]
   end
 
-end
+end

data/lib/buildr/core/project.rb

@@ -240,18 +240,19 @@ module Buildr
         rake_check_options options, :scope if options
         raise ArgumentError, 'Only one project name at a time' unless args.size == 1
         @projects ||= {}
-        name = args.first
+        name = args.first.to_s
+        # Make sure parent project is evaluated (e.g. if looking for foo:bar, find foo first)
+        unless @projects[name]
+          parts = name.split(':')
+          project(parts.first, options || {}) if parts.size > 1
+        end
         if options && options[:scope]
           # We assume parent project is evaluated.
           project = options[:scope].split(':').inject([[]]) { |scopes, scope| scopes << (scopes.last + [scope]) }.
             map { |scope| @projects[(scope + [name]).join(':')] }.
             select { |project| project }.last
         end
-        unless project
-          # Parent project not evaluated.
-          name.split(':').tap { |parts| @projects[parts.first].invoke if parts.size > 1 }
-          project = @projects[name]
-        end
+        project ||= @projects[name] # Not found in scope.
         raise "No such project #{name}" unless project
         project.invoke
         project
@@ -861,32 +862,4 @@ module Buildr
     Project.projects *args
   end
 
-  # Forces all the projects to be evaluated before executing any other task.
-  # If we don't do that, we don't get to have tasks available when running Rake.
-  namespace 'buildr' do
-    task 'initialize' do
-      projects
-    end
-
-    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)
-      if original =~ /gem\s*(["'])buildr\1/
-        modified = original.sub(/gem\s*(["'])buildr\1\s*,\s*(["']).*\2/, %{gem "buildr", "#{Buildr::VERSION}"})
-      else
-        modified = %{gem "buildr", "#{Buildr::VERSION}"\n} + original
-      end
-      File.open(Buildr.application.buildfile, "w") { |file| file.write modified }
-    end
-
-    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/, "")
-      File.open(Buildr.application.buildfile, "w") { |file| file.write modified }
-    end
-  end
-
-
 end

data/lib/buildr/core/test.rb

@@ -442,7 +442,13 @@ module Buildr
         @passed_tests, @failed_tests = [], []
       else
         info "Running tests in #{@project.name}"
-        @passed_tests = @framework.run(@tests, dependencies)
+        begin
+          @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
+          @passed_tests = []
+        end
         @failed_tests = @tests - @passed_tests
         unless @failed_tests.empty?
           error "The following tests failed:\n#{@failed_tests.join("\n")}"
@@ -592,8 +598,8 @@ module Buildr
       project.build test unless test.options[:integration]
 
       project.clean do
-        rm_rf test.compile.target.to_s, :verbose=>false if test.compile.target
-        rm_rf test.report_to.to_s, :verbose=>false
+        rm_rf test.compile.target.to_s if test.compile.target
+        rm_rf test.report_to.to_s
       end
     end
 
@@ -629,9 +635,9 @@ module Buildr
     # Use this method to return the integration tests task, or enhance it with a block to execute.
     #
     # There is one integration tests task you can execute directly, or as a result of running the package
-    # task (or tasks that depend on it, like install and deploy). It contains all the tests marked with
+    # task (or tasks that depend on it, like install and upload). It contains all the tests marked with
     # :integration=>true, all other tests are considered unit tests and run by the test task before packaging.
-    # So essentially: build=>test=>packaging=>integration=>install/deploy.
+    # So essentially: build=>test=>packaging=>integration=>install/upload.
     #
     # You add new tests from projects that define integration tests using the regular test task,
     # but with the following addition:
@@ -658,7 +664,7 @@ module Buildr
   class Options
 
     # Runs tests after the build when true (default). This forces tests to execute
-    # after the build, including when running build related tasks like install, deploy and release.
+    # after the build, including when running build related tasks like install, upload and release.
     #
     # Set to false to not run any tests. Set to :all to run all tests, ignoring failures.
     #

data/lib/buildr/core/transports.rb

@@ -14,18 +14,18 @@
 # the License.
 
 
-require 'cgi'
+require 'uri'
 require 'net/http'
-require 'net/https'
+Net.autoload :HTTPS, 'net/https'
 # PATCH:  On Windows, Net::SSH 2.0.2 attempts to load the Pageant DLLs which break on JRuby.
 $LOADED_FEATURES << 'net/ssh/authentication/pageant.rb' if RUBY_PLATFORM =~ /java/
-require 'net/sftp'
-require 'uri'
+gem 'net-ssh' ; Net.autoload :SSH, 'net/ssh'
+gem 'net-sftp' ; Net.autoload :SFTP, 'net/sftp'
+autoload :CGI, 'cgi'
 require 'digest/md5'
 require 'digest/sha1'
 require 'stringio'
-require 'tempfile'
-require 'buildr/core/progressbar'
+autoload :ProgressBar, 'buildr/core/progressbar'
 
 
 # Not quite open-uri, but similar. Provides read and write methods for the resource represented by the URI.
@@ -37,8 +37,8 @@ module URI
   class NotFoundError < RuntimeError
   end
 
-  # How many bytes to read/write at once.
-  RW_CHUNK_SIZE = 2 ** 20 #:nodoc:
+  # How many bytes to read/write at once. Do not change without checking BUILDR-214 first.
+  RW_CHUNK_SIZE = 128 * 1024 #:nodoc:
 
   class << self
 
@@ -154,7 +154,7 @@ module URI
           read({:progress=>verbose}.merge(options || {}).merge(:modified=>modified)) { |chunk| temp.write chunk }
         end
         mkpath File.dirname(target)
-        File.move temp.path, target
+        mv temp.path, target
       when File
         read({:progress=>verbose}.merge(options || {}).merge(:modified=>target.mtime)) { |chunk| target.write chunk }
         target.flush
@@ -289,7 +289,9 @@ module URI
           when Net::HTTPRedirection
             # Try to download from the new URI, handle relative redirects.
             trace "Redirected to #{response['Location']}"
-            return (self + URI.parse(response['location'])).read(options, &block)
+            rself = self + URI.parse(response['Location'])
+            rself.user, rself.password = self.user, self.password
+            return rself.read(options, &block)
           when Net::HTTPOK
             info "Downloading #{self}"
             result = nil
@@ -547,7 +549,7 @@ module URI
       end
       real_path.tap do |path|
         mkpath File.dirname(path)
-        File.move temp.path, path
+        mv temp.path, path
       end
     end
 

data/lib/buildr/core/util.rb

@@ -16,7 +16,12 @@
 
 require 'rbconfig'
 require 'pathname'
-require 'builder' # A different kind of buildr, one we use to create XML.
+autoload :Tempfile, 'tempfile'
+autoload :YAML, 'yaml'
+autoload :REXML, 'rexml/document'
+gem 'xml-simple' ; autoload :XmlSimple, 'xmlsimple'
+gem 'builder' ; autoload :Builder, 'builder' # A different kind of buildr, one we use to create XML.
+require 'highline/import'
 
 
 module Buildr
@@ -31,7 +36,7 @@ module Buildr
     # In order to determine if we are running on a windows OS,
     # prefer this function instead of using Gem.win_platform?.
     #
-    # Gem.win_platform? only checks the RUBY_PLATFORM global,
+    # Gem.win_platform? only checks these RUBY_PLATFORM global,
     # that in some cases like when running on JRuby is not 
     # succifient for our purpose:
     #
@@ -55,8 +60,10 @@ module Buildr
       end
       cmd << ruby_bin
       cmd << '-S' << options.delete(:command) if options[:command]
-      sh *cmd.push(*args.flatten).push(options) do |ok, status|
-        ok or fail "Command failed with status (#{status ? status.exitstatus : 'unknown'}): [#{cmd.join(" ")}]"
+      cmd.concat args.flatten
+      cmd.push options
+      sh *cmd do |ok, status|
+        ok or fail "Command ruby failed with status (#{status ? status.exitstatus : 'unknown'}): [#{cmd.join(" ")}]"
       end
     end
 
@@ -109,7 +116,7 @@ module Buildr
     end
 
     # Utility methods for running gem commands
-    module Gems
+    module Gems #:nodoc:
       extend self
 
       # Install gems specified by each Gem::Dependency if they are missing. This method prompts the user
@@ -186,24 +193,8 @@ end
 class OpenObject < Hash
 
   def initialize(source=nil, &block)
-    @hash = Hash.new(&block)
-    @hash.update(source) if source
-  end
-
-  def [](key)
-    @hash[key]
-  end
-
-  def []=(key, value)
-    @hash[key] = value
-  end
-
-  def delete(key)
-    @hash.delete(key)
-  end
-
-  def to_hash
-    @hash.clone
+    super &block
+    update source if source
   end
 
   def method_missing(symbol, *args)

data/lib/buildr/groovy/bdd.rb

@@ -13,6 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+
 module Buildr::Groovy
 
   # EasyB is a Groovy based BDD framework.
@@ -85,7 +86,7 @@ module Buildr::Groovy
       tests.inject([]) do |passed, test|
         name = test.sub(/.*?groovy[\/\\]/, '').pathmap('%X')
         report = File.join(task.report_to.to_s, name + ext)
-        mkpath report.pathmap('%d'), :verbose => false
+        mkpath report.pathmap('%d')
         begin
           Java::Commands.java cmd_args,
              "-#{easyb_format}", report,
@@ -102,4 +103,4 @@ module Buildr::Groovy
   
 end
 
-Buildr::TestFramework << Buildr::Groovy::EasyB
+Buildr::TestFramework << Buildr::Groovy::EasyB

data/lib/buildr/groovy/compiler.rb

@@ -19,7 +19,7 @@ module Buildr::Groovy
   # Groovyc compiler:
   #  compile.using(:groovyc)
   #
-  # You need to require 'buildr/java/groovyc' if you need to use this compiler.
+  # You need to require 'buildr/groovy/compiler' if you need to use this compiler.
   #
   # Used by default if .groovy files are found in the src/main/groovy directory (or src/test/groovy)
   # and sets the target directory to target/classes (or target/test/classes).

data/lib/buildr/ide/eclipse.rb

@@ -25,16 +25,16 @@ module Buildr
 
     first_time do
       # Global task "eclipse" generates artifacts for all projects.
-      desc "Generate Eclipse artifacts for all projects"
-      Project.local_task "eclipse"=>"artifacts"
+      desc 'Generate Eclipse artifacts for all projects'
+      Project.local_task 'eclipse'=>'artifacts'
     end
 
     before_define do |project|
-      project.recursive_task("eclipse")
+      project.recursive_task('eclipse')
     end
 
     after_define do |project|
-      eclipse = project.task("eclipse")
+      eclipse = project.task('eclipse')
 
       # Check if project has scala facet
       scala = project.compile.language == :scala
@@ -42,17 +42,18 @@ module Buildr
       # Only for projects that we support
       supported_languages = [:java, :scala]
       supported_packaging = %w(jar war rar mar aar)
-      if (supported_languages.include? project.compile.language || 
+      if (supported_languages.include?(project.compile.language) ||
+          supported_languages.include?(project.test.compile.language) ||
           project.packages.detect { |pkg| supported_packaging.include?(pkg.type.to_s) })
-        eclipse.enhance [ file(project.path_to(".classpath")), file(project.path_to(".project")) ]
+        eclipse.enhance [ file(project.path_to('.classpath')), file(project.path_to('.project')) ]
 
         # The only thing we need to look for is a change in the Buildfile.
-        file(project.path_to(".classpath")=>Buildr.application.buildfile) do |task|
+        file(project.path_to('.classpath')=>Buildr.application.buildfile) do |task|
           info "Writing #{task.name}"
 
           m2repo = Buildr::Repositories.instance.local
 
-          File.open(task.name, "w") do |file|
+          File.open(task.name, 'w') do |file|
             classpathentry = ClasspathEntryWriter.new project, file
             classpathentry.write do
               # Note: Use the test classpath since Eclipse compiles both "main" and "test" classes using the same classpath
@@ -82,7 +83,7 @@ module Buildr
               # Classpath elements from other projects
               classpathentry.src_projects project_libs
 
-              classpathentry.output project.compile.target
+              classpathentry.output project.compile.target if project.compile.target
               classpathentry.lib libs
               classpathentry.var m2_libs, 'M2_REPO', m2repo
 
@@ -93,9 +94,9 @@ module Buildr
         end
 
         # The only thing we need to look for is a change in the Buildfile.
-        file(project.path_to(".project")=>Buildr.application.buildfile) do |task|
+        file(project.path_to('.project')=>Buildr.application.buildfile) do |task|
           info "Writing #{task.name}"
-          File.open(task.name, "w") do |file|
+          File.open(task.name, 'w') do |file|
             xml = Builder::XmlMarkup.new(:target=>file, :indent=>2)
             xml.projectDescription do
               xml.name project.id
@@ -103,17 +104,17 @@ module Buildr
               xml.buildSpec do
                 if scala
                   xml.buildCommand do
-                    xml.name "ch.epfl.lamp.sdt.core.scalabuilder"
+                    xml.name 'ch.epfl.lamp.sdt.core.scalabuilder'
                   end
                 else
                   xml.buildCommand do
-                    xml.name "org.eclipse.jdt.core.javabuilder"
+                    xml.name 'org.eclipse.jdt.core.javabuilder'
                   end
                 end
               end
               xml.natures do
-                xml.nature "ch.epfl.lamp.sdt.core.scalanature" if scala
-                xml.nature "org.eclipse.jdt.core.javanature"
+                xml.nature 'ch.epfl.lamp.sdt.core.scalanature' if scala
+                xml.nature 'org.eclipse.jdt.core.javanature'
               end
             end
           end
@@ -126,7 +127,7 @@ module Buildr
     # It converts tasks to paths.
     # It converts absolute paths to relative paths.
     # It ignores duplicate directories.
-    class ClasspathEntryWriter
+    class ClasspathEntryWriter #:nodoc:
       def initialize project, target
         @project = project
         @xml = Builder::XmlMarkup.new(:target=>target, :indent=>2)
@@ -149,7 +150,7 @@ module Buildr
       end
 
       # Write a classpathentry of kind 'src'.
-      # Accepts an array of absolute paths or a task.
+      # Accept an array of absolute paths or a task.
       def src arg
         if [:sources, :target].all? { |message| arg.respond_to?(message) }
           src_from_task arg
@@ -159,10 +160,10 @@ module Buildr
       end
 
       # Write a classpathentry of kind 'src' for dependent projects.
-      # Accepts an array of 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}"
+          @xml.classpathentry :kind=>'src', :combineaccessrules=>'false', :path=>"/#{project_id}"
         end
       end
       
@@ -170,9 +171,18 @@ module Buildr
         @xml.classpathentry :kind=>'output', :path=>relative(target)
       end
 
+      # Write a classpathentry of kind 'var' (variable) for a library in a local repo.
+      # * +libs+ is an array of library paths.
+      # * +var_name+ is a variable name as defined in Eclipse (e.g., 'M2_REPO').
+      # * +var_value+ is the value of this variable (e.g., '/home/me/.m2').
+      # E.g., <tt>var([lib1, lib2], 'M2_REPO', '/home/me/.m2/repo')</tt>
       def var libs, var_name, var_value
-        libs.map { |lib| lib.to_s.sub(var_value, var_name) }.sort.uniq.each do |path|
-          @xml.classpathentry :kind=>'var', :path=>path
+        libs.each do |lib_path|
+          lib_artifact = file(lib_path)
+          source_path = lib_artifact.sources_artifact.to_s
+          relative_lib_path = lib_path.sub(var_value, var_name)
+          relative_source_path = source_path.sub(var_value, var_name)
+          @xml.classpathentry :kind=>'var', :path=>relative_lib_path, :sourcepath=>relative_source_path
         end
       end
               

data/lib/buildr/ide/idea.rb

@@ -17,7 +17,6 @@
 require 'buildr/core/project'
 require 'buildr/packaging'
 require 'stringio'
-require 'rexml/document'
 
 
 module Buildr
@@ -130,7 +129,9 @@ module Buildr
                         xml.root :url=>"jar://#{path}!/"
                       end
                       xml.JAVADOC
-                      xml.SOURCES
+                      xml.SOURCES do
+                        xml.root :url=>"jar://#{path.sub(/\.jar$/, "-sources.jar")}!/"
+                      end
                     end
                   end
                 end

data/lib/buildr/ide/idea7x.rb

@@ -17,7 +17,7 @@
 require 'buildr/core/project'
 require 'buildr/packaging'
 require 'stringio'
-require 'rexml/document'
+
 
 module Buildr
   module Idea7x #:nodoc:
@@ -160,7 +160,9 @@ module Buildr
                 xml.root :url=> path
               end
               xml.JAVADOC
-              xml.SOURCES
+              xml.SOURCES do
+                xml.root :url=>"jar://#{path.sub(/\.jar$/, "-sources.jar")}!/"
+              end
             end
           end
         end
@@ -179,8 +181,8 @@ module Buildr
             xml.modules do
               project.projects.each do |subp|
                 module_name = subp.name.gsub(":", "-")
-                module_path = subp.name.split(":"); module_path.shift
-                module_path = module_path.join(File::SEPARATOR)
+                module_path = subp.base_dir ? subp.base_dir.gsub(/^#{project.base_dir}\//, '') :
+                                              subp.name.split(":")[1 .. -1].join(FILE::SEPARATOR)
                 path = "#{module_path}/#{module_name}#{IML_SUFFIX}"
                 xml.module :fileurl=>"#{PROJECT_DIR_URL}/#{path}", :filepath=>"#{PROJECT_DIR}/#{path}"
               end