buildr 1.4.6 → 1.4.7.pre2

data/CHANGELOG

@@ -1,3 +1,62 @@
+1.4.7 (Pending)
+* Added:  Add a Findbugs extension.
+* Added:  Add a Checkstyle extension.
+* Added:  Add a JavaNCSS extension.
+* Added:  Add a PMD extension.
+* Added:  MultiTest framework that allows combining multiple test frameworks
+          for a single project.
+* Added:  Scala Specs2 framework support.
+* Added:  Buildr.transitive() now accepts hash with :scopes, :optional and
+          :scopes_transitive parameters
+* Added:  Improved scala file change detection
+          (to avoid recompiling  unnecessarily)
+* Added:  ScalaTest now automatically loads the Mockito library
+* Added:  Enhance the Intellij IDEA extension to support the addition of "artifacts"
+          and "configurations" to the generated project file.
+* Added:  BUILDR-598 TestNG support for :groups and :excludegroups (Christopher Coco)
+* Added:  BUILDR-616 Buildr development - If using rvm a default .rvmrc file would be helpful (Russell Teabeault)
+* Change: Scala Specs upgraded to 1.6.9 if using Scala 2.9.1
+* Change: Scala 2.9.1 is now default
+* Change: Make it possible to parameterize the JDepend extension and control the
+          projects that are included in the analysis and to enable support for
+          loading a per project jdepend.properties.
+* Change: Parameterize the the directory where the top level cobertura tasks will generate
+          reports. Specify using Buildr::Cobertura.report_dir = '....'
+* Change: Stop pretty printing the Intellij IDEA project files to avoid IDEA breaking
+          in the presence of non-normalized whitespace content.
+* Change: Change the Intellij IDEA extension to always rebuild the project files.
+* Change: Upgrade to require atoulme-Antwrap 0.7.2
+* Change: Changed the default output directory for Intellij IDEA extension to be
+          _(:target, :main, :idea, :classes) from _(:target, :main, :java) and the
+          default test output directory to be _(:target, :test, :idea, :classes)
+          from _(:target, :test, :java)
+* Change: Upgrade to highline 1.6.2
+* Change: Upgrade to jekyll 0.11.0, jekylltask 1.1.0, RedCloth 4.2.7, rdoc 3.8 for
+          generating documentation
+* Change: Upgrade to require rubygems > 1.8.6
+* Change: BUILDR-603 Remove install/uninstall actions from :gem packaging type
+* Change: BUILDR-602 Fail the build when gem dependencies are missing rather than
+          attempting to install the dependencies
+* Change: BUILDR-601 Remove Buildr::Util::Gems
+* Change: BUILDR-600 Centralize the common ad internal requires into one location.
+* Change: Upgrade to JRuby 1.6.2
+* 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
+* 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)
+* Fixed:  Handle HTTP Unauthorized (501) result code when downloading artifacts.
+* Fixed:  BUILDR-611 Buildr should not unnecessarily recompile Java files
+          explicitly added to compile.from
+* Fixed:  scaladoc generation with scala 2.9.x
+* Fixed:  Bnd Plugin: Add each artifact individually as a prerequisite to
+          bundle / package task when passed to classpath_element method
+* Fixed:  BUILDR-439 "The command line is too long" when running TestNG tests (Tammo Van Lessen)
+* Fixed:  BUILDR-595 Add option to specifiy location of ca cert
+* Fixed:  BUILDR-596 Update installation notes to talk about the all-in-one bundle
+
 1.4.6 (2011-06-21)
 * Added:  BUILDR-592 Allow Users to Specify SSH Options for Deployment (Marc-André Laverdière)
 * Fixed:  BUILDR-591 Sort modules in iml files generated by idea task to ensure

data/Rakefile

@@ -16,7 +16,7 @@
 # We need JAVA_HOME for most things (setup, spec, etc).
 unless ENV['JAVA_HOME']
   if RUBY_PLATFORM[/java/]
-    ENV['JAVA_HOME'] = java.lang.System.getProperty('java.home')
+    ENV['JAVA_HOME'] = Java.java.lang.System.getProperty('java.home')
   elsif RUBY_PLATFORM[/darwin/]
     ENV['JAVA_HOME'] = '/System/Library/Frameworks/JavaVM.framework/Home'
   else

