buildr 1.3.5-x86-mswin32 → 1.4.0-x86-mswin32

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']

data/lib/buildr/ide/eclipse.rb

@@ -31,6 +31,29 @@ module Buildr
         @options = Options.new(project)
       end
 
+      # :call-seq:
+      #   classpath_variables { :VAR => '/path/to/location' }
+      # Sets classpath variables to be used for library path substitution
+      # on the project.
+      #
+      def classpath_variables(*values)
+        fail "eclipse.classpath_variables expects a single hash argument" if values.size > 1
+        if values.size == 1
+          fail "eclipse.classpath_variables expects a Hash argument" unless values[0].is_a? Hash
+          # convert keys to strings
+          values = values[0].inject({}) { |h, (k,v)| h[k.to_s] = @project.path_to(v); h }
+          @variables = values.merge(@variables || {})
+        end
+        @variables || (@project.parent ? @project.parent.eclipse.classpath_variables : default_classpath_variables)
+      end
+
+      def default_classpath_variables
+        vars = {}
+        vars[:SCALA_HOME] = ENV['SCALA_HOME'] if ENV['SCALA_HOME']
+        vars[:JAVA_HOME]  = ENV['JAVA_HOME']  if ENV['JAVA_HOME']
+        vars
+      end
+
       # :call-seq:
       #   natures=(natures)
       # Sets the Eclipse project natures on the project.
@@ -49,7 +72,7 @@ module Buildr
       def natures(*values)
         if values.size > 0
           @natures ||= []
-          @natures += values
+          @natures += values.flatten
         else
           @natures || (@project.parent ? @project.parent.eclipse.natures : [])
         end
@@ -74,12 +97,32 @@ module Buildr
       def classpath_containers(*values)
         if values.size > 0
           @classpath_containers ||= []
-          @classpath_containers += values
+          @classpath_containers += values.flatten
         else
           @classpath_containers || (@project.parent ? @project.parent.eclipse.classpath_containers : [])
         end
       end
 
+      # :call-seq:
+      #   exclude_libs() => [lib1, lib2]
+      # Returns the an array of libraries to be excluded from the generated Eclipse classpath
+      def exclude_libs(*values)
+        if values.size > 0
+          @exclude_libs ||= []
+          @exclude_libs += values.flatten
+        else
+          @exclude_libs || (@project.parent ? @project.parent.eclipse.exclude_libs : [])
+        end
+      end
+
+      # :call-seq:
+      #   exclude_libs=(lib1, lib2)
+      # Sets libraries to be excluded from the generated Eclipse classpath
+      #
+      def exclude_libs=(libs)
+        @exclude_libs = arrayfy(libs)
+      end
+
       # :call-seq:
       #   builders=(builders)
       # Sets the Eclipse project builders on the project.
@@ -98,7 +141,7 @@ module Buildr
       def builders(*values)
         if values.size > 0
           @builders ||= []
-          @builders += values
+          @builders += values.flatten
         else
           @builders || (@project.parent ? @project.parent.eclipse.builders : [])
         end
@@ -147,80 +190,99 @@ module Buildr
       project.recursive_task('eclipse')
     end
 
-    after_define do |project|
-      eclipse = project.task('eclipse')
-
-      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|
-        if (project.eclipse.natures.reject { |x| x.is_a?(Symbol) }.size > 0)
-          info "Writing #{task.name}"
-
-          m2repo = Buildr::Repositories.instance.local
-
-          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
-              cp = project.test.compile.dependencies.map(&:to_s) - [ project.compile.target.to_s, project.resources.target.to_s ]
-              cp = cp.uniq
+    after_define(:eclipse => :package) do |project|
+      # Need to enhance because using project.projects during load phase of the
+      # buildfile has harmful side-effects on project definition order
+      project.enhance do
+        eclipse = project.task('eclipse')
+        # We don't create the .project and .classpath files if the project contains projects.
+        if project.projects.empty?
+
+          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|
+            if (project.eclipse.natures.reject { |x| x.is_a?(Symbol) }.size > 0)
+              info "Writing #{task.name}"
+
+              m2repo = Buildr::Repositories.instance.local
+
+              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
+                  cp = project.test.compile.dependencies.map(&:to_s) - [ project.compile.target.to_s, project.resources.target.to_s ]
+                  cp = cp.uniq
+
+                  # Convert classpath elements into applicable Project objects
+                  cp.collect! { |path| Buildr.projects.detect { |prj| prj.packages.detect { |pkg| pkg.to_s == path } } || path }
+
+                  # Remove excluded libs
+                  cp -= project.eclipse.exclude_libs.map(&:to_s)
+
+                  # project_libs: artifacts created by other projects
+                  project_libs, others = cp.partition { |path| path.is_a?(Project) }
+
+                  # Separate artifacts under known classpath variable paths
+                  # including artifacts located in local Maven2 repository
+                  vars = []
+                  project.eclipse.classpath_variables.merge(project.eclipse.options.m2_repo_var => m2repo).each do |name, path|
+                    matching, others = others.partition { |f| File.expand_path(f.to_s).index(path) == 0 }
+                    matching.each do |m|
+                      vars << [m, name, path]
+                    end
+                  end
 
