buildr 1.3.4 → 1.3.5

data/lib/buildr/ide/eclipse/java.rb

@@ -0,0 +1,53 @@
+# 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/project'
+require 'buildr/core/common'
+
+module Buildr
+  module Eclipse
+    module Java
+      include Extension
+
+      NATURE    = 'org.eclipse.jdt.core.javanature'
+      CONTAINER = 'org.eclipse.jdt.launching.JRE_CONTAINER'
+      BUILDER    = 'org.eclipse.jdt.core.javabuilder'
+
+      after_define do |project|
+        eclipse = project.eclipse
+
+        # smart defaults
+        if project.compile.language == :java || project.test.compile.language == :java
+          eclipse.natures = NATURE if eclipse.natures.empty?
+          eclipse.classpath_containers = CONTAINER if eclipse.classpath_containers.empty?
+          eclipse.builders = BUILDER if eclipse.builders.empty?
+        end
+
+        # :java nature explicitly set
+        if eclipse.natures.include? :java
+          eclipse.natures += NATURE unless eclipse.natures.include? NATURE
+          eclipse.classpath_containers += CONTAINER unless eclipse.classpath_containers.include? CONTAINER
+          eclipse.builders += BUILDER unless eclipse.builders.include? BUILDER
+        end
+      end
+
+    end
+  end
+end
+
+class Buildr::Project
+  include Buildr::Eclipse::Java
+end

data/lib/buildr/ide/eclipse/plugin.rb

@@ -0,0 +1,68 @@
+# 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/project'
+require 'buildr/core/common'
+
+module Buildr
+  module Eclipse
+    module Plugin
+      include Extension
+
+      NATURE    = 'org.eclipse.pde.PluginNature'
+      CONTAINER = 'org.eclipse.pde.core.requiredPlugins'
+      BUILDERS   = ['org.eclipse.pde.ManifestBuilder', 'org.eclipse.pde.SchemaBuilder']
+
+      after_define do |project|
+        eclipse = project.eclipse
+
+        # smart defaults
+        if eclipse.natures.empty? && ((File.exists? project.path_to("plugin.xml")) || (File.exists? project.path_to("OSGI-INF")))
+          eclipse.natures = [NATURE, Buildr::Eclipse::Java::NATURE]
+          eclipse.classpath_containers = [CONTAINER, Buildr::Eclipse::Java::CONTAINER] if eclipse.classpath_containers.empty?
+          eclipse.builders = BUILDERS + [Buildr::Eclipse::Java::BUILDER] if eclipse.builders.empty?
+        end
+
+        # :plugin nature explicitly set
+        if eclipse.natures.include? :plugin
+          unless eclipse.natures.include? NATURE
+            # plugin nature must be before java nature
+            eclipse.natures += [Buildr::Eclipse::Java::NATURE] unless eclipse.natures.include? Buildr::Eclipse::Java::NATURE
+            index = eclipse.natures.index(Buildr::Eclipse::Java::NATURE) || -1
+            eclipse.natures = eclipse.natures.insert(index, NATURE)
+          end
+          unless eclipse.classpath_containers.include? CONTAINER
+            # plugin container must be before java container
+            index = eclipse.classpath_containers.index(Buildr::Eclipse::Java::CONTAINER) || -1
+            eclipse.classpath_containers = eclipse.classpath_containers.insert(index, CONTAINER)
+          end
+          unless (eclipse.builders.include?(BUILDER[0]) && eclipse.builders.include?(BUILDER[1]))
+            # plugin builder must be before java builder
+            index = eclipse.classpath_containers.index(Buildr::Eclipse::Java::BUILDER) || -1
+            eclipse.builders = eclipse.builders.insert(index, BUILDER[1]) unless eclipse.builders.include? BUILDER[1]
+            index = eclipse.classpath_containers.index(BUILDER[1]) || -1
+            eclipse.builders = eclipse.builders.insert(index, BUILDER[0]) unless eclipse.builders.include? BUILDER[0]
+          end
+        end
+      end
+
+    end
+  end
+end
+
+class Buildr::Project
+  include Buildr::Eclipse::Plugin
+end

data/lib/buildr/ide/eclipse/scala.rb

@@ -0,0 +1,66 @@
+# 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/project'
+require 'buildr/core/common'
+
+module Buildr
+  module Eclipse
+    module Scala
+      include Extension
+
+      NATURE    = 'ch.epfl.lamp.sdt.core.scalanature'
+      CONTAINER = 'ch.epfl.lamp.sdt.launching.SCALA_CONTAINER'
+      BUILDER   = 'ch.epfl.lamp.sdt.core.scalabuilder'
+
+      after_define do |project|
+        eclipse = project.eclipse
+
+        # smart defaults
+        if eclipse.natures.empty? && (project.compile.language == :scala || project.test.compile.language == :scala)
+          eclipse.natures = [NATURE, Buildr::Eclipse::Java::NATURE]
+          eclipse.classpath_containers = [CONTAINER, Buildr::Eclipse::Java::CONTAINER] if eclipse.classpath_containers.empty?
+          eclipse.builders = BUILDER if eclipse.builders.empty?
+        end
+
+        # :scala nature explicitly set
+        if eclipse.natures.include? :scala
+          unless eclipse.natures.include? NATURE
+            # scala nature must be before java nature
+            eclipse.natures += [Buildr::Eclipse::Java::NATURE] unless eclipse.natures.include? Buildr::Eclipse::Java::NATURE
+            index = eclipse.natures.index(Buildr::Eclipse::Java::NATURE) || -1
+            eclipse.natures = eclipse.natures.insert(index, NATURE)
+          end
+          unless eclipse.classpath_containers.include? CONTAINER
+            # scala container must be before java container
+            index = eclipse.classpath_containers.index(Buildr::Eclipse::Java::CONTAINER) || -1
+            eclipse.classpath_containers = eclipse.classpath_containers.insert(index, CONTAINER)
+          end
+          unless eclipse.builders.include? BUILDER
+            # scala builder overrides java builder
+            eclipse.builders -= [Buildr::Eclipse::Java::BUILDER]
+            eclipse.builders += [BUILDER]
+          end
+        end
+      end
+
+    end
+  end
+end
+
+class Buildr::Project
+  include Buildr::Eclipse::Scala
+end

data/lib/buildr/java/bdd.rb

@@ -48,7 +48,7 @@ module Buildr
   module TestFramework::JRubyBased
     extend self
 
-    VERSION = '1.1.6'
+    VERSION = '1.3.1'
 
     class << self
       def version
@@ -94,7 +94,7 @@ module Buildr
       
       Buildr.write(runner.file, runner.content)
       rm_f runner.result
-      
+
       if RUBY_PLATFORM[/java/] && !options.fork
         runtime = new_runtime
         runtime.getObject.java.lang.System.getProperties().putAll(options[:properties] || {})
@@ -109,7 +109,7 @@ module Buildr
       if Exception === result
         raise [result.message, result.backtrace].flatten.join("\n")
       end
-      result.succeeded
+      tests - result.failed
     end
 
     def jruby_home
@@ -201,9 +201,13 @@ module Buildr
       runner.gems ||= {}
       runner.rspec ||= ['--format', 'progress', '--format', "html:#{runner.html_report}"]
       runner.format.each { |format| runner.rspec << '--format' << format } if runner.format
-      runner.rspec.push '--format', "Buildr::TestFramework::TestResult::YamlFormatter:#{runner.result}"
+      runner.rspec.push '--format', "#{runner_formatter}:#{runner.result}"
       runner
-    end    
+    end
+    
+    def runner_formatter
+      "Buildr::TestFramework::TestResult::YamlFormatter"
+    end
     
   end
 
@@ -236,8 +240,7 @@ module Buildr
     end
 
     def tests(dependencies) #:nodoc:
-      Dir[task.project.path_to(:source, bdd_dir, lang, '**/*_spec.rb')].
-        select do |name| 
+      Dir[task.project.path_to(:source, bdd_dir, lang, '**/*_spec.rb')].select do |name| 
         selector = ENV['SPEC']
         selector.nil? || Regexp.new(selector) === name
       end
@@ -268,7 +271,8 @@ module Buildr
         argv.push *<%= tests.inspect %>
         parser.order!(argv)
         $rspec_options = parser.options
-        Buildr::TestFramework::TestResult::Error.guard('<%= runner.file %>') do
+        
+        Buildr::TestFramework::TestResult::Error.guard('<%= runner.result %>') do
           ::Spec::Runner::CommandLine.run($rspec_options)
         end
         exit 0 # let buildr figure the result from the yaml file
@@ -379,6 +383,10 @@ module Buildr
       Filter::Mapper.new(:erb, binding).transform(File.read(runner_erb), runner_erb)
     end
     
+    def runner_formatter
+      'Buildr::TestFramework::TestResult::JtestRYamlFormatter'
+    end
+    
   end
 
   

data/lib/buildr/java/cobertura.rb

@@ -19,7 +19,7 @@ require 'buildr/java'
 
 module Buildr
 
-  # Provides the <code>cobertura:html</code> and <code>cobertura:xml</code> tasks.
+  # Provides the <code>cobertura:html</code>, <code>cobertura:xml</code> and <code>cobertura:check</code> tasks.
   # Require explicitly using <code>require "buildr/cobertura"</code>.
   #
   # You can generate cobertura reports for a single project 
@@ -37,6 +37,7 @@ module Buildr
   #      cobertura.exclude 'some.foo.util.SimpleUtil'
   #      cobertura.exclude /*.Const(ants)?/i
   #   end
+  #
   module Cobertura
 
     VERSION = '1.9'
@@ -70,7 +71,7 @@ module Buildr
       
       attr_reader :project
       private :project
-
+      
       attr_writer :data_file, :instrumented_dir, :report_dir
       
       def data_file
@@ -116,6 +117,15 @@ module Buildr
       def sources
         project.compile.sources
       end
+      
+      def check
+        @check ||= CoberturaCheck.new
+      end
+    end
+    
+    class CoberturaCheck
+      attr_writer :branch_rate, :line_rate, :total_branch_rate, :total_line_rate, :package_line_rate, :package_branch_rate
+      attr_reader :branch_rate, :line_rate, :total_branch_rate, :total_line_rate, :package_line_rate, :package_branch_rate
     end
 
     module CoberturaExtension # :nodoc:
@@ -171,23 +181,44 @@ module Buildr
             project.test.with Cobertura.dependencies
             project.test.options[:properties]["net.sourceforge.cobertura.datafile"] = cobertura.data_file
             
-            [:xml, :html].each do |format|
-              task format => ['instrument', 'test'] do 
-                info "Creating test coverage reports in #{cobertura.report_to(format)}"
-                Buildr.ant "cobertura" do |ant|
-                  ant.taskdef :resource=>"tasks.properties",
-                    :classpath=>Buildr.artifacts(Cobertura.dependencies).each(&:invoke).map(&:to_s).join(File::PATH_SEPARATOR)
-                  ant.send "cobertura-report", :format=>format, 
-                    :destdir=>cobertura.report_to(format), :datafile=>cobertura.data_file do
-                    cobertura.sources.flatten.each do |src|
-                      ant.fileset(:dir=>src.to_s) if File.exist?(src.to_s)
+            unless project.compile.sources.empty?
+              [:xml, :html].each do |format|
+                task format => ['instrument', 'test'] do 
+                  info "Creating test coverage reports in #{cobertura.report_to(format)}"
+                  Buildr.ant "cobertura" do |ant|
+                    ant.taskdef :resource=>"tasks.properties",
+                      :classpath=>Buildr.artifacts(Cobertura.dependencies).each(&:invoke).map(&:to_s).join(File::PATH_SEPARATOR)
+                    ant.send "cobertura-report", :format=>format, 
+                      :destdir=>cobertura.report_to(format), :datafile=>cobertura.data_file do
+                      cobertura.sources.flatten.each do |src|
+                        ant.fileset(:dir=>src.to_s) if File.exist?(src.to_s)
+                      end
                     end
                   end
                 end
               end
             end
+
+            task :check => [:instrument, :test] do
+              Buildr.ant "cobertura" do |ant|
+                ant.taskdef :classpath=>Cobertura.requires.join(File::PATH_SEPARATOR), :resource=>"tasks.properties"
+                
+                params = { :datafile => Cobertura.data_file }
+                
+                # oh so ugly...
+                params[:branchrate] = cobertura.check.branch_rate if cobertura.check.branch_rate
+                params[:linerate] = cobertura.check.line_rate if cobertura.check.line_rate
+                params[:totalbranchrate] = cobertura.check.total_branch_rate if cobertura.check.total_branch_rate
+                params[:totallinerate] = cobertura.check.total_line_rate if cobertura.check.total_line_rate
+                params[:packagebranchrate] = cobertura.check.package_branch_rate if cobertura.check.package_branch_rate
+                params[:packagelinerate] = cobertura.check.package_line_rate if cobertura.check.package_line_rate
+                
+                ant.send("cobertura-check", params) do
+                end
+              end
+            end
+            
           end
