buildr 1.3.5 → 1.4.0

data/lib/buildr/scala/doc.rb

@@ -0,0 +1,106 @@
+# 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/core/doc'
+require 'buildr/scala/compiler'   # ensure Scala dependencies are ready
+
+module Buildr
+  module Doc
+    class Scaladoc < Base
+      specify :language => :scala, :source_ext => 'scala'
+
+      def generate(sources, target, options = {})
+        cmd_args = [ '-d', target, Buildr.application.options.trace ? '-verbose' : '' ]
+        options.reject { |key, value| [:sourcepath, :classpath].include?(key) }.
+          each { |key, value| value.invoke if value.respond_to?(:invoke) }.
+          each do |key, value|
+            case value
+            when true, nil
+              cmd_args << "-#{key}"
+            when false
+              cmd_args << "-no#{key}"
+            when Hash
+              value.each { |k,v| cmd_args << "-#{key}" << k.to_s << v.to_s }
+            else
+              cmd_args += Array(value).map { |item| ["-#{key}", item.to_s] }.flatten
+            end
+          end
+        [:sourcepath, :classpath].each do |option|
+          Array(options[option]).flatten.tap do |paths|
+            cmd_args << "-#{option}" << paths.flatten.map(&:to_s).join(File::PATH_SEPARATOR) unless paths.empty?
+          end
+        end
+        cmd_args += sources.flatten.uniq
+        unless Buildr.application.options.dryrun
+          info "Generating Scaladoc for #{project.name}"
+          trace (['scaladoc'] + cmd_args).join(' ')
+          Java.load
+          Java.scala.tools.nsc.ScalaDoc.main(cmd_args.to_java(Java.java.lang.String)) == 0 or
+            fail 'Failed to generate Scaladocs, see errors above'
+        end
+      end
+    end
+
+    class VScaladoc < Base
+      VERSION = '1.2-SNAPSHOT'
+      Buildr.repositories.remote << 'http://scala-tools.org/repo-snapshots'
+
+      class << self
+        def dependencies
+          [ "org.scala-tools:vscaladoc:jar:#{VERSION}" ]
+        end
+      end
+
+      Java.classpath << dependencies
+
+      specify :language => :scala, :source_ext => 'scala'
+
+      def generate(sources, target, options = {})
+        cmd_args = [ '-d', target, (Buildr.application.options.trace ? '-verbose' : ''),
+          '-sourcepath', project.compile.sources.join(File::PATH_SEPARATOR) ]
+        options.reject { |key, value| [:sourcepath, :classpath].include?(key) }.
+          each { |key, value| value.invoke if value.respond_to?(:invoke) }.
+          each do |key, value|
+            case value
+            when true, nil
+              cmd_args << "-#{key}"
+            when false
+              cmd_args << "-no#{key}"
+            when Hash
+              value.each { |k,v| cmd_args << "-#{key}" << k.to_s << v.to_s }
+            else
+              cmd_args += Array(value).map { |item| ["-#{key}", item.to_s] }.flatten
+            end
+          end
+        [:sourcepath, :classpath].each do |option|
+          Array(options[option]).flatten.tap do |paths|
+            cmd_args << "-#{option}" << paths.flatten.map(&:to_s).join(File::PATH_SEPARATOR) unless paths.empty?
+          end
+        end
+        cmd_args += sources.flatten.uniq
+        unless Buildr.application.options.dryrun
+          info "Generating VScaladoc for #{project.name}"
+          trace (['vscaladoc'] + cmd_args).join(' ')
+          Java.load
+          Java.org.scala_tools.vscaladoc.Main.main(cmd_args.to_java(Java.java.lang.String)) == 0 or
+            fail 'Failed to generate VScaladocs, see errors above'
+        end
+      end
+    end
+  end
+end
+
+Buildr::Doc.engines << Buildr::Doc::Scaladoc
+Buildr::Doc.engines << Buildr::Doc::VScaladoc

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

@@ -0,0 +1,57 @@
+/* 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;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.io.File;
+
+/**
+ * @author Daniel Spiewak
+ */
+public class SpecsSingletonRunner {
+  // Incompatible with JVM 1.4 target
+  // @throws(classOf[Throwable])
+  public static void main(String[] args) {
+      boolean colors = (args.length > 1 && args[1].equals("-c"));
+      String spec = colors ? args[2] : args[1];
+
+      run(args[0], colors, spec);
+  }
+
+  // Incompatible with JVM 1.4 target
+  // @throws(classOf[Throwable])
+  static void run(String path, boolean colors, String spec) {
+      try {
+          File parent = new File(path);
+          URL specURL = new File(parent, spec.replace('.', '/') + ".class").toURL();
+          URLClassLoader loader = new URLClassLoader(new URL[] { specURL }, Thread.currentThread().getContextClassLoader());
+
+          Class clazz = loader.loadClass(spec);
+          Object instance = clazz.getField("MODULE$").get(null);
+
+          Method main = clazz.getMethod("main", String[].class);
+
+          String[] args = colors ? new String[] { "-c" } : new String[] {};
+          main.invoke(instance, new Object[] { args });
+      } catch (Exception e) {
+          throw new RuntimeException(e);
+      }
+  }
+}

