git-version-bump 0.15.1 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c7aa6d10395aa2b64c367ea1050ae82d59ced3b7
-  data.tar.gz: bde064218de7a6bb85a4a903c7a89ac87f81684d
+SHA256:
+  metadata.gz: 94d95a18eae098b144f0f9afff676405cb1a05cf35b6786410e160269d7b34ec
+  data.tar.gz: db3e976ffa2d7e5493c957d340aafaffdd570d45bc3db83e2f0d6f70742e58c0
 SHA512:
-  metadata.gz: 8c35d8caa34d3bdda551444a4e10ad0d28eee67e712a67b632d4409c8656d94413389620d6714fbc24ecd27d0481d80c59fd338bf59c1e07bd65a1402ef694d6
-  data.tar.gz: 68c3056ec5589daf817f572eb3dc9778252a6acd01688d2434370c296e18e1810e9befa42d40381e3d166f22c874bbff1c5d7c93f9d3f246ae4dcc7a92cefb02
+  metadata.gz: 4c2a692ace08cda02976a2647dec09b978a82829e51e7bdec4a93c7954d3e4728e24bcac211fa128861fec979f5f41290e88ca40f6e04feb371f362854abf9e3
+  data.tar.gz: 737dd2b41d89ca7d33722948e69a9de74f10e260d4776aba82cfee9f6b4a15df28042b86d839ceb53012ac7a1247278b8e46b259e10ced7cae904cadb512510d

data/bin/git-version-bump

@@ -4,10 +4,11 @@ require 'git-version-bump'
 
 if ARGV[0].nil? or
    ARGV[0].empty? or
+   (ARGV.length == 1 && (ARGV[0] == "-d" || ARGV[0] == "--dry-run")) or
    ARGV[0] == '-h' or
    ARGV[0] == '--help'
 	$stderr.puts <<-EOF.gsub(/^\t\t/, '')
-		Usage: git version-bump [-n|--notes] <major|minor|patch|show>
+		Usage: git version-bump [-n|--notes] [-d|--dry-run] <major|minor|patch|show>
 
 		'major': x.y.z -> x+1.0.0
 		'minor': x.y.z -> x.y+1.0
@@ -15,11 +16,13 @@ if ARGV[0].nil? or
 
 		'show': Display the current GVB version
 
-		--release: Prompt for "release notes" to add to the release tag
+		-d, --dry-run: Calculate and return the bump value, but don't update git workspace or remote
+		-n, --notes: Prompt for "release notes" to add to the release tag
 	EOF
 end
 
 release_notes = ARGV.delete('-n') || ARGV.delete('--notes')
+dry_run = ARGV.delete('-d') || ARGV.delete('--dry-run')
 
 if ARGV[0].nil? or ARGV[0].empty?
 	exit 1
@@ -27,13 +30,13 @@ elsif ARGV[0] == '-h' or ARGV[0] == '--help'
 	exit 0
 end
 
-case ARGV[0].downcase
+result = case ARGV[0].downcase
 	when /^maj?o?r?$/
-		GVB.tag_version "#{GVB.major_version(true) + 1}.0.0", release_notes
+		"#{GVB.major_version(true) + 1}.0.0"
 	when /^min?o?r?$/
-		GVB.tag_version "#{GVB.major_version(true)}.#{GVB.minor_version(true)+1}.0", release_notes
+		"#{GVB.major_version(true)}.#{GVB.minor_version(true)+1}.0"
 	when /^pa?t?c?h?$/
-		GVB.tag_version "#{GVB.major_version(true)}.#{GVB.minor_version(true)}.#{GVB.patch_version(true)+1}", release_notes
+		"#{GVB.major_version(true)}.#{GVB.minor_version(true)}.#{GVB.patch_version(true)+1}"
 	when /^sh?o?w?$/
 		puts GVB.version(true)
 		exit 0
@@ -42,4 +45,9 @@ case ARGV[0].downcase
 		exit 1
 end
 
-puts "Version is now #{GVB.version(true)}."
+if dry_run
+	puts result
+else
+	GVB.tag_version result, release_notes
+	puts "Version is now #{GVB.version(true)}."
+end

data/git-version-bump.gemspec

@@ -1,4 +1,6 @@
-require File.expand_path('../lib/git-version-bump', __FILE__)
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'git-version-bump'
 
 Gem::Specification.new do |s|
 	s.name = "git-version-bump"

data/lib/git-version-bump.rb

@@ -5,6 +5,8 @@ require 'pathname'
 module GitVersionBump
 	class VersionUnobtainable < StandardError; end
 
+	DEVNULL = Gem.win_platform? ? "NUL" : "/dev/null"
+
 	def self.version(use_local_git=false)
 		if use_local_git
 			unless git_available?
@@ -12,13 +14,12 @@ module GitVersionBump
 				      "GVB.version(use_local_git=true) called, but git isn't installed"
 			end
 
-			sq_git_dir = "'#{Dir.pwd.gsub("'", "'\\''")}'"
+			sq_git_dir = shell_quoted_string(Dir.pwd)
 		else
-			# Shell Quoted, for your convenience
-			sq_git_dir = "'" + (File.dirname(caller_file) rescue nil || Dir.pwd).gsub("'", "'\\''") + "'"
+			sq_git_dir = shell_quoted_string((File.dirname(caller_file) rescue nil || Dir.pwd))
 		end
 
-		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`.
+		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> #{DEVNULL}`.
 		            strip.
 		            gsub(/^v/, '').
 		            gsub('-', '.')
