buildr 1.3.5-java → 1.4.0-java

data/doc/scripts/gitflow.rb

@@ -20,7 +20,7 @@ require 'fileutils'
 
 module GitFlow
   extend self
-  
+
   attr_accessor :should_run, :trace, :program
 
   self.program = 'gitflow'
@@ -34,7 +34,7 @@ It is generic enougth to be used on any git based project besides Apache Buildr.
 OVERVIEW:
 
 gitflow is intended to help developers with their daily git workflow,
-performing repetitive git commands for them. It is implemented in 
+performing repetitive git commands for them. It is implemented in
 ruby so you can do anything, from invoking rake tasks to telling
 people on twitter you are having trouble with their code :P.
 
@@ -53,7 +53,7 @@ After that you can use
 
 EXTENDING YOUR WORKFLOW:
 
-You can create your own gitflow commands, to adapt your development 
+You can create your own gitflow commands, to adapt your development
 workflow.
 
 Simply create a ruby script somewhere say ~/.buildr/gitflow.rb
@@ -66,17 +66,17 @@ A sample command would look like this.. (you may want to look at buildr-git.rb)
 
     #!/usr/bin/env ruby
     require /path/to/gitflow.rb
-    
+
     class MyCommand < GitFlow/'my-flow'
-      
+
       @help = "Summary to be displayed when listing commands"
       @documentation = "Very long help that will be paged if necessary. (for --help)"
-      
+
       # takes an openstruct to place default values and option values.
       # returns an array of arguments given to optparse.on
       def options(opts)
         opts.something = 'default'
-        [ 
+        [
          ['--name NAME', lambda { |n| opts.name = n }],
          ['--yes', lambda { |n| opts.yes = true }]
         ]
@@ -94,7 +94,7 @@ A sample command would look like this.. (you may want to look at buildr-git.rb)
       class SubCommand < MyCommand/'sub-work'
         ... # implement a subcommand
       end
-      
+
     end
 
 You would then get help for your command with
@@ -203,26 +203,26 @@ HELP
 
     # Override this method in your command class if it
     # needs to parse command line options.
-    # 
+    #
     # This method takes an openstruct object as argument
-    # allowing you to store default values on it, and 
+    # allowing you to store default values on it, and
     # set option values.
     #
-    # The return value must be an array of arguments 
+    # The return value must be an array of arguments
     # given to optparse.on
     def options(opt)
       []
     end
-    
+
     # Override this method in your command class to implement
     # the command.
     # First argument is the openstruct object after
-    # it has been populated by the option parser. 
+    # it has been populated by the option parser.
     # Second argument is the array of non-option arguments.
     def execute(opt, argv)
       fail "#{self.class.command} not implemented"
     end
-    
+
     # Run the command line given on argv
     def run(*argv, &block)
       GitFlow.run(*argv, &block)
@@ -233,11 +233,11 @@ HELP
       GitFlow.pager
       yield
     end
-  
+
     def trace(*str)
       STDERR.puts(*str) if GitFlow.trace
     end
-    
+
     def git(*args)
       cmd = 'git ' + args.map { |arg| arg[' '] ? %Q{"#{arg}"} : arg }.join(' ')
       trace cmd
@@ -245,13 +245,13 @@ HELP
         fail "GIT command `#{cmd}` failed with status #{$?.exitstatus}" unless $?.exitstatus == 0
       }
     end
-    
+
     def sh(*args)
       `#{args.join(' ')}`.tap {
         fail "Shell command `#{args.join(' ')}` failed with status #{$?.exitstatus}" unless $?.exitstatus == 0
       }
     end
-    
+
     def expand_path(path, dir=Dir.pwd)
       File.expand_path(path, dir)
     end
@@ -259,7 +259,7 @@ HELP
 
   class NoSuchCommand < GitFlow/nil
     @documentation = HELP
-    
+
     def execute(opts, argv)
       page do
         puts "Command not found: #{argv.join(' ').inspect}"
