buildr 1.4.7.pre2-java → 1.4.8-java

data/CHANGELOG

@@ -1,4 +1,67 @@
-1.4.7 (Pending)
+1.4.8 (2012-11-01)
+* Change: Revert to importing non-verbose FileUtils utility methods to match buildr 1.4.6 release and earlier.
+* Added:  Experimental support for jacoco code coverage tool.
+* Fixed:  BUILDR-655 - Support JDK1.7 under OSX
+* Change: Updated dependency versions;
+          - builder (3.1.3)
+          - rubyforge (2.0.4)
+          - net-ssh (2.6.0)
+          - hoe (3.1.0)
+          - rjb (1.4.2)
+          - rdoc (3.12)
+          - xml-simple (1.1.1)
+          - rspec-expectations (2.11.3)
+          - rspec-mocks (2.11.3)
+          - rspec-core (2.11.1)
+          - rspec (2.11.0)
+          - rubyzip (0.9.9)
+* Added:  BUILDR-652 Generate buildfile from Eclipse workspace. (Niklaus Giger)
+* Fixed:  BUILDR-627 Support explicitly listed source files in buildr cc task. (Christopher Tiwald)
+* Fixed:  BUILDR-606 Transitive artifact resolution should not include artifacts in 'provided' scope in poms to
+          match maven behaviour. (Julio Arias)
+* Change: BUILDR-640 Enable building jekyll and rdoc under more rubies. (Niklaus Giger)
+* Change: Mark Buildr:Bnd.remote_repository as deprecated as dependencies appear in maven central.
+* Added:  BUILDR-654 Add the ability to configure the version of BND used by bnd addon. (Niklaus Giger)
+* Added:  Create the git_auto_version addon that automatically specifies a version for a git project based
+          on git describe.
+* Added:  Integrate with Zinc (incremental compilation wrapper for scalac 2.9+)
+* Change: Default to Scala 2.9.2, ScalaTest 1.8, Scala Specs2 1.11,
+          ScalaCheck 1.10.0.
+* Change: Scala artifact repository changed to
+          http://oss.sonatype.org/content/repositories/releases
+* Added:  BUILDR-645 Support Mercurial as a version control system (Tan Quach)
+* Fixed:  BUILDR-646 TGZ files do not keep their permissions when extracted
+          via Buildr::Unzip#extract
+* Added:  Add add_exploded_ear_artifact and add_exploded_ejb_artifact to the idea project extension.
+* Change: Default to using Checkstyle 5.5 in the checkstyle addon.
+* Fixed:  Fix the add_exploded_war_artifact method on the idea project by adding in missing method
+          `partition_dependencies`.
+* Fixed:  Fix the extension of the gwt plugin so that it can be required as an addon.
+* Fixed:  Fix the undefined default_web_xml variable in the add_web_facet method on the idea project.
+
+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 +106,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/]
@@ -34,11 +37,5 @@ def spec(platform = RUBY_PLATFORM[/java/] || 'ruby')
   @specs[platform]
 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']
-end
-
-
 desc 'Clean up all temporary directories used for running tests, creating documentation, packaging, etc.'
 task :clobber

data/addon/buildr/bnd.rb

@@ -16,14 +16,24 @@
 module Buildr
   module Bnd
     class << self
+      @@version = '1.50.0'
+      def version
+        @@version
+      end
+
+      def version=(newVersion)
+        @@version = newVersion
+      end
+
       # The specs for requirements
       def dependencies
-        ["biz.aQute:bnd:jar:0.0.384"]
+        ["biz.aQute:bnd:jar:#{version}"]
       end
 
       # Repositories containing the requirements
       def remote_repository
-        "http://www.aQute.biz/repo"
+        Buildr.application.deprecated "'Buildr:Bnd.remote_repository deprecated as the dependencies appear in maven central."
+        "http://www.aqute.biz/repo"
       end
 
       def bnd_main(*args)
@@ -102,7 +112,7 @@ module Buildr
             f.print params.collect { |k, v| "#{k}=#{v}" }.join("\n")
           end
 
-          Buildr::Bnd.bnd_main( "build", "-noeclipse", bnd_filename )
+          Buildr::Bnd.bnd_main( bnd_filename )
           begin
             Buildr::Bnd.bnd_main( "print", "-verify", filename )
           rescue => e

data/addon/buildr/{checkstyle.rake → checkstyle.rb}

@@ -23,7 +23,7 @@ module Buildr
       # The specs for requirements
       def dependencies
         [
-          'com.puppycrawl.tools:checkstyle:jar:5.4',
+          'com.puppycrawl.tools:checkstyle:jar:5.5',
           'commons-cli:commons-cli:jar:1.2',
           'antlr:antlr:jar:2.7.7',
           'com.google.collections:google-collections:jar:1.0',

data/addon/buildr/git_auto_version.rb

@@ -0,0 +1,33 @@
+# 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 GitAutoVersion
+    module ProjectExtension
+      include Extension
+
+      before_define do |project|
+        unless project.version
+          version_suffix = ENV['BUILD_NUMBER'] ? "-#{ENV['BUILD_NUMBER']}" : ''
+          project.version = `git describe --tags --always`.strip + version_suffix
+        end
+      end
+    end
+  end
+end
+
+class Buildr::Project
+  include Buildr::GitAutoVersion::ProjectExtension
+end

data/addon/buildr/gwt.rb

@@ -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/jacoco.rb

@@ -0,0 +1,194 @@
+# 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
+  # Initial support for JaCoCo coverage reports.
+  # WARNING: Experimental and may change radically.
+  module JaCoCo
+    class << self
+      VERSION = '0.5.10.201208310627'
+
+      def version
+        @version || Buildr.settings.build['jacoco'] || VERSION
+      end
+
+      def version=(value)
+        @version = value
+      end
+
+      def agent_spec
+        ["org.jacoco:org.jacoco.agent:jar:runtime:#{version}"]
+      end
+
+      def ant_spec
+        [
+          "org.jacoco:org.jacoco.report:jar:#{version}",
+          "org.jacoco:org.jacoco.core:jar:#{version}",
+          "org.jacoco:org.jacoco.ant:jar:#{version}",
+          'asm:asm:jar:3.3.1',
+          'asm:asm-commons:jar:3.3.1',
+          'asm:asm-tree:jar:3.3.1'
+        ]
+      end
+    end
+
+    class Config
+
+      attr_writer :enabled
+
+      def enabled?
+        @enabled.nil? ? true : @enabled
+      end
+
+      attr_writer :destfile
+
+      def destfile
+        @destfile || "#{self.report_dir}/jacoco.cov"
+      end
+
+      attr_writer :output
+
+      def output
+        @output || 'file'
+      end
+
+      attr_accessor :sessionid
+      attr_accessor :address
+      attr_accessor :port
+      attr_accessor :classdumpdir
+      attr_accessor :dumponexit
+      attr_accessor :append
+      attr_accessor :exclclassloader
+
+      def includes
+        @includes ||= []
+      end
+
+      def excludes
+        @excludes ||= []
+      end
+
+      attr_writer :report_dir
+
+      def report_dir
+        @report_dir || project._(:reports, :jacoco)
+      end
+
+      attr_writer :generate_xml
+
+      def generate_xml?
+        @generate_xml.nil? ? false : @generate_xml
+      end
+
+      attr_writer :xml_output_file
+
+      def xml_output_file
+        @xml_output_file || "#{self.report_dir}/jacoco.xml"
+      end
+
+      attr_writer :generate_html
+
+      def generate_html?
+        @generate_html.nil? ? false : @generate_html
+      end
+
+      attr_writer :html_output_directory
+
+      def html_output_directory
+        @html_output_directory || "#{self.report_dir}/jacoco"
+      end
+
+      protected
+
+      def initialize(project)
+        @project = project
+      end
+
+      attr_reader :project
+
+    end
+
+    module ProjectExtension
+      include Extension
+
+      def jacoco
+        @jacoco ||= Buildr::JaCoCo::Config.new(project)
+      end
+
+      after_define do |project|
+        unless project.test.compile.target.nil? || !project.jacoco.enabled?
+          project.test.setup do
+            agent_jar = Buildr.artifacts(Buildr::JaCoCo.agent_spec).each(&:invoke).map(&:to_s).join('')
+            options = []
+            ["destfile",
+             "append",
+             "exclclassloader",
+             "sessionid",
+             "dumponexit",
+             "output",
+             "address",
+             "port",
+             "classdumpdir"].each do |option|
+              value = project.jacoco.send(option.to_sym)
+              options << "#{option}=#{value}" unless value.nil?
+            end
+            options << "includes=#{project.jacoco.includes.join(':')}" unless project.jacoco.includes.empty?
+            options << "excludes=#{project.jacoco.excludes.join(':')}" unless project.jacoco.excludes.empty?
+
+            agent_config = "-javaagent:#{agent_jar}=#{options.join(',')}"
+            project.test.options[:java_args] = (project.test.options[:java_args] || []) + [agent_config]
+          end
+          namespace 'jacoco' do
+            if project.jacoco.generate_xml?
+              desc "Generate JaCoCo reports."
+              task 'reports' do
+                Buildr.ant "jacoco" do |ant|
+                  ant.taskdef(:resource => "org/jacoco/ant/antlib.xml") do |ant|
+                    ant.classpath :path => Buildr.artifacts(Buildr::JaCoCo.ant_spec).each(&:invoke).map(&:to_s).join(File::PATH_SEPARATOR)
+                  end
+                  ant.report do |ant|
+                    ant.executiondata do |ant|
+                      ant.file :file => project.jacoco.destfile
+                    end
+
+                    ant.structure(:name => project.name) do |ant|
+                      if project.compile.target
+                        ant.classfiles do |ant|
+                          ant.fileset :dir => project.compile.target
+                        end
+                      end
+                      ant.sourcefiles(:encoding => "UTF-8") do |ant|
+                        project.compile.sources.each do |path|
+                          ant.fileset :dir => path.to_s
+                        end
+                      end
+                    end
+
+                    ant.xml :destfile => project.jacoco.xml_output_file if project.jacoco.generate_xml?
+                    ant.html :destdir => project.jacoco.html_output_directory if project.jacoco.generate_html?
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+class Buildr::Project
+  include Buildr::JaCoCo::ProjectExtension
+end