buildr-findBugs 0.1.0 → 0.1.1

data/buildr-findBugs.gemspec

@@ -16,7 +16,7 @@
 
 Gem::Specification.new do |spec|
   spec.name           = 'buildr-findBugs'
-  spec.version        = '0.1.0'
+  spec.version        = '0.1.1'
   spec.author         = 'Antoine Toulme'
   spec.email          = "atoulme@intalio.com"
   spec.homepage       = "http://www.github.com/intalio/buildr-findBugs"

data/lib/buildr-findBugs.rb

@@ -3,68 +3,79 @@
 module Buildr
   module FindBugs
     include Extension
+    VERSION = "1.3.9"
+
+    class << self
+      def version
+        Buildr.settings.build['findbugs'] || VERSION
+      end
+    end
+
+    REQUIRES = ["com.google.code.findbugs:findbugs-ant:jar:#{version}"]
+
+    class << self
+      def requires
+        @requires ||= Buildr.transitive(REQUIRES).each(& :invoke).map(& :to_s)
+      end
+    end
 
     class FindBugsTask < Rake::Task
 
       attr_reader :project
-      
-      attr_writer :sourcePath, :auxAnalyzePath, :auxClasspath, :jvmargs, :report
 
-      def initialize(*args) #:nodoc:
+      attr_writer :sourcePath, :auxAnalyzePath, :auxClasspath, :jvmargs, :report, :excludeFilter
+
+      def initialize(* args) #:nodoc:
         super
-        enhance do
-          raise "Cannot run Findbugs, FINDBUGS_HOME undefined" unless defined? ENV['FINDBUGS_HOME']
+        enhance([:compile]) do
           mkpath File.dirname(report) #otherwise Findbugs can't create the file
-          
+
           Buildr.ant('findBugs') do |ant|
-            refid = "#{project.name}-auxClasspath"
-            artifacts = [Buildr::artifact("com.google.code.findbugs:findbugs-ant:jar:1.3.9")]
-            artifacts.each {|lib| lib.invoke}
-            # We use a huge classpath.
-            ant.path :id => refid do
-              [[auxClasspath] + artifacts].flatten.each do |elt|
-                ant.pathelement :location => elt
-              end
-            end
-            
+            antClasspath = FindBugs.requires.join(File::PATH_SEPARATOR)
+            excludeFilterFile = File.expand_path(excludeFilter)
+
             ant.taskdef :name=>'findBugs',
-                  :classname=>'edu.umd.cs.findbugs.anttask.FindBugsTask', :classpathref => refid
-            ant.findBugs :output => "xml", :outputFile => report, :home => ENV['FINDBUGS_HOME'], :jvmargs => jvmargs do
-              ant.sourcePath(:path => sourcePath)
+                        :classname=>'edu.umd.cs.findbugs.anttask.FindBugsTask',
+                        :classpath => antClasspath
+            ant.findBugs :output => "xml", :outputFile => report, :classpath => antClasspath, :pluginList => '', :jvmargs => jvmargs, :excludeFilter => excludeFilterFile do
+              ant.sourcePath :path => sourcePath
               ant.auxAnalyzePath :path => auxAnalyzePath
-              ant.auxClasspath :refid => refid
+              ant.auxClasspath { |aux| auxClasspath.each { |dep| aux.pathelement :location => dep } } unless auxClasspath.empty?
             end
 
           end
 
         end
       end
-      
+
       def report
         @report || project.path_to(:reports, "findbugs.xml")
       end
-      
+
       def sourcePath
         @sourcePath || project.compile.sources.select { |source| File.directory?(source.to_s) }.join(File::PATH_SEPARATOR)
       end
-      
+
       def auxAnalyzePath
         @auxAnalyzePath || project.compile.target
       end
-      
+
       def auxClasspath
-        @auxClasspath || [project.compile.dependencies]
+        @auxClasspath || project.compile.dependencies
       end
-      
+
       def jvmargs
         @jvmargs || "-Xmx512m"
       end
-        
+
+      def excludeFilter
+        @excludeFilter || project.path_to("exclude_filter.xml")
+      end
 
       # :call-seq:
       #   with(options) => self
       #
-      # Passes options to the task and returns self. 
+      # Passes options to the task and returns self.
       #
       def with(options)
         options.each do |key, value|
@@ -76,14 +87,14 @@ module Buildr
         end
         self
       end
-      
-      private 
+
+      private
 
       def associate_with(project)
         @project = project
-      end    
-      
-      
+      end
+
+
     end
 
     first_time do
@@ -97,18 +108,19 @@ module Buildr
       project.recursive_task('findBugs')
     end
 
-    after_define do |project|  
+    after_define do |project|
       project.clean do
         rm_rf project.path_to(:reports, "findbugs.xml")
       end
     end
 
-    def findBugs(*deps, &block)
-      task('findBugs').enhance deps, &block
+    def findBugs(* deps, & block)
+      task('findBugs').enhance deps, & block
     end
   end
 end
 
 class Buildr::Project
   include Buildr::FindBugs
-end
+end
+

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: buildr-findBugs
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  hash: 25
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Antoine Toulme
@@ -9,19 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-23 00:00:00 -08:00
+date: 2010-08-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: buildr
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        - 0
         version: 1.4.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: |
   Adds a task to help run FindBugs over your code.
 
@@ -50,21 +62,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A plugin for adding FindBugs support to Buildr.