buildr 1.4.7 → 1.4.8

data/CHANGELOG

@@ -1,3 +1,44 @@
+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.

data/Rakefile

@@ -37,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?
-  RbConfig::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.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/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

data/buildr.buildfile

@@ -18,8 +18,8 @@ require 'buildr/jetty'
 require 'buildr/nailgun'
 require 'buildr/scala'
 repositories.remote << 'http://repo1.maven.org/maven2'
-repositories.remote << 'http://scala-tools.org/repo-releases/'
 
+repositories.remote << 'https://oss.sonatype.org/content/groups/scala-tools'
 
 define 'buildr' do
   compile.using :source=>'1.5', :target=>'1.5', :debug=>false

data/buildr.gemspec

@@ -55,38 +55,45 @@ for those one-off tasks, with a language that's a joy to use.
 
   # Tested against these dependencies.
   spec.add_dependency 'rake',                 '0.9.2.2'
-  spec.add_dependency 'builder',              '2.1.2'
-  spec.add_dependency 'net-ssh',              '2.3.0'
+  spec.add_dependency 'builder',              '3.1.3'
+  spec.add_dependency 'net-ssh',              '2.6.0'
   spec.add_dependency 'net-sftp',             '2.0.5'
-  spec.add_dependency 'rubyzip',              '0.9.4'
+  spec.add_dependency 'rubyzip',              '0.9.9'
+  # Highline 1.6.15 does not seem to work on windows. We should
+  # investigate the root cause at a later stage before upgrading
   spec.add_dependency 'highline',             '1.6.2'
-  spec.add_dependency 'json_pure',            '1.4.3'
-  spec.add_dependency 'rubyforge',            '2.0.3'
-  spec.add_dependency 'hoe',                  '2.3.3'
-  spec.add_dependency 'rjb',                  '1.4.0' if ($platform.to_s == 'x86-mswin32' || $platform.to_s == 'ruby')
+  spec.add_dependency 'json_pure',            '1.7.5'
+  spec.add_dependency 'rubyforge',            '2.0.4'
+  spec.add_dependency 'hoe',                  '3.1.0'
+  spec.add_dependency 'rjb',                  '1.4.2' if ($platform.to_s == 'x86-mswin32' || $platform.to_s == 'ruby')
   spec.add_dependency 'atoulme-Antwrap',      '~> 0.7.2'
   spec.add_dependency 'diff-lcs',             '1.1.3'
-  spec.add_dependency 'rspec-expectations',   '2.9.0'
-  spec.add_dependency 'rspec-mocks',          '2.9.0'
-  spec.add_dependency 'rspec-core',           '2.9.0'
-  spec.add_dependency 'rspec',                '2.9.0'
-  spec.add_dependency 'xml-simple',           '1.0.12'
+  spec.add_dependency 'rspec-expectations',   '2.11.3'
+  spec.add_dependency 'rspec-mocks',          '2.11.3'
+  spec.add_dependency 'rspec-core',           '2.11.1'
+  spec.add_dependency 'rspec',                '2.11.0'
+  spec.add_dependency 'xml-simple',           '1.1.1'
   spec.add_dependency 'minitar',              '0.5.3'
   spec.add_dependency 'jruby-openssl',        '>= 0.7' if $platform.to_s == 'java'
 
-  # The documentation is currently not generated whe building via jruby
+  # Unable to get this consistently working under jruby on windows
   unless $platform.to_s == 'java'
     spec.add_development_dependency 'jekyll', '0.11.2'
     spec.add_development_dependency 'RedCloth', '4.2.9'
     spec.add_development_dependency 'jekylltask', '1.1.0'
-    spec.add_development_dependency 'rdoc', '3.8'
+    spec.add_development_dependency 'rdoc', '3.12'
     spec.add_development_dependency 'rcov', '0.9.9'
   end
 
-  spec.add_development_dependency 'ci_reporter', '1.6.3'
+  spec.add_development_dependency 'ci_reporter', '1.7.2'
 
+  # NOTE: Must update all-in-one.rake if this is updated
   spec.add_development_dependency 'ffi-ncurses', '0.4.0' if $platform.to_s == 'java'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'win32console' if $platform.to_s == 'x86-mswin32'
