bake-gem 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 307b46bb648004706745207f0c6d53fcd1a30b8c2bfed945b57f23a2d65685d8
-  data.tar.gz: 3ed9dee4422cf593efe9ca45a92b1db0e55f2cf4d863f8e38d1b46fa5ce7b2cc
+  metadata.gz: 436620eb899794e3709390307a7d665798d1808b2cdded1a151c005db9c3f55d
+  data.tar.gz: c438bf0f5436b9eb5935661d8d9b4b4241050f7d5dfd4f0da086a4fe9ff48e04
 SHA512:
-  metadata.gz: 3984cc693ce4a547ab0c880a396738b5c9f74c16bf604b8c56494ad7aafe9d68f8b2468a52c52d816532c290a6828b4236a0274f535842850ecf38d7f166cc7a
-  data.tar.gz: dffb5ba0adff68a801aa29a0cb76275cee66d3218227e2333ffc2dae98da546a86faef310ba11b0045dd447a4bbb08fc7ad53711ff036e6948d9b424fb1756f5
+  metadata.gz: 3bb4833a86116ebdcfb5949f5d8960473ded2595ad0fbd3d533988a79fb8158535c43ffeeb1755e5ac657a2f884f863f99c3d4dca562a2efc2f2c8b53abe8735
+  data.tar.gz: 5821fefb80eac7a536e54c0f4df700ff0d800938bd72e4ad4c364f1262878247a68922ae70474bfc57a44821efad2ae7cf394ae19abef5fe12d0a9038887f2dd

data/bake/gem/release/version.rb

@@ -32,12 +32,10 @@ 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

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.9.0"
+		VERSION = "0.10.0"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bake-gem
 version: !ruby/object:Gem::Version
-  version: 0.9.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-08-22 00:00:00.000000000 Z
+date: 2024-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: console