git-version-bump 0.18.0.7.g2e0c3c4 → 0.18.0.9.gdf2ea32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32795b930c87e8796ae34c50d42703165e8dc083d4fa4e6cd19763f49f71d78a
-  data.tar.gz: bdf0755443972b724acb3be0cf0b677cc5a698f52533ec9afe8c47dd35ec5553
+  metadata.gz: 79a1a1154525f5c0f50020261fba1e295f985e3d2264335420b060c2c55a352b
+  data.tar.gz: c4aa9cfd65980d0d1024daf8806b4831acd8056d1a315d1c562e80fb87a58f9b
 SHA512:
-  metadata.gz: 3e97d8fd061b44c0f841c435f303930eacf1834acfb555c3b69f5ab7cfc918b678fa452e4f5ce1b8b0b780d5f01546226791a0fa45ad6985fc252d7c9cd63d5e
-  data.tar.gz: 82f01e33ed949be7ad11a544a24a44383e8f01896b67ff242c955287ea7ea51987e43c7afb9727afd026c63bce78bf0d06b3729016c8af5e4ca429d4ed832d53
+  metadata.gz: eec061ff61f4a8e4e26c8b8bb119cbd3414d1015b79fd1649fb8307422dcd43e6deb5b392adb3be1ff21097fc85f41d582f99919b5ddf2d0926479bc2ee4bae8
+  data.tar.gz: 59661e2dbace2392afd6be097d399ac908cec1a6cbd3214bf57cf618d8a7530990fb59cd59199985f32bffcbe8b616077fd79ba67250150236cf225f2ee7bb51

data/README.md

@@ -141,6 +141,19 @@ commits to be detected then use the following configuration:
     end
 
 
+## Overriding the version
+
+In very rare circumstances, while running in a git repo, you may wish to explicitly set the version or date returned by `GVB.version` or `GVB.date`, respectively.
+This can be done by setting the repo's `versionBump.versionOverride` or `versionBump.dateOverride` config values, like so:
+
+```bash
+git config versionBump.versionOverride 1.2.3
+git config versionBump.dateOverride 1970-01-01
+```
+
+Note that whatever you set those values to is used without validity checking; if you set it to something weird, you'll get weird results.
+
+
 # Contributing
 
 Send your pull requests to the [Github

data/git-version-bump.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
 	s.platform              = Gem::Platform::RUBY
 	s.required_ruby_version = ">= 2.1.0"
 
-	s.homepage = "http://theshed.hezmatt.org/git-version-bump"
+	s.homepage = "https://github.com/mpalmer/git-version-bump"
 	s.summary = "Manage your app version entirely via git tags"
 	s.authors = ["Matt Palmer"]
 

data/lib/git-version-bump.rb

@@ -25,7 +25,7 @@ module GitVersionBump
 			repo_version(true, include_lite_tags)
 		else
 			gem_version || repo_version(false, include_lite_tags)
-		end
+		end.tap { |v| p :GVB_VERSION, v if debug? }
 	end
 
 	def self.major_version(use_local_dir=false, include_lite_tags=false)
@@ -236,6 +236,11 @@ module GitVersionBump
 	end
 	private_class_method :try_command
 
+	def self.run_git(git_args, desc, use_local_dir)
+		run_command(["git", "-C", git_dir(use_local_dir).to_s] + git_args, desc)
+	end
+	private_class_method :run_git
+
 	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
@@ -298,6 +303,16 @@ module GitVersionBump
 	private_class_method :gem_version
 
 	def self.repo_version(use_local_dir, include_lite_tags)
+		begin
+			run_git(["config", "versionBump.versionOverride"], "getting versionOverride", use_local_dir).chomp
+		rescue CommandFailure => ex
+			p :NO_OVERRIDE_VERSION, [ex.class, ex.message] if debug?
+			repo_version_from_tag(use_local_dir, include_lite_tags)
+		end
+	end
+	private_class_method :repo_version
+
+	def self.repo_version_from_tag(use_local_dir, include_lite_tags)
 		git_cmd = ["git", "-C", git_dir(use_local_dir).to_s, "describe", "--dirty=.1.dirty.#{Time.now.strftime("%Y%m%d.%H%M%S")}", "--match=#{VERSION_TAG_GLOB}"]
 		git_cmd << "--tags" if include_lite_tags
 
@@ -316,9 +331,19 @@ module GitVersionBump
 			end
 		end
 	end
-	private_class_method :repo_version
+	private_class_method :repo_version_from_tag
 
 	def self.repo_date(use_local_dir, include_lite_tags)
+		begin
+			run_git(["config", "versionBump.dateOverride"], "getting dateOverride", use_local_dir).chomp
+		rescue CommandFailure => ex
+			p :NO_OVERRIDE_DATE, [ex.class, ex.message] if debug?
+			repo_date_from_commit(use_local_dir, include_lite_tags)
+		end
+	end
+	private_class_method :repo_date
+
+	def self.repo_date_from_commit(use_local_dir, include_lite_tags)
 		if dirty_tree?(git_dir(use_local_dir))
 			Time.now.strftime("%F")
 		else
@@ -328,7 +353,7 @@ module GitVersionBump
 	rescue CommandFailure
 		raise VersionUnobtainable, "Could not get commit date from git repository at #{git_dir(use_local_dir)}"
 	end
-	private_class_method :repo_date
+	private_class_method :repo_date_from_commit
 
 	def self.git_dir(use_local_dir = false)
 		if use_local_dir

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-version-bump
 version: !ruby/object:Gem::Version
-  version: 0.18.0.7.g2e0c3c4
+  version: 0.18.0.9.gdf2ea32
 platform: ruby
 authors:
 - Matt Palmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-11 00:00:00.000000000 Z
+date: 2023-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-release
@@ -85,7 +85,7 @@ files:
 - 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
+homepage: https://github.com/mpalmer/git-version-bump
 licenses: []
 metadata: {}
 post_install_message: