buildr 1.4.7.pre2 → 1.4.7

data/CHANGELOG

@@ -1,4 +1,26 @@
-1.4.7 (Pending)
+1.4.7 (2012-05-29)
+* Added:  BUILDR-618 pom properties feature does not support hierarchy (kafka liu)
+* Added:  Add a Sonar extension.
+* Change: BUILDR-638 Update to rake 0.9.2.2 (Russell Teabeault)
+* Added:  BUILDR-316 Add a GWT extension
+* Change: BUILDR-624 Update rspec version to 2.9.0 (Russell Teabeault)
+* Change: BUILDR-632 Update net-ssh version to 2.3.0 (Russell Teabeault)
+* Change: BUILDR-632 Update net-sftp version to 2.0.5 (Russell Teabeault)
+* Fixed:  BUILDR-635 JRE container entry to be declared before user sources and dependencies (Dani Perez)
+* Change: BUILDR-639 Stop requiring pygmentize to run "rake -T" (Russell Teabeault)
+* Added:  Enhance the IDEA extension to support the addition of several explicit facets such as
+          ejb, jruby, jpa, web and gwt.
+* Added:  Add several utility methods to IDEA extension for defining artifacts and configurations.
+          Add some explicit methods to support a gwt configuration and a "Exploded War" artifact.
+* Change: Upgraded to Apache Ant 1.8.3
+* Change: Default maven2 repository is now repo1.maven.org/maven2.
+* Change: Make minimumTokenCount and encoding configurable for the PMD/CPD action
+          and default encoding to UTF-8 for compatibility with external tools (i.e. Jenkins)
+* Change: BUILDR-615 VersionRequirement.version? now returns true for
+          versions following pattern "r9999", e.g. "r09"
+* Change: BUILDR-630 Run task should not add test dependencies (Russell Teabeault)
+* Change: BUILDR-629 JavaRunner should include target/resources in classpath (Russell Teabeault)
+* Fixed:  BUILDR-617 pom exclusion does not work (Kafka Liu)
 * Added:  Add a Findbugs extension.
 * Added:  Add a Checkstyle extension.
 * Added:  Add a JavaNCSS extension.
@@ -43,7 +65,7 @@
 * Change: Move to Bundler to manage the project dependencies
 * Change: BUILDR-548 Remove support for JTestR as it is no longer maintained (Antoine Toulme)
 * Change: BUILDR-614 Buildr development - Using rvm, bundler and OSX installs the wrong rjb (Russell Teabeault)
-* Change: Upgrade to RJB 1.3.7
+* Change: Upgrade to RJB 1.4.0
 * Fixed:  ArtifactNamespace fails when using artifacts with classfier.
 * Fixed:  Buildr.artifacts() should handle any object with :to_spec method
           (i.e., any object that ActsAsArtifact)

data/Rakefile

@@ -13,6 +13,9 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+# To work-around a bug with gemcutter: http://stackoverflow.com/questions/4932881/gemcutter-rake-build-now-throws-undefined-method-write-for-syckemitter
+require 'psych' if RUBY_VERSION >= '1.9.2' && !RUBY_PLATFORM[/java/]
+
 # We need JAVA_HOME for most things (setup, spec, etc).
 unless ENV['JAVA_HOME']
   if RUBY_PLATFORM[/java/]
@@ -36,7 +39,7 @@ end
 
 # Tell us if we need sudo for various commands.
 def sudo_needed?
-  Config::CONFIG['host_os'] !~ /windows|cygwin|bccwin|cygwin|djgpp|mingw|mswin|wince/i && !ENV['GEM_HOME']
+  RbConfig::CONFIG['host_os'] !~ /windows|cygwin|bccwin|cygwin|djgpp|mingw|mswin|wince/i && !ENV['GEM_HOME']
 end
 
 

data/addon/buildr/gwt.rake

@@ -0,0 +1,82 @@
+# 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
+  module GWT
+
+    class << self
+      # The specs for requirements
+      def dependencies
+        ['com.google.gwt:gwt-dev:jar:2.4.0']
+      end
+
+      def gwtc_main(modules, source_artifacts, output_dir, options = {})
+        cp = Buildr.artifacts(self.dependencies).each(&:invoke).map(&:to_s) + Buildr.artifacts(source_artifacts).each(&:invoke).map(&:to_s)
+        style = options[:style] || "OBFUSCATED," # "PRETTY", "DETAILED"
+        log_level = options[:log_level] #  ERROR, WARN, INFO, TRACE, DEBUG, SPAM, or ALL
+        workers = options[:workers] || 2
+
+        args = []
+        if log_level
+          args << "-logLevel"
+          args << log_level
+        end
+        args << "-strict"
+        args << "-style"
+        args << style
+        args << "-localWorkers"
+        args << workers
+        args << "-war"
+        args << output_dir
+        if options[:compile_report_dir]
+          args << "-compileReport"
+          args << "-extra"
+          args << options[:compile_report_dir]
+        end
+
+        if options[:draft_compile]
+          args << "-draftCompile"
+        end
+
+        args += modules
+
+        Java::Commands.java 'com.google.gwt.dev.Compiler', *(args + [{:classpath => cp, :properties => options[:properties], :java_args => options[:java_args]}])
+      end
+    end
+
+    module ProjectExtension
+      include Extension
+
+      def gwt(module_names, options = {})
+        output_key = options[:output_key] || project.id
+        output_dir = project._(:target, :generated, :gwt, output_key)
+        artifacts = (project.compile.sources + project.resources.sources).collect do |a|
+          a.is_a?(String) ? file(a) : a
+        end
+        dependencies = artifacts(options[:dependencies]) || project.compile.dependencies
+        task = file(output_dir) do
+          Buildr::GWT.gwtc_main(module_names, dependencies + artifacts, output_dir, options.dup)
+        end
+        task.enhance(dependencies)
+        task.enhance([project.compile])
+        task
+      end
+    end
+  end
+end
+
+class Buildr::Project
+  include Buildr::GWT::ProjectExtension
+end

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/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/{pmd.rake → pmd.rb}

@@ -54,13 +54,15 @@ module Buildr
       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 => 100, :outputFile => "#{output_file_prefix}.#{format}" do
+          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

data/addon/buildr/sonar.rb

@@ -0,0 +1,142 @@
+# 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
+  module Sonar
+
+    class << self
+
+      # The specs for requirements
+      def dependencies
+        [
+          'org.codehaus.sonar-plugins:sonar-ant-task:jar:1.3'
+        ]
+      end
+
+      def sonar(jdbc_url, jdbc_driver_class_name, jdbc_username, jdbc_password, host_url, project_name, key, sources, binaries, libraries)
+
+        # Build the artifacts for FindBugs to analyse
+        Buildr.artifacts(binaries).each(&:invoke)
+
+        cp = Buildr.artifacts(self.dependencies).each(&:invoke).map(&:to_s).join(File::PATH_SEPARATOR)
+
+        args = {
+          :key => key,
+          :version => '1',
+          'xmlns:sonar' => 'antlib:org.sonar.ant'
+        }
+
+        Buildr.ant('sonar') do |ant|
+          ant.taskdef  :name => 'sonar', :classname => 'org.sonar.ant.SonarTask', :classpath => cp
+
+          ant.property :name => 'sonar.projectName', :value => project_name
+
+          ant.property :name => 'sonar.jdbc.url', :value => jdbc_url
+          ant.property :name => 'sonar.jdbc.driverClassName', :value => jdbc_driver_class_name
+          ant.property :name => 'sonar.jdbc.username', :value => jdbc_username
+          ant.property :name => 'sonar.jdbc.password', :value => jdbc_password
+          ant.property :name => 'sonar.host.url', :value => host_url
+
+          ant.property :name => 'sonar.checkstyle.generateXml', :value => 'true'
+
+          ant.property :name => 'sonar.sources', :value => sources.join(',')
+          ant.property :name => 'sonar.binaries', :value => binaries.join(',')
+          ant.property :name => 'sonar.libraries', :value => libraries.join(',')
+
+          ant.sonar args
+
+        end
+      end
+    end
+
+    class Config
+
+      attr_accessor :enabled
+      attr_accessor :jdbc_url
+      attr_accessor :jdbc_driver_class_name
+      attr_accessor :jdbc_username
+      attr_accessor :jdbc_password
+      attr_accessor :host_url
+      attr_accessor :key
+      attr_accessor :project_name
+
+      attr_writer :sources
+      def sources
+        @sources ||= []
+      end
+
+      attr_writer :binaries
+      def binaries
+        @binaries ||= []
+      end
+
+      attr_writer :libraries
+      def libraries
+        @libraries ||= []
+      end
+
+      def enabled?
+        !!@enabled
+      end
+
+      protected
+
+      def initialize(project)
+        @project = project
+      end
+
+      attr_reader :project
+
+    end
+
+    module ProjectExtension
+      include Extension
+
+      def sonar
+        @sonar ||= Buildr::Sonar::Config.new(project)
+      end
+
+      after_define do |project|
+        if project.sonar.enabled?
+          desc 'Execute Sonar code analysis'
+          project.task('sonar') do
+            puts 'Sonar: Analyzing source code...'
+
+            sources = project.sonar.sources.flatten.compact
+            binaries = project.sonar.binaries.flatten.compact
+            libraries = project.sonar.libraries.flatten.compact
+
+            Buildr::Sonar.sonar(
+              project.sonar.jdbc_url,
+              project.sonar.jdbc_driver_class_name,
+              project.sonar.jdbc_username,
+              project.sonar.jdbc_password,
+              project.sonar.host_url,
+              project.sonar.project_name,
+              project.sonar.key,
+              sources,
+              binaries,
+              libraries
+            )
+          end
+        end
+      end
+    end
+  end
+end
+
+class Buildr::Project
+  include Buildr::Sonar::ProjectExtension
+end