buildr 1.4.17 → 1.4.18

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzAwYjE0NTBlYTRjYjU2Yjc3NmEzYmRjNTI3OWE0MjFkYzE2ODczNA==
+    NTkzMTBlY2Q3ZmQzODRkYTIyNjYzNzVjMzczMTIwNDdhNDE1NjNhZQ==
   data.tar.gz: !binary |-
-    MDFlNWU0Yjc2MzIzY2MyNzFjN2U3MTFkNDM0NjUwZWZlMDVmODI5NA==
+    ODBkYjk1MWY1YWNlZmE4OTgyZGQ0MDJkYWYxODRjNDk4ZGIzN2JjYw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZGUwOGRjZTlkMjAyZmM1ZjYyMWMwMGNhYmJiYzIxZjE2OGM5YTE3ZTg2MjMz
-    N2VjYTExMjMzMWRiMDQzOTczMDkxN2IyN2IwZjYzMWM5ZTYzMWJjY2Y1NDY1
-    NDFiNzQ5NjQxYzkxMzBiZTc5NjllNGE4NzViNjdhMDM1MjUwZTc=
+    YTQ0ODIxZmExOWI0NDk0ODVjNGNmNGJlM2NhN2Y3YzRiOWNlNWI3MTlhNGRk
+    OWFhZDRkM2Y1MmU3Y2UwYWE3OTlkMGYzNjk1ZmFlNTNlZWFlNmUzYjk2NmY1
+    N2NhNTk4MjJhNTMxZjVlMzNlOGViMTkwMTFkM2RhZDMzZmQ0YTk=
   data.tar.gz: !binary |-
-    NmVlMDZjMTNkZmE2YTk3MzM2YTgyYWY3NTc0ZjE3M2ZkNWQxZGFhMjAzNmM0
-    N2ZhMTgzNTZlNjc3MTIyN2RiODQzMTBjYjRmOTUyNzU4OWM0ZmNjYzliZjZk
-    NWNhZGViOWU2MDRmYWE5MmIyNWViMGM1MGY0MGU3ZjdhYWJiNDI=
+    NjQ4ZWVjOWNlZjg3N2UxYzNjNGI4MjY2NWY1NjhiNzAwNTFhYjJkOWY2NDY4
+    YTA5ZWQ0MTIwZTcwZmI1NzBkMjJhODA4MjZhMmUxZDVjYWE4ODE4OWFlN2I3
+    MzM2YmI3NGJiN2RmNWRjOWJlM2E3Y2Y4OTNmYmViYjNhMDBmZjA=

data/CHANGELOG

@@ -1,3 +1,29 @@
+1.4.18 (2014-06-24)
+* Fixed:  BUILDR-699 - Update the custom_pom addon to avoid failure when
+          used with zip packages.
+* Fixed:  BUILDR-694 - "buildr upload" fails: wrong number of arguments in
+          progress bar read() in Ruby 2.1.0. Submitted By Mark Reibert.
+* Change: Remove support for uploads to RubyForge.org with gem dependencies
+          as the site no longer exists.
+* Change: BUILDR-664 - Update Checkstyle addon so that extra_dependencies is
+          the project dependencies by default. Move the checkstyle dependencies
+          to the start of the classpath to avoid problems running checkstyle.
+          Submitted by Dieter Vrancken.
+* Fixed:  BUILDR-698 - Correct "Lines of code" example in documentation.
+          Submitted By: Trejkaz.
+* Added:  Add ipr.add_glassfish_configuration method for defining a local
+          glassfish configuration within IDEA.
+* Added:  Add ipr.add_ruby_script_configuration method for defining a ruby
+          configuration within IDEA.
+* Added:  Add ipr.add_java_configuration method for defining a java
+          configuration within IDEA.
+* Change: Include additional rules in default pmd rule set: 'finalizers' and
+          'braces'.
+* Change: Upgrade the version of PMD in use to 5.1.1.
+* Change: Supply a default xsl file for generating the jdepend report.
+* Fixed:  Fix the naming of css_lint addon file so it is made available
+          as an addon.
+
 1.4.17 (2014-05-25)
 * Added:  Add the add_default_testng_configuration method to help IDEA
           project creation. Improves test coverage across 'default'

data/README.rdoc

@@ -13,7 +13,7 @@ Buildr needs Ruby 1.8 or later and RubyGems 0.9 or later.
 Windows users can get the one-click Ruby installer, which includes the latest
 version of Ruby and RubyGems:
 
