gem_toys 0.10.0 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be3b572d39236cf68b7d1c1a56e4a68792176a594047af91302799954898dab3
-  data.tar.gz: 2073632a59bb127935d67114d0f7753db0c12606a30f67db6fe704b70bba06a4
+  metadata.gz: 112ee3b1f0047eb32d9beedccc1249e000164a10513365de206c8d1bf06a0691
+  data.tar.gz: 9876889866f9d38eeceb03ea04303845088e5fc429e7f8a9e5312dc0a35cce83
 SHA512:
-  metadata.gz: c11e21b77d865010227986b4b96d5b3291cc447edff5f7df60e6572c2e2e96cb83b983c718d7c1b00b4ad328c3a921da9dba2fc23f7ad6a1d5b02e9da7ca6c16
-  data.tar.gz: 7f9a2d20007c1d2d4a097de4f378eceb19401254e16583cbd2b46fdab50777d5972b62efd9026cde51f3c171574cdd134f14adf6c5ee346259d515f6235dbc25
+  metadata.gz: 4e6342e7bb1b2485caa3b08a9c0bda86961f47626f7236d808c5bfebd15fb37b4f28021ed43b9faaccd669b9f0b66cd237842301bc28578d48d35d258a3f3b98
+  data.tar.gz: 6ba75096de3694778131890372df8b5ba4fad5a3d3f1386635d6b86f75efa7dae98bda97be352998d246656b271cfcdc3549071a22508424c197a6f7828cc230

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 ## Unreleased
 
+## 0.11.2 (2021-11-07)
+
+*   Fix version for gem staff after manual refresh too.
+
+## 0.11.1 (2021-11-07)
+
+*   Fix new version for git staff after manual refresh.
+
+## 0.11.0 (2021-10-29)
+
+*   Revert version and changelog files changes at rejection.
+*   Revert version file changes at changelog fails.
+*   Update development dependencies.
+
 ## 0.10.0 (2021-10-15)
 
 *   Process cases with non-JSON String from RubyGems.org.

data/lib/gem_toys/template/common_code.rb

@@ -28,6 +28,10 @@ module GemToys
 			end
 
 			memoize def current_version
+				parse_version_from_file
+			end
+
+			def parse_version_from_file
 				version_file_content.match(/VERSION = '(.+)'/)[1]
 			end
 

data/lib/gem_toys/template/release/changelog.rb

@@ -28,7 +28,10 @@ module GemToys
 
 					unreleased_title_index = @changelog_lines.index("#{unreleased_title}\n")
 
-					abort_without_unreleased_title unless unreleased_title_index
+					unless unreleased_title_index
+						sh "git restore --worktree #{version_file_path}"
+						abort_without_unreleased_title
+					end
 
 					@changelog_lines.insert(
 						unreleased_title_index + 2,

data/lib/gem_toys/template/release/git.rb

@@ -8,16 +8,17 @@ module GemToys
 				private
 
 				def process_git
-					new_version_git_tag = "#{@template.version_tag_prefix}#{@new_version}"
+					## `current_version` should be refreshed before this method invocation
+					version_git_tag = "#{@template.version_tag_prefix}#{current_version}"
 
 					## Checkout to a new git branch, required for protected `master` with CI
-					# sh "git switch -c #{new_version_git_tag}"
+					# sh "git switch -c #{version_git_tag}"
 
 					commit_changes
 
 					## Tag commit
 					puts 'Tagging the commit...'
-					sh "git tag -a #{new_version_git_tag} -m 'Version #{@new_version}'"
+					sh "git tag -a #{version_git_tag} -m 'Version #{current_version}'"
 
 					## Push commit
 					puts 'Pushing commit...'
@@ -33,7 +34,7 @@ module GemToys
 
 					sh "git add #{version_file_path} #{changelog_file_path}"
 
-					sh "git commit -m 'Update version to #{@new_version}'"
+					sh "git commit -m 'Update version to #{current_version}'"
 				end
 			end
 		end

data/lib/gem_toys/template/release.rb

@@ -76,8 +76,6 @@ module GemToys
 							else
 								new_version
 							end
-
-						clear_memery_cache! :current_version
 					end
 
 					def handle_keyword_in_new_version(current_version_parts, version_index)
@@ -119,14 +117,23 @@ module GemToys
 
 							menu.prompt = 'Are these changes correct? '
 
-							menu.choice(:yes)
-							menu.choice(:no) { abort }
+							menu.choice(:yes) do
+								## `current_version` is using in `git` and `gem` commands
+								clear_memery_cache! :current_version
+							end
+							menu.choice(:no) { handle_refusing_to_continue }
 							menu.choice(:refresh) do
-								handle_new_version
 								wait_for_manual_check
 							end
 						end
 					end
+
+					def handle_refusing_to_continue
+						[version_file_path, changelog_file_path].each do |file_path|
+							sh "git restore --worktree #{file_path}"
+						end
+						abort
+					end
 				end
 			end
 		end

data/lib/gem_toys/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GemToys
-	VERSION = '0.10.0'
+	VERSION = '0.11.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gem_toys
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.2
 platform: ruby
 authors:
 - Alexander Popov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-15 00:00:00.000000000 Z
+date: 2021-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alt_memery
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: 1.22.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: 1.22.2
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement