buildr 1.3.4-java → 1.3.5-java

data/doc/testing.textile

@@ -26,39 +26,31 @@ h2(#ignoring). Excluding Tests and Ignoring Failures
 
 If you have a lot of tests that are failing or just hanging there collecting dusts, you can tell Buildr to ignore them.  You can either tell Buildr to only run specific tests, for example:
 
-<notextile>
 {% highlight ruby %}
 test.include 'com.acme.tests.passing.*'
 {% endhighlight %}
-</notextile>
 
 Or tell it to exclude specific tests, for example:
 
-<notextile>
 {% highlight ruby %}
 test.exclude '*FailingTest', '*FailingWorseTest'
 {% endhighlight %}
-</notextile>
 
 Note that we're always using the package qualified class name, and you can use star (@*@) to substitute for any set of characters.
 
 When tests fail, Buildr fails the @test@ task.  This is usually a good thing, but you can also tell Buildr to ignore failures by resetting the @:fail_on_failure@ option:
 
-<notextile>
 {% highlight ruby %}
 test.using :fail_on_failure=>false
 {% endhighlight %}
-</notextile>
 
 Besides giving you a free pass to ignore failures, you can use it for other causes, for example, to be somewhat forgiving:
 
-<notextile>
 {% highlight ruby %}
 test do
   fail 'More than 3 tests failed!' if test.failed_tests.size > 3
 end
 {% endhighlight %}
-</notextile>
 
 The @failed_tests@ collection holds the names of all classes with failed tests. And there's @classes@, which holds the names of all test classes.  Ruby arithmetic allows you to get the name of all passed test classes with a simple @test.classes – test.failed_tests@.  We'll let you imagine creative use for these two.
 
@@ -67,56 +59,50 @@ h2(#running). Running Tests
 
 It's a good idea to run tests every time you change the source code, so we wired the @build@ task to run the @test@ task at the end of the build.  And conveniently enough, the @build@ task is the default task, so another way to build changes in your code and run your tests:
 
-<notextile>
 {% highlight sh %}
 $ buildr
 {% endhighlight %}
-</notextile>
 
 That only works with the local @build@ task and any local task that depends on it, like @package@, @install@ and @upload@.  Each project also has its own @build@ task that does not invoke the @test@ task, so @buildr build@ will run the tests cases, but @buildr foo:build@ will not.
 
 While it's a good idea to always run your tests, it's not always possible. There are two ways you can get @build@ to not run the @test@ task.  You can set the environment variable @test@ to @no@ (but @skip@ and @off@ will also work). You can do that when running Buildr:
 
-<notextile>
 {% highlight sh %}
 $ buildr test=no
 {% endhighlight %}
-</notextile>
 
 Or set it once in your environment:
 
-<notextile>
 {% highlight sh %}
 $ export TEST=no
 $ buildr
 {% endhighlight %}
-</notextile>
 
 If you're feeling really adventurous, you can also disable tests from your Buildfile or @buildr.rb@ file, by setting @options.test = false@. We didn't say it's a good idea, we're just giving you the option.
 
 The @test@ task is just smart enough to run all the tests it finds, but will accept include/exclude patterns.  Often enough you're only working on one broken test and you only want to run that one test.  Better than changing your Buildfile, you can run the @test@ task with a pattern.  For example:
 
-<notextile>
 {% highlight sh %}
 $ buildr test:KillerAppTest
 {% endhighlight %}
-</notextile>
 
 Buildr will then run only tests that match the pattern @KillerAppTest@.  It uses pattern matching, so @test:Foo@ will run @com.acme.FooTest@ and @com.acme.FooBarTest@.  With Java, you can use this to pick a class name, or a package name to run all tests in that package, or any such combination.  In fact, you can specify several patterns separated with commas.  For example:
 
-<notextile>
 {% highlight sh %}
 $ buildr test:FooTest,BarTest
 {% endhighlight %}
-</notextile>
+
+Buildr forcefully runs all tests that match the pattern.  If you want to re-run all tests even if your sources have not changed, you can execute:
+
+{% highlight sh %}
+$ buildr test:*
+{% endhighlight %}
 
 As you probably noticed, Buildr will stop your build at the first test that fails.  We think it's a good idea, except when it's not.  If you're using a continuous build system, you'll want a report of all the failed tests without stopping at the first failure.  To make that happen, set the environment variable @test@ to "all", or the Buildr @options.test@ option to @:all@.  For example:
 
-<notextile>
 {% highlight sh %}
 $ buildr package test=all
 {% endhighlight %}
-</notextile>
 
 We're using @package@ and not @build@ above.  When using a continuous build system, you want to make sure that packages are created, contain the right files, and also run the integration tests.
 
@@ -129,29 +115,23 @@ In contrast, integration tests are run with a number of components, in an enviro
 
 You write integration tests much the same way as you write unit tests, using @test.compile@ and @test.resources@.  However, you need to tell Buildr that your tests will execute during integration test.  To do so, add the following line in your project definition:
 
-<notextile>
 {% highlight ruby %}
 test.using :integration
 {% endhighlight %}
-</notextile>
 
 Typically you'll use unit tests in projects that create internal modules, such as JARs, and integration tests in projects that create components, such as WARs and EARs.  You only need to use the @:integration@ option with the later.
 
 To run integration tests on the current project:
 
-<notextile>
 {% highlight sh %}
 $ buildr integration
 {% endhighlight %}
-</notextile>
 
 You can also run specific tests cases, for example:
 
-<notextile>
 {% highlight sh %}
 $ buildr integration:ClientTest
 {% endhighlight %}
-</notextile>
 
 If you run the @package@ task (or any task that depends on it, like @install@ and @upload@), Buildr will first run the @build@ task and all its unit tests, and then create the packages and run the integration tests.  That gives you full coverage for your tests and ready to release packages.  As with unit tests, you can set the environment variable @test@ to "no" to skip integration tests, or "all" to ignore failures.
 
@@ -162,12 +142,10 @@ Some tests need you to setup an environment before they run, and tear it down af
 
 Integration tests run a setup task before the tests, and a teardown task afterwards.  You can use this task to setup a Web server for testing your Web components, or a database server for testing persistence.  You can access either task by calling @integration.setup@ and @integration.teardown@.  For example:
 
-<notextile>
 {% highlight ruby %}
 integration.setup { server.start ; server.deploy }
 integration.teardown { server.stop }
 {% endhighlight %}
-</notextile>
 
 Depending on your build, you may want to enhance the setup/teardown tasks from within a project, for example, to populate the database with data used by that project's test, or from outside the project definition, for example, to start and stop the Web server.
 
@@ -182,7 +160,6 @@ Each project has a @check@ task that runs just after packaging.  You can use thi
 
 You use the @check@ method to express and expectation.  Buildr will then run all these expectations against your project, and fail at the first expectation that doesn't match.  An expectation says three things.  Let's look at a few examples:
 
-<notextile>
 {% highlight ruby %}
 check package(:war), 'should exist' do
   it.should exist
@@ -206,19 +183,16 @@ check file('target/classes/killerapp/Code.class'), 'should exist' do
   it.should exist
 end
 {% endhighlight %}
-</notextile>
 
 The first argument is the subject, or the project if you skip the first argument.  The second argument is the description, optional, but we recommend using it.  The method @it@ returns the subject.
 
 You can also write the first expectation like this:
 
-<notextile>
 {% highlight ruby %}
 check do
   package(:jar).should exist
 end
 {% endhighlight %}
-</notextile>
 
 We recommend using the subject and description, they make your build easier to read and maintain, and produce better error messages.
 

data/lib/buildr.rb

@@ -14,13 +14,14 @@
 # the License.
 
 module Buildr
-  VERSION = '1.3.4'.freeze
+  VERSION = '1.3.5'.freeze
 end
 
 require 'buildr/core'
 require 'buildr/packaging'
 require 'buildr/java'
 require 'buildr/ide'
+require 'buildr/shell'
 
 # Methods defined in Buildr are both instance methods (e.g. when included in Project)
 # and class methods when invoked like Buildr.artifacts().

data/lib/buildr/core.rb

@@ -14,6 +14,11 @@
 # the License.
 
 
+# TODO: Antwrap 0.7 requires this monkeypatch, have it fixed.
+class Array #:nodoc:
+  alias :nitems :size
+end
+
 require 'buildr/core/common'
 require 'buildr/core/application'
 require 'buildr/core/project'
@@ -23,6 +28,7 @@ require 'buildr/core/build'
 require 'buildr/core/filter'
 require 'buildr/core/compile'
 require 'buildr/core/test'
+require 'buildr/core/shell'
 require 'buildr/core/checks'
 require 'buildr/core/transports'
 require 'buildr/core/generate'

data/lib/buildr/core/application.rb

@@ -396,11 +396,6 @@ module Buildr
     def raw_load_buildfile # replaces raw_load_rakefile
       puts "(in #{Dir.pwd}, #{environment})" unless options.silent
       load File.expand_path(@rakefile) if @rakefile && @rakefile != ''
-      options.rakelib.each do |rlib|
-        glob("#{rlib}/*.rake") do |name|
-          add_import name
-        end
-      end
       load_imports
       Buildr.projects
     end
@@ -456,6 +451,8 @@ module Buildr
       files = [ File.expand_path('buildr.rb', ENV['HOME']), 'buildr.rb' ].select { |file| File.exist?(file) }
       files += [ File.expand_path('buildr.rake', ENV['HOME']), File.expand_path('buildr.rake') ].
         select { |file| File.exist?(file) }.each { |file| warn "Please use '#{file.ext('rb')}' instead of '#{file}'" }
+      files += (options.rakelib || []).collect { |rlib| Dir["#{rlib}/*.rake"] }.flatten
+
       files.each do |file|
         unless $LOADED_FEATURES.include?(file)
           load file

data/lib/buildr/core/build.rb

@@ -108,8 +108,7 @@ module Buildr
 
 
   module Git  #:nodoc:
-
-  module_function
+    module_function
 
     # :call-seq:
     #   git(*args)
@@ -127,7 +126,7 @@ module Buildr
 
     # Returns list of uncommited/untracked files as reported by git status.
     def uncommitted_files
-      `git status`.scan(/^#\s{7}(\S.*)$/).map { |match| match.first.split.last }
+      `git status`.scan(/^#(\t|\s{7})(\S.*)$/).map { |match| match.last.split.last }
     end
 
     # Commit the given file with a message.
@@ -148,23 +147,19 @@ module Buildr
     # Return the name of the remote repository whose branch the current local branch tracks,
     # or nil if none.
     def remote(branch = current_branch)
-      remote = git('config', '--get', "branch.#{branch}.remote").strip
-      remote if git('remote').include?(remote)
-    rescue
-      nil
+      remote = git('config', '--get', "branch.#{branch}.remote").to_s.strip
+      remote if !remote.empty? && git('remote').include?(remote)
     end
 
     # Return the name of the current branch
     def current_branch
       git('branch')[/^\* (.*)$/, 1]
     end
-
   end
 
 
   module Svn #:nodoc:
-
-  module_function
+    module_function
 
     # :call-seq:
     #   svn(*args)
@@ -246,6 +241,15 @@ module Buildr
         @list ||= []
       end
 
+      # Finds and returns the Release instance for this project.
+      def find
+        unless @release
+          klass = list.detect { |impl| impl.applies_to? }
+          @release = klass.new if klass
+        end
+        @release
+      end
+
     end
  
     # Use this to specify a different tag name for tagging the release in source control.
@@ -307,7 +311,7 @@ module Buildr
     # for the release buildfile.
     def with_release_candidate_version
       release_candidate_buildfile = Buildr.application.buildfile.to_s + '.next'
-      release_candidate_buildfile_contents = change_version { |version| version[-1] = version[-1].to_i }
+      release_candidate_buildfile_contents = change_version { |version| version[-1] = version[-1].split('-')[0] }
       File.open(release_candidate_buildfile, 'w') { |file| file.write release_candidate_buildfile_contents }
       begin
         yield release_candidate_buildfile
@@ -344,7 +348,7 @@ module Buildr
 
     # Move the version to next and save the updated buildfile
     def update_buildfile
-      buildfile = change_version { |version| version[-1] = (version[-1].to_i + 1).to_s + '-SNAPSHOT' }
+      buildfile = change_version { |version| version[-1] = sprintf("%0#{version[-1].size}d", version[-1].to_i + 1) + '-SNAPSHOT' }
       File.open(Buildr.application.buildfile.to_s, 'w') { |file| file.write buildfile }
     end
 
@@ -364,8 +368,14 @@ module Buildr
 
   class GitRelease < Release
     class << self
-      def applies_to?(directory = '.')
-        File.exist? File.join(directory, '.git/config')
+      def applies_to?
+        if File.exist? '.git/config'
+          true
+        else
+          File.expand_path(Dir.pwd) != '/' && Dir.chdir('..') do
+            applies_to?
+          end
+        end
       end
     end
 
@@ -402,8 +412,8 @@ module Buildr
 
   class SvnRelease < Release
     class << self
-      def applies_to?(directory = '.')
-        File.exist? File.join(directory, '.svn')
+      def applies_to?
+        File.exist?('.svn')
       end
     end
     
@@ -429,9 +439,9 @@ module Buildr
 
   desc 'Make a release'
   task 'release' do |task|
-    klass = Release.list.detect { |impl| impl.applies_to? }
-    fail 'Unable to detect the Version Control System.' unless klass
-    klass.new.make
+    release = Release.find
+    fail 'Unable to detect the Version Control System.' unless release
+    release.make
   end
 
 end

data/lib/buildr/core/compile.rb

@@ -122,7 +122,7 @@ module Buildr
         map = compile_map(sources, target)
         return false if map.empty?
         return true unless File.exist?(target.to_s)
-        source_files_not_yet_compiled = map.select { |source, target| !File.exist?(target) }
+        source_files_not_yet_compiled = map.select { |source, target| !File.exist?(target) }.to_a
         trace "Compile needed because source file #{source_files_not_yet_compiled[0][0]} has no corresponding #{source_files_not_yet_compiled[0][1]}" unless source_files_not_yet_compiled.empty?
         return true if map.any? { |source, target| !File.exist?(target) || File.stat(source).mtime > File.stat(target).mtime }
         oldest = map.map { |source, target| File.stat(target).mtime }.min
@@ -175,14 +175,32 @@ module Buildr
             FileList["#{source}/**/*.{#{ext_glob}}"].reject { |file| File.directory?(file) }.
               each { |file| map[file] = File.join(target, Util.relative_path(file, source).ext(target_ext)) }
           else
-            map[source] = target # File.join(target, File.basename(source).ext(target_ext))
+            # try to extract package name from .java or .scala files
+            if ['.java', '.scala', '.groovy'].include? File.extname(source)
+              package = findFirst(source, /^\s*package\s+(\S+)\s*;?\s*$/)
+              map[source] = package ? File.join(target, package[1].gsub('.', '/'), File.basename(source).ext(target_ext)) : target
+            elsif
+              map[source] = target
+            end
           end
           map
         end
       end
+
+    private
       
-    end
+      def findFirst(file, pattern)
+        match = nil
+        File.open(file, "r") do |infile|
+          while (line = infile.gets)
+            match = line.match(pattern)
+            break if match
+          end
+        end
+        match
+      end
 
+    end
   end
 
 
@@ -244,7 +262,7 @@ module Buildr
     #
     # For example:
     #   compile.from('src/java').into('classes').with('module1.jar')
-    def from(*sources)  
+    def from(*sources)
       @sources |= sources.flatten
       guess_compiler if @compiler.nil? && sources.flatten.any? { |source| File.exist?(source) }
       self

data/lib/buildr/core/filter.rb

@@ -285,7 +285,7 @@ module Buildr
           @config = configurer.call(*args, &block)
         else
           raise ArgumentError, "Missing hash argument after :#{mapper_type}" unless args.size == 1 && Hash === args[0]
-          @config = *args
+          @config = args.first
         end
         @mapper_type = mapper_type
       end
@@ -312,10 +312,8 @@ module Buildr
       
       def erb_transform(content, path = nil)
         case config
-        when Binding, Proc
+        when Binding
           bnd = config
-        when Method
-          bnd = config.to_proc
         when Hash
           bnd = OpenStruct.new
           table = config.inject({}) { |h, e| h[e.first.to_sym] = e.last; h }

data/lib/buildr/core/project.rb

@@ -222,7 +222,7 @@ module Buildr
             @on_define.each { |callback| callback[project] }
           end if @on_define
           # Enhance the project using the definition block.
-          project.enhance { project.instance_eval &block } if block
+          project.enhance { project.instance_exec project, &block } if block
 
           # Top-level project? Invoke the project definition. Sub-project? We don't invoke
           # the project definiton yet (allow project calls to establish order of evaluation),
@@ -317,11 +317,12 @@ module Buildr
       #
       # The optional block is called with the project name when the task executes
       # and returns a message that, for example "Building project #{name}".
-      def local_task(args, &block)
-        task args do |task|
+      def local_task(*args, &block)
+        task *args do |task, args|
+          args = task.arg_names.map {|n| args[n]}
           local_projects do |project|
             info block.call(project.name) if block
-            task("#{project.name}:#{task.name}").invoke
+            task("#{project.name}:#{task.name}").invoke *args
           end
         end
       end

data/lib/buildr/core/shell.rb

@@ -0,0 +1,198 @@
+# 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'
+require 'buildr/java/commands'
+require 'buildr/core/util'
+
+module Buildr
+  module Shell
+
+    class BeanShell < Base
+      
+      include JavaRebel
+      
+      VERSION = '2.0b4'
+
+      class << self
+        def version
+          Buildr.settings.build['bsh'] || VERSION
+        end
+        
+        def artifact
+          "org.beanshell:bsh:jar:#{version}"
+        end
+        
+        def lang
+          :java
+        end
+        
+        def to_sym
+          :bsh
+        end
+      end
+      
+      def launch
+        cp = project.compile.dependencies + [project.path_to(:target, :classes), Buildr.artifact(BeanShell.artifact)]
+        Java::Commands.java 'bsh.Console', {
+          :properties => rebel_props(project),
+          :classpath => cp,
+          :java_args => rebel_args
+        }
+      end
+      
+    end # BeanShell
+
+        
+    class JIRB < Base
+      include JavaRebel
+      
+      JRUBY_VERSION = '1.3.1'
+      
+      class << self        
+        def lang
+          :none
+        end
+      end
+      
+      def launch
+        if jruby_home     # if JRuby is installed, use it
+          cp = project.compile.dependencies + 
+            [project.path_to(:target, :classes)] +
+            Dir.glob("#{jruby_home}#{File::SEPARATOR}lib#{File::SEPARATOR}*.jar")
+          
+          props = {
+            'jruby.home' => jruby_home,
+            'jruby.lib' => "#{jruby_home}#{File::SEPARATOR}lib"
+          }
+          
+          if not Util.win_os?
+            uname = `uname -m`
+            cpu = if uname =~ /i[34567]86/
+              'i386'
+            elsif uname == 'i86pc'
+              'x86'
+            elsif uname =~ /amd64|x86_64/
+              'amd64'
+            end
+            
+            os = `uname -s | tr '[A-Z]' '[a-z]'`
+            path = if os == 'darwin'
+              'darwin'
+            else
+              "#{os}-#{cpu}"
+            end
+            
+            props['jna.boot.library.path'] = "#{jruby_home}/lib/native/#{path}"
+          end
+          
+          props['jruby.script'] = if Util.win_os? then 'jruby.bat' else 'jruby' end
+          props['jruby.shell'] = if Util.win_os? then 'cmd.exe' else '/bin/sh' end
+          
+          args = [
+            "-Xbootclasspath/a:#{Dir.glob("#{jruby_home}#{File::SEPARATOR}lib#{File::SEPARATOR}jruby*.jar").join File::PATH_SEPARATOR}"
+          ]
+          
+          Java::Commands.java 'org.jruby.Main', "#{jruby_home}#{File::SEPARATOR}bin#{File::SEPARATOR}jirb", {
+            :properties => props.merge(rebel_props(project)),
+            :classpath => cp,
+            :java_args => args + rebel_args
+          }
+        else
+          cp = project.compile.dependencies + [
+              jruby_artifact,
+              project.path_to(:target, :classes)
+            ]
+          
+          Java::Commands.java 'org.jruby.Main', '--command', 'irb', {
+            :properties => rebel_props(project),
+            :classpath => cp,
+            :java_args => rebel_args
+          }
+        end
+      end
+    private
+      def jruby_home
+        @jruby_home ||= RUBY_PLATFORM =~ /java/ ? Config::CONFIG['prefix'] : ENV['JRUBY_HOME']
+      end
+
+      def jruby_artifact
+        version = Buildr.settings.build['jruby'] || JRUBY_VERSION
+        "org.jruby:jruby-complete:jar:#{version}"
+      end
+    
+    end
+    
+    class Clojure < Base
+      include JavaRebel
+      
+      JLINE_VERSION = '0.9.94'
+      
+      class << self
+        def lang
+          :none
+        end
+        
+        def to_sym
+          :clj      # more common than `clojure`
+        end
+      end
+      
+      # don't build if it's *only* Clojure sources
+      def build?
+        !has_source?(:clojure) or has_source?(:java) or has_source?(:scala) or has_source?(:groovy)
+      end
+      
+      def launch
+        fail 'Are we forgetting something? CLOJURE_HOME not set.' unless clojure_home
+        
+        cp = project.compile.dependencies + 
+          [
+            if build?
+              project.path_to(:target, :classes)
+            else
+              project.path_to(:src, :main, :clojure)
+            end,
+            File.expand_path('clojure.jar', clojure_home),
+            'jline:jline:jar:0.9.94'
+          ]
+        
+        if build?
+          Java::Commands.java 'jline.ConsoleRunner', 'clojure.lang.Repl', {
+            :properties => rebel_props(project),
+            :classpath => cp,
+            :java_args => rebel_args
+          }
+        else
+          Java::Commands.java 'jline.ConsoleRunner', 'clojure.lang.Repl', :classpath => cp
+        end
+      end
+      
+    private
+      def clojure_home
+        @home ||= ENV['CLOJURE_HOME']
+      end
+      
+      def has_source?(lang)
+        File.exists? project.path_to(:src, :main, lang)
+      end
+    end
+  end
+end
+
+Buildr::ShellProviders << Buildr::Shell::BeanShell
+Buildr::ShellProviders << Buildr::Shell::JIRB
+Buildr::ShellProviders << Buildr::Shell::Clojure