svn commit: r1429367 - in /buildr/trunk: CHANGELOG addon/buildr/checkstyle.rb

[bo...@apache.org]

Author: boisvert
Date: Sat Jan  5 19:48:20 2013
New Revision: 1429367

URL: http://svn.apache.org/viewvc?rev=1429367&view=rev
Log:
Checkstyle addon correctly handles String dependencies (vs task dependencies)

Modified:
    buildr/trunk/CHANGELOG
    buildr/trunk/addon/buildr/checkstyle.rb

Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1429367&r1=1429366&r2=1429367&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Sat Jan  5 19:48:20 2013
@@ -1,4 +1,6 @@
 1.4.10 (Pending)
+* Fixed:  Checkstyle addon correctly handles String dependencies
+          (vs task dependencies)
 * Added:  Created an addon 'buildr/wsgen' for generating wsdls from java
           and java from wsdls using the underlying wsgen tool.
 * Change: Defer the expansion of generated poms by wrapping the generation

Modified: buildr/trunk/addon/buildr/checkstyle.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/addon/buildr/checkstyle.rb?rev=1429367&r1=1429366&r2=1429367&view=diff
==============================================================================
--- buildr/trunk/addon/buildr/checkstyle.rb (original)
+++ buildr/trunk/addon/buildr/checkstyle.rb Sat Jan  5 19:48:20 2013
@@ -34,7 +34,7 @@ module Buildr
 
       def checkstyle(configuration_file, format, output_file, source_paths, options = {})
         dependencies = (options[:dependencies] || []) + self.dependencies
-        cp = Buildr.artifacts(dependencies).each(&:invoke).map(&:to_s)
+        cp = Buildr.artifacts(dependencies).each { |a| a.invoke() if a.respond_to?(:invoke) }.map(&:to_s)
 
         args = []
         if options[:properties_file]
@@ -141,7 +141,7 @@ module Buildr
       end
 
       def extra_dependencies
-        @extra_dependencies ||= [self.project.compile.dependencies, self.project.test.compile.dependencies]
+        @extra_dependencies ||= [self.project.compile.dependencies, self.project.test.compile.dependencies].flatten
       end
 
       protected