git-lite-version-bump 0.17.1 → 0.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 245fa58c69c2530bf29a431acafb3d1c2072dd685322efe95f2e0a486f57a050
-  data.tar.gz: 9a2b6c6cab12d189fdf6e85ff769bffaa64a1ca0d301f5712e2cd124fb5e9528
+  metadata.gz: 11b1d0035cce0dcc1c4713db85c0b695c945200a625d281b24c50fd2e5fbddb9
+  data.tar.gz: 9826f50499d603317b53640bd772bba95486b1180b1fa8d12bfe64cf053c3fb8
 SHA512:
-  metadata.gz: 55b0499ada73ff1ee43db28d8388235dde7c2ebe2e36aed80630d61ac1c59a12e942a8ba9461103e02759e093b54dfe10141b664cd52351a70c743c16bae9b6c
-  data.tar.gz: 5c939fe28ce4faba2fda3016b827b407fbeeb7c021dae79a41316825fae1e256ff0364a35c43dc00e9d6c232d9e2f52f49ef8580c5611d3f8196e0b11e711a85
+  metadata.gz: 5a7978746a84b9e614bb1904be4ccbe1790b2f1f0a1f1b6947578418d2341217691bac76af8aeb02dcd9f490110e039fcadc39c5e95ea894eb5abc9b2fadd482
+  data.tar.gz: 53ecbb6f8ea367f4273e6a0e78ddd181189fe4ebf4b8a41d48ca92992279380bffcb41273f0a6a32fc33cea0d603c806f97e65c0c992ccd87c50234242d66f27

data/lib/git-version-bump.rb

@@ -5,6 +5,8 @@ require 'pathname'
 module GitVersionBump
 	class VersionUnobtainable < StandardError; end
 
+	VERSION_TAG_GLOB = 'v[0.9]*.[0-9]*.*[0-9]'
+
 	DEVNULL = Gem.win_platform? ? "NUL" : "/dev/null"
 
 	def self.version(use_local_git=false, include_lite_tags=false)
@@ -19,7 +21,7 @@ module GitVersionBump
 			sq_git_dir = shell_quoted_string((File.dirname(caller_file) rescue nil || Dir.pwd))
 		end
 
-		git_cmd = "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]'"
+		git_cmd = "git -C #{sq_git_dir} describe --dirty='.1.dirty.#{Time.now.strftime("%Y%m%d.%H%M%S")}' --match='#{VERSION_TAG_GLOB}'"
 		git_cmd << " --tags" if include_lite_tags
 
 		git_ver = `#{git_cmd} 2> #{DEVNULL}`.
@@ -34,11 +36,13 @@ module GitVersionBump
 		# git failed us; we're either not in a git repo or else we've never
 		# tagged anything before.
 
-		# Are we in a git repo with no tags?  If so, dump out our
-		# super-special version and be done with it, otherwise try to use the
-		# gem version.
-		system("git -C #{sq_git_dir} status > #{DEVNULL} 2>&1")
-		$? == 0 ? "0.0.0.1.ENOTAG" : gem_version(use_local_git)
+		# Are we in a git repo with no tags?  If so, try to use the gemspec
+		# and if that fails then abort
+		begin
+			return gem_version(use_local_git)
+		rescue VersionUnobtainable
+			return "0.0.0.1.ENOTAG"
+		end
 	end
 
 	def self.major_version(use_local_git=false, include_lite_tags=false)
@@ -98,11 +102,11 @@ module GitVersionBump
 		if $? == 0
 			# Yes, we're in git.
 
-			if dirty_tree?
+			if dirty_tree?(sq_git_dir)
 				return Time.now.strftime("%F")
 			else
 				# Clean tree.  Date of last commit is needed.
-				return `git -C #{sq_git_dir} show --no-show-signature --format=format:%cd --date=short`.lines.first.strip
+				return `git -C #{sq_git_dir} show --no-show-signature --format=format:%cd --date=short`.lines.first&.strip
 			end
 		else
 			if use_local_git
@@ -127,7 +131,7 @@ module GitVersionBump
 			if release_notes
 				# We need to find the tag before this one, so we can list all the commits
 				# between the two.  This is not a trivial operation.
-				git_cmd = 'git describe --always'
+				git_cmd = "git describe --match '#{VERSION_TAG_GLOB}' --always"
 				git_cmd << ' --tags' if include_lite_tags
 				prev_tag = `#{git_cmd}`.strip.gsub(/-\d+-g[0-9a-f]+$/, '')
 
@@ -226,10 +230,13 @@ module GitVersionBump
 		# git failed us; either we're not in a git repo or else it's a git
 		# repo that's not got any commits.
 
-		# Are we in a git repo with no tags?  If so, dump out our
-		# super-special version and be done with it.
-		system("git -C #{sq_git_dir} status > #{DEVNULL} 2>&1")
-		$? == 0 ? "0.0.0.1.ENOCOMMITS" : gem_version(use_local_git)
+		# Are we in a git repo with no commits?  If so, try to use the gemspec
+		# and if that fails then abort
+		begin
+			return gem_version(use_local_git)
+		rescue VersionUnobtainable
+			return "0.0.0.1.ENOCOMMITS"
+		end
 	end
 
 	private
@@ -240,11 +247,9 @@ module GitVersionBump
 		$? == 0
 	end
 
-	def self.dirty_tree?
+	def self.dirty_tree?(sq_git_dir='.')
 		# Are we in a dirty, dirty tree?
-		system("! git diff --no-ext-diff --quiet --exit-code 2> #{DEVNULL} || ! git diff-index --cached --quiet HEAD 2> #{DEVNULL}")
-
-		$? == 0
+		!system("git -C #{sq_git_dir} diff --no-ext-diff --quiet --exit-code 2> #{DEVNULL}") || !("git -C #{sq_git_dir} diff-index --cached --quiet HEAD 2> #{DEVNULL}")
 	end
 
 	def self.caller_file
@@ -252,14 +257,9 @@ module GitVersionBump
 		# 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 returns paths of the form `/path/to/file:100:in method...` on *nix
-		# and `C:\path\to\file:in method...` on Windows. Splitting on colon isn't
-		# reliable since the Windows path has a colon at the beginning, split on :num:
-		# instead since that will always be there no matter the platform.
 		Pathname(
-		  caller.
-		  map  { |l| l.split(/:\d+:/)[0] }.
+		  caller_locations.
+		  map(&:path).
 		  find { |l| l != __FILE__ }
 		).realpath.to_s rescue nil
 	end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-lite-version-bump
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.17.2
 platform: ruby
 authors:
 - Matt Palmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-06 00:00:00.000000000 Z
+date: 2020-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-release