data/addon/buildr/antlr.rb

@@ -13,10 +13,6 @@
 # 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

data/addon/buildr/bnd.rb

@@ -46,7 +46,9 @@ module Buildr
 
       def classpath_element(dependencies)
         artifacts = Buildr.artifacts([dependencies])
-        self.prerequisites << artifacts
+        artifacts.each do |artifact|
+          self.prerequisites << artifact
+        end
         artifacts.each do |dependency|
           self.classpath << dependency.to_s
         end

data/addon/buildr/checkstyle.rake

@@ -0,0 +1,201 @@
+# 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>checkstyle:html</code> and <code>checkstyle:xml</code> tasks.
+  # Require explicitly using <code>require "buildr/checkstyle"</code>.
+  module Checkstyle
+
+    class << self
+
+      # The specs for requirements
+      def dependencies
+        [
+          'com.puppycrawl.tools:checkstyle:jar:5.4',
+          'commons-cli:commons-cli:jar:1.2',
+          'antlr:antlr:jar:2.7.7',
+          'com.google.collections:google-collections:jar:1.0',
+          'commons-beanutils:commons-beanutils-core:jar:1.8.3',
+          'commons-logging:commons-logging:jar:1.1.1'
+        ]
+      end
+
+      def checkstyle(configuration_file, format, output_file, source_paths, options = {})
+        dependencies = (options[:dependencies] || []) + self.dependencies
+        cp = Buildr.artifacts(dependencies).each(&:invoke).map(&:to_s)
+
+        args = []
+        if options[:properties_file]
+          args << "-p"
+          args << options[:properties_file]
+        end
+        args << "-c"
+        args << configuration_file
+        args << "-f"
+        args << format
+        args << "-o"
+        args << output_file
+        source_paths.each do |source_path|
+          args << "-r"
+          args << source_path
+        end
+
+        begin
+          Java::Commands.java 'com.puppycrawl.tools.checkstyle.Main', *(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?
+        File.exist?(self.configuration_file)
+      end
+
+      def html_enabled?
+        File.exist?(self.style_file)
+      end
+
+      attr_writer :config_directory
+
+      def config_directory
+        @config_directory || project._(:source, :main, :etc, :checkstyle)
+      end
+
+      attr_writer :report_dir
+
+      def report_dir
+        @report_dir || project._(:reports, :checkstyle)
+      end
+
+      attr_writer :configuration_file
+
+      def configuration_file
+        @configuration_file || "#{self.config_directory}/checks.xml"
+      end
+
+      attr_writer :fail_on_error
+
+      def fail_on_error?
+        @fail_on_error.nil? ? false : @fail_on_error
+      end
+
+      attr_writer :format
+
+      def format
+        @format || 'xml'
+      end
+
+      attr_writer :xml_output_file
+
+      def xml_output_file
+        @xml_output_file || "#{self.report_dir}/checkstyle.xml"
+      end
+
+      attr_writer :html_output_file
+
+      def html_output_file
+        @html_output_file || "#{self.report_dir}/checkstyle.html"
+      end
+
+      attr_writer :style_file
+
+      def style_file
+        @style_file || "#{self.config_directory}/checkstyle-report.xsl"
+      end
+
+      attr_writer :suppressions_file
+
+      def suppressions_file
+        @suppressions_file || "#{self.config_directory}/suppressions.xml"
+      end
+
+      attr_writer :import_control_file
+
+      def import_control_file
+        @import_control_file || "#{self.config_directory}/import-control.xml"
+      end
+
+      def properties
+        properties = {:basedir => self.project.base_dir}
+        properties['checkstyle.suppressions.file'] = self.suppressions_file if File.exist?(self.suppressions_file)
+        properties['checkstyle.import-control.file'] = self.import_control_file if File.exist?(self.import_control_file)
+        properties
+      end
+
+      def source_paths
+        @source_paths ||= [self.project.compile.sources, self.project.test.compile.sources]
+      end
+
+      def extra_dependencies
+        @extra_dependencies ||= [self.project.compile.dependencies, self.project.test.compile.dependencies]
+      end
+
+      protected
+
+      def initialize(project)
+        @project = project
+      end
+
+      attr_reader :project
+
+    end
+
+    module ProjectExtension
+      include Extension
+
+      def checkstyle
+        @checkstyle ||= Buildr::Checkstyle::Config.new(project)
+      end
+
+      after_define do |project|
+        if project.checkstyle.enabled?
+          desc "Generate checkstyle xml report."
+          project.task("checkstyle:xml") do
+            puts "Checkstyle: Analyzing source code..."
+            mkdir_p File.dirname(project.checkstyle.xml_output_file)
+            Buildr::Checkstyle.checkstyle(project.checkstyle.configuration_file,
+                                          project.checkstyle.format,
+                                          project.checkstyle.xml_output_file,
+                                          project.checkstyle.source_paths.flatten.compact,
+                                          :properties => project.checkstyle.properties,
+                                          :fail_on_error => project.checkstyle.fail_on_error?,
+                                          :dependencies => project.checkstyle.extra_dependencies)
+          end
+
+          if project.checkstyle.html_enabled?
+            xml_task = project.task("checkstyle:xml")
+            desc "Generate checkstyle html report."
+            project.task("checkstyle:html" => xml_task) do
+              puts "Checkstyle: Generating report"
+              mkdir_p File.dirname(project.checkstyle.html_output_file)
+              Buildr.ant "checkstyle" do |ant|
+                ant.xslt :in => project.checkstyle.xml_output_file,
+                         :out => project.checkstyle.html_output_file,
+                         :style => project.checkstyle.style_file
+              end
+            end
+
+          end
+        end
+      end
+    end
+  end
+end
+
+class Buildr::Project
+  include Buildr::Checkstyle::ProjectExtension
+end

data/addon/buildr/cobertura.rb

@@ -13,7 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
 if Buildr::VERSION < '1.5'
   Buildr.application.deprecated "'buildr/cobertura', use 'buildr/java/cobertura' instead"
   require 'buildr/java/cobertura'

data/addon/buildr/drb.rb

@@ -13,11 +13,9 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
 require 'delegate'
 require 'drb/drb'
 
-
 module Buildr
 
   # This addon allows you start a DRb server hosting a buildfile, so that

data/addon/buildr/emma.rb

@@ -13,7 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
 if Buildr::VERSION < '1.5'
   Buildr.application.deprecated "'buildr/emma', use 'buildr/java/emma' instead"
   require 'buildr/java/emma'

data/addon/buildr/findbugs.rake

@@ -0,0 +1,227 @@
+# 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>findbugs:html</code> and <code>findbugs:xml</code> tasks.
+  # Require explicitly using <code>require "buildr/findbugs"</code>.
+  module Findbugs
+
+    class << self
+
+      # The specs for requirements
+      def dependencies
+        [
+            'com.google.code.findbugs:findbugs-ant:jar:1.3.9',
+            'com.google.code.findbugs:findbugs:jar:1.3.9',
+            'com.google.code.findbugs:bcel:jar:1.3.9',
+            'com.google.code.findbugs:jsr305:jar:1.3.9',
+            'com.google.code.findbugs:jFormatString:jar:1.3.9',
+            'com.google.code.findbugs:annotations:jar:1.3.9',
+            'dom4j:dom4j:jar:1.6.1',
+            'jaxen:jaxen:jar:1.1.1',
+            'jdom:jdom:jar:1.0',
+            'xom:xom:jar:1.0',
+            'com.ibm.icu:icu4j:jar:2.6.1',
+            'asm:asm:jar:3.1',
+            'asm:asm-analysis:jar:3.1',
+            'asm:asm-tree:jar:3.1',
+            'asm:asm-commons:jar:3.1',
+            'asm:asm-util:jar:3.1',
+            'asm:asm-xml:jar:3.1',
+            'commons-lang:commons-lang:jar:2.4'
+        ]
+      end
+
+      def findbugs(output_file, source_paths, analyze_paths, options = { })
+        dependencies = (options[:dependencies] || []) + self.dependencies
+        cp = Buildr.artifacts(dependencies).each(&:invoke).map(&:to_s).join(File::PATH_SEPARATOR)
+
+        args = {
+            :output => "xml:withMessages",
+            :outputFile => output_file,
+            :effort => 'max',
+            :pluginList => '',
+            :classpath => cp,
+            :timeout => "90000000",
+            :debug => "false"
+        }
+        args[:failOnError] = true if options[:fail_on_error]
+        args[:excludeFilter] = options[:exclude_filter] if options[:exclude_filter]
+        args[:jvmargs] = options[:java_args] if options[:java_args]
+
+        Buildr.ant('findBugs') do |ant|
+          ant.taskdef :name =>'findBugs',
+                      :classname =>'edu.umd.cs.findbugs.anttask.FindBugsTask',
+                      :classpath => cp
+          ant.findBugs args do
+            source_paths.each do |source_path|
+              ant.sourcePath :path => source_path.to_s
+            end
+            Buildr.artifacts(analyze_paths).each(&:invoke).each do |analyze_path|
+              ant.auxAnalyzePath :path => analyze_path.to_s
+            end
+            if options[:properties]
+              options[:properties].each_pair do |k, v|
+                ant.systemProperty :name => k, :value => v
+              end
+            end
+            if options[:extra_dependencies]
+              ant.auxClasspath do |aux|
+                Buildr.artifacts(options[:extra_dependencies]).each(&:invoke).each do |dep|
+                  aux.pathelement :location => dep.to_s
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+
+    class Config
+
+      attr_accessor :enabled
+
+      def enabled?
+        !!@enabled
+      end
+
+      def html_enabled?
+        File.exist?(self.style_file)
+      end
+
+      attr_writer :config_directory
+
+      def config_directory
+        @config_directory || project._(:source, :main, :etc, :findbugs)
+      end
+
+      attr_writer :report_dir
+
+      def report_dir
+        @report_dir || project._(:reports, :findbugs)
+      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}/findbugs.xml"
+      end
+
+      attr_writer :html_output_file
+
+      def html_output_file
+        @html_output_file || "#{self.report_dir}/findbugs.html"
+      end
+
+      attr_writer :style_file
+
+      def style_file
+        @style_file || "#{self.config_directory}/findbugs-report.xsl"
+      end
+
+      attr_writer :filter_file
+
+      def filter_file
+        @filter_file || "#{self.config_directory}/filter.xml"
+      end
+
+      def properties
+        @properties ||= { }
+      end
+
+      attr_writer :java_args
+
+      def java_args
+        @java_args || "-server -Xss1m -Xmx800m -Duser.language=en -Duser.region=EN "
+      end
+
+      def source_paths
+        @source_paths ||= [self.project.compile.sources, self.project.test.compile.sources]
+      end
+
+      def analyze_paths
+        @analyze_path ||= [self.project.compile.target]
+      end
+
+      def extra_dependencies
+        @extra_dependencies ||= [self.project.compile.dependencies, self.project.test.compile.dependencies]
+      end
+
+      protected
+
+      def initialize(project)
+        @project = project
+      end
+
+      attr_reader :project
+
+    end
+
+    module ProjectExtension
+      include Extension
+
+      def findbugs
+        @findbugs ||= Buildr::Findbugs::Config.new(project)
+      end
+
+      after_define do |project|
+        if project.findbugs.enabled?
+          desc "Generate findbugs xml report."
+          project.task("findbugs:xml") do
+            puts "Findbugs: Analyzing source code..."
+            mkdir_p File.dirname(project.findbugs.xml_output_file)
+
+            options =
+              {
+                :properties => project.findbugs.properties,
+                :fail_on_error => project.findbugs.fail_on_error?,
+                :extra_dependencies => project.findbugs.extra_dependencies
+              }
+            options[:exclude_filter] = project.findbugs.filter_file if File.exist?(project.findbugs.filter_file)
+
+            Buildr::Findbugs.findbugs(project.findbugs.xml_output_file,
+                                      project.findbugs.source_paths.flatten.compact,
+                                      project.findbugs.analyze_paths.flatten.compact,
+                                      options)
+          end
+
+          if project.findbugs.html_enabled?
+            xml_task = project.task("findbugs:xml")
+            desc "Generate findbugs html report."
+            project.task("findbugs:html" => xml_task) do
+              puts "Findbugs: Generating report"
+              mkdir_p File.dirname(project.findbugs.html_output_file)
+              Buildr.ant "findbugs" do |ant|
+                ant.style :in => project.findbugs.xml_output_file,
+                          :out => project.findbugs.html_output_file,
+                          :style => project.findbugs.style_file
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+class Buildr::Project
+  include Buildr::Findbugs::ProjectExtension
+end