buildr 1.4.6-x86-mswin32 → 1.4.7-x86-mswin32

data/addon/buildr/jdepend.rb.orig

@@ -0,0 +1,178 @@
+# 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.
+
+module Buildr
+  # Addes the <code>projectname:jdepend:swing</code>, <code>projectname:jdepend:text</code> and
+  # <code>projectname:jdepend:xml</code> tasks.
+  #
+  # Require explicitly using <code>require "buildr/jdepend"</code>.
+  module JDepend
+
+    class << self
+
+      # The specs for requirements
+      def dependencies
+        [
+          'jdepend:jdepend:jar:2.9.1'
+        ]
+      end
+
+      def jdepend(output_file, target_paths, options = {})
+        dependencies = (options[:dependencies] || []) + self.dependencies
+        cp = Buildr.artifacts(dependencies).each(&:invoke).map(&:to_s)
+
+        args = []
+        if output_file
+          args << "-file"
+          args << output_file
+        end
+        target_paths.each do |target_path|
+          file(target_path).invoke
+<<<<<<< HEAD
+          args << target_path
+=======
+          args << target_path.to_s
+>>>>>>> 28deb000947f13d5df722228ed2bc24fdcb303d3
+        end
+
+        # If no output file then we must be trying to run the swing app
+        command = output_file ? 'jdepend.xmlui.JDepend' : 'jdepend.swingui.JDepend'
+
+        begin
+          Java::Commands.java command, *(args + [{:classpath => cp, :properties => options[:properties], :java_args => options[:java_args]}])
+        rescue => e
+          raise e if options[:fail_on_error]
+        end
+      end
+    end
+
+    class Config
+      def enabled?
+        !!@enabled
+      end
+
+      attr_writer :enabled
+
+      def html_enabled?
+        File.exist?(self.style_file)
+      end
+
+      attr_writer :config_directory
+
+      def config_directory
+        @config_directory || project._(:source, :main, :etc, :jdepend)
+      end
+
+      attr_writer :report_dir
+
+      def report_dir
+        @report_dir || project._(:reports, :jdepend)
+      end
+
+      attr_writer :fail_on_error
+
+      def fail_on_error?
+        @fail_on_error.nil? ? false : @fail_on_error
+      end
+
+      attr_writer :xml_output_file
+
+      def xml_output_file
+        @xml_output_file || "#{self.report_dir}/jdepend.xml"
+      end
+
+      attr_writer :html_output_file
+
+      def html_output_file
+        @html_output_file || "#{self.report_dir}/jdepend.html"
+      end
+
+      attr_writer :style_file
+
+      def style_file
+        @style_file || "#{self.config_directory}/jdepend.xsl"
+      end
+
+      def target_paths
+        @target_paths ||= [self.project.compile.target, self.project.test.compile.target]
+      end
+
+      def to_options
+        {
+            :fail_on_error => project.jdepend.fail_on_error?,
+            # Set user home so that jdepend.properties will be loaded from there if present
+            :properties => { 'user.home' => project.jdepend.config_directory }
+        }
+      end
+
+      protected
+
+      def initialize(project)
+        @project = project
+      end
+
+      attr_reader :project
+
+    end
+
+    module ProjectExtension
+      include Extension
+
+      def jdepend
+        @jdepend ||= Buildr::JDepend::Config.new(project)
+      end
+
+      after_define do |project|
+        if project.jdepend.enabled?
+          desc "Generate JDepend xml report."
+          project.task("jdepend:xml") do
+            puts "JDepend: Analyzing source code..."
+            mkdir_p File.dirname(project.jdepend.xml_output_file)
+            Buildr::JDepend.jdepend(project.jdepend.xml_output_file,
+                                    project.jdepend.target_paths.flatten.compact,
+                                    project.jdepend.to_options)
+          end
+
+          desc "Run JDepend with Swing UI."
+          project.task("jdepend:swing") do
+            puts "JDepend: Analyzing source code..."
+            Buildr::JDepend.jdepend(nil,
+                                    project.jdepend.target_paths.flatten.compact,
+                                    project.jdepend.to_options)
+          end
+
+          if project.jdepend.html_enabled?
+            xml_task = project.task("jdepend:xml")
+            desc "Generate JDepend html report."
+            project.task("jdepend:html" => xml_task) do
+              puts "JDepend: Generating report"
+              mkdir_p File.dirname(project.jdepend.html_output_file)
+              Buildr.ant "jdepend" do |ant|
+                ant.xslt :in => project.jdepend.xml_output_file,
+                         :out => project.jdepend.html_output_file,
+                         :style => project.jdepend.style_file
+              end
+            end
+
+          end
+        end
+      end
+    end
+  end
+end
+
+class Buildr::Project
+  include Buildr::JDepend::ProjectExtension
+end

data/addon/buildr/jetty.rb

@@ -13,15 +13,10 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
 require 'uri'
 require 'net/http'
-require 'buildr/core/project'
-require 'buildr/java'
-require 'buildr/packaging'
 require 'thread'
 
-
 module Buildr
 
   # Provides a collection of tasks and methods for using Jetty, specifically as a server

data/addon/buildr/jibx.rb

@@ -1,86 +1,85 @@
-# 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 'java/java'
-
-
-module Buildr
-
-  # Provides JiBX bytecode enhancement. Require explicitly using <code>require 'buildr/jibx'</code>.
-  module JiBX 
-
-    JIBX_VERSION = '1.1.5'
-    BCEL_VERSION = '5.2'
-    STAX_VERSION = '1.0-2'
-    XPP3_VERSION = '1.1.4c'
-
-    REQUIRES = [ "org.jibx:jibx-bind:jar:#{JIBX_VERSION}",
-      "org.jibx:jibx-run:jar:#{JIBX_VERSION}",
-      "org.apache.bcel:bcel:jar:#{BCEL_VERSION}",
-      "javax.xml.stream:stax-api:jar:#{STAX_VERSION}",
-      "xpp3:xpp3:jar:#{XPP3_VERSION}" ]
-
-    Java.classpath << REQUIRES
-
-    class << self
-
-      def bind(options)
-        rake_check_options options, :classpath, :output, :binding, :target, :verbose, :load
-        artifacts = Buildr.artifacts(options[:classpath]).each { |a| a.invoke }.map(&:to_s) + [options[:output].to_s]
-        binding = file(options[:binding]).tap { |task| task.invoke }.to_s
-
-        Buildr.ant 'jibx' do |ant|
-          ant.taskdef :name=>'bind', :classname=>'org.jibx.binding.ant.CompileTask',
-            :classpath => requires.join(File::PATH_SEPARATOR)
-          ant.bind :verbose => options[:verbose].to_s, :load => options[:load].to_s, :binding=>options[:binding].to_s do
-            ant.classpath :path => artifacts.join(File::PATH_SEPARATOR)
-          end
-        end
-      end
-
-    private
-
-      def requires()
-        @requires ||= Buildr.artifacts(REQUIRES).each { |artifact| artifact.invoke }.map(&:to_s)
-      end
-
-    end
-
-    def jibx_bind(options = nil)
-      
-      # FIXME - add support for :bindingfileset and :classpathset
-      # Note: either :binding or :bindingfileset should be set, and either
-      # :classpath or :classpathset should be set, and options passed to
-      # ant.bind should be adjusted accordingly. At present, only :binding
-      # and :classpath are supported (which should be fine for most!)
-      jibx_options = { :output => compile.target,
-        :classpath => compile.classpath,
-        :binding => path_to(:source, :main, :resources, 'META-INF/binding.xml'),
-        :target => compile.target,
-        :load => false,
-        :verbose => false
-      }
-
-      JiBX.bind jibx_options.merge(options || {})
-    end
-
-  end
-
-  class Project
-    include JiBX 
-  end
-end
-
+# 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 'java/java'
+
+module Buildr
+
+  # Provides JiBX bytecode enhancement. Require explicitly using <code>require 'buildr/jibx'</code>.
+  module JiBX
+
+    JIBX_VERSION = '1.1.5'
+    BCEL_VERSION = '5.2'
+    STAX_VERSION = '1.0-2'
+    XPP3_VERSION = '1.1.4c'
+
+    REQUIRES = ["org.jibx:jibx-bind:jar:#{JIBX_VERSION}",
+                "org.jibx:jibx-run:jar:#{JIBX_VERSION}",
+                "org.apache.bcel:bcel:jar:#{BCEL_VERSION}",
+                "javax.xml.stream:stax-api:jar:#{STAX_VERSION}",
+                "xpp3:xpp3:jar:#{XPP3_VERSION}"]
+
+    Java.classpath << REQUIRES
+
+    class << self
+
+      def bind(options)
+        rake_check_options options, :classpath, :output, :binding, :target, :verbose, :load
+        artifacts = Buildr.artifacts(options[:classpath]).each { |a| a.invoke }.map(&:to_s) + [options[:output].to_s]
+        binding = file(options[:binding]).tap { |task| task.invoke }.to_s
+
+        Buildr.ant 'jibx' do |ant|
+          ant.taskdef :name=>'bind',
+                      :classname=>'org.jibx.binding.ant.CompileTask',
+                      :classpath => requires.join(File::PATH_SEPARATOR)
+          ant.bind :verbose => options[:verbose].to_s, :load => options[:load].to_s, :binding=>options[:binding].to_s do
+            ant.classpath :path => artifacts.join(File::PATH_SEPARATOR)
+          end
+        end
+      end
+
+      private
+
+      def requires()
+        @requires ||= Buildr.artifacts(REQUIRES).each { |artifact| artifact.invoke }.map(&:to_s)
+      end
+
+    end
+
+    def jibx_bind(options = nil)
+
+      # FIXME - add support for :bindingfileset and :classpathset
+      # Note: either :binding or :bindingfileset should be set, and either
+      # :classpath or :classpathset should be set, and options passed to
+      # ant.bind should be adjusted accordingly. At present, only :binding
+      # and :classpath are supported (which should be fine for most!)
+      jibx_options = {:output => compile.target,
+                      :classpath => compile.classpath,
+                      :binding => path_to(:source, :main, :resources, 'META-INF/binding.xml'),
+                      :target => compile.target,
+                      :load => false,
+                      :verbose => false
+      }
+
+      JiBX.bind jibx_options.merge(options || {})
+    end
+
+  end
+
+  class Project
+    include JiBX
+  end
+end
+

