rake-dotnet 0.1.7 → 0.1.8

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.1.8 / 2009-06-30
+
+FIX: When TeamCity build-configs are out-of-sync, number-wise, we cannot rely on RDNVERSION to be a sensible default.
+
 === 0.1.7 / 2009-06-30
 
 (Messed up release)

data/Rakefile.rb

@@ -5,7 +5,7 @@ require 'hoe'
 require 'Pathname'
 require 'rake/clean'
 
-Hoe.new('rake-dotnet', '0.1.7') do |p|
+Hoe.new('rake-dotnet', '0.1.8') do |p|
   p.author = 'Peter Mounce'
   p.description = 'Making a .NET build-automation dev\'s life easier, one angle-bracket at a time'
   p.email = 'pete@neverrunwithscissors.com'

data/lib/rake_dotnet.rb

@@ -922,10 +922,11 @@ end
 
 
 class Versioner
-  def initialize(template_file=nil)
+  def initialize(template_file=nil, opts={})
     tf = template_file || 'version.template.txt'
     file = Pathname.new(tf)
     @maj_min = file.read.chomp
+	@bin_out = opts[:bin_out] || File.join(OUT_DIR, 'bin')
   end
 
   def get
@@ -933,18 +934,40 @@ class Versioner
   end
 
   def build
-	bn = ENV['BUILD_NUMBER']
+	fl = FileList.new("#{@bin_out}*")
+	if ENV['TEAMCITY_BUILDCONF_NAME']
+		pb = get_from_previous_binaries('.*-v\d+\.\d+\.(\d+)\.\d+')
+		return pb unless pb.nil?# use a previous binaries-build if one exists
+		# otherwise use the current environment variable
+		bn = ENV['BUILD_NUMBER']
+	end
 	return 0 if bn == nil || !bn.match(/\d+/)
 	return bn
   end
 
   def revision
     if (Pathname.new('.svn').exist?)
-      SvnInfo.new(:path => '.').revision
+		if ENV['TEAMCITY_BUILDCONF_NAME']
+			pb = get_from_previous_binaries('.*-v\d+\.\d+\.\d+\.(\d+)')
+			return pb unless pb.nil?
+		end
+		return SvnInfo.new(:path => '.').revision
     else
-      '0' # YYYYMMDD is actually invalid for a {revision} number.
+		return '0' # YYYYMMDD is actually invalid for a {revision} number.
     end
   end
+  
+  def get_from_previous_binaries(regex)
+	fl = FileList.new("#{@bin_out}*")
+	fl.each do |e|
+		re = regexify(@bin_out)
+		unless e.match(/#{re}/).nil?
+			matches = e.match(/#{regex}/)
+			return matches[1] unless matches.nil?
+		end
+	end
+	return nil
+  end
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rake-dotnet
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - Peter MouncePeter Mounce