-http://rubyinstaller.rubyforge.org
+http://rubyinstaller.org
 
 Make sure to set JAVA_HOME environment variable first, then:
 
@@ -53,7 +53,7 @@ dependencies are installed when you run:
 Windows users can get the one-click Ruby installer, which includes the latest
 version of Ruby and RubyGems:
 
-http://rubyinstaller.rubyforge.org
+http://rubyinstaller.org
 
 Before installing Buildr, please set the JAVA_HOME environment variable to
 point to your JDK distribution.  Next, use Ruby Gem to install Buildr:

data/addon/buildr/checkstyle-report.xsl

@@ -2,6 +2,23 @@
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
+  <!--
+     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.
+  -->
+
   <xsl:template match="/">
     <html>
       <head>

data/addon/buildr/checkstyle.rb

@@ -35,7 +35,7 @@ module Buildr
       end
 
       def checkstyle(configuration_file, format, output_file, source_paths, options = {})
-        dependencies = (options[:dependencies] || []) + self.dependencies
+        dependencies = self.dependencies + (options[:dependencies] || [])
         cp = Buildr.artifacts(dependencies).each { |a| a.invoke() if a.respond_to?(:invoke) }.map(&:to_s)
 
         args = []
@@ -153,7 +153,7 @@ module Buildr
       end
 
       def extra_dependencies
-        @extra_dependencies ||= []
+        @extra_dependencies ||= [self.project.compile.dependencies, self.project.test.compile.dependencies].flatten
       end
 
       protected

data/addon/buildr/css_lint-report.xsl

@@ -2,6 +2,23 @@
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
+  <!--
+     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.
+  -->
+
   <xsl:template match="/">
     <html>
       <head>

data/addon/buildr/custom_pom.rb

@@ -236,47 +236,46 @@ module Buildr
       end
     end
   end
-end
-
-module Buildr
-  class Project #:nodoc:
-    def pom
-      unless @pom
-        @pom = parent ? parent.pom.dup : Buildr::CustomPom.new
-        @pom.send :associate_project, self
+  module CPom
+    module ProjectExtension
+      include Extension
+
+      def pom
+        unless @pom
+          @pom = parent ? parent.pom.dup : Buildr::CustomPom.new
+          @pom.send :associate_project, self
+        end
+        @pom
       end
-      @pom
-    end
-  end
-end
 
-module Buildr
-  module Package
-    alias :old_package :package
-
-    def package(*args)
-      package = old_package(*args)
-      class << package
-        def pom
-          unless @pom || classifier
-            pom_filename = Util.replace_extension(name, 'pom')
-            spec = {:group => group, :id => id, :version => version, :type => :pom}
-            @pom = Buildr.artifact(spec, pom_filename)
-            buildr_project = Buildr.project(self.scope.join(':'))
-            @pom.content Buildr::CustomPom.pom_xml(buildr_project, self)
+      after_define do |project|
+        project.packages.each do |pkg|
+          if pkg.type.to_s == 'jar' && !pkg.classifier
+            class << pkg
+              def pom_xml
+                self.pom.content
+              end
+
+              def pom
+                unless @pom
+                  pom_filename = Util.replace_extension(name, 'pom')
+                  spec = {:group => group, :id => id, :version => version, :type => :pom}
+                  @pom = Buildr.artifact(spec, pom_filename)
+                  buildr_project = Buildr.project(self.scope.join(':'))
+                  @pom.content Buildr::CustomPom.pom_xml(buildr_project, self)
+                end
+                @pom
+              end
+            end
+            pkg.instance_variable_set('@pom', nil)
+            pkg.enhance([pkg.pom.to_s])
           end
-          @pom
         end
       end
-      package.instance_variable_set('@pom', nil)
-      package.enhance([package.pom.to_s]) if package.type.to_s == 'jar' && !package.classifier
-      package
     end
   end
+end
 
-  module ActsAsArtifact
-    def pom_xml
-      self.pom.content
-    end
-  end
+class Buildr::Project
+  include Buildr::CPom::ProjectExtension
 end

data/addon/buildr/gpg.rb

@@ -65,7 +65,7 @@ module Buildr
 
       def sign_and_upload_all_packages(project)
         project.packages.each { |pkg| Buildr::GPG.sign_and_upload(project, pkg) }
