buildr 1.2.10 → 1.3.0

data/{lib → addon}/buildr/antlr.rb

@@ -1,11 +1,28 @@
-require "java/java"
+# 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/java'
+
 
 module Buildr
   # Provides ANTLR grammar generation tasks. Require explicitly using <code>require "buildr/antlr"</code>.
   module ANTLR
     REQUIRES = [ "org.antlr:antlr:jar:3.0", "antlr:antlr:jar:2.7.7", "org.antlr:stringtemplate:jar:3.0" ]
 
-    Java.wrapper.classpath << REQUIRES
+    Java.classpath << REQUIRES
 
     class << self
       def antlr(*args)
@@ -19,13 +36,9 @@ module Buildr
           mkdir_p options[:token] 
           args = ["-lib",  options[:token]] + args 
         end
-        Java.wrapper do |wrapper|
-          antlr_class = wrapper.import("org.antlr.Tool")
-          antlr_tool = antlr_class.new_with_sig("[Ljava.lang.String;", args)
-          antlr_tool.process
-          #wrapper.import("org.antlr.Tool").main(args) == 0 or
-          #  fail "Failed to run ANTLR, see errors above."
-        end
+        Java.load
+        #Java.org.antlr.Tool.new_with_sig("[Ljava.lang.String;", args).process
+        Java.org.antlr.Tool.new(args.to_java(Java.java.lang.String)).process
       end
     end
 
@@ -37,7 +50,7 @@ module Buildr
       else
         in_package = []; token = nil
       end
-      file(path_to(:target, "generated/antlr")=>args.flatten) do |task|
+      file(path_to(:target, :generated, :antlr)=>args.flatten) do |task|
         args = {:output=>File.join(task.name, in_package)}
         args.merge!({:token=>File.join(task.name, token)}) if token
         ANTLR.antlr task.prerequisites, args

data/addon/buildr/cobertura.rb

@@ -0,0 +1,232 @@
+# 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/java'
+
+
+module Buildr
+
+  # Provides the <code>cobertura:html</code> and <code>cobertura:xml</code> tasks.
+  # Require explicitly using <code>require "buildr/cobertura"</code>.
+  #
+  # You can generate cobertura reports for a single project 
+  # using the project name as prefix:
+  #
+  #   project_name:cobertura:html
+  #
+  # You can also specify which classes to include/exclude from instrumentation by 
+  # passing a class name regexp to the <code>cobertura.include</code> or 
+  # <code>cobertura.exclude</code> methods. 
+  # 
+  #   define 'someModule' do 
+  #      cobertura.include 'some.package.*'
+  #      cobertura.include /some.(foo|bar).*/
+  #      cobertura.exclude 'some.foo.util.SimpleUtil'
+  #      cobertura.exclude /*.Const(ants)?/i
+  #   end
+  module Cobertura
+
+    class << self
+
+      REQUIRES = ["net.sourceforge.cobertura:cobertura:jar:1.9", "log4j:log4j:jar:1.2.9",
+        "asm:asm:jar:2.2.1", "asm:asm-tree:jar:2.2.1", "oro:oro:jar:2.0.8"]
+
+      def requires()
+        @requires ||= Buildr.artifacts(REQUIRES).each(&:invoke).map(&:to_s)
+      end
+
+      def report_to(file = nil)
+        File.expand_path(File.join(*["reports/cobertura", file.to_s].compact))
+      end
+
+      def data_file()
+        File.expand_path("reports/cobertura.ser")
+      end
+
+    end
+    
+    class CoberturaConfig # :nodoc:
+      
+      def initialize(project)
+        @project = project
+      end
+      
+      attr_reader :project
+      private :project
+
+      attr_writer :data_file, :instrumented_dir, :report_dir
+      
+      def data_file
+        @data_file ||= project.path_to(:reports, 'cobertura.ser')
+      end
+
+      def instrumented_dir
+        @instrumented_dir ||= project.path_to(:target, :instrumented, :classes)
+      end
+
+      def report_dir
+        @report_dir ||= project.path_to(:reports, :cobertura)
+      end
+
+      def report_to(file = nil)
+        File.expand_path(File.join(*[report_dir, file.to_s].compact))
+      end
+
+      # :call-seq:
+      #   project.cobertura.include(*classPatterns)
+      #
+      def include(*classPatterns)
+        includes.push(*classPatterns.map { |p| String === p ? Regexp.new(p) : p })
+        self
+      end
+      
+      def includes
+        @includeClasses ||= []
+      end
+
+      # :call-seq:
+      #   project.cobertura.exclude(*classPatterns)
+      #
+      def exclude(*classPatterns)
+        excludes.push(*classPatterns.map { |p| String === p ? Regexp.new(p) : p })
+        self
+      end
+
+      def excludes
+        @excludeClasses ||= []
+      end
+
+      def sources
+        project.compile.sources
+      end
+    end
+
+    module CoberturaExtension # :nodoc:
+      include Buildr::Extension
+
+      def cobertura
+        @cobertura_config ||= CoberturaConfig.new(self)
+      end
+
+      after_define do |project|
+        cobertura = project.cobertura
+        
+        namespace 'cobertura' do
+          # Instrumented bytecode goes in a different directory. This task creates before running the test
+          # cases and monitors for changes in the generate bytecode.
+          instrumented = project.file(cobertura.instrumented_dir => file(project.compile.target)) do |task|
+            mkdir_p task.to_s, :verbose => false
+            unless project.compile.sources.empty?
+              puts "Instrumenting classes with cobertura data file #{cobertura.data_file}"
+              Buildr.ant "cobertura" do |ant|
+                ant.taskdef :classpath=>Cobertura.requires.join(File::PATH_SEPARATOR), :resource=>"tasks.properties"
+                ant.send "cobertura-instrument", :todir=>task.to_s, :datafile=>cobertura.data_file do
+                  includes, excludes = cobertura.includes, cobertura.excludes
+                  
+                  classes_dir = project.compile.target.to_s
+                  if includes.empty? && excludes.empty? 
+                    ant.fileset :dir => classes_dir do 
+                      ant.include :name => "**/*.class"
+                    end
+                  else
+                    includes = [//] if includes.empty?
+                    Dir.glob(File.join(classes_dir, "**/*.class")) do |cls|
+                      cls_name = cls.gsub(/#{classes_dir}\/?|\.class$/, '').gsub('/', '.')
+                      if includes.any? { |p| p === cls_name } && !excludes.any? { |p| p === cls_name }
+                        ant.fileset :file => cls
+                      end
+                    end
+                  end
+                end
+              end
+            end
+            touch task.to_s, :verbose=>false
+          end
+
+          task 'instrument' => instrumented
+          [:xml, :html].each do |format|
+            task format => ['instrument', 'test'] do 
+              puts "Creating test coverage reports in #{cobertura.report_to(format)}"
+              Buildr.ant "cobertura" do |ant|
+                ant.taskdef :classpath=>Cobertura.requires.join(File::PATH_SEPARATOR), :resource=>"tasks.properties"
+                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
+
+        # We now have two target directories with bytecode. It would make sense to remove compile.target
+        # and add instrumented instead, but apparently Cobertura only creates some of the classes, so
+        # we need both directories and instrumented must come first.
+        project.test.dependencies.unshift cobertura.instrumented_dir
+        project.test.with Cobertura.requires
+        project.test.options[:properties]["net.sourceforge.cobertura.datafile"] = cobertura.data_file
+        
+        project.clean do
+          rm_rf [cobertura.report_to, cobertura.data_file, cobertura.instrumented_dir], :verbose=>false
+        end
+        
+      end
+      
+    end
+
+    class Buildr::Project
+      include CoberturaExtension
+    end
+
+    namespace "cobertura" do
+
+      task "instrument" do
+        Buildr.projects.each do |project|
+          project.cobertura.data_file = data_file
+          project.test.options[:properties]["net.sourceforge.cobertura.datafile"] = data_file
+          project.task('cobertura:instrument').invoke
+        end
+      end
+      
+      [:xml, :html].each do |format|
+        report_target = report_to(format)
+        desc "Run the test cases and produce code coverage reports in #{report_target}"
+        task format => ["instrument", "test"] do
+          puts "Creating test coverage reports in #{report_target}"
+          Buildr.ant "cobertura" do |ant|
+            ant.taskdef :classpath=>requires.join(File::PATH_SEPARATOR), :resource=>"tasks.properties"
+            ant.send "cobertura-report", :destdir=>report_target, :format=>format, :datafile=>data_file do
+              Buildr.projects.map(&:cobertura).map(&:sources).flatten.each do |src|
+                ant.fileset :dir=>src.to_s if File.exist?(src.to_s)
+              end
+            end
+          end
+        end
+      end
+      
+      task "clean" do
+        rm_rf [report_to, data_file], :verbose=>false
+      end
+    end
+
+    task "clean" do
+      task("cobertura:clean").invoke if Dir.pwd == Rake.application.original_dir
+    end
+
+  end
+end

data/{lib → addon}/buildr/hibernate.rb

@@ -1,5 +1,21 @@
-require "java/java"
-require "java/ant"
+# 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/java'
+
 
 module Buildr
 
@@ -101,11 +117,11 @@ module Buildr
     #   hibernate_schemaexport "derby.sql" do |task, ant|
     #     ant.schemaexport :properties=>"derby.properties", :output=>task.name,
     #       :delimiter=>";", :drop=>"no", :create=>"yes" do
-    #       fileset(:dir=>path_to(:java_src_dir)) { include :name=>"**/*.hbm.xml" } }
+    #       fileset(:dir=>compile.sources.first) { include :name=>"**/*.hbm.xml" } }
     #     end
     #   end
     def hibernate_schemaexport(args, &block)
-      path, deps = Rake.application.resolve_args(args)
+      path, arg_names, deps = Rake.application.resolve_args([args])
       unless Rake::Task.task_defined?(path)
         class << file(path) ; attr_accessor :ant ; end
         file(path).enhance { |task| task.ant = Hibernate.schemaexport }

data/{lib → addon}/buildr/javacc.rb

@@ -1,4 +1,21 @@
-require "java/java"
+# 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/java'
+
 
 module Buildr
   # Provides JavaCC compile tasks. Require explicitly using <code>require "buildr/javacc"</code>.
@@ -6,7 +23,7 @@ module Buildr
 
     REQUIRES = [ "net.java.dev.javacc:javacc:jar:4.0", "net.java.dev.javacc:javacc:jar:4.0" ]
 
-    Java.wrapper.classpath << REQUIRES
+    Java.classpath << REQUIRES
 
     class << self
 
@@ -16,10 +33,9 @@ module Buildr
 
         args = args.flatten.map(&:to_s).collect { |f| File.directory?(f) ? FileList[f + "/**/*.jj"] : f }.flatten
         args.unshift "-OUTPUT_DIRECTORY=#{options[:output]}" if options[:output]
-        Java.wrapper do |jw|
-          jw.import("org.javacc.parser.Main").mainProgram(args) == 0 or
-            fail "Failed to run JavaCC, see errors above."
-        end
+        Java.load
+        Java.org.javacc.parser.Main.mainProgram(args.to_java(Java.java.lang.String)) == 0 or
+          fail "Failed to run JavaCC, see errors above."
       end
 
       def jjtree(*args)
@@ -29,10 +45,9 @@ module Buildr
         args = args.flatten.map(&:to_s).collect { |f| File.directory?(f) ? FileList[f + "**/*.jjt"] : f }.flatten
         args.unshift "-OUTPUT_DIRECTORY=#{options[:output]}" if options[:output]
         args.unshift "-BUILD_NODE_FILES=#{options[:build_node_files] || false}"
-        Java.wrapper do |jw|
-          jw.import("org.javacc.jjtree.JJTree").new.main(args) == 0 or
-            fail "Failed to run JJTree, see errors above."
-        end
+        Java.load
+        Java.org.javacc.jjtree.JJTree.new.main(args.to_java(Java.java.lang.String)) == 0 or
+          fail "Failed to run JJTree, see errors above."
       end
 
     end
@@ -44,7 +59,7 @@ module Buildr
       else
         in_package = []
       end
-      file(path_to(:target, "generated/javacc")=>args.flatten) do |task|
+      file(path_to(:target, :generated, :javacc)=>args.flatten) do |task|
         JavaCC.javacc task.prerequisites, :output=>File.join(task.name, in_package)
       end         
     end
@@ -57,7 +72,7 @@ module Buildr
       else
         in_package = []
       end
-      file(path_to(:target, "generated/jjtree")=>args.flatten) do |task|
+      file(path_to(:target, :generated, :jjtree)=>args.flatten) do |task|
         JavaCC.jjtree task.prerequisites, :output=>File.join(task.name, in_package), :build_node_files=>build_node_files
       end         
     end

data/addon/buildr/jdepend.rb

@@ -0,0 +1,60 @@
+# 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/java'
+
+
+module Buildr
+
+  # Addes the <code>jdepend:swing</code>, <code>jdepend:text</code> and <code>jdepend:xml</code> tasks.
+  # Require explicitly using <code>require "buildr/jdepend"</code>.
+  module Jdepend
+
+    REQUIRES = ["jdepend:jdepend:jar:2.9.1"]
+
+    class << self
+
+      def requires()
+        @requires ||= Buildr.artifacts(REQUIRES).each(&:invoke).map(&:to_s)
+      end
+
+      def paths()
+        Project.projects.map(&:compile).each(&:invoke).map(&:target).
+          map(&:to_s).select { |path| File.exist?(path) }.map { |path| File.expand_path(path) }
+      end
+
+    end
+
+    namespace "jdepend" do
+
+      desc "Runs JDepend on all your projects (Swing UI)"
+      task "swing" do
+        Java::Commands.java "jdepend.swingui.JDepend", paths, :classpath=>requires, :name=>"JDepend"
+      end
+
+      desc "Runs JDepend on all your projects (Text UI)"
+      task "text" do
+        Java::Commands.java "jdepend.textui.JDepend", paths, :classpath=>requires, :name=>"JDepend"
+      end
+
+      desc "Runs JDepend on all your projects (XML output to jdepend.xml)"
+      task "xml" do
+        Java::Commands.java "jdepend.xmlui.JDepend", "-file", "jdepend.xml", paths, :classpath=>requires, :name=>"JDepend"
+        puts "Created jdepend.xml"
+      end
+    end
+  end
+end