buildr 1.4.16 → 1.4.17

data/doc/preface.textile

@@ -51,4 +51,4 @@ bq. The positive side effect for me as a java user is that I learn a little ruby
 </div>
 
 
-p(preface).  
+p(preface).

data/doc/projects.textile

@@ -16,21 +16,21 @@ The remainder of this guide deals with what it takes to build a project.  But fi
 require "buildr/openjpa"
 
 include Buildr::OpenJPA
- 
+
 VERSION_NUMBER = '1.0'
- 
+
 AXIS2 = 'org.apache.axis2:axis2:jar:1.2'
 AXIOM = group('axiom-api', 'axiom-impl', 'axiom-dom',
   :under=>'org.apache.ws.commons.axiom', :version=>'1.2.4')
 AXIS_OF_WS = [AXIOM, AXIS2]
 OPENJPA = ['org.apache.openjpa:openjpa:jar:1.2.0',
   'net.sourceforge.serp:serp:jar:1.12.0']
- 
+
 repositories.remote << 'http://www.ibiblio.org/maven2/'
- 
+
 desc 'Code. Build. ??? Profit!'
 define 'killer-app' do
- 
+
   project.version = VERSION_NUMBER
   project.group = 'acme'
   manifest['Copyright'] = 'Acme Inc (C) 2007'
@@ -124,7 +124,7 @@ To see a list of all projects defined in your Buildfile run @buildr help:project
 
 h2(#tasks). Running Project Tasks
 
-Most times, you run tasks like @build@ or @package@ that operate on the current project and recursively on its sub-projects.  The "current project" is the one that uses the current working directory.  So if you're in the @la-web/src@ directory looking at source files, _la-web_ is the current project.  For example: 
+Most times, you run tasks like @build@ or @package@ that operate on the current project and recursively on its sub-projects.  The "current project" is the one that uses the current working directory.  So if you're in the @la-web/src@ directory looking at source files, _la-web_ is the current project.  For example:
 
 {% highlight sh %}
 # build killer-app and all its sub-projects

data/doc/releasing.textile

@@ -116,4 +116,3 @@ The environment variable @NEXT_VERSION@ has precedence over Release.next_version
 h2(#custom_tag_and_msg). How to specify my own tag name and commit message?
 
 As explained earlier, Buildr will create two new commits and a new tag in the version control system. Similarly to @Release.next_version@, the commit message and the tag name can be customized with @Release.message@ and @Release.tag_name@. Both could be strings or procs that would receive the released version @THIS_VERSION@ without @-SNAPSHOT@.
-

data/lib/buildr/clojure/shell.rb

@@ -49,4 +49,3 @@ module Buildr::Shell #:nodoc:
 end
 
 Buildr::Shell.providers << Buildr::Shell::Clojure
-

data/lib/buildr/core/build.rb

@@ -106,7 +106,7 @@ module Buildr #:nodoc:
     # :call-seq:
     #   hg(*args)
     #
-    # Executes a Mercurial (hg) command passing through the args and returns the output. 
+    # Executes a Mercurial (hg) command passing through the args and returns the output.
     # Throws exception if the exit status is not zero. For example:
     #   hg 'commit'
     #   hg 'update', 'default'
@@ -287,13 +287,13 @@ module Buildr #:nodoc:
       # Use this to specify the next version number to replace VERSION_NUMBER with in the buildfile.
       # You can set the next version or a proc that will be called with the current version number.
       # For example, with the following buildfile:
-      #   THIS_VERSION = "1.0.0-rc1" 
-      #   Release.next_version = lambda { |version| 
+      #   THIS_VERSION = "1.0.0-rc1"
+      #   Release.next_version = lambda { |version|
       #       version[-1] = version[-1].to_i + 1
       #       version
-      #   } 
-      # 
-      # Release.next_version will return "1.0.0-rc2", so at the end of the release, the buildfile will contain VERSION_NUMBER = "1.0.0-rc2" 
+      #   }
+      #
+      # Release.next_version will return "1.0.0-rc2", so at the end of the release, the buildfile will contain VERSION_NUMBER = "1.0.0-rc2"
       #
       attr_accessor :next_version
 
@@ -343,7 +343,7 @@ module Buildr #:nodoc:
 
     def check
       if this_version == resolve_next_version(this_version) && this_version.match(/-SNAPSHOT$/)
-        fail "The next version can't be equal to the current version #{this_version}.\nUpdate THIS_VERSION/VERSION_NUMBER, specify Release.next_version or use NEXT_VERSION env var" 
+        fail "The next version can't be equal to the current version #{this_version}.\nUpdate THIS_VERSION/VERSION_NUMBER, specify Release.next_version or use NEXT_VERSION env var"
       end
     end
 
@@ -370,7 +370,7 @@ module Buildr #:nodoc:
     end
 
   protected
- 
+
     # the initial value of THIS_VERSION
     attr_accessor :this_version
 
@@ -391,7 +391,7 @@ module Buildr #:nodoc:
     # for the release buildfile.
     def with_release_candidate_version
       release_candidate_buildfile = Buildr.application.buildfile.to_s + '.next'
-    
+
       release_candidate_buildfile_contents = change_version { |version|
         version.gsub(/-SNAPSHOT$/, "")
       }
@@ -435,20 +435,20 @@ module Buildr #:nodoc:
         next_version ||= lambda { |v|
           snapshot = v.match(/-SNAPSHOT$/)
           version = v.gsub(/-SNAPSHOT$/, "").split(/\./)
-          if snapshot 
+          if snapshot
             version[-1] = sprintf("%0#{version[-1].size}d", version[-1].to_i + 1) + '-SNAPSHOT'
-          end 
+          end
           version.join('.')
-        } 
-        next_version = ENV['NEXT_VERSION'] if ENV['NEXT_VERSION'] 
-        next_version = ENV['next_version'] if ENV['next_version'] 
+        }
+        next_version = ENV['NEXT_VERSION'] if ENV['NEXT_VERSION']
+        next_version = ENV['next_version'] if ENV['next_version']
         next_version = next_version.call(current_version) if Proc === next_version
         next_version
     end
 
     # Move the version to next and save the updated buildfile
     def update_buildfile
-      buildfile = change_version { |version| # THIS_VERSION minus SNAPSHOT 
+      buildfile = change_version { |version| # THIS_VERSION minus SNAPSHOT
         resolve_next_version(this_version) # THIS_VERSION
       }
       File.open(Buildr.application.buildfile.to_s, 'w') { |file| file.write buildfile }
@@ -512,7 +512,7 @@ module Buildr #:nodoc:
       info "Current version is now #{extract_version}"
       Hg.commit File.basename(Buildr.application.buildfile.to_s), message
       Hg.push if Hg.remote
-    end     
+    end
   end
 
 

data/lib/buildr/core/filter.rb

@@ -198,10 +198,10 @@ module Buildr #:nodoc:
     end
 
   protected
-  
+
     # :call-seq:
     #   pattern_match(file, pattern) => boolean
-    # 
+    #
     # This method returns true if the file name matches the pattern.
     # The pattern may be a String, a Regexp or a Proc.
     #
@@ -219,7 +219,7 @@ module Buildr #:nodoc:
         raise "Cannot interpret pattern #{pattern}"
       end
     end
-    
+
   private
     def copy_map
       sources.each { |source| raise "Source directory #{source} doesn't exist" unless File.exist?(source.to_s) }

data/lib/buildr/core/jrebel.rb

@@ -39,4 +39,3 @@ module Buildr #:nodoc:
     end
   end
 end
-

data/lib/buildr/core/linux.rb

@@ -26,4 +26,3 @@ if $stdout.isatty && verbose
     Buildr.application.on_failure { |title, message, ex| notify_send(:failed, title, message) if verbose }
   end
 end
-

data/lib/buildr/core/run.rb

@@ -36,4 +36,3 @@ module Buildr #:nodoc:
 end
 
 Buildr::Run.runners << Buildr::Run::JavaRunner
-

data/lib/buildr/core/shell.rb

@@ -128,4 +128,3 @@ end
 
 Buildr::Shell.providers << Buildr::Shell::BeanShell
 Buildr::Shell.providers << Buildr::Shell::JIRB
-

data/lib/buildr/groovy/doc.rb

@@ -70,4 +70,3 @@ module Buildr #:nodoc:
 end
 
 Buildr::Doc.engines << Buildr::Doc::Groovydoc
-

data/lib/buildr/ide/eclipse.rb

@@ -534,5 +534,3 @@ class Buildr::Project
   include Buildr::Eclipse::Scala
   include Buildr::Eclipse::Java
 end
-
-

data/lib/buildr/ide/idea.rb

@@ -658,7 +658,9 @@ module Buildr #:nodoc:
       end
 
       def add_default_configuration(type, factory_name)
-        add_configuration(nil, type, factory_name)
+        add_configuration(nil, type, factory_name, true) do |xml|
+          yield xml if block_given?
+        end
       end
 
       def add_postgres_data_source(name, options = {})
@@ -837,6 +839,40 @@ module Buildr #:nodoc:
         end
       end
 
+      def add_default_testng_configuration(options = {})
+        jvm_args = options[:jvm_args] || '-ea'
+        dir = options[:dir] || '$PROJECT_DIR$'
+
+        add_default_configuration('TestNG', 'TestNG') do |xml|
+          xml.extension(:name => 'coverage', :enabled => 'false', :merge => 'false', :sample_coverage => 'true', :runner => 'idea')
+          xml.module(:name => '')
+          xml.option(:name => 'ALTERNATIVE_JRE_PATH_ENABLED', :value => 'false')
+          xml.option(:name => 'ALTERNATIVE_JRE_PATH')
+          xml.option(:name => 'SUITE_NAME')
+          xml.option(:name => 'PACKAGE_NAME')
+          xml.option(:name => 'MAIN_CLASS_NAME')
+          xml.option(:name => 'METHOD_NAME')
+          xml.option(:name => 'GROUP_NAME')
+          xml.option(:name => 'TEST_OBJECT', :value => 'CLASS')
+          xml.option(:name => 'VM_PARAMETERS', :value => jvm_args)
+          xml.option(:name => 'PARAMETERS')
+          xml.option(:name => 'WORKING_DIRECTORY', :value => dir)
+          xml.option(:name => 'OUTPUT_DIRECTORY')
+          xml.option(:name => 'ANNOTATION_TYPE')
+          xml.option(:name => 'ENV_VARIABLES')
+          xml.option(:name => 'PASS_PARENT_ENVS', :value => 'true')
+          xml.option(:name => 'TEST_SEARCH_SCOPE') do |opt|
+            opt.value(:defaultName => 'moduleWithDependencies')
+          end
+          xml.option(:name => 'USE_DEFAULT_REPORTERS', :value => 'false')
+          xml.option(:name => 'PROPERTIES_FILE')
+          xml.envs
+          xml.properties
+          xml.listeners
+          xml.method
+        end
+      end
+
       protected
 
       def artifact_content(xml, project, projects, options)
@@ -942,13 +978,13 @@ module Buildr #:nodoc:
           end
         end
 
-        if mappings.size > 1
-          create_component("VcsDirectoryMappings") do |xml|
-            mappings.each_pair do |dir, vcs_type|
-              resolved_dir = resolve_path(dir)
-              mapped_dir = resolved_dir == '$PROJECT_DIR$/.' ? buildr_project.base_dir : resolved_dir
-              xml.mapping :directory => mapped_dir, :vcs => vcs_type
-            end
+        return nil if 0 == mappings.size
+
+        create_component("VcsDirectoryMappings") do |xml|
+          mappings.each_pair do |dir, vcs_type|
+            resolved_dir = resolve_path(dir)
+            mapped_dir = resolved_dir == '$PROJECT_DIR$/.' ? buildr_project.base_dir : resolved_dir
+            xml.mapping :directory => mapped_dir, :vcs => vcs_type
           end
         end
       end

data/lib/buildr/java/bdd.rb

@@ -342,4 +342,3 @@ end
 
 Buildr::TestFramework << Buildr::RSpec
 Buildr::TestFramework << Buildr::JBehave
-

data/lib/buildr/java/commands.rb

@@ -110,7 +110,7 @@ module Java
             # set new cmd line.
             cmd_args = [tmp.path]
           end
-          
+
           unless Buildr.application.options.dryrun
             info "Running #{name}" if name && options[:verbose]
             block = lambda { |ok, res| fail "Failed to execute #{name}, see errors above" unless ok } unless block
@@ -121,7 +121,7 @@ module Java
           end
         ensure
           unless tmp.nil?
-            tmp.close 
+            tmp.close
             tmp.unlink
           end
         end
@@ -281,4 +281,3 @@ module Java
   end
 
 end
-

data/lib/buildr/java/jruby.rb

@@ -57,10 +57,10 @@ module Java
   # Since we already have a JVM loaded, we can use it to guess where JAVA_HOME is.
   # We set JAVA_HOME early so we can use it without calling Java.load first.
   ENV['JAVA_HOME'] ||= java.lang.System.getProperty("java.home")
-  
+
   # This version is the minimal version Buildr will support.
   # Any older version of JRuby will raise an exception.
-  JRUBY_MIN_VERSION = '1.5.1' 
+  JRUBY_MIN_VERSION = '1.5.1'
   raise "JRuby must be at least at version #{JRUBY_MIN_VERSION}" unless JRUBY_VERSION >= JRUBY_MIN_VERSION
 
   class << self

data/lib/buildr/java/org/apache/buildr/JavaTestFilter.java

@@ -71,7 +71,7 @@ public class JavaTestFilter {
     }
     return this;
   }
-  
+
   public JavaTestFilter addFields(String[] names) {
     for (int i = names.length; i -- > 0;) {
       String name = names[i];
@@ -79,7 +79,7 @@ public class JavaTestFilter {
     }
     return this;
   }
-  
+
   private boolean isTest(Class cls) {
     if (Modifier.isAbstract(cls.getModifiers()) || !Modifier.isPublic(cls.getModifiers()))
       return false;
@@ -89,12 +89,12 @@ public class JavaTestFilter {
         if (iface.isAssignableFrom(cls)) { return true; }
       }
     }
-    if (classAnnotations != null) { 
+    if (classAnnotations != null) {
       for (Iterator it = classAnnotations.iterator(); it.hasNext(); ) {
         Class annotation = (Class) it.next();
         if (cls.isAnnotationPresent(annotation)) { return true; }
       }
-    } 
+    }
     if (methodAnnotations != null) {
       Method[] methods = cls.getMethods();
       for (int j = methods.length ; j-- > 0 ;) {
@@ -134,7 +134,7 @@ public class JavaTestFilter {
 
 }
 
-/* 
+/*
  * Local Variables:
  * indent-tabs-mode: nil
  * c-basic-offset: 2

data/lib/buildr/java/tests.rb

@@ -428,4 +428,3 @@ end # Buildr
 Buildr::TestFramework << Buildr::JUnit
 Buildr::TestFramework << Buildr::TestNG
 Buildr::TestFramework << Buildr::MultiTest
-

data/lib/buildr/packaging/artifact_namespace.rb

@@ -1007,5 +1007,3 @@ module Buildr #:nodoc:
   end
 
 end
-
-

data/lib/buildr/resources/icons-license.txt

@@ -1,17 +1,14 @@
-
-MouseRunner.com Green/Red icons
--------------------------------
-
-The graphics contained in the 'completed.png' and 'failed.png' files are
-licensed under the Creative Commons Attribution-ShareAlike 2.5 License
-
-Furthermore,
-You may not claim the works as your own.
-You must provide a link back to www.MouseRunner.com when using on a website,
-for commercial purposes, and for applications.
-
-Visit the address below to learn more about the Creative Commons license.
-http://creativecommons.org/licenses/by-nc-sa/2.5/legalcode
-
-
-
+
+MouseRunner.com Green/Red icons
+-------------------------------
+
+The graphics contained in the 'completed.png' and 'failed.png' files are
+licensed under the Creative Commons Attribution-ShareAlike 2.5 License
+
+Furthermore,
+You may not claim the works as your own.
+You must provide a link back to www.MouseRunner.com when using on a website,
+for commercial purposes, and for applications.
+
+Visit the address below to learn more about the Creative Commons license.
+http://creativecommons.org/licenses/by-nc-sa/2.5/legalcode

data/lib/buildr/scala/bdd.rb

@@ -253,4 +253,3 @@ end
 
 Buildr::TestFramework << Buildr::Scala::Specs
 Buildr::TestFramework << Buildr::Scala::Specs2
-

data/lib/buildr/scala/compiler.rb

@@ -385,4 +385,3 @@ Buildr::Compiler.compilers.unshift Buildr::Scala::Scalac
 class Buildr::Project #:nodoc:
   include Buildr::Scala::ProjectExtension
 end
-

data/lib/buildr/scala/org/apache/buildr/Specs2Runner.java

@@ -34,5 +34,3 @@ public class Specs2Runner {
   }
 
 }
-
-

data/lib/buildr/version.rb

@@ -14,5 +14,5 @@
 # the License.
 
 module Buildr #:nodoc:
-  VERSION = '1.4.16'.freeze
+  VERSION = '1.4.17'.freeze
 end

data/rakelib/metrics.rake

@@ -22,12 +22,12 @@ namespace 'metrics' do
     base_dir = Pathname.new(File.expand_path(File.join(File.dirname(__FILE__), '..')))
     rb_files = %w(lib addon).collect { |folder|
       FileList[File.expand_path(File.join(File.dirname(__FILE__), '..', folder, '**', '*.rb'))]
-    }.flatten.collect {|path| 
+    }.flatten.collect {|path|
       Pathname.new(path).relative_path_from(base_dir).to_s
     }
     SaikuroRunner.new.run(rb_files, output_dir)
   end
-  
+
   desc 'generate ccn treemap'
   task 'ccn_treemap' do
     require 'saikuro_treemap'
@@ -36,4 +36,4 @@ namespace 'metrics' do
 end
 
 desc 'Run all metrics tools'
-task 'metrics' => %w(metrics:saikuro metrics:ccn_treemap)
+task 'metrics' => %w(metrics:saikuro metrics:ccn_treemap)