-        project.packages.map { |pkg| pkg.pom }.compact.uniq.each { |pom| Buildr::GPG.sign_and_upload(project, pom) }
+        project.packages.select {|pkg| pkg.respond_to?(:pom) }.map { |pkg| pkg.pom }.compact.uniq.each { |pom| Buildr::GPG.sign_and_upload(project, pom) }
       end
     end
 

data/addon/buildr/jdepend-report.xsl

@@ -0,0 +1,404 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+  <!--
+     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.
+  -->
+
+  <xsl:output method="html" indent="yes" encoding="US-ASCII"/>
+
+  <xsl:template match="JDepend">
+    <html>
+      <head>
+        <title>JDepend Analysis</title>
+
+        <style type="text/css">
+          body {
+          font:normal 68% verdana,arial,helvetica;
+          color:#000000;
+          }
+          table tr td, tr th {
+          font-size: 68%;
+          }
+          table.details tr th{
+          font-weight: bold;
+          text-align:left;
+          background:#a6caf0;
+          }
+          table.details tr td{
+          background:#eeeee0;
+          }
+
+          p {
+          line-height:1.5em;
+          margin-top:0.5em; margin-bottom:1.0em;
+          margin-left:2em;
+          margin-right:2em;
+          }
+          h1 {
+          margin: 0px 0px 5px; font: 165% verdana,arial,helvetica
+          }
+          h2 {
+          margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica
+          }
+          h3 {
+          margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica
+          }
+          h4 {
+          margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+          }
+          h5 {
+          margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+          }
+          h6 {
+          margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+          }
+          .Error {
+          font-weight:bold; color:red;
+          }
+          .Failure {
+          font-weight:bold; color:purple;
+          }
+          .Properties {
+          text-align:right;
+          }
+        </style>
+
+
+      </head>
+      <body>
+        <!--h1>JDepend Report</h1>
+        <ul>
+        <xsl:for-each select="./Packages/Package">
+                    <xsl:sort select="@name"/>
+            <li><xsl:value-of select="@name"/></li>
+        </xsl:for-each>
+        </ul-->
+
+        <h1>
+          <a name="top">JDepend Analysis</a>
+        </h1>
+        <p align="right">Designed for use with
+          <a href="http://www.clarkware.com/software/JDepend.html">JDepend</a> and <a href="http://buildr.apache.org">Buildr</a>.
+        </p>
+        <hr size="2"/>
+
+        <table width="100%">
+          <tr>
+            <td>
+              <a name="NVsummary">
+                <h2>Summary</h2>
+              </a>
+            </td>
+            <td align="right">
+              [<a href="#NVsummary">summary</a>]
+              [<a href="#NVpackages">packages</a>]
+              [<a href="#NVcycles">cycles</a>]
+              [<a href="#NVexplanations">explanations</a>]
+            </td>
+          </tr>
+        </table>
+
+        <table width="100%" class="details">
+          <tr>
+            <th>Package</th>
+            <th>Total Classes</th>
+            <th>
+              <a href="#EXnumber">Abstract Classes</a>
+            </th>
+            <th>
+              <a href="#EXnumber">Concrete Classes</a>
+            </th>
+            <th>
+              <a href="#EXafferent">Afferent Couplings</a>
+            </th>
+            <th>
+              <a href="#EXefferent">Efferent Couplings</a>
+            </th>
+            <th>
+              <a href="#EXabstractness">Abstractness</a>
+            </th>
+            <th>
+              <a href="#EXinstability">Instability</a>
+            </th>
+            <th>
+              <a href="#EXdistance">Distance</a>
+            </th>
+
+          </tr>
+          <xsl:for-each select="./Packages/Package">
+            <xsl:if test="count(error) = 0">
+              <tr>
+                <td align="left">
+                  <a>
+                    <xsl:attribute name="href">#PK<xsl:value-of select="@name"/>
+                    </xsl:attribute>
+                    <xsl:value-of select="@name"/>
+                  </a>
+                </td>
+                <td align="right">
+                  <xsl:value-of select="Stats/TotalClasses"/>
+                </td>
+                <td align="right">
+                  <xsl:value-of select="Stats/AbstractClasses"/>
+                </td>
+                <td align="right">
+                  <xsl:value-of select="Stats/ConcreteClasses"/>
+                </td>
+                <td align="right">
+                  <xsl:value-of select="Stats/Ca"/>
+                </td>
+                <td align="right">
+                  <xsl:value-of select="Stats/Ce"/>
+                </td>
+                <td align="right">
+                  <xsl:value-of select="Stats/A"/>
+                </td>
+                <td align="right">
+                  <xsl:value-of select="Stats/I"/>
+                </td>
+                <td align="right">
+                  <xsl:value-of select="Stats/D"/>
+                </td>
+
+
+              </tr>
+            </xsl:if>
+          </xsl:for-each>
+          <xsl:for-each select="./Packages/Package">
+            <xsl:if test="count(error) &gt; 0">
+              <tr>
+                <td align="left">
+                  <xsl:value-of select="@name"/>
+                </td>
+                <td align="left" colspan="8">
+                  <xsl:value-of select="error"/>
+                </td>
+              </tr>
+            </xsl:if>
+          </xsl:for-each>
+        </table>
+
+        <table width="100%">
+          <tr>
+            <td>
+              <a name="NVpackages">
+                <h2>Packages</h2>
+              </a>
+            </td>
+            <td align="right">
+              [<a href="#NVsummary">summary</a>]
+              [<a href="#NVpackages">packages</a>]
+              [<a href="#NVcycles">cycles</a>]
+              [<a href="#NVexplanations">explanations</a>]
+            </td>
+          </tr>
+        </table>
+
+        <xsl:for-each select="./Packages/Package">
+          <xsl:if test="count(error) = 0">
+            <h3>
+              <a>
+                <xsl:attribute name="name">PK<xsl:value-of select="@name"/>
+                </xsl:attribute>
+                <xsl:value-of select="@name"/>
+              </a>
+            </h3>
+
+            <table width="100%">
+              <tr>
+                <td><a href="#EXafferent">Afferent Couplings</a>:
+                  <xsl:value-of select="Stats/Ca"/>
+                </td>
+                <td><a href="#EXefferent">Efferent Couplings</a>:
+                  <xsl:value-of select="Stats/Ce"/>
+                </td>
+                <td><a href="#EXabstractness">Abstractness</a>:
+                  <xsl:value-of select="Stats/A"/>
+                </td>
+                <td><a href="#EXinstability">Instability</a>:
+                  <xsl:value-of select="Stats/I"/>
+                </td>
+                <td><a href="#EXdistance">Distance</a>:
+                  <xsl:value-of select="Stats/D"/>
+                </td>
+              </tr>
+            </table>
+
+            <table width="100%" class="details">
+              <tr>
+                <th>Abstract Classes</th>
+                <th>Concrete Classes</th>
+                <th>Used by Packages</th>
+                <th>Uses Packages</th>
+              </tr>
+              <tr>
+                <td valign="top" width="25%">
+                  <xsl:if test="count(AbstractClasses/Class)=0">
+                    <i>None</i>
+                  </xsl:if>
+                  <xsl:for-each select="AbstractClasses/Class">
+                    <xsl:value-of select="node()"/>
+                    <br/>
+                  </xsl:for-each>
+                </td>
+                <td valign="top" width="25%">
+                  <xsl:if test="count(ConcreteClasses/Class)=0">
+                    <i>None</i>
+                  </xsl:if>
+                  <xsl:for-each select="ConcreteClasses/Class">
+                    <xsl:value-of select="node()"/>
+                    <br/>
+                  </xsl:for-each>
+                </td>
+                <td valign="top" width="25%">
+                  <xsl:if test="count(UsedBy/Package)=0">
+                    <i>None</i>
+                  </xsl:if>
+                  <xsl:for-each select="UsedBy/Package">
+                    <a>
+                      <xsl:attribute name="href">#PK<xsl:value-of select="node()"/>
+                      </xsl:attribute>
+                      <xsl:value-of select="node()"/>
+                    </a>
+                    <br/>
+                  </xsl:for-each>
+                </td>
+                <td valign="top" width="25%">
+                  <xsl:if test="count(DependsUpon/Package)=0">
+                    <i>None</i>
+                  </xsl:if>
+                  <xsl:for-each select="DependsUpon/Package">
+                    <a>
+                      <xsl:attribute name="href">#PK<xsl:value-of select="node()"/>
+                      </xsl:attribute>
+                      <xsl:value-of select="node()"/>
+                    </a>
+                    <br/>
+                  </xsl:for-each>
+                </td>
+              </tr>
+            </table>
+          </xsl:if>
+        </xsl:for-each>
+
+        <table width="100%">
+          <tr>
+            <td>
+              <a name="NVcycles">
+                <h2>Cycles</h2>
+              </a>
+            </td>
+            <td align="right">
+              [<a href="#NVsummary">summary</a>]
+              [<a href="#NVpackages">packages</a>]
+              [<a href="#NVcycles">cycles</a>]
+              [<a href="#NVexplanations">explanations</a>]
+            </td>
+          </tr>
+        </table>
+
+        <xsl:if test="count(Cycles/Package) = 0">
+          <p>There are no cyclic dependancies.</p>
+        </xsl:if>
+        <xsl:for-each select="Cycles/Package">
+          <h3>
+            <xsl:value-of select="@Name"/>
+          </h3>
+          <p>
+            <xsl:for-each select="Package">
+              <xsl:value-of select="."/>
+              <br/>
+            </xsl:for-each>
+          </p>
+        </xsl:for-each>
+
+        <table width="100%">
+          <tr>
+            <td>
+              <a name="NVexplanations">
+                <h2>Explanations</h2>
+              </a>
+            </td>
+            <td align="right">
+              [<a href="#NVsummary">summary</a>]
+              [<a href="#NVpackages">packages</a>]
+              [<a href="#NVcycles">cycles</a>]
+              [<a href="#NVexplanations">explanations</a>]
+            </td>
+          </tr>
+        </table>
+
+        <p>The following explanations are for quick reference and are lifted directly from the original<a
+                                                                                                         href="http://www.clarkware.com/software/JDepend.html">
+          JDepend documentation</a>.
+        </p>
+
+        <h3>
+          <a name="EXnumber">Number of Classes</a>
+        </h3>
+        <p>The number of concrete and abstract classes (and interfaces) in the package is an indicator of the
+          extensibility of the package.
+        </p>
+        <h3>
+          <a name="EXafferent">Afferent Couplings</a>
+        </h3>
+        <p>The number of other packages that depend upon classes within the package is an indicator of the package's
+          responsibility.
+        </p>
+        <h3>
+          <a name="EXefferent">Efferent Couplings</a>
+        </h3>
+        <p>The number of other packages that the classes in the package depend upon is an indicator of the package's
+          independence.
+        </p>
+        <h3>
+          <a name="EXabstractness">Abstractness</a>
+        </h3>
+        <p>The ratio of the number of abstract classes (and interfaces) in the analyzed package to the total number of
+          classes in the analyzed package.
+        </p>
+        <p>The range for this metric is 0 to 1, with A=0 indicating a completely concrete package and A=1 indicating a
+          completely abstract package.
+        </p>
+        <h3>
+          <a name="EXinstability">Instability</a>
+        </h3>
+        <p>The ratio of efferent coupling (Ce) to total coupling (Ce / (Ce + Ca)). This metric is an indicator of the
+          package's resilience to change.
+        </p>
+        <p>The range for this metric is 0 to 1, with I=0 indicating a completely stable package and I=1 indicating a
+          completely instable package.
+        </p>
+        <h3>
+          <a name="EXdistance">Distance</a>
+        </h3>
+        <p>The perpendicular distance of a package from the idealized line A + I = 1. This metric is an indicator of the
+          package's balance between abstractness and stability.
+        </p>
+        <p>A package squarely on the main sequence is optimally balanced with respect to its abstractness and stability.
+          Ideal packages are either completely abstract and stable (x=0, y=1) or completely concrete and instable (x=1,
+          y=0).
+        </p>
+        <p>The range for this metric is 0 to 1, with D=0 indicating a package that is coincident with the main sequence
+          and D=1 indicating a package that is as far from the main sequence as possible.
+        </p>
+
+      </body>
+    </html>
+  </xsl:template>
+
+</xsl:stylesheet>

data/addon/buildr/jdepend.rb

@@ -98,7 +98,15 @@ module Buildr
       attr_writer :style_file
 
       def style_file
-        @style_file || "#{self.config_directory}/jdepend.xsl"
+        unless @style_file
+          project_xsl = "#{self.config_directory}/jdepend-report.xsl"
+          if File.exist?(project_xsl)
+            @style_file = project_xsl
+          else
+            @style_file = "#{File.dirname(__FILE__)}/jdepend-report.xsl"
+          end
+        end
+        @style_file
       end
 
       def target_paths