buildr 1.4.6-java → 1.4.7-java

data/lib/buildr/scala/bdd.rb

@@ -13,12 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-require 'buildr/core/build'
-require 'buildr/core/compile'
-require 'buildr/java/bdd'
-require 'buildr/scala/tests'
-
 module Buildr::Scala
 
   # Specs is a Scala based BDD framework.
@@ -35,13 +29,12 @@ module Buildr::Scala
     VERSION = case
       when Buildr::Scala.version?("2.8.0")
         '1.6.5'
-      when Buildr::Scala.version?("2.8.1")
+      when Buildr::Scala.version?("2.8.1"), Buildr::Scala.version?("2.8.2"), Buildr::Scala.version?("2.9.0")
         '1.6.8'
       else
-        '1.6.8'
+        '1.6.9'
     end
 
-
     class << self
       def version
         custom = Buildr.settings.build['scala.specs']
@@ -61,14 +54,17 @@ module Buildr::Scala
         unless @dependencies
           super
           # Add utility classes (e.g. SpecsSingletonRunner) and other dependencies
-          @dependencies |= [ File.join(File.dirname(__FILE__)) ] + specs +
+          @dependencies |= [ File.join(File.dirname(__FILE__)) ] +
+                           specs +
                            Check.dependencies + JUnit.dependencies + Scalac.dependencies
         end
         @dependencies
       end
 
       def applies_to?(project)  #:nodoc:
-        !Dir[project.path_to(:source, bdd_dir, lang, '**/*.scala')].empty?
+        scala_files = Dir[project.path_to(:source, bdd_dir, lang, '**/*.scala')]
+        return false if scala_files.empty?
+        scala_files.detect { |f| find(f, /\s+(org\.specs\.)/) }
       end
 
     private
@@ -77,6 +73,15 @@ module Buildr::Scala
         Buildr.application.deprecated "Please use Scala::Specs.dependencies/.version instead of ScalaSpecs::REQUIRES/VERSION"
         dependencies
       end
+
+      def find(file, pattern)
+        File.open(file, "r") do |infile|
+          while (line = infile.gets)
+            return true if line.match(pattern)
+          end
+        end
+        false
+      end
     end
 
     def initialize(task, options) #:nodoc:
@@ -121,6 +126,117 @@ module Buildr::Scala
       end
     end
   end
+
+  class Specs2 < Buildr::TestFramework::JavaBDD
+    @lang = :scala
+    @bdd_dir = :spec
+
+    VERSION = case
+      when Buildr::Scala.version?("2.8.0"),  Buildr::Scala.version?("2.8.1"), Buildr::Scala.version?("2.8.2")
+        '1.5'
+      else
+        '1.6.1'
+    end
+
+    class << self
+      def version
+        custom = Buildr.settings.build['scala.specs2']
+        (custom =~ /:/) ? Buildr.artifact(custom).version : VERSION
+      end
+
+      def specs
+        custom = Buildr.settings.build['scala.specs2']
+        [ (custom =~ /:/) ? custom : "org.specs2:#{artifact}:jar:#{version}" ]
+      end
+
+      def artifact
+        Buildr.settings.build['scala.specs2.artifact'] || "specs2_#{Buildr::Scala.version_without_build}"
+      end
+
+      def scalaz_dependencies
+        if Buildr::Scala.version?("2.8")
+          []
+        else
+          default_version = "6.0.1"
+          custom_version = Buildr.settings.build['scala.specs2-scalaz']
+          version = (custom_version =~ /:/) ? Buildr.artifact(custom_version).version : default_version
+
+          artifact = Buildr.settings.build['scala.specs2-scalaz.artifact'] || "specs2-scalaz-core_#{Buildr::Scala.version_without_build}"
+
+          custom_spec = Buildr.settings.build['scala.specs2-scalaz']
+          spec = [ (custom_spec =~ /:/) ? custom_spec : "org.specs2:#{artifact}:jar:#{version}" ]
+          Buildr.transitive(spec, :scopes => [nil, "compile", "runtime", "provided", "optional"], :optional => true)
+        end
+      end
+
+      def dependencies
+        unless @dependencies
+          super
+
+          # Add utility classes (e.g. SpecsSingletonRunner) and other dependencies
+          options = {
+            :scopes => [nil, "compile", "runtime", "provided", "optional"],
+            :optional => true
+          }
+          @dependencies |= [ File.join(File.dirname(__FILE__)) ] + Buildr.transitive(specs, options) +
+                             scalaz_dependencies + Check.dependencies + JUnit.dependencies +
+                             Scalac.dependencies
+        end
+        @dependencies
+      end
+
+      def applies_to?(project)  #:nodoc:
+        scala_files = Dir[project.path_to(:source, bdd_dir, lang, '**/*.scala')]
+        return false if scala_files.empty?
+        scala_files.detect { |f| find(f, /\s+(org\.specs2\.)/) }
+      end
+
+    private
+
+      def find(file, pattern)
+        File.open(file, "r") do |infile|
+          while (line = infile.gets)
+            return true if line.match(pattern)
+          end
+        end
+        false
+      end
+    end
+
+    def initialize(task, options) #:nodoc:
+      super
+
+      specs = task.project.path_to(:source, :spec, :scala)
+      task.compile.from specs if File.directory?(specs)
+
+      resources = task.project.path_to(:source, :spec, :resources)
+      task.resources.from resources if File.directory?(resources)
+    end
+
+    def tests(dependencies)
+      filter_classes(dependencies, :interfaces => ['org.specs2.Specification', 'org.specs2.mutable.Specification'])
+    end
+
+    def run(specs, dependencies)  #:nodoc:
+      properties = { "specs2.outDir" => task.compile.target.to_s }
+
+      cmd_options = { :properties => options[:properties].merge(properties),
+                      :java_args => options[:java_args],
+                      :classpath => dependencies,
+                      :name => false }
+
+      runner = 'org.apache.buildr.Specs2Runner'
+      specs.inject [] do |passed, spec|
+        begin
+          Java::Commands.java(runner, spec, cmd_options)
+        rescue => e
+          passed
+        else
+          passed << spec
+        end
+      end
+    end
+  end
 end
 
 # Backwards compatibility stuff.  Remove in 1.5.
@@ -129,3 +245,5 @@ module Buildr
 end
 
 Buildr::TestFramework << Buildr::Scala::Specs
+Buildr::TestFramework << Buildr::Scala::Specs2
+

data/lib/buildr/scala/compiler.rb

@@ -13,13 +13,8 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-require 'buildr/core/project'
-require 'buildr/core/common'
-require 'buildr/core/compile'
-require 'buildr/packaging'
-
 module Buildr::Scala
-  DEFAULT_VERSION = '2.9.0-1'
+  DEFAULT_VERSION = '2.9.1'
 
   class << self
 
@@ -216,8 +211,60 @@ module Buildr::Scala
       end
     end
 
+  protected
+
+    # :nodoc: see Compiler:Base
+    def compile_map(sources, target)
+      target_ext = self.class.target_ext
+      ext_glob = Array(self.class.source_ext).join(',')
+      sources.flatten.map{|f| File.expand_path(f)}.inject({}) do |map, source|
+        sources = if File.directory?(source)
+          FileList["#{source}/**/*.{#{ext_glob}}"].reject { |file| File.directory?(file) }
+        else
+          [source]
+        end
+
+        sources.each do |source|
+          # try to extract package name from .java or .scala files
+          if ['.java', '.scala'].include? File.extname(source)
+            name = File.basename(source).split(".")[0]
+            package = findFirst(source, /^\s*package\s+([^\s;]+)\s*;?\s*/)
+            packages = count(source, /^\s*package\s+([^\s;]+)\s*;?\s*/)
+            found = findFirst(source, /((trait)|(class)|(object))\s+(#{name})/)
+
+            # if there's only one package statement and we know the target name, then we can depend
+            # directly on a specific file, otherwise, we depend on the general target
+            if (found && packages == 1)
+              map[source] = package ? File.join(target, package[1].gsub('.', '/'), name.ext(target_ext)) : target
+            else
+              map[source] = target
+            end
+
+          elsif
+            map[source] = target
+          end
+        end
+
+        map.each do |key,value|
+          map[key] = first_file unless map[key]
+        end
+
+        map
+      end
+    end
+
   private
 
+    def count(file, pattern)
+      count = 0
+      File.open(file, "r") do |infile|
+        while (line = infile.gets)
+          count += 1 if line.match(pattern)
+        end
+      end
+      count
+    end
+
     def java_sources(sources)
       sources.flatten.map { |source| File.directory?(source) ? FileList["#{source}/**/*.java"] : source } .
         flatten.reject { |file| File.directory?(file) || File.extname(file) != '.java' }.map { |file| File.expand_path(file) }.uniq

data/lib/buildr/scala/doc.rb

@@ -13,9 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-require 'buildr/core/doc'
-require 'buildr/scala/compiler'   # ensure Scala dependencies are ready
-
 module Buildr
   module Doc
 
@@ -62,7 +59,12 @@ module Buildr
           trace (['scaladoc'] + cmd_args).join(' ')
           Java.load
           begin
-            Java.scala.tools.nsc.ScalaDoc.process(cmd_args.to_java(Java.java.lang.String))
+            if Scala.version?(2.7, 2.8)
+              Java.scala.tools.nsc.ScalaDoc.process(cmd_args.to_java(Java.java.lang.String))
+            else
+              scaladoc = Java.scala.tools.nsc.ScalaDoc.new
+              scaladoc.process(cmd_args.to_java(Java.java.lang.String))
+            end
           rescue => e
             fail 'Failed to generate Scaladocs, see errors above: ' + e
           end

data/lib/buildr/scala/org/apache/buildr/Specs2Runner.java

@@ -0,0 +1,38 @@
+/* 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.
+ */
+
+package org.apache.buildr;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+public class Specs2Runner {
+
+  public static void main(String[] args) {
+      try {
+          ClassLoader loader = Thread.currentThread().getContextClassLoader();
+          Class clazz = loader.loadClass("org.specs2.runner.ClassRunner");
+          Object instance = clazz.newInstance();
+          Method main = clazz.getMethod("main", String[].class);
+          main.invoke(instance, new Object[] { args });
+      } catch (Exception e) {
+          throw new RuntimeException(e);
+      }
+  }
+
+}
+
+

data/lib/buildr/scala/shell.rb

@@ -13,10 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-require 'buildr/shell'
-require 'buildr/java/commands'
-
 module Buildr
   module Scala
     class ScalaShell < Buildr::Shell::Base

data/lib/buildr/scala/tests.rb

@@ -13,14 +13,23 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+module Buildr::Scala
 
-require 'buildr/core/build'
-require 'buildr/core/compile'
-require 'buildr/java/ant'
-require 'buildr/java/tests'
+  # Mockito is available when running ScalaTest
+  module Mockito
+    VERSION = '1.8.5'
 
+    class << self
+      def version
+        Buildr.settings.build['scalatest-mockito'] || Buildr.settings.build['mockito'] || VERSION
+      end
+
+      def dependencies
+        @dependencies ||= ["org.mockito:mockito-all:jar:#{version}"]
+      end
+    end
+  end
 
-module Buildr::Scala
   # Scala::Check is available when using Scala::Test or Scala::Specs
   module Check
     VERSION = case
@@ -93,7 +102,7 @@ module Buildr::Scala
       end
 
       def dependencies
-        [specs] + Check.dependencies + JMock.dependencies + JUnit.dependencies
+        [specs] + Check.dependencies + JMock.dependencies + JUnit.dependencies + Mockito.dependencies
       end
 
       def applies_to?(project) #:nodoc:

data/lib/buildr/shell.rb

@@ -13,7 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
 module Buildr
   module Shell
     include Extension

data/lib/buildr/version.rb

@@ -14,5 +14,5 @@
 # the License.
 
 module Buildr
-  VERSION = '1.4.6'.freeze
+  VERSION = '1.4.7'.freeze
 end

data/rakelib/all-in-one.rake

@@ -14,15 +14,15 @@
 # the License.
 
 desc "Create JRuby all-in-one distribution"
-task "all-in-one" => 'all-in-one:all-in-one' 
+task "all-in-one" => 'all-in-one:all-in-one'
 
 namespace :'all-in-one' do
-  
-  version = "1.5.2"
+
+  version = "1.6.4"
   jruby_distro = "jruby-bin-#{version}.tar.gz"
   url = "http://jruby.org.s3.amazonaws.com/downloads/#{version}/#{jruby_distro}"
   dir = "jruby-#{version}"
-  
+
   task "all-in-one" => [:gem,
       # Prepare to run
       :prepare,
@@ -73,41 +73,50 @@ namespace :'all-in-one' do
     rm_rf 'samples'
     rm_rf 'share'
   end
-  
+
   desc 'Install Buildr gem and dependencies'
   task :install_dependencies do
+    puts "Install rubygems-update"
+    sh "bin/jruby -S gem install rubygems-update"
+
+    puts "Upgrade Rubygems"
+    sh "bin/jruby -S gem update --system"
+
+    puts "Install ffi-ncurses"
+    sh "bin/jruby -S gem install ffi-ncurses"
+
     puts "Install Buildr gem ..."
     sh "bin/jruby", '-S', 'gem', 'install', FileList['../../pkg/*-java.gem'].first,
        '--no-rdoc', '--no-ri'
     puts "[X] Install Buildr gem"
   end
-  
+
   desc 'Add Buildr executables/scripts'
   task :add_execs do
     cp 'bin/jruby.exe', 'bin/_buildr.exe'
     cp Dir["../../all-in-one/*"], 'bin'
   end
-  
+
   desc 'Package distribution'
   task :package do
     puts "Zipping distribution ..."
     cd '..'
-    new_dir  = "#{spec.name}-#{spec.version}"
+    new_dir  = "#{spec.name}-all-in-one-#{spec.version}"
     mv dir, new_dir
     zip = "#{new_dir}.zip"
     rm zip if File.exist? zip
     sh 'zip', '-q', '-r', zip, new_dir
     puts "[X] Zipped distribution"
-   
+
     puts "Tarring distribution ..."
     tar = "#{new_dir}.tar.gz"
     rm tar if File.exist? tar
     sh 'tar', 'czf', tar, new_dir
     puts "[X] Tarred distribution"
-    
+
     rm_rf new_dir
   end
-  
+
 end
 
 task(:clobber) { rm_rf '_all-in-one' }