-  spec.add_development_dependency 'rubyforge'
+  # Ideally we would depend on psych when the platform has >= 1.9.2 support and jruby platform version > 1.6.6
+  #spec.add_development_dependency 'psych' if RUBY_VERSION >= '1.9.2'
+  spec.add_development_dependency 'pygmentize', '0.0.3'
+  spec.add_development_dependency 'saikuro_treemap', '0.2.0'
+  spec.add_development_dependency 'atoulme-Saikuro', '1.2.1'
 end

data/doc/_layouts/default.html

@@ -60,8 +60,6 @@
               <li><a href='http://issues.apache.org/jira/browse/Buildr'>Issues/Bugs</a></li>
               <li><a href='https://builds.apache.org/view/A-F/view/Buildr'>CI Jobs</a></li>
               <li><a href='contributing.html'>Contributing</a></li>
-              <li><a href='specs.html'>Specs</a></li>
-              <li><a href='coverage/index.html'>Coverage</a></li>
             </ol>
           </li>
           <li>

data/doc/contributing.textile

@@ -242,6 +242,53 @@ The care and feeding of the "CI Jobs":https://builds.apache.org/view/A-F/view/Bu
 
 You may also need to coordinate with the Apache infrastructure team to get accounts on the actual slave hosts that run the CI jobs. This access may be required to install tools and gems required to run the CI jobs. The main slave host to get access to is vesta.apache.org at the time of writing. You can also log on to the slave host, impersonate hudson and manually run tasks when you are attempting to track down build problems. Of course to impersonate hudson you will need to learn how to use "OPIE.":http://apache.org/dev/freebsd-jails
 
+h3(#cilinux).  Linux Setup
+
+The tests on the Linux hosts rely on "RVM":https://rvm.io/ to setup the ruby environment. At the time of writing the Linux/x86 nodes that Apache uses for CI are based of the old "Ubuntu 10.04.4 LTS (Lucid Lynx)" operating system. As it is a relatively old operating system, it requires a little bit of manual intervention to install RVM on the node. We have installed the required tools on vesta.apache.org manually. The script looks something like;
+
+{% highlight sh %}
+ssh my_username@vesta.apache.org
+sudo su - hudson
+
+curl -L https://get.rvm.io | bash -s stable
+rvm reload
+rvm pkg install readline
+rvm pkg install iconv
+rvm pkg install curl
+rvm pkg install openssl
+rvm pkg install zlib
+rvm pkg install autoconf
+rvm pkg install ncurses
+rvm pkg install pkgconfig
+rvm pkg install gettext
+rvm pkg install glib
+rvm pkg install mono
+rvm pkg install llvm
+rvm pkg install libxml2
+rvm pkg install libxslt
+rvm pkg install libyaml
+rvm install ruby-1.8.7-p358
+rvm install ruby-1.9.2-p320
+rvm install jruby-1.6.7
+rvm install ruby-1.9.3-p194
+{% endhighlight %}
+
+It should also be noted that jruby-1.6.7 release has a native library that is compiled using a more modern version of libc than is available on this variant of the operating system. We could download the source release and recompile the library but instead we have just avoided the need for any use of the ruby native interface library in our CI infrastructure.
+
+h3(#ciwindows).  Windows Setup
+
+The ci infrastructure on the windows host (hudson-win.apache.org) is a little fragile. First you need to RDP in and download the support libraries. We have manually installed the tools in the following locations. Note: it is important to make the locations read-write access to the hudson user.
+
+{% highlight sh %}
+F:\hudson\tools\Ruby193-p194
+F:\hudson\tools\Ruby192-p290
+F:\hudson\tools\Ruby187-p370
+F:\hudson\tools\jruby-1.6.7
+F:\hudson\tools\scala-2.9.0.1
+{% endhighlight %}
+
+WARNING: Several attempts were made to use GEM_HOME to install the dependent gems for each test in a separate location but we were unable to figure out the mechanisms via which sub-shells would inherit the paths and the ability to run tools such as rspec.
+
 h2(#contributors).  Contributors
 
 Here is the list of people who are actively working and committing on Buildr: