git-version-bump 0.10.0 → 0.12.0

data/lib/git-version-bump/version.rb

@@ -0,0 +1,8 @@
+module GitVersionBump
+	VERSION = GVB.version
+	MAJOR_VERSION = GVB.major_version
+	MINOR_VERSION = GVB.minor_version
+	PATCH_VERSION = GVB.patch_version
+	INTERNAL_REVISION = GVB.internal_revision
+	DATE = GVB.date
+end

data/lib/git-version-bump.rb

@@ -11,35 +11,41 @@ module GitVersionBump
 		$? == 0
 	end
 
+	def self.caller_file
+		# 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 caller stack ourselves to find which
+		# gem we're trying to version all over.
+		File.realpath(
+		  caller.
+		  map  { |l| l.split(':')[0] }.
+		  find { |l| l != __FILE__ }
+		) rescue nil
+	end
+
 	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 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__ }
-
-		# Real paths, please.
-		caller_file = File.realpath(caller_file)
-
-		# Next we grovel through all the loaded gems to try and find the gem
+		cf = caller_file or return nil
+
+		# Grovel through all the loaded gems to try and find the gem
 		# that contains the caller's file.
 		Gem.loaded_specs.values.each do |spec|
-			if Dir.
-				  glob(spec.lib_dirs_glob).
-				  find { |d| caller_file.index(File.realpath(d)) == 0 }
+			if (Dir.glob(spec.lib_dirs_glob) + Dir["#{spec.bin_dir}/*"]).
+			     find { |d| cf.index(File.realpath(d)) == 0 }
 				# The caller_file is in this
 				# gem!  Woohoo!
 				return spec
 			end
 		end
 
-		nil
+		raise VersionUnobtainable,
+		      "Unable to find gemspec for caller file #{cf}"
 	end
 
-	def self.version(gem = nil)
-		git_ver = `git describe --dirty='.1.dirty.#{Time.now.strftime("%Y%m%d.%H%M%S")}' --match='v[0-9]*.[0-9]*.*[0-9]' 2>/dev/null`.
+	def self.version
+		# Shell Quoted, for your convenience
+		sq_git_dir = "'" + (File.dirname(caller_file) rescue nil || Dir.pwd).gsub("'", "'\\''") + "'"
+
+		git_ver = `git -C #{sq_git_dir} describe --dirty='.1.dirty.#{Time.now.strftime("%Y%m%d.%H%M%S")}' --match='v[0-9]*.[0-9]*.*[0-9]' 2>/dev/null`.
 		            strip.
 		            gsub(/^v/, '').
 		            gsub('-', '.')
@@ -53,13 +59,9 @@ module GitVersionBump
 
 		# Are we in a git repo with no tags?  If so, dump out our
 		# super-special version and be done with it.
-		system("git status >/dev/null 2>&1")
+		system("git -C #{sq_git_dir} 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.
@@ -75,10 +77,8 @@ module GitVersionBump
 		end
 	end
 
-	VERSION = version('git-version-bump')
-
-	def self.major_version(gem = nil)
-		ver = version(gem)
+	def self.major_version
+		ver = version
 		v   = ver.split('.')[0]
 
 		unless v =~ /^[0-9]+$/
@@ -89,10 +89,8 @@ module GitVersionBump
 		return v.to_i
 	end
 
-	MAJOR_VERSION = major_version('git-version-bump')
-
-	def self.minor_version(gem = nil)
-		ver = version(gem)
+	def self.minor_version
+		ver = version
 		v   = ver.split('.')[1]
 
 		unless v =~ /^[0-9]+$/
@@ -103,10 +101,8 @@ module GitVersionBump
 		return v.to_i
 	end
 
-	MINOR_VERSION = minor_version('git-version-bump')
-
-	def self.patch_version(gem = nil)
-		ver = version(gem)
+	def self.patch_version
+		ver = version
 		v   = ver.split('.')[2]
 
 		unless v =~ /^[0-9]+$/
@@ -117,15 +113,11 @@ module GitVersionBump
 		return v.to_i
 	end
 
-	PATCH_VERSION = patch_version('git-version-bump')
-
-	def self.internal_revision(gem = nil)
-		version(gem).split('.', 4)[3].to_s
+	def self.internal_revision
+		version.split('.', 4)[3].to_s
 	end
 
-	INTERNAL_REVISION = internal_revision('git-version-bump')
-
-	def self.date(gem = nil)
+	def self.date
 		# Are we in a git tree?
 		system("git status >/dev/null 2>&1")
 		if $? == 0
@@ -139,21 +131,15 @@ 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.date.strftime("%F")
 			end
 
 			raise RuntimeError,
-				  "GVB.date(#{gem.inspect}) called from mysterious, non-gem location."
+				  "GVB.date called from mysterious, non-gem location."
 		end
 	end
 
-	DATE = date('git-version-bump')
-
 	def self.tag_version(v, release_notes = false)
 		if dirty_tree?
 			puts "You have uncommitted files.  Refusing to tag a dirty tree."
@@ -171,7 +157,7 @@ module GitVersionBump
 
 					# Write your release notes above.  The first line should be the release name.
 					# To help you remember what's in here, the commits since your last release
-					# are listed below.
+					# are listed below. This will become v#{v}
 					#
 				EOF
 
@@ -200,4 +186,6 @@ module GitVersionBump
 	end
 end
 
-GVB = GitVersionBump
+GVB = GitVersionBump unless defined? GVB
+
+require_relative 'git-version-bump/version'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-version-bump
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-25 00:00:00.000000000 Z
+date: 2014-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -75,6 +75,7 @@ files:
 - git-version-bump.gemspec
 - lib/git-version-bump.rb
 - lib/git-version-bump/rake-tasks.rb
+- lib/git-version-bump/version.rb
 homepage: http://theshed.hezmatt.org/git-version-bump
 licenses: []
 post_install_message: 
@@ -89,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 879836245496390919
+      hash: 4388350532020015811
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -98,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 879836245496390919
+      hash: 4388350532020015811
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23