git-version-bump 0.4.0 → 0.5.0

data/lib/git-version-bump.rb

@@ -8,8 +8,9 @@ module GitVersionBump
 
 	def self.caller_gemspec
 		# First up, who called us?  Because this method gets called from other
-		# methods within this file, we can't just look at Gem.location_of_caller,
-		# but instead we need to parse the whole caller stack ourselves.
+		# methods within this file, we can't just look at
+		# Gem.location_of_caller, but instead we need to parse the caller
+		# stack ourselves to find which gem we're trying to version all over.
 		caller_file = caller.
 		                map  { |l| l.split(':')[0] }.
 		                find { |l| l != __FILE__ }
@@ -29,7 +30,7 @@ module GitVersionBump
 		nil
 	end
 
-	def self.version
+	def self.version(gem = nil)
 		git_ver = `git describe --dirty --match='v[0-9]*.[0-9]*.*[0-9]' 2>/dev/null`.
 		            strip.
 		            gsub(/^v/, '').
@@ -47,6 +48,10 @@ module GitVersionBump
 		system("git status >/dev/null 2>&1")
 		return "0.0.0.1.ENOTAG" if $? == 0
 
+		if gem
+			return Gem.loaded_specs[gem].version.to_s
+		end
+
 		# We're not in a git repo.  This means that we need to get version
 		# information out of rubygems, given only the filename of who called
 		# us.  This takes a little bit of effort.
@@ -58,14 +63,14 @@ module GitVersionBump
 			# weren't called from within a loaded gem, and so we've got *no*
 			# idea what's going on.  Time to bail!
 			raise RuntimeError,
-					  "GVB.version called from mysterious, non-gem location."
+					  "GVB.version(#{gem.inspect}) called from mysterious, non-gem location."
 		end
 	end
 
-	VERSION = version
+	VERSION = version('git-version-bump')
 
-	def self.major_version
-		ver = version
+	def self.major_version(gem = nil)
+		ver = version(gem)
 		v   = ver.split('.')[0]
 		
 		unless v =~ /^[0-9]+$/
@@ -76,10 +81,10 @@ module GitVersionBump
 		return v.to_i
 	end
 
-	MAJOR_VERSION = major_version
+	MAJOR_VERSION = major_version('git-version-bump')
 
-	def self.minor_version
-		ver = version
+	def self.minor_version(gem = nil)
+		ver = version(gem)
 		v   = ver.split('.')[1]
 		
 		unless v =~ /^[0-9]+$/
@@ -90,10 +95,10 @@ module GitVersionBump
 		return v.to_i
 	end
 
-	MINOR_VERSION = minor_version
+	MINOR_VERSION = minor_version('git-version-bump')
 
-	def self.patch_version
-		ver = version
+	def self.patch_version(gem = nil)
+		ver = version(gem)
 		v   = ver.split('.')[2]
 		
 		unless v =~ /^[0-9]+$/
@@ -104,20 +109,20 @@ module GitVersionBump
 		return v.to_i
 	end
 
-	PATCH_VERSION = patch_version
+	PATCH_VERSION = patch_version('git-version-bump')
 
-	def self.internal_revision
-		version.split('.', 4)[3].to_s
+	def self.internal_revision(gem = nil)
+		version(gem).split('.', 4)[3].to_s
 	end
 
-	INTERNAL_REVISION = internal_revision
+	INTERNAL_REVISION = internal_revision('git-version-bump')
 
-	def self.date
+	def self.date(gem = nil)
 		# Are we in a git tree?
 		system("git status >/dev/null 2>&1")
 		if $? == 0
 			# Yes, we're in git.
-			
+
 			if dirty_tree?
 				return Time.now.strftime("%F")
 			else
@@ -126,16 +131,20 @@ module GitVersionBump
 			end
 		else
 			# Not in git; time to hit the gemspecs
+			if gem
+				return Gem.loaded_specs[gem].date.strftime("%F")
+			end
+
 			if spec = caller_gemspec
-				return spec.version.to_s
-			else
-				raise RuntimeError,
-					  "GVB.date called from mysterious, non-gem location."
+				return spec.date.strftime("%F")
 			end
+
+			raise RuntimeError,
+				  "GVB.date(#{gem.inspect}) called from mysterious, non-gem location."
 		end
 	end
 
-	DATE = date
+	DATE = date('git-version-bump')
 
 	def self.tag_version(v)
 		if dirty_tree?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-version-bump
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -87,7 +87,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4259481629869116982
+      hash: 1215033858800300071
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4259481629869116982
+      hash: 1215033858800300071
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23