-          
         end
 
         project.clean do

data/lib/buildr/java/commands.rb

@@ -51,8 +51,8 @@ module Java
           block = lambda { |ok, res| fail "Failed to execute #{name}, see errors above" unless ok } unless block
           puts cmd_args.join(' ') if Buildr.application.options.trace
           cmd_args = cmd_args.map(&:inspect).join(' ') if Util.win_os?
-          system(*cmd_args).tap do |ok|
-            block.call ok, $?
+          sh(*cmd_args) do |ok, ps|
+            block.call ok, ps
           end
         end
       end
@@ -190,7 +190,9 @@ module Java
       # Returns the path to the specified Java command (with no argument to java itself).
       def path_to_bin(name = nil)
         home = ENV['JAVA_HOME'] or fail 'Are we forgetting something? JAVA_HOME not set.'
-        File.expand_path(File.join(home, 'bin', name.to_s))
+        bin = File.expand_path(File.join(home, 'bin'))
+        fail 'JAVA_HOME environment variable does not point to a valid JRE/JDK installation.' unless File.exist? bin
+        File.expand_path(File.join(bin, name.to_s))
       end
 
       # :call-seq:

data/lib/buildr/java/org/apache/buildr/JavaTestFilter.java

@@ -18,6 +18,7 @@
 package org.apache.buildr;
 
 import java.lang.reflect.Method;
+import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.io.File;
 import java.io.IOException;
@@ -33,6 +34,7 @@ public class JavaTestFilter {
   private Vector methodAnnotations = new Vector();
   private Vector classAnnotations = new Vector();
   private Vector interfaces = new Vector();
+  private Vector fieldNames = new Vector();
 
   public JavaTestFilter(String[] paths) throws IOException {
     URL[] urls = new URL[paths.length];
@@ -70,6 +72,14 @@ public class JavaTestFilter {
     return this;
   }
   
+  public JavaTestFilter addFields(String[] names) {
+    for (int i = names.length; i -- > 0;) {
+      String name = names[i];
+      fieldNames.add(name);
+    }
+    return this;
+  }
+  
   private boolean isTest(Class cls) {
     if (Modifier.isAbstract(cls.getModifiers()) || !Modifier.isPublic(cls.getModifiers()))
       return false;
@@ -94,6 +104,14 @@ public class JavaTestFilter {
         }
       }
     }
+    if (fieldNames != null) {
+      Field[] fields = cls.getFields();
+      for (int j = 0; j < fields.length; j++) {
+        for (Iterator it = fieldNames.iterator(); it.hasNext(); ) {
+          if (fields[j].getName().equals(it.next())) { return true; }
+        }
+      }
+    }
     return false;
   }
 

data/lib/buildr/java/packaging.rb

@@ -39,7 +39,7 @@ module Buildr
             sections = str.split(SECTION_SEPARATOR).reject { |s| s.strip.empty? }
             new sections.map { |section|
               lines = section.split(LINE_SEPARATOR).inject([]) { |merged, line|
-                if line[0] == 32
+                if line[/^ /] == ' '
                   merged.last << line[1..-1]
                 else
                   merged << line
@@ -302,7 +302,7 @@ module Buildr
           @wsdls = []
           prepare do
             path('META-INF').include @wsdls
-            path('META-INF').include @services_xml, :as=>['services.xml'] if @services_xml
+            path('META-INF').include @services_xml, :as=>'services.xml' if @services_xml
             path('lib').include Buildr.artifacts(@libs) unless @libs.nil? || @libs.empty?
           end
         end

data/lib/buildr/java/rjb.rb

@@ -134,7 +134,7 @@ module Java
 
     def __package__(name) #:nodoc:
       const = name.split('.').map { |part| part.gsub(/^./) { |char| char.upcase } }.join
-      return const_get(const) if constants.include?(const)
+      return const_get(const) if constants.include?(const) || constants.include?(const.to_sym)
       package = Module.new
       package.extend Package
       package.instance_variable_set :@name, name