-              # Convert classpath elements into applicable Project objects
-              cp.collect! { |path| Buildr.projects.detect { |prj| prj.packages.detect { |pkg| pkg.to_s == path } } || path }
+                  # Generated: Any non-file classpath elements in the project are assumed to be generated
+                  libs, generated = others.partition { |path| File.file?(path.to_s) }
 
-              # project_libs: artifacts created by other projects
-              project_libs, others = cp.partition { |path| path.is_a?(Project) }
+                  classpathentry.src project.compile.sources + generated
+                  classpathentry.src project.resources
 
-              # Separate artifacts from Maven2 repository
-              m2_libs, others = others.partition { |path| path.to_s.index(m2repo) == 0 }
+                  if project.test.compile.target
+                    classpathentry.src project.test.compile
+                    classpathentry.src project.test.resources
+                  end
 
-              # Generated: Any non-file classpath elements in the project are assumed to be generated
-              libs, generated = others.partition { |path| File.file?(path.to_s) }
+                  # Classpath elements from other projects
+                  classpathentry.src_projects project_libs
 
-              classpathentry.src project.compile.sources + generated
-              classpathentry.src project.resources
+                  classpathentry.output project.compile.target if project.compile.target
+                  classpathentry.lib libs
+                  classpathentry.var vars
 
-              if project.test.compile.target
-                classpathentry.src project.test.compile
-                classpathentry.src project.test.resources
+                  project.eclipse.classpath_containers.each { |container|
+                    classpathentry.con container
+                  }
+                end
               end
-
-              # Classpath elements from other projects
-              classpathentry.src_projects project_libs
-
-              classpathentry.output project.compile.target if project.compile.target
-              classpathentry.lib libs
-              classpathentry.var m2_libs, project.eclipse.options.m2_repo_var, m2repo
-
-              project.eclipse.classpath_containers.each { |container|
-                classpathentry.con container
-              }
             end
           end
-        end
-      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|
-        if (project.eclipse.natures.reject { |x| x.is_a?(Symbol) }.size > 0)
-          info "Writing #{task.name}"
-          File.open(task.name, 'w') do |file|
-            xml = Builder::XmlMarkup.new(:target=>file, :indent=>2)
-            xml.projectDescription do
-              xml.name project.id
-              xml.projects
-              xml.buildSpec do
-                project.eclipse.builders.each { |builder|
-                  xml.buildCommand do
-                    xml.name builder
+          # The only thing we need to look for is a change in the Buildfile.
+          file(project.path_to('.project')=>Buildr.application.buildfile) do |task|
+            info "Writing #{task.name}"
+            File.open(task.name, 'w') do |file|
+              xml = Builder::XmlMarkup.new(:target=>file, :indent=>2)
+              xml.projectDescription do
+                xml.name project.id
+                xml.projects
+                unless project.eclipse.builders.empty?
+                  xml.buildSpec do
+                    project.eclipse.builders.each { |builder|
+                      xml.buildCommand do
+                        xml.name builder
+                      end
+                    }
                   end
-                }
-              end
-              xml.natures do
-                project.eclipse.natures.each { |nature|
-                  xml.nature nature unless nature.is_a? Symbol
-                }
+                end
+                unless project.eclipse.natures.empty?
+                  xml.natures do
+                    project.eclipse.natures.each { |nature|
+                      xml.nature nature unless nature.is_a? Symbol
+                    }
+                  end
+                end
               end
             end
           end
@@ -251,7 +313,7 @@ module Buildr
 
       def lib libs
         libs.map(&:to_s).sort.uniq.each do |path|
-          @xml.classpathentry :kind=>'lib', :path=>path
+          @xml.classpathentry :kind=>'lib', :path=>relative(path)
         end
       end
 
@@ -282,24 +344,35 @@ module Buildr
       # * +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.each do |lib_path|
+      def var(libs)
+        libs.each do |lib_path, var_name, var_value|
           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
+          relative_lib_path = lib_path.sub(var_value, var_name.to_s)
+          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
+          end
         end
       end
 
       private
 
-      # Find a path relative to the project's root directory.
+      # 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
+      # can happen on Windows, for instance, when the two paths are not on the
+      # same drive.
       def relative path
         path or raise "Invalid path '#{path.inspect}'"
         msg = [:to_path, :to_str, :to_s].find { |msg| path.respond_to? msg }
         path = path.__send__(msg)
-        Util.relative_path(File.expand_path(path), @project.path_to)
+        begin
+          Util.relative_path(File.expand_path(path), @project.path_to)
+        rescue ArgumentError
+          File.expand_path(path)
+        end
       end
 
       def src_from_task task

data/lib/buildr/ide/eclipse/java.rb

@@ -38,9 +38,9 @@ module Buildr
 
         # :java nature explicitly set
         if eclipse.natures.include? :java
-          eclipse.natures += NATURE unless eclipse.natures.include? NATURE
-          eclipse.classpath_containers += CONTAINER unless eclipse.classpath_containers.include? CONTAINER
-          eclipse.builders += BUILDER unless eclipse.builders.include? BUILDER
+          eclipse.natures += [NATURE] unless eclipse.natures.include? NATURE
+          eclipse.classpath_containers += [CONTAINER] unless eclipse.classpath_containers.include? CONTAINER
+          eclipse.builders += [BUILDER] unless eclipse.builders.include? BUILDER
         end
       end