rake-dotnet 0.1.11 → 0.1.12

data/History.txt

@@ -1,10 +1,6 @@
-=== 0.1.11 / 2009-08-25
+=== 0.1.12 / 2009-08-29
 
-FIX: Messed up previous gem
-
-=== 0.1.10 / 2009-08-24
-
-FIX: Svn: revision would return the last changed revision, not the actual revision number
+FIX: Versioner: Cache the version number to a file, so CI can pull/push it and maintain same version number throughout CI pipeline stages
 
 === 0.1.9 / 2009-07-07
 

data/Rakefile.rb

@@ -5,7 +5,7 @@ require 'hoe'
 require 'Pathname'
 require 'rake/clean'
 
-Hoe.new('rake-dotnet', '0.1.11') do |p|
+Hoe.new('rake-dotnet', '0.1.12') 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

@@ -83,6 +83,7 @@ CLEAN.include("#{SRC_DIR}/**/obj")
 CLEAN.include("#{SRC_DIR}/**/bin")
 CLEAN.include("#{SRC_DIR}/**/AssemblyInfo.cs")
 CLEAN.include("#{SRC_DIR}/**/AssemblyInfo.vb")
+CLEAN.include('version.txt')
 CLOBBER.include(OUT_DIR)
 
 VERBOSE = ENV['VERBOSE'] ? ENV['VERBOSE'] : false
@@ -913,8 +914,7 @@ class SvnInfo < Svn
 	def revision
 		puts cmd if VERBOSE
 		out = `#{cmd}`
-		rev = out.match(/Revision: (\d+)/)[1]
-		return rev
+		out.match(/Revision: (\d+)/)[1]
 	end
 	
 	def path
@@ -925,53 +925,41 @@ end
 
 class Versioner
   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')
+	tf_path = template_file || 'version.template.txt'
+    @tf = Pathname.new(tf_path)
+	@vf = Pathname.new(tf_path.sub('.template', ''))
   end
 
   def get
-    "#{@maj_min}.#{build}.#{revision}"
+	return @vf.read.chomp if @vf.exist?
+	
+	v = "#{maj_min}.#{build}.#{revision}"
+	@vf.open('w') {|f| f.write(v) }
+	
+	return v
   end
 
+  def maj_min
+	return @tf.read.chomp
+  end
+  
   def build
-	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
+	bn = ENV['BUILD_NUMBER']
 	return 0 if bn == nil || !bn.match(/\d+/)
 	return bn
   end
 
   def revision
     if (Pathname.new('.svn').exist?)
-		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
+		# TODO: return something numeric but sane for non-numeric revision numbers (eg DVCSs)
 		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
 
+RDNVERSION = Versioner.new.get
 
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rake-dotnet
 version: !ruby/object:Gem::Version 
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors: 
 - Peter MouncePeter Mounce
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-25 00:00:00 +01:00
+date: 2009-08-29 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.12.2
+        version: 1.11.0
     version: 
 description: Making a .NET build-automation dev's life easier, one angle-bracket at a time
 email: pete@neverrunwithscissors.compete@neverrunwithscissors.com
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rake-dotnet
-rubygems_version: 1.3.3
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
 summary: Build automation for .NET builds