buildr 1.3.4-java → 1.3.5-java

data/lib/buildr/core/test.rb

@@ -443,6 +443,8 @@ module Buildr
       else
         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] || {})
           @passed_tests = @framework.run(@tests, dependencies)
         rescue Exception=>ex
           error "Test framework error: #{ex.message}"

data/lib/buildr/core/transports.rb

@@ -16,7 +16,6 @@
 
 require 'uri'
 require 'net/http'
-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/
 gem 'net-ssh' ; Net.autoload :SSH, 'net/ssh'
@@ -148,11 +147,10 @@ module URI
         # worse than not having a file at all, so download to temporary
         # file and then move over.
         modified = File.stat(target).mtime if File.exist?(target)
-        temp = nil
-        Tempfile.open File.basename(target) do |temp|
-          temp.binmode
-          read({:progress=>verbose}.merge(options || {}).merge(:modified=>modified)) { |chunk| temp.write chunk }
-        end
+        temp = Tempfile.new(File.basename(target))
+        temp.binmode
+        read({:progress=>verbose}.merge(options || {}).merge(:modified=>modified)) { |chunk| temp.write chunk }
+        temp.close
         mkpath File.dirname(target)
         mv temp.path, target
       when File
@@ -366,7 +364,10 @@ module URI
       else
         http = Net::HTTP.new(host, port)
       end
-      http.use_ssl = true if self.instance_of? URI::HTTPS
+      if self.instance_of? URI::HTTPS
+        require 'net/https'
+        http.use_ssl = true
+      end
       yield http
     end
 
@@ -537,20 +538,18 @@ module URI
 
     def write_internal(options, &block) #:nodoc:
       raise ArgumentError, 'Either you\'re attempting to write a file to another host (which we don\'t support), or you used two slashes by mistake, where you should have file:///<path>.' if host
-      temp = nil
-      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(RW_CHUNK_SIZE)
-            temp.write chunk
-            progress << chunk
-          end
+      temp = Tempfile.new(File.basename(path))
+      temp.binmode
+      with_progress_bar options[:progress] && options[:size], path.split('/'), options[:size] || 0 do |progress|
+        while chunk = yield(RW_CHUNK_SIZE)
+          temp.write chunk
+          progress << chunk
         end
       end
-      real_path.tap do |path|
-        mkpath File.dirname(path)
-        mv temp.path, path
-      end
+      temp.close
+      mkpath File.dirname(real_path)
+      mv temp.path, real_path
+      real_path
     end
 
     @@schemes['FILE'] = FILE

data/lib/buildr/core/util.rb

@@ -159,24 +159,54 @@ module Buildr
 end
 
 
-if RUBY_VERSION < '1.9.0'
-  module Kernel #:nodoc:
-    # Borrowed from Ruby 1.9.
+class Object #:nodoc:
+  unless defined? instance_exec # 1.9
+    module InstanceExecMethods #:nodoc:
+    end
+    include InstanceExecMethods
+
+    # Evaluate the block with the given arguments within the context of
+    # this object, so self is set to the method receiver.
+    #
+    # From Mauricio's http://eigenclass.org/hiki/bounded+space+instance_exec
+    def instance_exec(*args, &block)
+      begin
+        old_critical, Thread.critical = Thread.critical, true
+        n = 0
+        n += 1 while respond_to?(method_name = "__instance_exec#{n}")
+        InstanceExecMethods.module_eval { define_method(method_name, &block) }
+      ensure
+        Thread.critical = old_critical
+      end
+
+      begin
+        send(method_name, *args)
+      ensure
+        InstanceExecMethods.module_eval { remove_method(method_name) } rescue nil
+      end
+    end
+  end
+end
+
+module Kernel #:nodoc:
+  unless defined? tap # 1.9
     def tap
       yield self if block_given?
       self
-    end unless method_defined?('tap')
+    end
   end
+end
 
-
-  class Symbol #:nodoc:
+class Symbol #:nodoc:
+  unless defined? to_proc # 1.9
     # Borrowed from Ruby 1.9.
     def to_proc
       Proc.new{|*args| args.shift.__send__(self, *args)}
-    end unless method_defined?('to_proc')
+    end
   end
+end
 
-  # Also borrowed from Ruby 1.9.
+unless defined? BasicObject # 1.9
   class BasicObject #:nodoc:
     (instance_methods - ['__send__', '__id__', '==', 'send', 'send!', 'respond_to?', 'equal?', 'object_id']).
       each do |method|
@@ -230,7 +260,9 @@ class Hash
         # 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)
+        #key = Java.java.lang.String.valueOf(keys.next.to_s)
+        key = keys.next
+        key = key.toString unless String === key
         hash[key] = java_properties.getProperty(key)
       end
       hash
@@ -278,3 +310,140 @@ class Hash
   end
 
 end
+
+if Buildr::Util.java_platform?
+  require 'ffi'
+
+  # Fix for BUILDR-292.
+  # JRuby fails to rename a file on different devices
+  # this monkey-patch wont be needed when JRUBY-3381 gets resolved.
+  module FileUtils #:nodoc:
+    alias_method :__mv_native, :mv
+
+    def mv(from, to, options = nil)
+      dir_to = File.directory?(to) ? to : File.dirname(to)
+      Array(from).each do |from|
+        dir_from = File.dirname(from)
+        if File.stat(dir_from).dev != File.stat(dir_to).dev
+          cp from, to, options
+          rm from, options
+        else
+          __mv_native from, to, options
+        end
+      end
+    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
+      end
+      args.push defaults
+      args
+    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
+    end
+  end
+
+  module FileUtils
+    extend FFI::Library
+    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}]"
+        }
+      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]
+        cd = "cd '#{Dir.pwd}' && "
+        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
+          arg_str = args.map { |a| "'#{a}'" }
+          __native_system__(cd + cmd.first + ' ' + arg_str.join(' '))
+        end
+        $? = Buildr::ProcessStatus.new(0, res == 0, res)    # KLUDGE
+        block.call(res == 0, $?)
+      end
+    end
+
+  end
+end

data/lib/buildr/groovy.rb

@@ -16,3 +16,4 @@
 
 require 'buildr/groovy/compiler'
 require 'buildr/groovy/bdd'
+require 'buildr/groovy/shell'

data/lib/buildr/groovy/bdd.rb

@@ -23,7 +23,7 @@ module Buildr::Groovy
   # 
   # This framework will search in your project for:
   #   src/spec/groovy/**/*Story.groovy
-  #   src/spec/groovy/**/*Behavior.groovy
+  #   src/spec/groovy/**/*Specification.groovy
   #
   # Support the following options:
   # * :format -- Report format :txt or :xml, default is :txt
@@ -33,8 +33,8 @@ module Buildr::Groovy
     @lang = :groovy
     @bdd_dir = :spec
 
-    VERSION = "0.7"
-    TESTS_PATTERN = [ /(Story|Behavior).groovy$/ ]
+    VERSION = "0.9"
+    TESTS_PATTERN = [ /(Story|Specification).groovy$/ ]
     OPTIONS = [:format, :properties, :java_args]
 
     class << self