data/addon/buildr/nailgun.rb

@@ -49,7 +49,7 @@ module Buildr
 
     # Returns the path to JRUBY_HOME.
     def jruby_home
-      ENV['JRUBY_HOME'] || Config::CONFIG['prefix']
+      ENV['JRUBY_HOME'] || RbConfig::CONFIG['prefix']
     end
 
     # Returns the path to NAILGUN_HOME.
@@ -164,7 +164,7 @@ module Buildr
       attr_reader :artifact
       @artifact = Buildr.artifact(ARTIFACT_SPEC).from(nailgun_jar)
 
-      compiled_bin = file(tmp_path(NAME, NAME, 'ng' + Config::CONFIG['EXEEXT']) => dist_dir.target) do |task|
+      compiled_bin = file(tmp_path(NAME, NAME, 'ng' + RbConfig::CONFIG['EXEEXT']) => dist_dir.target) do |task|
         unless task.to_s.pathmap('%x') == '.exe'
           Dir.chdir(task.to_s.pathmap('%d')) do
             info "Compiling #{task.to_s}"

data/addon/buildr/openjpa.rb

@@ -13,10 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-require 'buildr/java'
-
-
 module Buildr
 
   # Provides OpenJPA bytecode enhancement and Mapping tool task. Require explicitly using <code>require "buildr/openjpa"</code>.

data/addon/buildr/pmd.rb

@@ -0,0 +1,166 @@
+# 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.
+
+module Buildr
+  # Provides the <code>pmd:rule:xml</code>, <code>pmd:rule:html</code>, <code>pmd:cpd:xml</code>
+  # and <code>pmd:cpd:html</code> tasks.
+  #
+  # Require explicitly using <code>require "buildr/pmd"</code>.
+  module Pmd
+
+    class << self
+
+      # The specs for requirements
+      def dependencies
+        [
+          'pmd:pmd:jar:4.2.6',
+          'jaxen:jaxen:jar:1.1.1',
+          'asm:asm:jar:3.2'
+        ]
+      end
+
+      def pmd(rule_set_files, format, output_file_prefix, source_paths, options = {})
+        dependencies = (options[:dependencies] || []) + self.dependencies
+        cp = Buildr.artifacts(dependencies).each(&:invoke).map(&:to_s)
+        (options[:rule_set_paths] || []).each {|p| cp << p}
+
+        puts "PMD: Analyzing source code..."
+        mkdir_p File.dirname(output_file_prefix)
+
+        Buildr.ant("pmd-report") do |ant|
+          ant.taskdef :name=> 'pmd', :classpath => cp.join(';'), :classname => 'net.sourceforge.pmd.ant.PMDTask'
+          ant.pmd :shortFilenames => true, :rulesetfiles => rule_set_files.join(',') do
+            ant.formatter :type => format, :toFile => "#{output_file_prefix}.#{format}"
+            source_paths.each do |src|
+              ant.fileset :dir=> src, :includes=>'**/*.java'
+            end
+          end
+
+        end
+      end
+
+      def cpd(format, output_file_prefix, source_paths, options = {})
+        dependencies = (options[:dependencies] || []) + self.dependencies
+        cp = Buildr.artifacts(dependencies).each(&:invoke).map(&:to_s)
+        minimum_token_count = options[:minimum_token_count] || 100
+        encoding = options[:encoding] || 'UTF-8'
+
+        puts "PMD-CPD: Analyzing source code..."
+        mkdir_p File.dirname(output_file_prefix)
+
+        Buildr.ant("cpd-report") do |ant|
+          ant.taskdef :name=> 'cpd', :classpath => cp.join(';'), :classname => 'net.sourceforge.pmd.cpd.CPDTask'
+          ant.cpd :format => format, :minimumTokenCount => minimum_token_count, :encoding => encoding, :outputFile => "#{output_file_prefix}.#{format}" do
+            source_paths.each do |src|
+              ant.fileset :dir=> src, :includes=>'**/*.java'
+            end
+          end
+
+        end
+      end
+    end
+
+    class Config
+
+      attr_writer :enabled
+
+      def enabled?
+        !!@enabled
+      end
+
+      attr_writer :rule_set_files
+
+      def rule_set_files
+        @rule_set_files || ['basic','imports','unusedcode']
+      end
+
+      attr_writer :rule_set_paths
+
+      def rule_set_paths
+        @rule_set_paths ||= []
+      end
+
+      attr_writer :report_dir
+
+      def report_dir
+        @report_dir || project._(:reports, :pmd)
+      end
+
+      attr_writer :output_file_prefix
+
+      def output_file_prefix
+        @output_file_prefix || "#{self.report_dir}/pmd"
+      end
+
+      attr_writer :cpd_output_file_prefix
+
+      def cpd_output_file_prefix
+        @cpd_output_file_prefix || "#{self.report_dir}/cpd"
+      end
+
+      def source_paths
+        @source_paths ||= [self.project.compile.sources, self.project.test.compile.sources]
+      end
+
+      def flat_source_paths
+        source_paths.flatten.compact
+      end
+
+      protected
+
+      def initialize(project)
+        @project = project
+      end
+
+      attr_reader :project
+    end
+
+    module ProjectExtension
+      include Extension
+
+      def pmd
+        @pmd ||= Buildr::Pmd::Config.new(project)
+      end
+
+      after_define do |project|
+        if project.pmd.enabled?
+          desc "Generate pmd xml report."
+          project.task("pmd:rule:xml") do
+            Buildr::Pmd.pmd(project.pmd.rule_set_files, 'xml', project.pmd.output_file_prefix, project.pmd.flat_source_paths, :rule_set_paths => project.pmd.rule_set_paths)
+          end
+
+          desc "Generate pmd html report."
+          project.task("pmd:rule:html") do
+            Buildr::Pmd.pmd(project.pmd.rule_set_files, 'html', project.pmd.output_file_prefix, project.pmd.flat_source_paths, :rule_set_paths => project.pmd.rule_set_paths)
+          end
+
+          desc "Generate pmd cpd xml report."
+          project.task("pmd:cpd:xml") do
+            Buildr::Pmd.cpd('xml', project.pmd.cpd_output_file_prefix, project.pmd.flat_source_paths)
+          end
+
+          desc "Generate pmd cpd text report."
+          project.task("pmd:cpd:text") do
+            Buildr::Pmd.cpd('text', project.pmd.cpd_output_file_prefix, project.pmd.flat_source_paths)
+          end
+        end
+      end
+    end
+  end
+end
+
+class Buildr::Project
+  include Buildr::Pmd::ProjectExtension
+end