@@ -271,7 +271,7 @@ HELP
   class HelpCommand < GitFlow/:help
     @help = "Display help for a command or show command list"
     @documentation = "Displays help for the command given as argument"
-    
+
     def execute(opts, argv)
       if argv.empty?
         opt = GitFlow.optparse
@@ -290,7 +290,7 @@ HELP
       end
     end
   end
-    
+
 end
 
 at_exit { GitFlow.run(*ARGV) if GitFlow.should_run }

data/doc/settings_profiles.textile

@@ -41,6 +41,7 @@ Buildr supports the following environment variables:
 | @HOME@        | Your home directory. |
 | @HTTP_PROXY@  | URL for HTTP proxy server (see "Specifying Repositories":artifacts.html#repositories). |
 | @HTTPS_PROXY@ | URL for HTTPS proxy server (see "Specifying Repositories":artifacts.html#repositories). |
+| @IGNORE_BUILDFILE@ | Set to "true" or "yes" to ignore changes in Buildfile or its dependencies when running tests. |
 | @JAVA_HOME@   | Points to your JDK, required when using Java and Ant. |
 | @JAVA_OPTS@   | Command line options to pass to the JDK (e.g. @'-Xms1g'@). |
 | @M2_REPO@     | Location of the Maven2 local repository.  Defaults to the @.m2@ directory in your home directory (@ENV['HOME']@). |
@@ -165,9 +166,9 @@ Build settings can be retreived using the @Buildr.settings.build@ accessor.
 
 h2(#variable). Non constant settings
 
-Before loading the Buildfile, Buildr will attempt to load two other files: the @buildr.rb@ file it finds in your home directory, followed by the @buildr.rb@ file it finds in the build directory.
+Before loading the Buildfile, Buildr will attempt to load two other files: the @buildr.rb@ file in the @.buildr@ directory under your home directory, followed by the @buildr.rb@ file it finds in the build directory.
 
-The loading order allows you to place global settings that affect all your builds in your home directory's @buildr.rb@, but also over-ride those with settings for a given project.
+The loading order allows you to place global settings that affect all your builds in your @buildr.rb@, but also over-ride those with settings for a given project.
 
 Here's an example @buildr.rb@:
 
@@ -179,6 +180,12 @@ repositories.upload_to[:password] = 'supersecret'
 repositories.remote << 'http://inside-the-firewall'
 {% endhighlight %}
 
+p(note). Buildr 1.3 and earlier used the file @buildr.rb@ directly in your home directory.  Starting with version 1.4, Buildr loads @buildr.rb@ from the @.buildr@ directory under your home directory in preference.  If you use Buildr 1.3 and earlier and don't want to duplicate your settings, you can move you existing @buildr.rb@ under the @.buildr@ directory and create a new @buildr.rb@ in your home directory containing:
+
+{% highlight ruby %}
+# Backward compatibility:  Buildr 1.4+ uses $HOME/.buildr/buildr.rb
+load File.expand_path('buildr.rb', Buildr.application.home_dir)
+{% endhighlight %}
 
 h2(#environments). Environments
 

data/doc/testing.textile

@@ -4,7 +4,7 @@ title: Testing
 ---
 
 
-Untested code is broken code, so we take testing seriously.  Off the bat you get to use either JUnit or TestNG for writing unit tests and integration tests. And you can also add your own framework, or even script tests using Ruby.  But= first, let's start with the basics.
+Untested code is broken code, so we take testing seriously.  Off the bat you get to use either JUnit or TestNG for writing unit tests and integration tests. And you can also add your own framework, or even script tests using Ruby.  But first, let's start with the basics.
 
 
 h2(#writing). Writing Tests
@@ -44,15 +44,15 @@ When tests fail, Buildr fails the @test@ task.  This is usually a good thing, bu
 test.using :fail_on_failure=>false
 {% endhighlight %}
 
-Besides giving you a free pass to ignore failures, you can use it for other causes, for example, to be somewhat forgiving:
+Besides giving you a free pass to ignore failures, you can use it for other causes, for example, as a gentle reminder:
 
 {% highlight ruby %}
 test do
-  fail 'More than 3 tests failed!' if test.failed_tests.size > 3
+  warn "Did you forget something?" if test.tests.nil? || test.tests.empty?
 end
 {% endhighlight %}
 
-The @failed_tests@ collection holds the names of all classes with failed tests. And there's @classes@, which holds the names of all test classes.  Ruby arithmetic allows you to get the name of all passed test classes with a simple @test.classes – test.failed_tests@.  We'll let you imagine creative use for these two.
+The @tests@ collection holds the names of all classes with tests, if any. And there's @classes@, which holds the names of all test classes.  We'll let you imagine creative use for these two.
 
 
 h2(#running). Running Tests
@@ -106,6 +106,17 @@ $ buildr package test=all
 
 We're using @package@ and not @build@ above.  When using a continuous build system, you want to make sure that packages are created, contain the right files, and also run the integration tests.
 
+During development, if you want to re-run only tests that have failed during the last test execution, you can execute:
+
+{% highlight sh %}
+$ buildr test:failed
+{% endhighlight %}
+
+One last note on running tests.  By default when you run tests, Buildr will automatically run all transitive test dependencies.  This mean if you run "buildr test" inside project @bar@ and @bar@ depends on project @foo@, Buildr will first run tests in project @foo@ if there have been any changes affecting @foo@ that haven't been taken into account yet.   This behavior often surprises people, especially when they are trying to get things done and only care about tests in @bar@ at that moment.  For those times when you'd like to focus your testing on specific projects, Buildr has the @only@ option that will only run tests for projects specified on the command line,
+
+{% highlight sh %}
+$ buildr test=only bar:test
+{% endhighlight %}
 
 h2(#integration). Integration Tests
 
@@ -170,7 +181,7 @@ end
 check package(:war).path('WEB-INF'), 'should contain files' do
   it.should_not be_empty
 end
-check package(:war).path('WEB-INF/classes'), 'should contain classes' do 
+check package(:war).path('WEB-INF/classes'), 'should contain classes' do
   it.should contain('**/*.class')
 end
 check package(:war).entry('META-INF/MANIFEST'), 'should have license' do

data/etc/KEYS

@@ -149,3 +149,41 @@ Ajt5Ierk8kbjO9yM75Y2+84McRiR8JCld2WJFNXXwKCIWuh6+UtGPqafxHccKQYv
 QKtVPfIqp4oI8qSfsZ0gMafFRwCfTqvRMVFyLEnygWnhpxgJRYk+8Fc=
 =ryOG
 -----END PGP PUBLIC KEY BLOCK-----
+
+
+pub   2048R/191DFA62 2010-03-15
+uid                  Antoine Toulme <antoine@lunar-ocean.com>
+sig 3        191DFA62 2010-03-15  Antoine Toulme <antoine@lunar-ocean.com>
+sub   2048R/F82CCCA4 2010-03-15
+sig          191DFA62 2010-03-15  Antoine Toulme <antoine@lunar-ocean.com>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.10 (Darwin)
+
+mQENBEud3FYBCACjGYLotue6+saF39/Yim+UrSnLgsM6hwPETpwOawQOKUuEd8/N
+I07bCXI7HHgeBHQ0ENTWqH4hO1CoyKDsIChY37GYLZkx7KS8HVCxg/b6DNVp5vTi
+oHm8XTGvdVzkvoKj4Se0T+jpTfVYoiq8CRY0jH3Wqxs8QGfVGVkVJ9hgz8UyJUyB
+7PidE0P4U/xmZ3lMzxWr9d1TabNjCQmtgRgoi8auX3VP0TXJbedPXPF3xuhbFSWl
+LAZhujzZwefGvJk9XX1lsA2BnMvTBC9PJqCbfaRE+3/bl3Cwq8CtyOjJ4O9i1ie8
++exUX8RSitlP3uxMJoFR2z/qHeRTors5d1DfABEBAAG0KEFudG9pbmUgVG91bG1l
+IDxhbnRvaW5lQGx1bmFyLW9jZWFuLmNvbT6JATgEEwECACIFAkud3FYCGwMGCwkI
+BwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEO7QCd8ZHfpiNL4H/3oe0+MVB72FR7Bg
+IRoNTxnsGb1kSarTMyYQHhWMQqUiH1hEqP0R0oPDcOumw08m91jmZFPEgk53fpZJ
+OL0T8UnG4XoIHilRqc55OiFkXgDFivS1RQLG6ZkLnslD70+hURiU26JJ3tQO4Jh9
+E9fAUy6KFGvwgAC9KMaw0wVgPZ9Ippd4lDE8VOPIOqZqvJ5kcYzi983I/b7eUhL9
+IMLGRRftG9VKMCxV+1mIIv+62KTaC0SlzOqaGpaC52HjJt3ogOyIjKqyoU+U+fXY
+AaP3iwHqXD2ojgbz89A5cckf99YImJlLGoWEiCNyhNh5EfuUH1QyuFssitJXsZS2
+PBzhr0G5AQ0ES53cVgEIAM/nSJsPWIq4GuLjTdOA1LyN/k2a/L2fU4jGu5VVrAJu
+2e4BEBfte9WubzubOL7JMnS/v4ilZe9PQnQkXWWIZUbkK2lsqws8J5rzk2OyzjJj
+aosoQfMJKgyLC0qmwhWElzlAbOU5ISCw58hCuATO5DnVCB4f3ltsLPyJ6T8RPb24
+YbBWzdxKdXrsqKhTlLkWUpBIg+yD+Z7EIBJtCOjU3/F/H+OBnyFdnT+9zR0QKzeB
+v3pRvQiBiMPNtOME+kjVJqTqjpCy8xh1AFjmOPjgOpQXv8YeCj/B4OcpyGpqJdL4
+TYIvwu/HFXSrCTAPlu7Jk4hMnsHRlVaTAkKBGP5KAAUAEQEAAYkBHwQYAQIACQUC
+S53cVgIbDAAKCRDu0AnfGR36YlhKB/46x/wrVl89i/jBa5iSVcIOpHhypLylGXaG
+J7a9ICfyVwmL0DNpdWOKlmPXEM3NEmELfJXiOZhzGKOE8y/JM/lS+z09rXngCm96
+CAzjwjNb6FC9wMZGsQGp7M/7VthyAjS/wlhS2PExCIWHglmsaPPj4NBAQxg/M8Na
+n5F6Rq2K6rOE1x882i5wNsgAEb1iOFEUE1ctYSNbmO6JQfFyvz0cKpdmW52/iC41
+sIHg4pUCB3Z7wT6vvSs/eQ3jARt7mok3JE56JL0sV2+Z2SePiFUn/ixKdn1lKP8d
++THIYJ/ZdpxUZeNKy7f1djoctqAk5T7ujVJh2d6xRXwqvQcJKoeW
+=6E9O
+-----END PGP PUBLIC KEY BLOCK-----

data/lib/buildr.rb

@@ -14,7 +14,7 @@
 # the License.
 
 module Buildr
-  VERSION = '1.3.5'.freeze
+  VERSION = '1.4.0'.freeze
 end
 
 require 'buildr/core'

data/lib/buildr/core.rb

@@ -32,4 +32,5 @@ require 'buildr/core/shell'
 require 'buildr/core/checks'
 require 'buildr/core/transports'
 require 'buildr/core/generate'
+require 'buildr/core/cc'
 require 'buildr/core/osx' if RUBY_PLATFORM =~ /darwin/

data/lib/buildr/core/application.rb

@@ -115,8 +115,8 @@ module Buildr
   class Application < Rake::Application #:nodoc:
 
     # Deprecated: rakefile/Rakefile, removed in 1.5
-    DEFAULT_BUILDFILES = ['buildfile', 'Buildfile'] + DEFAULT_RAKEFILES
-    
+    DEFAULT_BUILDFILES = ['buildfile', 'Buildfile', 'buildfile.rb', 'Buildfile.rb'] + DEFAULT_RAKEFILES
+
     attr_reader :rakefiles, :requires
     private :rakefiles, :requires
 
@@ -125,7 +125,7 @@ module Buildr
       @rakefiles = DEFAULT_BUILDFILES.dup
       @top_level_tasks = []
       @home_dir = File.expand_path('.buildr', ENV['HOME'])
-      mkpath @home_dir unless File.exist?(@home_dir)
+      mkpath @home_dir if !File.exist?(@home_dir) && File.writable?(ENV['HOME'])
       @settings = Settings.new(self)
       @on_completion = []
       @on_failure = []
@@ -173,7 +173,7 @@ module Buildr
 
     # Files that complement the buildfile itself
     def build_files #:nodoc:
-      deprecated 'Please call buildfile.prerequisites instead' 
+      deprecated 'Please call buildfile.prerequisites instead'
       buildfile.prerequisites
     end
 
@@ -208,7 +208,7 @@ module Buildr
     end
 
   protected
-    
+
     def load_buildfile # replaces load_rakefile
       standard_exception_handling do
         find_buildfile
@@ -255,10 +255,10 @@ module Buildr
         opts.banner = "buildr [-f rakefile] {options} targets..."
         opts.separator ""
         opts.separator "Options are ..."
-        
+
         opts.on_tail("-h", "--help", "-H", "Display this help message.") do
           puts opts
-          exit
+          exit 0
         end
         standard_buildr_options.each { |args| opts.on(*args) }
       end.parse!
@@ -275,18 +275,18 @@ module Buildr
         ],
         ['--execute',  '-E CODE',
           "Execute some Ruby code after loading the buildfile",
-          lambda { |value| options.execute = value }            
+          lambda { |value| options.execute = value }
         ],
         ['--environment',  '-e ENV',
           "Environment name (e.g. development, test, production).",
-          lambda { |value| ENV['BUILDR_ENV'] = value }            
+          lambda { |value| ENV['BUILDR_ENV'] = value }
         ],
         ['--generate [PATH]',
          "Generate buildfile from either pom.xml file or directory path.",
           lambda { |value|
             value ||= File.exist?('pom.xml') ? 'pom.xml' : Dir.pwd
             raw_generate_buildfile value
-            exit
+            exit 0
           }
         ],
         ['--libdir', '-I LIBDIR', "Include LIBDIR in the search path for required modules.",
@@ -302,8 +302,8 @@ module Buildr
           lambda { |value| verbose(false) }
         ],
         ['--buildfile', '-f FILE', "Use FILE as the buildfile.",
-          lambda { |value| 
-            @rakefiles.clear 
+          lambda { |value|
+            @rakefiles.clear
             @rakefiles << value
           }
         ],
@@ -354,8 +354,8 @@ module Buildr
         ],
         ['--version', '-V', "Display the program version.",
           lambda { |value|
-            puts "Buildr #{Buildr::VERSION} #{RUBY_PLATFORM[/java/] && '(JRuby '+JRUBY_VERSION+')'}"
-            exit
+            puts "Buildr #{Buildr::VERSION}#{RUBY_PLATFORM[/java/] ? " (JRuby #{JRUBY_VERSION})" : ""}"
+            exit 0
           }
         ]
       ]
@@ -434,7 +434,7 @@ module Buildr
       end
     end
 
-    # Load artifact specs from the build.yaml file, making them available 
+    # Load artifact specs from the build.yaml file, making them available
     # by name ( ruby symbols ).
     def load_artifact_ns #:nodoc:
       hash = settings.build['artifacts']
@@ -443,12 +443,18 @@ module Buildr
       # Currently we only use one artifact namespace to rule them all. (the root NS)
       Buildr::ArtifactNamespace.load(:root => hash)
     end
-    
-    # Loads buildr.rb files from users home directory and project directory.
+
+    # Loads buildr.rb files from home/.buildr directory and project directory.
     # Loads custom tasks from .rake files in tasks directory.
     def load_tasks #:nodoc:
       # TODO: this might need to be split up, look for deprecated features, better method name.
-      files = [ File.expand_path('buildr.rb', ENV['HOME']), 'buildr.rb' ].select { |file| File.exist?(file) }
+      old = File.expand_path('buildr.rb', ENV['HOME'])
+      new = File.expand_path('buildr.rb', home_dir)
+      if File.exist?(old) && !File.exist?(new)
+        warn "Deprecated: Please move buildr.rb from your home directory to the .buildr directory in your home directory"
+      end
+      # Load home/.buildr/buildr.rb in preference
+      files = [ File.exist?(new) ? new : old, 'buildr.rb' ].select { |file| File.exist?(file) }
       files += [ File.expand_path('buildr.rake', ENV['HOME']), File.expand_path('buildr.rake') ].
         select { |file| File.exist?(file) }.each { |file| warn "Please use '#{file.ext('rb')}' instead of '#{file}'" }
       files += (options.rakelib || []).collect { |rlib| Dir["#{rlib}/*.rake"] }.flatten
@@ -501,13 +507,14 @@ module Buildr
         $stderr.puts $terminal.color(ex.message, :red)
         exit(1)
       rescue Exception => ex
-        title, message = "Your build failed with an error", "#{Dir.pwd}:\n#{ex.message}"
+        ex_msg = ex.class.name == "Exception" ? ex.message : "#{ex.class.name} : #{ex.message}"
+        title, message = "Your build failed with an error", "#{Dir.pwd}:\n#{ex_msg}"
         @on_failure.each do |block|
           block.call(title, message, ex) rescue nil
         end
         # Exit with error message
         $stderr.puts "Buildr aborted!"
-        $stderr.puts $terminal.color(ex.message, :red)
+        $stderr.puts $terminal.color(ex_msg, :red)
         if options.trace
           $stderr.puts ex.backtrace.join("\n")
         else
@@ -519,13 +526,13 @@ module Buildr
     end
 
   end
-  
-  
+
+
   # This task stands for the buildfile and all its associated helper files (e.g., buildr.rb, build.yaml).
   # By using this task as a prerequisite for other tasks, you can ensure these tasks will be needed
   # whenever the buildfile changes.
   class BuildfileTask < Rake::FileTask #:nodoc:
-    
+
     def timestamp
       ([name] + prerequisites).map { |f| File.stat(f).mtime }.max rescue Time.now
     end
@@ -561,14 +568,13 @@ end
 
 
 # Add a touch of color when available and running in terminal.
+HighLine.use_color = false
 if $stdout.isatty
   begin
-    require 'Win32/Console/ANSI' if Config::CONFIG['host_os'] =~ /mswin/
+    require 'Win32/Console/ANSI' if Config::CONFIG['host_os'] =~ /mswin|win32|dos|cygwin|mingw/i
     HighLine.use_color = true
   rescue LoadError
   end
-else
-  HighLine.use_color = false
 end
 
 
@@ -629,7 +635,7 @@ module Rake #:nodoc
           old_chain, Thread.current[:rake_chain] = Thread.current[:rake_chain], new_chain
           execute(task_args) if needed?
         ensure
-          Thread.current[:rake_chain] = nil
+          Thread.current[:rake_chain] = old_chain
         end
       end
     end