@@ -33,8 +34,8 @@ module GitVersionBump
 		# 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 >/dev/null 2>&1")
-		 "0.0.0.1.ENOTAG" if $? == 0 ? "0.0.0.1.ENOTAG" : gem_version(use_local_git)
+		system("git -C #{sq_git_dir} status > #{DEVNULL} 2>&1")
+		$? == 0 ? "0.0.0.1.ENOTAG" : gem_version(use_local_git)
 	end
 
 	def self.major_version(use_local_git=false)
@@ -84,14 +85,13 @@ module GitVersionBump
 				      "GVB.date(use_local_git=true), but git is not installed"
 			end
 
-			sq_git_dir = "'#{Dir.pwd.gsub("'", "'\\''")}'"
+			sq_git_dir = shell_quoted_string(Dir.pwd)
 		else
-			# Shell Quoted, for your convenience
-			sq_git_dir = "'" + (File.dirname(caller_file) rescue nil || Dir.pwd).gsub("'", "'\\''") + "'"
+			sq_git_dir = shell_quoted_string((File.dirname(caller_file) rescue nil || Dir.pwd))
 		end
 
 		# Are we in a git tree?
-		system("git -C #{sq_git_dir} status >/dev/null 2>&1")
+		system("git -C #{sq_git_dir} status > #{DEVNULL} 2>&1")
 		if $? == 0
 			# Yes, we're in git.
 
@@ -99,7 +99,7 @@ module GitVersionBump
 				return Time.now.strftime("%F")
 			else
 				# Clean tree.  Date of last commit is needed.
-				return `git -C #{sq_git_dir} show --format=format:%cd --date=short | head -n 1`.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
@@ -139,7 +139,7 @@ module GitVersionBump
 				EOF
 
 				log_file.close
-				system("git log --format='# %h  %s' #{prev_tag}..HEAD >>#{log_file.path}")
+				system("git log --no-show-signature --format='# %h  %s' #{prev_tag}..HEAD >>#{log_file.path}")
 
 				pre_hash = Digest::SHA1.hexdigest(File.read(log_file.path))
 				system("git config -e -f #{log_file.path}")
@@ -157,8 +157,8 @@ module GitVersionBump
 				system("git tag -a -m 'Version v#{v}' v#{v}")
 			end
 
-			system("git push >/dev/null 2>&1")
-			system("git push --tags >/dev/null 2>&1")
+			system("git push > #{DEVNULL} 2>&1")
+			system("git push --tags > #{DEVNULL} 2>&1")
 		end
 	end
 
@@ -196,10 +196,9 @@ module GitVersionBump
 				      "GVB.commit_date_version(use_local_git=true) called, but git isn't installed"
 			end
 
-			sq_git_dir = "'#{Dir.pwd.gsub("'", "'\\''")}'"
+			sq_git_dir = shell_quoted_string(Dir.pwd)
 		else
-			# Shell Quoted, for your convenience
-			sq_git_dir = "'" + (File.dirname(caller_file) rescue nil || Dir.pwd).gsub("'", "'\\''") + "'"
+			sq_git_dir = shell_quoted_string((File.dirname(caller_file) rescue nil || Dir.pwd))
 		end
 
 		commit_dates = `git -C #{sq_git_dir} log --format=%at`.
@@ -224,21 +223,21 @@ 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 -C #{sq_git_dir} status >/dev/null 2>&1")
+		system("git -C #{sq_git_dir} status > #{DEVNULL} 2>&1")
 		$? == 0 ? "0.0.0.1.ENOCOMMITS" : gem_version(use_local_git)
 	end
 
 	private
 
 	def self.git_available?
-		system("git --version >/dev/null 2>&1")
+		system("git --version > #{DEVNULL} 2>&1")
 
 		$? == 0
 	end
 
 	def self.dirty_tree?
 		# Are we in a dirty, dirty tree?
-		system("! git diff --no-ext-diff --quiet --exit-code 2>/dev/null || ! git diff-index --cached --quiet HEAD 2>/dev/null")
+		system("! git diff --no-ext-diff --quiet --exit-code 2> #{DEVNULL} || ! git diff-index --cached --quiet HEAD 2> #{DEVNULL}")
 
 		$? == 0
 	end
@@ -262,7 +261,7 @@ module GitVersionBump
 		# that contains the caller's file.
 		Gem.loaded_specs.values.each do |spec|
 			search_dirs = spec.require_paths.map { |d| "#{spec.full_gem_path}/#{d}" } +
-			              [File.join(spec.gem_dir, spec.bindir)]
+			              [File.join(spec.full_gem_path, spec.bindir)]
 			search_dirs.map! do |d|
 				begin
 					Pathname(d).realpath.to_s
@@ -301,6 +300,18 @@ module GitVersionBump
 			end
 		end
 	end
+
+	def self.shell_quoted_string(dir_string)
+		if Gem.win_platform?
+			return "\"#{dir_string}\""
+		else
+			# Shell Quoted, for your convenience
+			return "'#{dir_string.gsub("'", "'\\''")}'"
+		end
+	end
+
+	private_class_method :shell_quoted_string
+
 end
 
 GVB = GitVersionBump unless defined? GVB

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-version-bump
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.16.0
 platform: ruby
 authors:
 - Matt Palmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2019-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-release
@@ -103,9 +103,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Manage your app version entirely via git tags
 test_files: []
-has_rdoc: