buildr 1.4.1-x86-mswin32 → 1.4.2-x86-mswin32

data/doc/packaging.textile

@@ -242,7 +242,8 @@ Axis2 service archives are similar to JAR's (compiled classes go into the root o
 
 {% highlight ruby %}
 package(:aar).with(:libs=>'log4j:log4j:jar:1.1')
-package(:aar).with(:services_xml=>_('target/services.xml'), :wsdls=>_('target/*.wsdl'))
+package(:aar).with(:services_xml=>_('target/services.xml'),
+                   :wsdls=>_('target/*.wsdl'))
 {% endhighlight %}
 
 The @libs@ attribute is a list of .jar artifacts to be included in the archive under /lib.  The default is no artifacts; compile dependencies are not included by default.
@@ -257,9 +258,11 @@ If you already have WSDL files in the @src/main/axis2@ directory but would like
 # Host name depends on environment.
 host = ENV['ENV'] == 'test' ? 'test.host' : 'ws.example.com'
 filter.from(_('src/main/axis2')).into(_(:target)).
-  include('services.xml', '==*==.wsdl').using('http_port'=>'8080', 'http_host'=>host)
+  include('services.xml', '==*==.wsdl').using('http_port'=>'8080',
+                                              'http_host'=>host)
 package(:aar).wsdls.clear
-package(:aar).with(:services_xml=>_('target/services.xml'), :wsdls=>_('target/==*==.wsdl'))
+package(:aar).with(:services_xml=>_('target/services.xml'),
+                   :wsdls=>_('target/==*==.wsdl'))
 {% endhighlight %}
 
 

data/doc/releasing.textile