@@ -50,7 +50,7 @@ module Buildr::Groovy
 
       def applies_to?(project) #:nodoc:
         %w{
-          **/*Behaviour.groovy **/*Behavior.groovy **/*Story.groovy
+          **/*Specification.groovy **/*Story.groovy
         }.any? { |glob| !Dir[project.path_to(:source, bdd_dir, lang, glob)].empty? }
       end
 
@@ -78,7 +78,7 @@ module Buildr::Groovy
         raise "Invalid format #{options[:format]} expected one of :txt :xml"
       end
     
-      cmd_args = [ 'org.disco.easyb.SpecificationRunner' ]
+      cmd_args = [ 'org.disco.easyb.BehaviorRunner' ]
       cmd_options = { :properties => options[:properties],
                       :java_args => options[:java_args],
                       :classpath => dependencies }

data/lib/buildr/groovy/shell.rb

@@ -0,0 +1,48 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+require 'buildr/shell'
+
+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) + 
+          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']
+      end
+    end
+  end
+end
+
+Buildr::ShellProviders << Buildr::Groovy::GroovySH

data/lib/buildr/ide/eclipse.rb

@@ -20,13 +20,127 @@ require 'buildr/packaging'
 
 module Buildr
   module Eclipse #:nodoc:
-
     include Extension
 
+    class Eclipse
+
+      attr_reader :options
+
+      def initialize(project)
+        @project = project
+        @options = Options.new(project)
+      end
+
+      # :call-seq:
+      #   natures=(natures)
+      # Sets the Eclipse project natures on the project.
+      #
+      def natures=(var)
+        @natures = arrayfy(var)
+      end
+
+      # :call-seq:
+      #   natures() => [n1, n2]
+      # Returns the Eclipse project natures on the project.
+      # They may be derived from the parent project if no specific natures have been set
+      # on the project.
+      #
+      # An Eclipse project nature is used internally by Eclipse to determine the aspects of a project.
+      def natures(*values)
+        if values.size > 0
+          @natures ||= []
+          @natures += values
+        else
+          @natures || (@project.parent ? @project.parent.eclipse.natures : [])
+        end
+      end
+
+      # :call-seq:
+      #   classpath_containers=(cc)
+      # Sets the Eclipse project classpath containers on the project.
+      #
+      def classpath_containers=(var)
+        @classpath_containers = arrayfy(var)
+      end
+
+      # :call-seq:
+      #   classpath_containers() => [con1, con2]
+      # Returns the Eclipse project classpath containers on the project.
+      # They may be derived from the parent project if no specific classpath containers have been set
+      # on the project.
+      #
+      # A classpath container is an Eclipse pre-determined ensemble of dependencies made available to
+      # the project classpath.
+      def classpath_containers(*values)
+        if values.size > 0
+          @classpath_containers ||= []
+          @classpath_containers += values
+        else
+          @classpath_containers || (@project.parent ? @project.parent.eclipse.classpath_containers : [])
+        end
+      end
+
+      # :call-seq:
+      #   builders=(builders)
+      # Sets the Eclipse project builders on the project.
+      #
+      def builders=(var)
+        @builders = arrayfy(var)
+      end
+
+      # :call-seq:
+      #   builders() => [b1, b2]
+      # Returns the Eclipse project builders on the project.
+      # They may be derived from the parent project if no specific builders have been set
+      # on the project.
+      #
+      # A builder is an Eclipse background job that parses the source code to produce built artifacts.
+      def builders(*values)
+        if values.size > 0
+          @builders ||= []
+          @builders += values
+        else
+          @builders || (@project.parent ? @project.parent.eclipse.builders : [])
+        end
+      end
+
+      private
+
+      def arrayfy(obj)
+        obj.is_a?(Array) ? obj : [obj]
+      end
+    end
+
+    class Options
+
+      attr_writer :m2_repo_var
+
+      def initialize(project)
+        @project = project
+      end
+
+      # The classpath variable used to point at the local maven2 repository.
+      # Example:
+      #   eclipse.options.m2_repo_var = 'M2_REPO'
+      def m2_repo_var(*values)
+        fail "m2_repo_var can only accept one value: #{values}" if values.size > 1
+        if values.size > 0
+          @m2_repo_var = values[0]
+        else
+          @m2_repo_var || (@project.parent ? @project.parent.eclipse.options.m2_repo_var : 'M2_REPO')
+        end
+      end
+    end
+
+    def eclipse
+      @eclipse ||= Eclipse.new(self)
+      @eclipse
+    end
+
     first_time do
       # Global task "eclipse" generates artifacts for all projects.
       desc 'Generate Eclipse artifacts for all projects'
-      Project.local_task 'eclipse'=>'artifacts'
+      Project.local_task('eclipse'=>'artifacts') { |name|  "Generating Eclipse project for #{name}" }
     end
 
     before_define do |project|
@@ -36,19 +150,11 @@ module Buildr
     after_define do |project|
       eclipse = project.task('eclipse')
 
-      # Check if project has scala facet
-      scala = project.compile.language == :scala
-
-      # 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) ||
-          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|
+      # 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
@@ -69,8 +175,8 @@ module Buildr
               # Separate artifacts from Maven2 repository
               m2_libs, others = others.partition { |path| path.to_s.index(m2repo) == 0 }
 
-              # Generated: classpath elements in the project are assumed to be generated
-              generated, libs = others.partition { |path| path.to_s.index(project.path_to.to_s) == 0 }
+              # Generated: Any non-file classpath elements in the project are assumed to be generated
+              libs, generated = others.partition { |path| File.file?(path.to_s) }
 
               classpathentry.src project.compile.sources + generated
               classpathentry.src project.resources
@@ -85,16 +191,19 @@ module Buildr
 
               classpathentry.output project.compile.target if project.compile.target
               classpathentry.lib libs
-              classpathentry.var m2_libs, 'M2_REPO', m2repo
+              classpathentry.var m2_libs, project.eclipse.options.m2_repo_var, m2repo
 
-              classpathentry.con 'ch.epfl.lamp.sdt.launching.SCALA_CONTAINER' if scala
-              classpathentry.con 'org.eclipse.jdt.launching.JRE_CONTAINER'
+              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|
+      # 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)
@@ -102,27 +211,24 @@ module Buildr
               xml.name project.id
               xml.projects
               xml.buildSpec do
-                if scala
-                  xml.buildCommand do
-                    xml.name 'ch.epfl.lamp.sdt.core.scalabuilder'
-                  end
-                else
+                project.eclipse.builders.each { |builder|
                   xml.buildCommand do
-                    xml.name 'org.eclipse.jdt.core.javabuilder'
+                    xml.name builder
                   end
-                end
+                }
               end
               xml.natures do
-                xml.nature 'ch.epfl.lamp.sdt.core.scalanature' if scala
-                xml.nature 'org.eclipse.jdt.core.javanature'
+                project.eclipse.natures.each { |nature|
+                  xml.nature nature unless nature.is_a? Symbol
+                }
               end
             end
           end
         end
       end
-
     end
 
+
     # Writes 'classpathentry' tags in an xml file.
     # It converts tasks to paths.
     # It converts absolute paths to relative paths.
@@ -134,11 +240,11 @@ module Buildr
         @excludes = [ '**/.svn/', '**/CVS/' ].join('|')
         @paths_written = []
       end
-      
+
       def write &block
         @xml.classpath &block
       end
-      
+
       def con path
         @xml.classpathentry :kind=>'con', :path=>path
       end
@@ -166,7 +272,7 @@ module Buildr
           @xml.classpathentry :kind=>'src', :combineaccessrules=>'false', :path=>"/#{project_id}"
         end
       end
-      
+
       def output target
         @xml.classpathentry :kind=>'output', :path=>relative(target)
       end
@@ -185,7 +291,7 @@ module Buildr
           @xml.classpathentry :kind=>'var', :path=>relative_lib_path, :sourcepath=>relative_source_path
         end
       end
-              
+
       private
 
       # Find a path relative to the project's root directory.
@@ -214,9 +320,15 @@ module Buildr
     end
 
   end
-end # module Buildr
 
+end # module Buildr
 
 class Buildr::Project
   include Buildr::Eclipse
 end
+
+# Order is significant for auto-detection, from most specific to least
+require 'buildr/ide/eclipse/plugin'
+require 'buildr/ide/eclipse/scala'
+require 'buildr/ide/eclipse/java'
+