buildr 1.3.5-x86-mswin32 → 1.4.0-x86-mswin32

data/lib/buildr/ide/eclipse/plugin.rb

@@ -30,7 +30,10 @@ module Buildr
         eclipse = project.eclipse
 
         # smart defaults
-        if eclipse.natures.empty? && ((File.exists? project.path_to("plugin.xml")) || (File.exists? project.path_to("OSGI-INF")))
+        if eclipse.natures.empty? && (
+            (File.exists? project.path_to("plugin.xml")) ||
+            (File.exists? project.path_to("OSGI-INF")) ||
+            (File.exists?(project.path_to("META-INF/MANIFEST.MF")) && File.read(project.path_to("META-INF/MANIFEST.MF")).match(/^Bundle-SymbolicName:/)))
           eclipse.natures = [NATURE, Buildr::Eclipse::Java::NATURE]
           eclipse.classpath_containers = [CONTAINER, Buildr::Eclipse::Java::CONTAINER] if eclipse.classpath_containers.empty?
           eclipse.builders = BUILDERS + [Buildr::Eclipse::Java::BUILDER] if eclipse.builders.empty?
@@ -49,12 +52,12 @@ module Buildr
             index = eclipse.classpath_containers.index(Buildr::Eclipse::Java::CONTAINER) || -1
             eclipse.classpath_containers = eclipse.classpath_containers.insert(index, CONTAINER)
           end
-          unless (eclipse.builders.include?(BUILDER[0]) && eclipse.builders.include?(BUILDER[1]))
+          unless (eclipse.builders.include?(BUILDERS[0]) && eclipse.builders.include?(BUILDERS[1]))
             # plugin builder must be before java builder
             index = eclipse.classpath_containers.index(Buildr::Eclipse::Java::BUILDER) || -1
-            eclipse.builders = eclipse.builders.insert(index, BUILDER[1]) unless eclipse.builders.include? BUILDER[1]
-            index = eclipse.classpath_containers.index(BUILDER[1]) || -1
-            eclipse.builders = eclipse.builders.insert(index, BUILDER[0]) unless eclipse.builders.include? BUILDER[0]
+            eclipse.builders = eclipse.builders.insert(index, BUILDERS[1]) unless eclipse.builders.include? BUILDERS[1]
+            index = eclipse.classpath_containers.index(BUILDERS[1]) || -1
+            eclipse.builders = eclipse.builders.insert(index, BUILDERS[0]) unless eclipse.builders.include? BUILDERS[0]
           end
         end
       end

data/lib/buildr/ide/eclipse/scala.rb

@@ -26,14 +26,15 @@ module Buildr
       CONTAINER = 'ch.epfl.lamp.sdt.launching.SCALA_CONTAINER'
       BUILDER   = 'ch.epfl.lamp.sdt.core.scalabuilder'
 
-      after_define do |project|
+      after_define :eclipse => :eclipse_scala
+      after_define :eclipse_scala do |project|
         eclipse = project.eclipse
-
         # smart defaults
         if eclipse.natures.empty? && (project.compile.language == :scala || project.test.compile.language == :scala)
           eclipse.natures = [NATURE, Buildr::Eclipse::Java::NATURE]
           eclipse.classpath_containers = [CONTAINER, Buildr::Eclipse::Java::CONTAINER] if eclipse.classpath_containers.empty?
           eclipse.builders = BUILDER if eclipse.builders.empty?
+          eclipse.exclude_libs += Buildr::Scala::Scalac.dependencies
         end
 
         # :scala nature explicitly set
@@ -54,6 +55,7 @@ module Buildr
             eclipse.builders -= [Buildr::Eclipse::Java::BUILDER]
             eclipse.builders += [BUILDER]
           end
+          eclipse.exclude_libs += Buildr::Scala::Scalac.dependencies
         end
       end
 

data/lib/buildr/ide/idea.rb

@@ -30,11 +30,11 @@ module Buildr
       Project.local_task "idea"=>"artifacts"
     end
 
-    before_define do |project|
+    before_define(:idea) do |project|
       project.recursive_task("idea")
     end
 
-    after_define do |project|
+    after_define(:idea => :package) do |project|
       idea = project.task("idea")
       # We need paths relative to the top project's base directory.
       root_path = lambda { |p| f = lambda { |p| p.parent ? f[p.parent] : p.base_dir }; f[p] }[project]

data/lib/buildr/ide/idea7x.rb

@@ -37,13 +37,17 @@ module Buildr
       # Global task "idea" generates artifacts for all projects.
       desc "Generate Idea 7.x artifacts for all projects"
       Project.local_task "idea7x"=>"artifacts"
+
+      desc "Delete the generated  Idea 7.x artifacts for all projects"
+      Project.local_task "idea7x:clean"
     end
 
-    before_define do |project|
+    before_define(:idea7x) do |project|
       project.recursive_task("idea7x")
+      project.recursive_task("idea7x:clean")
     end
 
-    after_define do |project|
+    after_define(:idea7x => :package) do |project|
       idea7x = project.task("idea7x")
 
       # We need paths relative to the top project's base directory.
@@ -90,7 +94,7 @@ module Buildr
                 ext_libs = m2_libs.map { |path| "jar://#{path.to_s.sub(m2repo, "$M2_REPO$")}!/" }
                 ext_libs << "#{MODULE_DIR_URL}/#{relative[project.test.resources.target.to_s]}" if project.test.resources.target
                 ext_libs << "#{MODULE_DIR_URL}/#{relative[project.resources.target.to_s]}" if project.resources.target
-                
+
                 Buildr::Idea7x.generate_module_libs(xml, ext_libs)
                 xml.orderEntryProperties
               end
@@ -99,11 +103,18 @@ module Buildr
         end
       end
 
+      # Add task to remove generated module
+      project.task("idea7x:clean") do
+        if File.exist?(task_name)
+          info "Removing #{task_name}"
+          rm_rf task_name 
+        end
+      end
+
       # Root project aggregates all the subprojects.
       if project.parent == nil
         Buildr::Idea7x.generate_ipr(project, idea7x, Buildr.application.buildfile)
       end
-
     end # after_define
 
     class << self
@@ -200,6 +211,14 @@ module Buildr
             template_xml.write file
           end
         end
+
+        # Add task to remove generated project file
+        project.task("idea7x:clean") do
+          if File.exist?(task_name)
+            info "Removing #{task_name}" 
+            rm_rf task_name 
+          end
+        end
       end
 
     end

data/lib/buildr/java.rb

@@ -20,4 +20,5 @@ require 'buildr/java/tests'
 require 'buildr/java/bdd'
 require 'buildr/java/packaging'
 require 'buildr/java/commands'
+require 'buildr/java/doc'
 require 'buildr/java/deprecated'

data/lib/buildr/java/ant.rb

@@ -25,8 +25,8 @@ module Buildr
   module Ant
 
     # Which version of Ant we're using by default.
-    VERSION = '1.7.1'
-    
+    VERSION = '1.8.0'
+
     class << self
       # Current version of Ant being used.
       def version
@@ -40,14 +40,14 @@ module Buildr
         @dependencies ||= ["org.apache.ant:ant:jar:#{version}", "org.apache.ant:ant-launcher:jar:#{version}",
                            "org.apache.ant:ant-trax:jar:#{version}"]
       end
-      
+
     private
       def const_missing(const)
         return super unless const == :REQUIRES # TODO: remove in 1.5
         Buildr.application.deprecated "Please use Ant.dependencies/.version instead of Ant::REQUIRES/VERSION"
         dependencies
       end
-    end    
+    end
 
 
     Java.classpath << lambda { Ant.dependencies }

data/lib/buildr/java/bdd.rb

@@ -31,7 +31,7 @@ module Buildr
     def initialize(task, options)
       self.bdd_dir = self.class.bdd_dir
       project = task.project
-      project.task('test:compile').tap do |comp| 
+      project.task('test:compile').tap do |comp|
         comp.send :associate_with, project, bdd_dir
         self.lang = comp.language || self.class.lang
       end
@@ -42,13 +42,13 @@ module Buildr
       end
       super
     end
-    
+
   end
 
   module TestFramework::JRubyBased
     extend self
 
-    VERSION = '1.3.1'
+    VERSION = '1.5.1'
 
     class << self
       def version
@@ -58,9 +58,12 @@ module Buildr
       def jruby_artifact
         "org.jruby:jruby-complete:jar:#{version}"
       end
-      
+
       def dependencies
-        [jruby_artifact]
+        unless @dependencies
+          @dependencies = [jruby_artifact]
+        end
+        @dependencies
       end
 
       def included(mod)
@@ -71,18 +74,20 @@ module Buildr
 
     module ClassMethods
       def dependencies
-        deps = super
-        unless RUBY_PLATFORM[/java/] && TestFramework::JRubyBased.jruby_installed?
-          deps |= TestFramework::JRubyBased.dependencies
+        unless @dependencies
+          super
+          unless RUBY_PLATFORM[/java/] && TestFramework::JRubyBased.jruby_installed?
+            @dependencies |= TestFramework::JRubyBased.dependencies
+          end
         end
-        deps
+        @dependencies
       end
     end
 
     def run(tests, dependencies)
       maybe_install_jruby
       dependencies |= [task.compile.target.to_s]
-      
+
       spec_dir = task.project.path_to(:source, :spec, :ruby)
       report_dir = task.report_to.to_s
       rm_rf report_dir
@@ -91,7 +96,7 @@ module Buildr
 
       runner = runner_config
       runner.content = runner_content(binding)
-      
+
       Buildr.write(runner.file, runner.content)
       rm_f runner.result
 
@@ -104,7 +109,7 @@ module Buildr
         cmd_options.update(:classpath => dependencies, :project => task.project)
         jruby runner.file, tests, cmd_options
       end
-      
+
       result = YAML.load(File.read(runner.result))
       if Exception === result
         raise [result.message, result.backtrace].flatten.join("\n")
@@ -113,14 +118,14 @@ module Buildr
     end
 
     def jruby_home
-      @jruby_home ||= RUBY_PLATFORM =~ /java/ ? Config::CONFIG['prefix'] : 
+      @jruby_home ||= RUBY_PLATFORM =~ /java/ ? Config::CONFIG['prefix'] :
         ( ENV['JRUBY_HOME'] || File.expand_path('~/.jruby') )
     end
 
     def jruby_installed?
       !Dir.glob(File.join(jruby_home, 'lib', 'jruby*.jar')).empty?
     end
-    
+
   protected
     def maybe_install_jruby
       unless jruby_installed?
@@ -129,15 +134,7 @@ module Buildr
         say msg
         say ''
         say "You need to install JRuby version #{jruby_artifact.version} using your system package manager."
-        say 'Or you can just execute the following command: '
-        say ''
-        say "   java -jar #{jruby_artifact} -S extract '#{jruby_home}'"
-        say ''
-        if agree('Do you want me to execute it for you? [y/N]', false)
-          jruby_artifact.invoke
-          Java::Commands.java('-jar', jruby_artifact.to_s, '-S', 'extract', jruby_home)
-        end
-        
+
         fail msg unless jruby_installed?
       end
     end
@@ -164,7 +161,7 @@ module Buildr
       yield config if block_given?
       Java.org.jruby.Ruby.newInstance config
     end
-    
+
     def jruby_gem
       %{
        require 'jruby'
@@ -201,14 +198,10 @@ module Buildr
       runner.gems ||= {}
       runner.rspec ||= ['--format', 'progress', '--format', "html:#{runner.html_report}"]
       runner.format.each { |format| runner.rspec << '--format' << format } if runner.format
-      runner.rspec.push '--format', "#{runner_formatter}:#{runner.result}"
+      runner.rspec.push '--format', "Buildr::TestFramework::TestResult::YamlFormatter:#{runner.result}"
       runner
     end
-    
-    def runner_formatter
-      "Buildr::TestFramework::TestResult::YamlFormatter"
-    end
-    
+
   end
 
   # <a href="http://rspec.info">RSpec</a> is the defacto BDD framework for ruby.
@@ -222,7 +215,7 @@ module Buildr
   # * :requires   -- A list of ruby files to require before running the specs
   #                  Mainly used if an rspec format needs to require some file.
   # * :format     -- A list of valid Rspec --format option values. (defaults to 'progress')
-  # * :output     -- File path to output dump. @false@ to supress output
+  # * :output     -- File path to output dump. @false@ to suppress output
   # * :fork       -- Create a new JavaVM to run the tests on
   # * :properties -- Hash of properties passed to the test suite.
   # * :java_args  -- Arguments passed to the JVM.
@@ -231,7 +224,7 @@ module Buildr
     @bdd_dir = :spec
 
     include TestFramework::JRubyBased
-  
+
     TESTS_PATTERN = [ /_spec.rb$/ ]
     OPTIONS = [:properties, :java_args]
 
@@ -240,7 +233,7 @@ module Buildr
     end
 
     def tests(dependencies) #:nodoc:
-      Dir[task.project.path_to(:source, bdd_dir, lang, '**/*_spec.rb')].select do |name| 
+      Dir[task.project.path_to(:source, bdd_dir, lang, '**/*_spec.rb')].select do |name|
         selector = ENV['SPEC']
         selector.nil? || Regexp.new(selector) === name
       end
@@ -271,7 +264,7 @@ module Buildr
         argv.push *<%= tests.inspect %>
         parser.order!(argv)
         $rspec_options = parser.options
-        
+
         Buildr::TestFramework::TestResult::Error.guard('<%= runner.result %>') do
           ::Spec::Runner::CommandLine.run($rspec_options)
         end
@@ -300,12 +293,12 @@ module Buildr
   # * :java_args  -- Arguments passed to the JVM.
   class JtestR < TestFramework::JavaBDD
     @lang = :ruby
-    @bdd_dir = :spec    
+    @bdd_dir = :spec
 
     include TestFramework::JRubyBased
 
-    VERSION = '0.3.1'
-    
+    VERSION = '0.5'
+
     # pattern for rspec stories
     STORY_PATTERN    = /_(steps|story)\.rb$/
     # pattern for test_unit files
@@ -322,10 +315,14 @@ module Buildr
       end
 
       def dependencies
-        @dependencies ||= Array(super) + ["org.jtestr:jtestr:jar:#{version}"] +
-          JUnit.dependencies + TestNG.dependencies
+        unless @dependencies
+          super
+          @dependencies |= ["org.jtestr:jtestr:jar:#{version}"] +
+                           JUnit.dependencies + TestNG.dependencies
+        end
+        @dependencies
       end
-    
+
       def applies_to?(project) #:nodoc:
         File.exist?(project.path_to(:source, bdd_dir, lang, 'jtestr_config.rb')) ||
           Dir[project.path_to(:source, bdd_dir, lang, '**/*.rb')].any? { |f| TESTS_PATTERN.any? { |r| r === f } } ||
@@ -372,7 +369,7 @@ module Buildr
 
     def runner_config
       runner = super
-      # JtestR 0.3.1 comes with rspec 1.1.4 (and any other jtestr dependency) included, 
+      # JtestR 0.3.1 comes with rspec 1.1.4 (and any other jtestr dependency) included,
       # so the rspec version used depends on the jtestr jar.
       runner.requires.unshift 'jtestr'
       runner
@@ -382,20 +379,16 @@ module Buildr
       runner_erb = File.join(File.dirname(__FILE__), 'jtestr_runner.rb.erb')
       Filter::Mapper.new(:erb, binding).transform(File.read(runner_erb), runner_erb)
     end
-    
-    def runner_formatter
-      'Buildr::TestFramework::TestResult::JtestRYamlFormatter'
-    end
-    
+
   end
 
-  
+
   # JBehave is a Java BDD framework. To use in your project:
   #   test.using :jbehave
-  # 
+  #
   # This framework will search in your project for:
   #   src/spec/java/**/*Behaviour.java
-  # 
+  #
   # JMock libraries are included on runtime.
   #
   # Support the following options:
@@ -407,15 +400,19 @@ module Buildr
 
     VERSION = '1.0.1'
     TESTS_PATTERN = [ /Behaviou?r$/ ] #:nodoc:
-    
+
     class << self
       def version
         Buildr.settings.build['jbehave'] || VERSION
       end
 
       def dependencies
-        @dependencies ||= ["org.jbehave:jbehave:jar:#{version}", 'cglib:cglib-full:jar:2.0.2'] +
-          JMock.dependencies + JUnit.dependencies
+        unless @dependencies
+          super
+          @dependencies |= ["org.jbehave:jbehave:jar:#{version}", 'cglib:cglib-full:jar:2.0.2'] +
+                           JMock.dependencies + JUnit.dependencies
+        end
+        @dependencies
       end
 
       def applies_to?(project) #:nodoc:
@@ -436,7 +433,7 @@ module Buildr
       filter_classes(dependencies, :class_names => TESTS_PATTERN,
                      :interfaces => %w{ org.jbehave.core.behaviour.Behaviours })
     end
-    
+
     def run(tests, dependencies) #:nodoc:
       cmd_args = ['org.jbehave.core.BehaviourRunner']
       cmd_options = { :properties=>options[:properties], :java_args=>options[:java_args], :classpath=>dependencies }
@@ -449,7 +446,7 @@ module Buildr
         end
       end
     end
-    
+
   end
 
 end

data/lib/buildr/java/cobertura.rb

@@ -22,16 +22,16 @@ module Buildr
   # Provides the <code>cobertura:html</code>, <code>cobertura:xml</code> and <code>cobertura:check</code> tasks.
   # Require explicitly using <code>require "buildr/cobertura"</code>.
   #
-  # You can generate cobertura reports for a single project 
+  # You can generate cobertura reports for a single project
   # using the project name as prefix:
   #
   #   project_name:cobertura:html
   #
-  # You can also specify which classes to include/exclude from instrumentation by 
-  # passing a class name regexp to the <code>cobertura.include</code> or 
-  # <code>cobertura.exclude</code> methods. 
-  # 
-  #   define 'someModule' do 
+  # You can also specify which classes to include/exclude from instrumentation by
+  # passing a class name regexp to the <code>cobertura.include</code> or
+  # <code>cobertura.exclude</code> methods.
+  #
+  #   define 'someModule' do
   #      cobertura.include 'some.package.*'
   #      cobertura.include /some.(foo|bar).*/
   #      cobertura.exclude 'some.foo.util.SimpleUtil'
@@ -40,17 +40,29 @@ module Buildr
   #
   module Cobertura
 
-    VERSION = '1.9'
+    VERSION = '1.9.4.1'
 
     class << self
-
       def version
         Buildr.settings.build['cobertura'] || VERSION
       end
+    end
+
+    REQUIRES = ArtifactNamespace.for(self).tap do |ns|
+      ns.cobertura! "net.sourceforge.cobertura:cobertura:jar:#{version}", '>=1.9'
+      ns.log4j! 'log4j:log4j:jar:1.2.9', ">=1.2.9"
+      ns.asm! 'asm:asm:jar:2.2.1', '>=2.2.1'
+      ns.asm_tree! 'asm:asm-tree:jar:2.2.1', '>=2.2.1'
+      ns.oro! 'oro:oro:jar:2.0.8', '>=2.0.8'
+    end
 
+    class << self
       def dependencies
-        @dependencies ||= [ "net.sourceforge.cobertura:cobertura:jar:#{version}", "log4j:log4j:jar:1.2.9",
-                            "asm:asm:jar:2.2.1", "asm:asm-tree:jar:2.2.1", "oro:oro:jar:2.0.8"]
+        if (VersionRequirement.create('>=1.9.1').satisfied_by?(REQUIRES.cobertura.version))
+          [:asm, :asm_tree].each { |s| REQUIRES[s] = '3.0' unless REQUIRES[s].selected? }
+        end
+
+        REQUIRES.artifacts
       end
 
       def report_to(file = nil)
@@ -62,18 +74,18 @@ module Buildr
       end
 
     end
-    
+
     class CoberturaConfig # :nodoc:
-      
+
       def initialize(project)
         @project = project
       end
-      
+
       attr_reader :project
       private :project
-      
+
       attr_writer :data_file, :instrumented_dir, :report_dir
-      
+
       def data_file
         @data_file ||= project.path_to(:reports, 'cobertura.ser')
       end
@@ -97,7 +109,7 @@ module Buildr
         includes.push(*classPatterns.map { |p| String === p ? Regexp.new(p) : p })
         self
       end
-      
+
       def includes
         @includeClasses ||= []
       end
@@ -114,15 +126,23 @@ module Buildr
         @excludeClasses ||= []
       end
 
+      def ignore(*regexps)
+        ignores.push(*regexps)
+      end
+
+      def ignores
+        @ignores ||= []
+      end
+
       def sources
         project.compile.sources
       end
-      
+
       def check
         @check ||= CoberturaCheck.new
       end
     end
-    
+
     class CoberturaCheck
       attr_writer :branch_rate, :line_rate, :total_branch_rate, :total_line_rate, :package_line_rate, :package_branch_rate
       attr_reader :branch_rate, :line_rate, :total_branch_rate, :total_line_rate, :package_line_rate, :package_branch_rate
@@ -137,7 +157,7 @@ module Buildr
 
       after_define do |project|
         cobertura = project.cobertura
-        
+
         namespace 'cobertura' do
           unless project.compile.target.nil?
             # Instrumented bytecode goes in a different directory. This task creates before running the test
@@ -151,10 +171,10 @@ module Buildr
                     :classpath=>Buildr.artifacts(Cobertura.dependencies).each(&:invoke).map(&:to_s).join(File::PATH_SEPARATOR)
                   ant.send "cobertura-instrument", :todir=>task.to_s, :datafile=>cobertura.data_file do
                     includes, excludes = cobertura.includes, cobertura.excludes
-                    
+
                     classes_dir = project.compile.target.to_s
-                    if includes.empty? && excludes.empty? 
-                      ant.fileset :dir => classes_dir do 
+                    if includes.empty? && excludes.empty?
+                      ant.fileset :dir => classes_dir do
                         ant.include :name => "**/*.class"
                       end
                     else
@@ -166,29 +186,31 @@ module Buildr
                         end
                       end
                     end
+
+                    cobertura.ignores.each { |r| ant.ignore :regex => r }
                   end
                 end
               end
               touch task.to_s
             end
-            
+
             task 'instrument' => instrumented
-            
+
             # We now have two target directories with bytecode. It would make sense to remove compile.target
             # and add instrumented instead, but apparently Cobertura only creates some of the classes, so
             # we need both directories and instrumented must come first.
             project.test.dependencies.unshift cobertura.instrumented_dir
             project.test.with Cobertura.dependencies
             project.test.options[:properties]["net.sourceforge.cobertura.datafile"] = cobertura.data_file
-            
+
             unless project.compile.sources.empty?
               [:xml, :html].each do |format|
-                task format => ['instrument', 'test'] do 
+                task format => ['instrument', 'test'] do
                   info "Creating test coverage reports in #{cobertura.report_to(format)}"
                   Buildr.ant "cobertura" do |ant|
                     ant.taskdef :resource=>"tasks.properties",
                       :classpath=>Buildr.artifacts(Cobertura.dependencies).each(&:invoke).map(&:to_s).join(File::PATH_SEPARATOR)
-                    ant.send "cobertura-report", :format=>format, 
+                    ant.send "cobertura-report", :format=>format,
                       :destdir=>cobertura.report_to(format), :datafile=>cobertura.data_file do
                       cobertura.sources.flatten.each do |src|
                         ant.fileset(:dir=>src.to_s) if File.exist?(src.to_s)
@@ -202,9 +224,9 @@ module Buildr
             task :check => [:instrument, :test] do
               Buildr.ant "cobertura" do |ant|
                 ant.taskdef :classpath=>Cobertura.requires.join(File::PATH_SEPARATOR), :resource=>"tasks.properties"
-                
+
                 params = { :datafile => Cobertura.data_file }
-                
+
                 # oh so ugly...
                 params[:branchrate] = cobertura.check.branch_rate if cobertura.check.branch_rate
                 params[:linerate] = cobertura.check.line_rate if cobertura.check.line_rate
@@ -212,21 +234,21 @@ module Buildr
                 params[:totallinerate] = cobertura.check.total_line_rate if cobertura.check.total_line_rate
                 params[:packagebranchrate] = cobertura.check.package_branch_rate if cobertura.check.package_branch_rate
                 params[:packagelinerate] = cobertura.check.package_line_rate if cobertura.check.package_line_rate
-                
+
                 ant.send("cobertura-check", params) do
                 end
               end
             end
-            
+
           end
         end
 
         project.clean do
           rm_rf [cobertura.report_to, cobertura.data_file, cobertura.instrumented_dir]
         end
-        
+
       end
-      
+
     end
 
     class Buildr::Project
@@ -243,7 +265,7 @@ module Buildr
           task(instrument_task).invoke if Rake::Task.task_defined?(instrument_task)
         end
       end
-      
+
       [:xml, :html].each do |format|
         report_target = report_to(format)
         desc "Run the test cases and produce code coverage reports in #{report_target}"
@@ -260,7 +282,7 @@ module Buildr
           end
         end
       end
-      
+
       task "clean" do
         rm_rf [report_to, data_file]
       end