gem_toys 0.7.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 061a23d19180942f3cb7ca6f4b43bfc5e48b5247e1ca45ec77969c0308cdf3aa
-  data.tar.gz: b57ac1d9e07c4a7f72ffaa3ff0e9d366160a47ffb2695232a7b928821ee0484c
+  metadata.gz: 112ee3b1f0047eb32d9beedccc1249e000164a10513365de206c8d1bf06a0691
+  data.tar.gz: 9876889866f9d38eeceb03ea04303845088e5fc429e7f8a9e5312dc0a35cce83
 SHA512:
-  metadata.gz: cec712bb01c015ba34dde170c5d7d855f56008e7234da72df02d8ed342dd9eb458ee06d7e4175e473dad213bba8f0229ca356fbc28a16ef06b42fe92186ea1b6
-  data.tar.gz: 5f0475c31feef1a52e77f59f4e30965c55401baa04fc425ca5a8864e9d6c0900d85e5fa06eac8936e2b09af0c498651e013e513cc1138b03f30e638c2678f540
+  metadata.gz: 4e6342e7bb1b2485caa3b08a9c0bda86961f47626f7236d808c5bfebd15fb37b4f28021ed43b9faaccd669b9f0b66cd237842301bc28578d48d35d258a3f3b98
+  data.tar.gz: 6ba75096de3694778131890372df8b5ba4fad5a3d3f1386635d6b86f75efa7dae98bda97be352998d246656b271cfcdc3549071a22508424c197a6f7828cc230

data/CHANGELOG.md

@@ -1,6 +1,38 @@
 # Changelog
 
-## master (unreleased)
+## 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.
+*   Update development dependencies.
+*   Resolve new offenses from RuboCop.
+*   Change default for unreleased in Changelog.
+
+## 0.9.0 (2021-08-26)
+
+*   Fix built gem version after `refresh` answer.
+*   Update development dependencies.
+*   Lock RuboCop version better.
+*   Resolve new RuboCop offenses.
+
+## 0.8.0 (2021-04-16)
+
+*   Add `refresh` answer for release confirmation.
 
 ## 0.7.1 (2021-03-04)
 

data/README.md

@@ -38,8 +38,8 @@ require 'gem_toys'
 expand GemToys::Template,
   ## default is `CHANGELOG.md`
   changelog_file_name: 'ChangeLog.md',
-  ## default is `## master (unreleased)`
-  unreleased_title: '## Unreleased',
+  ## default is `## Unreleased`
+  unreleased_title: '## main (unreleased)',
   ## default is `"lib/#{project_name_with_slashes_instead_dashes}/version.rb"`
   version_file_path: 'lib/my-awesome_gem.rb',
   ## default is `v`, so tags are like `v4.1.0`
@@ -63,7 +63,7 @@ alias_tool :g, :gem
 
 1.  Update `lib/*gem_name*/version.rb` file.
     Can be refined with `:version_file_path` option on `expand`.
-2.  Insert Markdown title with changes from `## master (unreleased)` in a `CHANGELOG.md` file.
+2.  Insert Markdown title with changes from `## Unreleased` in a `CHANGELOG.md` file.
     Can be refined with `:unreleased_title` option on `expand`.
 3.  [Builds](#build) a gem.
 4.  Ask you for manual check, if you want (print anything of OK).

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
 
@@ -51,13 +55,21 @@ module GemToys
 				require 'faraday'
 				require 'faraday_middleware'
 
-				Faraday.new 'https://rubygems.org/api/v1' do |conn|
-					conn.response :json, parser_options: { symbolize_names: true }
+				Faraday.new 'https://rubygems.org/api/v1' do |connection|
+					connection.response :json,
+						content_type: /\bjson$/,
+						parser_options: { symbolize_names: true }
 				end
 			end
 
 			memoize def rubygems_versions
-				rubygems_connection.get("versions/#{project_name}.json").body
+				response = rubygems_connection.get("versions/#{project_name}.json").body
+
+				return response if response.is_a?(Array)
+
+				return [] if response == 'This rubygem could not be found.'
+
+				raise "Unexpected response from RubyGems.org: #{response.inspect}"
 			end
 
 			def current_version_hash

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

@@ -28,11 +28,14 @@ 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,
-						'#' * unreleased_title.scan(/^#+/).first.size + " #{@new_version} (#{@today})\n\n"
+						('#' * unreleased_title.scan(/^#+/).first.size) + " #{@new_version} (#{@today})\n\n"
 					).join
 				end
 

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'highline'
+
 require_relative 'release/changelog'
 require_relative 'release/git'
 
@@ -44,11 +46,11 @@ module GemToys
 						## Update CHANGELOG
 						update_changelog_file
 
+						wait_for_manual_check
+
 						## Build new gem file
 						exec_tool 'gem build'
 
-						wait_for_manual_check
-
 						## Commit, tag, push
 						process_git
 
@@ -74,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)
@@ -100,12 +100,39 @@ module GemToys
 					end
 
 					def wait_for_manual_check
+						print_files_diff
+
+						manual_check_menu
+					end
+
+					def print_files_diff
 						$stdout.puts
 						sh "git diff #{version_file_path} #{changelog_file_path}"
 						$stdout.puts
-						$stdout.puts 'Please, validate files before committing and pushing!'
-						$stdout.puts 'Press anything to continue, Ctrl+C to cancel.'
-						$stdin.gets
+					end
+
+					def manual_check_menu
+						HighLine.new.choose do |menu|
+							menu.layout = :one_line
+
+							menu.prompt = 'Are these changes correct? '
+
+							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
+								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

data/lib/gem_toys/template/versions.rb

@@ -19,7 +19,9 @@ module GemToys
 
 						versions = rubygems_versions
 
-						versions.unshift current_version_hash if current_version != versions.first[:number]
+						if versions.empty? || current_version != versions.first[:number]
+							versions.unshift current_version_hash
+						end
 
 						puts_versions versions
 					end

data/lib/gem_toys/template.rb

@@ -15,7 +15,7 @@ module GemToys
 			changelog_file_name: 'CHANGELOG.md',
 			version_file_path: nil,
 			version_tag_prefix: 'v',
-			unreleased_title: '## master (unreleased)'
+			unreleased_title: '## Unreleased'
 		)
 			@changelog_file_name = changelog_file_name
 			@version_file_path = version_file_path

data/lib/gem_toys/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gem_toys
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Alexander Popov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-03 00:00:00.000000000 Z
+date: 2021-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alt_memery
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +100,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.22.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.22.2
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -223,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Toys template for gems