data/lib/buildr/scala/shell.rb

@@ -21,30 +21,35 @@ module Buildr
   module Scala
     class ScalaShell < Buildr::Shell::Base
       include Buildr::Shell::JavaRebel
-      
+
       class << self
         def lang
           :scala
         end
-        
+
         def to_sym
           :scala
         end
       end
-      
+
       def launch
-        cp = project.compile.dependencies + 
+        cp = project.compile.dependencies +
           Scalac.dependencies +
           [project.path_to(:target, :classes)]
-        
+
         props = {
-          'env.classpath' => cp.join(File::PATH_SEPARATOR),
           'scala.home' => Scalac.scala_home
         }
-        
-        Java::Commands.java 'scala.tools.nsc.MainGenericRunner', {
+
+        jline = [File.expand_path("lib/jline.jar", Scalac.scala_home)].find_all do |f|
+          File.exist? f
+        end
+
+        Java::Commands.java 'scala.tools.nsc.MainGenericRunner',
+                            '-cp', cp.join(File::PATH_SEPARATOR),
+        {
           :properties => props.merge(rebel_props(project)),
-          :classpath => cp,
+          :classpath => Scalac.dependencies + jline,
           :java_args => rebel_args
         }
       end

data/lib/buildr/scala/tests.rb

@@ -23,16 +23,20 @@ require 'buildr/java/tests'
 module Buildr::Scala
   # Scala::Check is available when using Scala::Test or Scala::Specs
   module Check
-    VERSION = '1.5'
-    
+    VERSION = '1.6'
+
     class << self
       def version
         Buildr.settings.build['scala.check'] || VERSION
       end
-      
+
+      def classifier
+        Buildr.settings.build['scala.check.classifier'] || ""
+      end
+
       def dependencies
-        ["org.scala-tools.testing:scalacheck:jar:#{version}"]
-      end  
+        ["org.scala-tools.testing:scalacheck:jar:#{classifier}:#{version}"]
+      end
 
     private
       def const_missing(const)
@@ -42,8 +46,8 @@ module Buildr::Scala
       end
     end
   end
-  
-  
+
+
   # ScalaTest framework, the default test framework for Scala tests.
   #
   # Support the following options:
@@ -52,36 +56,36 @@ module Buildr::Scala
   # * :java_args   -- Arguments passed as is to the JVM.
   class ScalaTest < Buildr::TestFramework::Java
 
-    VERSION = '0.9.5'
+    VERSION = '1.0.1'
 
     class << self
       def version
         Buildr.settings.build['scala.test'] || VERSION
       end
-      
+
       def dependencies
-        ["org.scala-tools.testing:scalatest:jar:#{version}"] + Check.dependencies + 
+        ["org.scalatest:scalatest:jar:#{version}"] + Check.dependencies +
           JMock.dependencies + JUnit.dependencies
-      end  
+      end
 
       def applies_to?(project) #:nodoc:
         !Dir[project.path_to(:source, :test, :scala, '**/*.scala')].empty?
-      end 
-      
+      end
+
     private
       def const_missing(const)
         return super unless const == :REQUIRES # TODO: remove in 1.5
         Buildr.application.deprecated "Please use Scala::Test.dependencies/.version instead of ScalaTest::REQUIRES/VERSION"
         dependencies
       end
-    end          
+    end
 
     # annotation-based group inclusion
     attr_accessor :group_includes
-    
+
     # annotation-based group exclusion
     attr_accessor :group_excludes
-    
+
     def initialize(test_task, options)
       super
       @group_includes = []
@@ -100,7 +104,8 @@ module Buildr::Scala
       scalatest.each do |suite|
         info "ScalaTest #{suite.inspect}"
         # Use Ant to execute the ScalaTest task, gives us performance and reporting.
-        reportFile = File.join(task.report_to.to_s, "TEST-#{suite}.txt")
+        reportDir = task.report_to.to_s
+        reportFile = File.join(reportDir, "TEST-#{suite}.txt")
         taskdef = Buildr.artifacts(self.class.dependencies).each(&:invoke).map(&:to_s)
         Buildr.ant('scalatest') do |ant|
           ant.taskdef :name=>'scalatest', :classname=>'org.scalatest.tools.ScalaTestTask',
@@ -109,42 +114,44 @@ module Buildr::Scala
             ant.suite    :classname=>suite
             ant.reporter :type=>'stdout', :config=>reporter_options
             ant.reporter :type=>'file', :filename=> reportFile, :config=>reporter_options
+            ant.reporter :type=>(ScalaTest.version == "1.0") ? "xml" : "junitxml",
+                         :directory=> reportDir, :config=>reporter_options
             # TODO: This should be name=>value pairs!
             #ant.includes group_includes.join(" ") if group_includes
             #ant.excludes group_excludes.join(" ") if group_excludes
-            (options[:properties] || []).each { |name, value| ant.property :name=>name, :value=>value }
+            (options[:properties] || []).each { |name, value| ant.config :name=>name, :value=>value }
           end
         end
-        
+
         # Parse for failures, errors, etc.
         # This is a bit of a pain right now because ScalaTest doesn't flush its
-        # output synchronously before the Ant test finishes so we have to loop 
-        # and wait for an indication that the test run was completed. 
+        # output synchronously before the Ant test finishes so we have to loop
+        # and wait for an indication that the test run was completed.
         failed = false
         completed = false
         wait = 0
         while (!completed) do
           File.open(reportFile, "r") do |input|
             while (line = input.gets) do
-              failed = (line =~ /(TESTS? FAILED -)|(RUN STOPPED)|(RUN ABORTED)/) unless failed
-              completed |= (line =~ /Run completed\./)
+              failed = (line =~ /(TESTS? FAILED)|(RUN STOPPED)|(RUN ABORTED)/) unless failed
+              completed |= (line =~ /Run completed/)
               break if (failed)
             end
           end
           wait += 1
-          break if (failed || wait > 10) 
+          break if (failed || wait > 10)
           unless completed
             sleep(1)
           end
         end
         success << suite if (completed && !failed)
       end
-      
+
       success
     end # run
 
   end # ScalaTest
-  
+
 end
 
 

data/lib/buildr/scala.rb

@@ -20,6 +20,7 @@ Buildr.repositories.remote << 'http://scala-tools.org/repo-releases'
 require 'buildr/scala/compiler'
 require 'buildr/scala/tests'
 require 'buildr/scala/bdd'
+require 'buildr/scala/doc'
 require 'buildr/scala/shell'
 
 Object::Scala = Buildr::Scala

data/lib/buildr/shell.rb

@@ -19,7 +19,7 @@ module Buildr
     class << self
       def add(p)
         @providers ||= {}
-        
+
         if p.lang == :none
           @providers[:none] ||= []
           @providers[:none] << p
@@ -28,11 +28,11 @@ module Buildr
         end
       end
       alias :<< :add
-      
+
       def providers
         @providers ||= {}
       end
-      
+
       def each
         providers.each do |lang, p|
           if lang == :none
@@ -46,51 +46,51 @@ module Buildr
       end
     end
   end
-  
+
   module Shell
     class Base
       attr_reader :project
-      
+
       class << self
         def lang
           :none
         end
-        
+
         def to_sym
           @symbol ||= name.split('::').last.downcase.to_sym
         end
       end
-      
+
       def initialize(project)
         @project = project
       end
-      
+
       def build?
         true
       end
-      
+
       def launch
         fail 'Not implemented'
       end
     end
-    
+
     module JavaRebel
       def rebel_home
         unless @rebel_home
-          @rebel_home = ENV['REBEL_HOME'] or ENV['JAVA_REBEL'] or ENV['JAVAREBEL'] or ENV['JAVAREBEL_HOME']
-          
+          @rebel_home = ENV['REBEL_HOME'] or ENV['JREBEL'] or ENV['JREBEL_HOME']
+
           if @rebel_home and File.directory? @rebel_home
-            @rebel_home += File::SEPARATOR + 'javarebel.jar'
+            @rebel_home += File::SEPARATOR + 'jrebel.jar'
           end
         end
-        
+
         if @rebel_home and File.exists? @rebel_home
           @rebel_home
         else
           nil
         end
       end
-      
+
       def rebel_args
         if rebel_home
           [
@@ -101,44 +101,44 @@ module Buildr
           []
         end
       end
-      
+
       def rebel_props(project)
         {}
       end
     end
   end
-  
+
   module ShellExtension
     include Extension
-    
+
     first_time do
       Project.local_task 'shell'
-      
+
       ShellProviders.each { |p| Project.local_task "shell:#{p.to_sym}" }    # TODO  not working
     end
-    
-    before_define do |project|
+
+    before_define(:shell => :compile) do |project|
       ShellProviders.each do |p|
         name = p.to_sym
-        
+
         trace "Defining task #{project.name}:shell:#{name}"
-        
+
         p_inst = p.new project
         deps = if p_inst.build? then [:compile] else [] end
-        
+
         project.task "shell:#{name}" => deps do
           trace "Launching #{name} shell"
           p_inst.launch
         end
       end
     end
-    
-    after_define do |project|
+
+    after_define(:shell => :compile) do |project|
       default_shell = project.shell.using
-      
+
       if default_shell
         dep = "shell:#{default_shell.to_sym}"
-        
+
         trace "Defining task shell based on #{dep}"
         project.task :shell => dep
       else
@@ -147,12 +147,12 @@ module Buildr
         end
       end
     end
-    
+
     class ShellConfig
       def initialize(project)
         @project = project
       end
-      
+
       def using(*args)
         if args.size > 0
           @using ||= args.first
@@ -160,20 +160,20 @@ module Buildr
           @using ||= find_shell_task
         end
       end
-      
+
     private
       def find_shell_task
         lang = @project.compile.language
         ShellProviders.providers[lang]
       end
     end
-    
+
     # TODO  temporary hack
     def shell
       @shell ||= ShellConfig.new self
     end
   end
-  
+
   class Project
     include ShellExtension
   end

data/lib/buildr.rb

@@ -14,7 +14,7 @@
 # the License.
 
 module Buildr
-  VERSION = '1.3.5'.freeze
+  VERSION = '1.4.0'.freeze
 end
 
 require 'buildr/core'

data/rakelib/all-in-one.rake

@@ -0,0 +1,113 @@
+# 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.
+
+desc "Create JRuby all-in-one distribution"
+task "all-in-one" => 'all-in-one:all-in-one' 
+
+namespace :'all-in-one' do
+  
+  version = "1.5.1"
+  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,
+      # Download and extract JRuby
+      :download_and_extract,
+      # Cleanup JRuby distribution
+      :clean_dist,
+      # Install Buildr gem and dependencies
+      :install_dependencies,
+      # Add Buildr executables/scripts
+      :add_execs,
+      # Package distribution
+      :package
+    ]
+
+  desc 'Prepare to run'
+  task :prepare do
+    mkpath '_all-in-one'
+    cd '_all-in-one'
+  end
+
+  desc 'Download and extract JRuby'
+  task :download_and_extract do
+    unless File.exist? jruby_distro
+      puts "Downloading JRuby from #{url} ..."
+      sh 'wget', url
+      puts "[X] Downloaded JRuby"
+    end
+
+    rm_rf dir if File.exist? dir
+
+    puts "Extracting JRuby to #{dir} ..."
+    sh 'tar', 'xzf', jruby_distro
+    puts "[X] Extracted JRuby"
+    cd dir
+  end
+
+  desc 'Cleanup JRuby distribution'
+  task :clean_dist do
+    puts 'Cleaning...'
+    rm_rf 'docs'
+    mkpath 'jruby-docs'
+    mv Dir["COPYING*"], 'jruby-docs'
+    mv Dir["LICENSE*"], 'jruby-docs'
+    mv 'README', 'jruby-docs'
+    rm_rf 'lib/ruby/1.9'
+    rm_rf 'lib/ruby/gems/1.8/doc'
+    rm_rf 'samples'
+    rm_rf 'share'
+  end
+  
+  desc 'Install Buildr gem and dependencies'
+  task :install_dependencies do
+    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}"
+    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' }

data/rakelib/checks.rake

@@ -18,7 +18,7 @@ desc "Check that source files contain the Apache license"
 task :license=>FileList["**/*.{rb,rake,java,gemspec,buildfile}", 'Rakefile'] do |task|
   puts "Checking that files contain the Apache license ... "
   required = task.prerequisites.select { |fn| File.file?(fn) }
-  missing = required.reject { |fn| 
+  missing = required.reject { |fn|
     comments = File.read(fn).scan(/(\/\*(.*?)\*\/)|^#\s+(.*?)$|^-#\s+(.*?)$|<!--(.*?)-->/m).
       map { |match| match.compact }.flatten.join("\n")
     comments =~ /Licensed to the Apache Software Foundation/ && comments =~ /http:\/\/www.apache.org\/licenses\/LICENSE-2.0/