bake-gem 0.8.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48eb04c9e92c22e34e9504d4cd5e29b47f7c01d5649815872f8163ff0352b14d
-  data.tar.gz: 486fa34ab83b02141d1b526ea19cfbb078cb0dd126d5c361f3d617dce9c72939
+  metadata.gz: 436620eb899794e3709390307a7d665798d1808b2cdded1a151c005db9c3f55d
+  data.tar.gz: c438bf0f5436b9eb5935661d8d9b4b4241050f7d5dfd4f0da086a4fe9ff48e04
 SHA512:
-  metadata.gz: 9edd13ef496b1b47c49040d87f3010f4ca2a3e3a46458ce3eedb5d6d185fed45a2eacdee97c2f4c700ba31f73e8cdeea358ebd5c5a3b7a201c9c5aac9cfe89eb
-  data.tar.gz: 57d47443d4e6c56f245342106e7c024a2b6caa5c432acf5f2bd702a7de712d56cb3e83c9848c59a39b0009e5e44550fa7db7120291d69e53a784e3fd4a31bae8
+  metadata.gz: 3bb4833a86116ebdcfb5949f5d8960473ded2595ad0fbd3d533988a79fb8158535c43ffeeb1755e5ac657a2f884f863f99c3d4dca562a2efc2f2c8b53abe8735
+  data.tar.gz: 5821fefb80eac7a536e54c0f4df700ff0d800938bd72e4ad4c364f1262878247a68922ae70474bfc57a44821efad2ae7cf394ae19abef5fe12d0a9038887f2dd

data/bake/gem/release/version.rb

@@ -32,12 +32,12 @@ def increment(bump, message: "Bump version.")
 	gemspec = helper.gemspec
 	
 	helper.update_version(bump) do |version|
-		version_string = version.join('.')
-		
-		Console.logger.info(self) {"Updated version to #{version_string}"}
+		Console.logger.info(self) {"Updated version: #{version}"}
 		
 		# Ensure that any subsequent tasks use the correct version!
-		gemspec.version = ::Gem::Version.new(version_string)
+		gemspec.version = version.join
+		
+		after_increment(version)
 	end
 end
 
@@ -54,9 +54,15 @@ def commit(bump, message: "Bump version.")
 	version_path = increment(bump, message: message)
 	
 	if version_path
-		system("git", "add", version_path, chdir: context.root)
+		system("git", "add", "--all", chdir: context.root)
 		system("git", "commit", "-m", message, chdir: context.root)
 	else
 		raise "Could not find version number!"
 	end
 end
+
+protected
+
+def after_increment(version)
+	context['after_gem_release_version_increment']&.call(version)
+end

data/bake/gem.rb

@@ -42,6 +42,8 @@ def install(local: false)
 	@helper.install_gem(*arguments, path: path)
 end
 
+# Release the gem by building it, pushing it to the server, and tagging the release.
+# @parameter tag [Boolean] Whether to tag the release.
 def release(tag: true)
 	@helper.guard_clean
 	

data/lib/bake/gem/helper.rb

@@ -11,6 +11,64 @@ require_relative 'shell'
 
 module Bake
 	module Gem
+		class Version
+			LINE_PATTERN = /VERSION = ['"](?<version>(?<parts>\d+\.\d+\.\d+)(-(?<suffix>.*?))?)['"]/
+			
+			# If the line contains a version constant, update it using the provided block.
+			def self.update_version(line)
+				if match = line.match(LINE_PATTERN)
+					parts = match[:parts].split(/\./).map(&:to_i)
+					suffix = match[:suffix]
+					
+					version = self.new(parts, suffix)
+					
+					yield version
+					
+					line.sub!(match[:version], version.join)
+				end
+			end
+			
+			def initialize(parts, suffix)
+				@parts = parts
+				@suffix = suffix
+			end
+			
+			def release?
+				@suffix.nil?
+			end
+			
+			# Join all parts together to form a version string.
+			def join
+				if @suffix
+					return "#{@parts.join('.')}-#{@suffix}"
+				else
+					return @parts.join('.')
+				end
+			end
+			
+			# The version string with a "v" prefix.
+			def to_s
+				"v#{join}"
+			end
+			
+			def increment(bump)
+				bump.each_with_index do |increment, index|
+					if index > @parts.size
+						@suffix = bump[index..-1].join('.')
+						break
+					end
+					
+					if increment == 1
+						@parts[index] += 1
+					elsif increment == 0
+						@parts[index] = 0
+					end
+				end
+				
+				return self
+			end
+		end
+		
 		class Helper
 			include Shell
 			
@@ -26,36 +84,25 @@ module Bake
 				@gemspec&.files.grep(/lib(.*?)\/version.rb/).first
 			end
 			
-			VERSION_PATTERN = /VERSION = ['"](?<value>\d+\.\d+\.\d+)(?<pre>.*?)['"]/
-			
 			def update_version(bump, version_path = self.version_path)
 				return false unless version_path
 				
 				lines = File.readlines(version_path)
-				version = nil
+				new_version = nil
 				
 				lines.each do |line|
-					if match = line.match(VERSION_PATTERN)
-						version = match[:value].split(/\./).map(&:to_i)
-						bump.each_with_index do |increment, index|
-							if increment == 1
-								version[index] += 1
-							elsif increment == 0
-								version[index] = 0
-							end
-						end
-						
-						line.sub!(match[:value], version.join('.'))
+					Version.update_version(line) do |version|
+						new_version = version.increment(bump)
 					end
 				end
 				
-				if version
+				if new_version
+					File.write(version_path, lines.join)
+					
 					if block_given?
-						yield version
+						yield new_version
 					end
 					
-					File.write(version_path, lines.join)
-					
 					return version_path
 				end
 			end

data/lib/bake/gem/version.rb

@@ -5,6 +5,6 @@
 
 module Bake
 	module Gem
-		VERSION = "0.8.0"
+		VERSION = "0.10.0"
 	end
 end

data/readme.md

@@ -10,6 +10,10 @@ Please see the [project documentation](https://ioquatix.github.io/bake-gem/) for
 
   - [Getting Started](https://ioquatix.github.io/bake-gem/guides/getting-started/index) - This guide explains how to use `bake-gem` to release gems.
 
+## See Also
+
+  - [Bake](https://github.com/ioquatix/bake) — The bake task execution tool.
+
 ## Contributing
 
 We welcome contributions to this project.
@@ -27,7 +31,3 @@ This project uses the [Developer Certificate of Origin](https://developercertifi
 ### Contributor Covenant
 
 This project is governed by the [Contributor Covenant](https://www.contributor-covenant.org/). All contributors and participants agree to abide by its terms.
-
-## See Also
-
-  - [Bake](https://github.com/ioquatix/bake) — The bake task execution tool.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bake-gem
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -37,7 +37,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-06-23 00:00:00.000000000 Z
+date: 2024-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: console