vic-buildr 1.3.1 → 1.3.3

data/lib/buildr/core/transports.rb

@@ -17,6 +17,8 @@
 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.
+$LOADED_FEATURES.unshift 'net/ssh/authentication/pageant' if RUBY_PLATFORM =~ /java/
 require 'net/ssh'
 require 'net/sftp'
 require 'uri'
@@ -54,6 +56,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:
@@ -290,7 +295,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
@@ -298,14 +303,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
@@ -336,9 +341,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) }
@@ -361,7 +366,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
@@ -406,23 +411,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
@@ -449,24 +454,24 @@ 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
-          File.dirname(path).split('/').inject('') do |base, part|
+          trace "Creating path #{path}"
+          File.dirname(path).split('/').reject(&:empty?).inject('/') do |base, part|
             combined = base + part
-            sftp.realpath combined rescue sftp.mkdir combined, {}
+            sftp.close(sftp.opendir!(combined)) rescue sftp.mkdir! combined, {}
             "#{combined}/"
           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
@@ -553,7 +558,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

@@ -13,8 +13,10 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+
 require 'rbconfig'
 require 'pathname'
+require 'builder' # A different kind of buildr, one we use to create XML.
 
 
 module Buildr
@@ -106,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
+
+    end # Gems
 
-module Kernel #:nodoc:
-  # Borrowed from Ruby 1.9.
-  def tap
-    yield self if block_given?
-    self
-  end unless method_defined?('tap')
+  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
 
-  def self.ancestors
-    [Kernel]
+  # 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]
+    end
   end
 end
 
@@ -185,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

data/lib/buildr/groovy.rb

@@ -0,0 +1,18 @@
+# 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/groovy/compiler'
+require 'buildr/groovy/bdd'

data/lib/buildr/groovy/bdd.rb

@@ -0,0 +1,105 @@
+# 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.
+
+module Buildr::Groovy
+
+  # EasyB is a Groovy based BDD framework.
+  # To use in your project:
+  #
+  #   test.using :easyb
+  # 
+  # This framework will search in your project for:
+  #   src/spec/groovy/**/*Story.groovy
+  #   src/spec/groovy/**/*Behavior.groovy
+  #
+  # Support the following options:
+  # * :format -- Report format :txt or :xml, default is :txt
+  # * :properties -- Hash of properties passed to the test suite.
+  # * :java_args -- Arguments passed to the JVM.
+  class EasyB < TestFramework::JavaBDD
+    @lang = :groovy
+    @bdd_dir = :spec
+
+    VERSION = "0.7"
+    TESTS_PATTERN = [ /(Story|Behavior).groovy$/ ]
+    OPTIONS = [:format, :properties, :java_args]
+
+    class << self
+      def version
+        Buildr.settings.build['jbehave'] || VERSION
+      end
+
+      def dependencies
+        @dependencies ||= ["org.easyb:easyb:jar:#{version}",
+          'org.codehaus.groovy:groovy:jar:1.5.3','asm:asm:jar:2.2.3',
+          'commons-cli:commons-cli:jar:1.0','antlr:antlr:jar:2.7.7']
+      end
+
+      def applies_to?(project) #:nodoc:
+        %w{
+          **/*Behaviour.groovy **/*Behavior.groovy **/*Story.groovy
+        }.any? { |glob| !Dir[project.path_to(:source, bdd_dir, lang, glob)].empty? }
+      end
+
+    private
+      def const_missing(const)
+        return super unless const == :REQUIRES # TODO: remove in 1.5
+        Buildr.application.deprecated "Please use JBehave.dependencies/.version instead of JBehave::REQUIRES/VERSION"
+        dependencies
+      end
+    end
+
+    def tests(dependencies) #:nodoc:
+      Dir[task.project.path_to(:source, bdd_dir, lang, "**/*.groovy")].
+        select { |name| TESTS_PATTERN.any? { |pat| pat === name } }
+    end
+
+    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]
+        easyb_format, ext = 'xmlbehavior', '.xml'
+      else
+        raise "Invalid format #{options[:format]} expected one of :txt :xml"
+      end
+    
+      cmd_args = [ 'org.disco.easyb.SpecificationRunner' ]
+      cmd_options = { :properties => options[:properties],
+                      :java_args => options[:java_args],
+                      :classpath => dependencies }
+
+      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
+        begin
+          Java::Commands.java cmd_args,
+             "-#{easyb_format}", report,
+             test, cmd_options.merge(:name => name)
+        rescue => e
+          passed
+        else
+          passed << test
+        end
+      end
+    end
+  
+  end # EasyB
+  
+end
+
+Buildr::TestFramework << Buildr::Groovy::EasyB

data/lib/buildr/groovy/compiler.rb

@@ -0,0 +1,138 @@
+# 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.
+
+
+module Buildr::Groovy
+
+  # Groovyc compiler:
+  #  compile.using(:groovyc)
+  #
+  # You need to require 'buildr/java/groovyc' 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).
+  #
+  # Groovyc is a joint compiler, this means that when selected for a project, this compiler is used
+  # to compile both groovy and java sources. It's recommended that Groovy sources are placed in the
+  # src/main/groovy directory, even though this compiler also looks in src/main/java
+  #
+  # Groovyc accepts the following options:
+  #
+  # * :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. 
+  #                                     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. 
+  #                                     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
+  # * :warnings          -- Issue warnings when compiling.  True when running in verbose mode.
+  # * :debug             -- Generates bytecode with debugging information.  Set from the debug
+  #                                     environment variable/global option.
+  # * :deprecation       -- If true, shows deprecation messages.  False by default.
+  # * :optimise          -- Generates faster bytecode by applying optimisations to the program.
+  # * :source            -- Source code compatibility.
+  # * :target            -- Bytecode compatibility.
+  # * :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'
+    #
+    # 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.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]
+    OPTIONS = GROOVYC_OPTIONS + JAVAC_OPTIONS
+
+    class << self
+      def dependencies #:nodoc:
+        REQUIRES.artifacts
+      end
+
+      def applies_to?(project, task) #:nodoc:
+        paths = task.sources + [sources].flatten.map { |src| Array(project.path_to(:source, task.usage, src.to_sym)) }
+        paths.flatten!
+        # Just select if we find .groovy files
+        paths.any? { |path| !Dir["#{path}/**/*.groovy"].empty? }
+      end
+    end
+    
+    Java.classpath << dependencies
+    
+    specify :language => :groovy, :sources => [:groovy, :java], :source_ext => [:groovy, :java], 
+            :target => 'classes', :target_ext => 'class', :packaging => :jar
+
+    def initialize(project, options) #:nodoc:
+      super
+      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[:warnings] = verbose if options[:warnings].nil?
+      options[:javac] = OpenObject.new if options[:javac].nil?
+    end
+
+    # http://groovy.codehaus.org/The+groovyc+Ant+Task
+    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)
+        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 }
+          ant.classpath do
+            classpath.each { |dep| ant.pathelement :path => dep }
+          end
+          ant.javac(javac_options)
+        end
+      end
+    end
+
+   private 
+    def groovyc_options(sources, target)
+      check_options options, OPTIONS
+      groovyc_options = options.to_hash.only(*GROOVYC_OPTIONS)
+      groovyc_options[:destdir] = File.expand_path(target)
+      groovyc_options
+    end
+
+    def javac_options
+      check_options options, OPTIONS
+      javac_options = options.to_hash.only(*JAVAC_OPTIONS)
+      javac_options[:optimize] = (javac_options.delete(:optimise) || false)
+      javac_options[:nowarn] = (javac_options.delete(:warnings) || verbose).to_s !~ /^(true|yes|on)$/i
+      other = javac_options.delete(:javac) || {}
+      javac_options.merge!(other)
+      javac_options
+    end
+    
+  end
+end
+
+# Groovy compiler comes first, ahead of Javac, this allows it to pick
+# projects that mix Groovy and Java code by spotting Groovy code first.
+Buildr::Compiler.compilers.unshift Buildr::Groovy::Groovyc