svn commit: r1406516 - in /buildr/trunk: lib/buildr/version.rb rakelib/release.rake rakelib/stage.rake

[do...@apache.org]

Author: donaldp
Date: Wed Nov  7 10:11:26 2012
New Revision: 1406516

URL: http://svn.apache.org/viewvc?rev=1406516&view=rev
Log:
Add .dev suffix to version while in development. Remove dev suffix as part of staging process and re-add it as part of release.

Modified:
    buildr/trunk/lib/buildr/version.rb
    buildr/trunk/rakelib/release.rake
    buildr/trunk/rakelib/stage.rake

Modified: buildr/trunk/lib/buildr/version.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/version.rb?rev=1406516&r1=1406515&r2=1406516&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/version.rb (original)
+++ buildr/trunk/lib/buildr/version.rb Wed Nov  7 10:11:26 2012
@@ -14,5 +14,5 @@
 # the License.
 
 module Buildr
-  VERSION = '1.4.9'.freeze
+  VERSION = '1.4.9.dev'.freeze
 end
\ No newline at end of file

Modified: buildr/trunk/rakelib/release.rake
URL: http://svn.apache.org/viewvc/buildr/trunk/rakelib/release.rake?rev=1406516&r1=1406515&r2=1406516&view=diff
==============================================================================
--- buildr/trunk/rakelib/release.rake (original)
+++ buildr/trunk/rakelib/release.rake Wed Nov  7 10:11:26 2012
@@ -89,7 +89,7 @@ task 'release' do
 
     ver_file = "lib/#{spec.name}/version.rb"
     if File.exist?(ver_file)
-      modified = File.read(ver_file).sub(/(VERSION\s*=\s*)(['"])(.*)\2/) { |line| "#{$1}#{$2}#{next_version}#{$2}" }
+      modified = File.read(ver_file).sub(/(VERSION\s*=\s*)(['"])(.*)\2/) { |line| "#{$1}#{$2}#{next_version}.dev#{$2}" }
       File.open ver_file, 'w' do |file|
         file.write modified
       end

Modified: buildr/trunk/rakelib/stage.rake
URL: http://svn.apache.org/viewvc/buildr/trunk/rakelib/stage.rake?rev=1406516&r1=1406515&r2=1406516&view=diff
==============================================================================
--- buildr/trunk/rakelib/stage.rake (original)
+++ buildr/trunk/rakelib/stage.rake Wed Nov  7 10:11:26 2012
@@ -22,6 +22,21 @@ gpg_cmd = 'gpg2'
 task 'prepare' do |task, args|
   gpg_arg = args.gpg || ENV['gpg']
 
+  # Update source files to next release number.
+  lambda do
+    current_version = spec.version.to_s.split('.').map { |v| v.to_i }.
+      zip([0, 0, 0]).map { |a| a.inject(0) { |t,i| i.nil? ? nil : t + i } }.compact.join('.')
+
+    ver_file = "lib/#{spec.name}/version.rb"
+    if File.exist?(ver_file)
+      modified = File.read(ver_file).sub(/(VERSION\s*=\s*)(['"])(.*)\2/) { |line| "#{$1}#{$2}#{current_version}#{$2}" }
+      File.open ver_file, 'w' do |file|
+        file.write modified
+      end
+      puts "[X] Removed dev suffix from version in #{ver_file}"
+    end
+  end.call
+
   # Make sure we're doing a release from checked code.
   lambda do
     puts 'Checking there are no local changes ... '