@@ -0,0 +1,116 @@
+---
+layout: default
+title: Releasing 
+---
+
+Now that we built and test awesome software, let's the world know and release it.
+
+
+Each buildile can specify the current version with a constant named VERSION_NUMBER or THIS_VERSION.
+
+{% highlight ruby %}
+THIS_VERSION = "1.0.0-SNAPSHOT"
+
+define 'killer-app' do
+
+  project.version = THIS_VERSION
+
+  # ...
+end
+{% endhighlight %}
+
+
+h2(#default). What does a release do?
+
+The default behavior of the Release task is the following:
+# Check that the version to be released and the next version are different
+# Check that the project is being tracked by Git or Subversion
+# Package, test and deploy the artifacts using THIS_VERSION value minus the '-SNAPSHOT' suffix (if any)
+# Tag the repository with the released version number
+# Update the value of THIS_VERSION in the buildfile with the next version number
+
+Buildr will increment the last digit of the 3-digit versioni number if THIS_VERSION contains '-SNAPSHOT'. 
+So, at the end of a release, the buildfile now looks like this:
+
+{% highlight ruby %}
+THIS_VERSION = "1.0.1-SNAPSHOT"
+
+define 'killer-app' do
+
+  project.version = THIS_VERSION
+
+  # ...
+end
+{% endhighlight %}
+
+And the Git repository now contains two new commits and a new tag.
+
+{% highlight sh %}
+~/w/killer-app[master]$git ol -4
+c1af3d5  (HEAD, origin/master, master) Changed version number to 1.0.1-SNAPSHOT
+dd35015  (tag: 1.0.0) Changed version number to 1.0.0
+76c96e7  Last fix before the release
+{% endhighlight %}
+
+
+h2(#custom_version). How to specify my own version number scheme?
+
+If THIS_VERSION does not contain '-SNAPSHOT', Buildr delegates the resolution of the next version number to the user which has 2 differents ways to express her wishes: Release.next_version or the environment variable NEXT_VERSION.
+
+h3(#next_version_proc). Using Release.next_version
+
+The Release class can receive the next version of the buildfile. This could be a string or a proc that would receive the current version and return the next version.
+
+{% highlight ruby %}
+THIS_VERSION = "1.0.0-SNAPSHOT"
+
+# a string
+Release.next_version = "2.0.0-SNAPSHOT"
+
+# or a proc
+Release.next_version = lambda do |this_version| # 1.0.0-SNAPSHOT
+    new_version = this_version.split(/\./)
+    new_version[0] = new_version[0] + 1
+    new_version
+end
+
+define 'killer-app' do
+
+  project.version = THIS_VERSION
+
+  # ...
+end
+{% endhighlight %}
+
+
+h3(#next_version_envvar). Using the environment variable NEXT_VERSION
+
+If the environment variable NEXT_VERSION is set, Buildr will use this value to update THIS_VERSION at the end of the release.
+
+For conveniency, this variable is case insensitive.
+
+So, all 3 following commands would generate the buildfile below:
+{% highlight sh %}
+$ buildr release next_version="1.0.0-rc1"
+$ env next_version="1.0.0-rc1" buildr release
+$ env NEXT_VERSION="1.0.0-rc1" buildr release
+{% endhighlight %}
+
+{% highlight ruby %}
+THIS_VERSION = "1.0.0-rc1"
+
+define 'killer-app' do
+
+  project.version = THIS_VERSION
+
+  # ...
+end
+{% endhighlight %}
+
+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 i.i THIS_VERSION without '-SNAPSHOT'.
+

data/doc/scripts/install-linux.sh

@@ -24,15 +24,15 @@ if [ -z `which ruby` ] ; then
     echo "Installing Ruby using apt-get"
     # ruby package does not contain RDoc, IRB, etc; ruby-full is a meta-package.
     # build-essentials not installed by default in Ubuntu, required for C extensions.
-    sudo apt-get install ruby-full ruby1.8-dev libopenssl-ruby build-essential 
+    sudo apt-get install ruby-full ruby1.8-dev libopenssl-ruby build-essential
     # RubyGems broken on Ubuntu, installing directly from source.
     echo "Installing RubyGems from RubyForge"
-    wget http://rubyforge.org/frs/download.php/45905/rubygems-1.3.1.tgz
-    tar xzf rubygems-1.3.1.tgz
-    cd rubygems-1.3.1
+    wget http://production.cf.rubygems.org/rubygems/rubygems-1.3.7.tgz
+    tar xzf rubygems-1.3.7.tgz
+    cd rubygems-1.3.7
     sudo ruby setup.rb
     cd ..
-    rm -rf rubygems-1.3.1
+    rm -rf rubygems-1.3.7
     # ruby is same as ruby1.8, we need gem that is same as gem1.8
     sudo ln -s /usr/bin/gem1.8 /usr/bin/gem
   elif [ `which urpmi` ] ; then
@@ -54,9 +54,10 @@ if [ -z $JAVA_HOME ] ; then
   exit 1
 fi
 
-if [ $(gem --version) \< '1.3.1' ] ; then
+if [ $(gem --version) \< '1.3.7' ] ; then
   echo "Upgrading to latest version of RubyGems"
   sudo gem update --system
+  sudo update_rubygems
   echo
 fi
 

data/doc/testing.textile

@@ -98,6 +98,20 @@ Buildr forcefully runs all tests that match the pattern.  If you want to re-run
 $ buildr test:*
 {% endhighlight %}
 
+You can exclude tests by preceeding them with a minus sign ('-'):
+
+{% highlight sh %}
+$ buildr test:-Bar
+{% endhighlight %}
+
+The above would run all tests except those with a name containing @Bar@.  Exclusions can be combined with inclusions:
+
+{% highlight sh %}
+$ buildr test:Foo,-Bar
+{% endhighlight %}
+
+Buildr would then run tests with names containing @Foo@ but not @Bar@.
+
 As you probably noticed, Buildr will stop your build at the first test that fails.  We think it's a good idea, except when it's not.  If you're using a continuous build system, you'll want a report of all the failed tests without stopping at the first failure.  To make that happen, set the environment variable @test@ to "all", or the Buildr @options.test@ option to @:all@.  For example:
 
 {% highlight sh %}

data/lib/buildr.rb

@@ -13,8 +13,8 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-module Buildr
-  VERSION = '1.4.1'.freeze
+unless defined?(Buildr::VERSION)
+  require 'buildr/version'
 end
 
 require 'buildr/core'

data/lib/buildr/core.rb

@@ -13,12 +13,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-
-# TODO: Antwrap 0.7 requires this monkeypatch, have it fixed.
-class Array #:nodoc:
-  alias :nitems :size
-end
-
 require 'buildr/core/common'
 require 'buildr/core/application'
 require 'buildr/core/project'

data/lib/buildr/core/application.rb

@@ -343,9 +343,13 @@ module Buildr
             options.full_description = false
           }
         ],
-        ['--trace', '-t', "Turn on invoke/execute tracing, enable full backtrace.",
+        ['--trace', '-t [CATEGORIES]', "Turn on invoke/execute tracing, enable full backtrace.",
           lambda { |value|
             options.trace = true
+            if value
+              options.trace_categories = value.split(',').map { |v| v.downcase.to_sym }
+            end
+            options.trace_all = options.trace_categories.include? :all
             verbose(true)
           }
         ],
@@ -357,6 +361,18 @@ module Buildr
             puts "Buildr #{Buildr::VERSION}#{RUBY_PLATFORM[/java/] ? " (JRuby #{JRUBY_VERSION})" : ""}"
             exit 0
           }
+        ],
+        ['--offline', '-o', "Do not try to download anything",
+          lambda { |value|
+            trace 'Working in offline mode; snapshot will not be updated.'
+            options.work_offline = true
+          }
+        ],
+        ['--update-snapshots', '-u', "Force updating all dependencies whose version contains SNAPSHOT",
+          lambda { |value|
+            trace 'Force update of SNAPSHOT artifacts.'
+            options.update_snapshots = true
+          }
         ]
       ]
     end
@@ -483,7 +499,7 @@ module Buildr
         width = displayable_tasks.collect { |t| t.name_with_args.length }.max || 10
         max_column = truncate_output? ? terminal_width - name.size - width - 7 : nil
         displayable_tasks.each do |t|
-          printf "#{name} %-#{width}s  # %s\n",
+          printf "buildr %-#{width}s  # %s\n",
             t.name_with_args, max_column ? truncate(t.comment, max_column) : t.comment
         end
       end
@@ -602,6 +618,13 @@ def trace(message)
   puts message if Buildr.application.options.trace
 end
 
+def trace?(*category)
+  options = Buildr.application.options
+  return options.trace if category.empty?
+  return true if options.trace_all
+  return false unless Buildr.application.options.trace_categories
+  options.trace_categories.include?(category.first)
+end
 
 module Rake #:nodoc
   # Rake's circular dependency checks (InvocationChain) only applies to task prerequisites,

data/lib/buildr/core/build.rb

@@ -239,6 +239,19 @@ module Buildr
       #   Release.commit_message = lambda { |ver| "Changed version number to #{ver}" }
       attr_accessor :commit_message
 
+      # 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| 
+      #       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" 
+      #
+      attr_accessor :next_version
+
       # :call-seq:
       #     add(MyReleaseClass)
       #
@@ -270,6 +283,7 @@ module Buildr
     #
     # Make a release.
     def make
+      @this_version = extract_version
       check
       with_release_candidate_version do |release_candidate_buildfile|
         args = '-S', 'buildr', "_#{Buildr::VERSION}_", '--buildfile', release_candidate_buildfile
@@ -278,11 +292,17 @@ module Buildr
         ruby *args
       end
       tag_release resolve_tag
-      update_version_to_next
+      update_version_to_next if this_version != resolve_next_version(this_version)
+    end
+
+    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" 
+      end
     end
 
     # :call-seq:
-    #   extract_version() => this_versin
+    #   extract_version() => this_version
     #
     # Extract the current version number from the buildfile.
     # Raise an error if not found.
@@ -304,6 +324,9 @@ module Buildr
     end
 
   protected
+ 
+    # the initial value of THIS_VERSION
+    attr_accessor :this_version
 
     # :call-seq:
     #   with_release_candidate_version() { |filename| ... }
@@ -322,7 +345,10 @@ module Buildr
     # 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[-1] = version[-1].split('-')[0] }
+    
+      release_candidate_buildfile_contents = change_version { |version|
+        version.gsub(/-SNAPSHOT$/, "")
+      }
       File.open(release_candidate_buildfile, 'w') { |file| file.write release_candidate_buildfile_contents }
       begin
         yield release_candidate_buildfile
@@ -338,13 +364,11 @@ module Buildr
     # Change version number in the current Buildfile, but without writing a new file (yet).
     # Returns the contents of the Buildfile with the modified version number.
     #
-    # This method yields to the block with the current (this) version number as an array and expects
-    # the block to update it.
+    # This method yields to the block with the current (this) version number and expects
+    # the block to return the updated version.
     def change_version
-      this_version = extract_version
-      new_version = this_version.split('.')
-      yield(new_version)
-      new_version = new_version.join('.')
+      current_version = extract_version
+      new_version = yield(current_version)
       buildfile = File.read(Buildr.application.buildfile.to_s)
       buildfile.gsub(THIS_VERSION_PATTERN) { |ver| ver.sub(/(["']).*\1/, %Q{"#{new_version}"}) }
     end
@@ -357,13 +381,34 @@ module Buildr
       tag
     end
 
+    # Return the new value of THIS_VERSION based on the version passed.
+    #
+    # This method receives the existing value of THIS_VERSION
+    def resolve_next_version(current_version)
+        next_version = Release.next_version
+        next_version ||= lambda { |v|
+          snapshot = v.match(/-SNAPSHOT$/)
+          version = v.gsub(/-SNAPSHOT$/, "").split(/\./)
+          if snapshot 
+            version[-1] = sprintf("%0#{version[-1].size}d", version[-1].to_i + 1) + '-SNAPSHOT'
+          end 
+          version.join('.')
+        } 
+        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| version[-1] = sprintf("%0#{version[-1].size}d", version[-1].to_i + 1) + '-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 }
     end
 
-    # Return the message to use to cimmit the buildfile with the next version
+    # Return the message to use to commit the buildfile with the next version
     def message
       version = extract_version
       msg = Release.commit_message || "Changed version number to #{version}"
@@ -396,6 +441,7 @@ module Buildr
     #    1. the repository is clean: no content staged or unstaged
     #    2. some remote repositories are defined but the current branch does not track any
     def check
+      super
       uncommitted = Git.uncommitted_files
       fail "Uncommitted files violate the First Principle Of Release!\n#{uncommitted.join("\n")}" unless uncommitted.empty?
       fail "You are releasing from a local branch that does not track a remote!" unless Git.remote
@@ -404,9 +450,11 @@ module Buildr
     # Add a tag reference in .git/refs/tags and push it to the remote if any.
     # If a tag with the same name already exists it will get deleted (in both local and remote repositories).
     def tag_release(tag)
-      info "Committing buildfile with version number #{extract_version}"
-      Git.commit File.basename(Buildr.application.buildfile.to_s), message
-      Git.push if Git.remote
+      unless this_version == extract_version
+        info "Committing buildfile with version number #{extract_version}"
+        Git.commit File.basename(Buildr.application.buildfile.to_s), message
+        Git.push if Git.remote
+      end
       info "Tagging release #{tag}"
       Git.git 'tag', '-d', tag rescue nil
       Git.git 'push', Git.remote, ":refs/tags/#{tag}" rescue nil if Git.remote
@@ -431,11 +479,14 @@ module Buildr
     end
 
     def check
+      super
       fail "Uncommitted files violate the First Principle Of Release!\n"+Svn.uncommitted_files.join("\n") unless Svn.uncommitted_files.empty?
       fail "SVN URL must contain 'trunk' or 'branches/...'" unless Svn.repo_url =~ /(trunk)|(branches.*)$/
     end
 
     def tag_release(tag)
+      # Unlike Git, committing the buildfile with the released version is not necessary.
+      # svn tag does commit & tag.
       info "Tagging release #{tag}"
       Svn.tag tag
     end
@@ -462,4 +513,4 @@ end
 
 class Buildr::Project
   include Buildr::Build
-end
+end

data/lib/buildr/core/compile.rb

@@ -15,6 +15,7 @@
 
 
 require 'buildr/core/common'
+require 'find'
 
 
 module Buildr
@@ -91,7 +92,15 @@ module Buildr
           paths = task.sources + [sources].flatten.map { |src| Array(project.path_to(:source, task.usage, src.to_sym)) }
           paths.flatten!
           ext_glob = Array(source_ext).join(',')
-          paths.any? { |path| !Dir["#{path}/**/*.{#{ext_glob}}"].empty? }
+          
+          paths.each { |path| 
+            Find.find(path) {|found|
+              if (!File.directory?(found)) && found.match(/.*\.#{Array(source_ext).join('|')}/)
+                return true
+              end
+              } if File.exist? path
+            }
+          false
         end
 
         # Implementations can use this method to specify various compiler attributes.