gem_toys 0.7.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b8a68d7567f6698b428f46a2f69694259e066412bedb21b55eda4585b76c70b
-  data.tar.gz: 74cfd96138c6e0a10eacec2235500f775d5f02b0f3ab215f88b0c911a8cf33a2
+  metadata.gz: be3b572d39236cf68b7d1c1a56e4a68792176a594047af91302799954898dab3
+  data.tar.gz: 2073632a59bb127935d67114d0f7753db0c12606a30f67db6fe704b70bba06a4
 SHA512:
-  metadata.gz: 98da90d85c1cb6f361bdef8d7a0ec42d5c0ba500121f3fc9655dacb24f160f9a9c21599afb01bf9ed3672a954c9ef27df384e988b8ad382e505cb1bedb1e1cab
-  data.tar.gz: d236a46c35fcedeb008aafbb4f1836e497c39d2b001b125634a60b114b555fd567b4236aa2294b50f708869a80dd416bf1998a585494c3854ba545128a0729a4
+  metadata.gz: c11e21b77d865010227986b4b96d5b3291cc447edff5f7df60e6572c2e2e96cb83b983c718d7c1b00b4ad328c3a921da9dba2fc23f7ad6a1d5b02e9da7ca6c16
+  data.tar.gz: 7f9a2d20007c1d2d4a097de4f378eceb19401254e16583cbd2b46fdab50777d5972b62efd9026cde51f3c171574cdd134f14adf6c5ee346259d515f6235dbc25

data/CHANGELOG.md

@@ -1,9 +1,39 @@
 # Changelog
 
-## master (unreleased)
+## Unreleased
+
+## 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)
+
+*   Fix error about non-renamed `version` in one of aborts.
+*   Improve Regexp for date of existing release.
+    Catch only content inside the last parentheses.
 
 ## 0.7.0 (2021-03-04)
 
+*   Add `:changelog_file_name` option.
+*   Add `:version_tag_prefix` option.
+*   Change date format for `versions` tool.
+*   Add documentation about `:version_file_path` option.
+*   Split `release` tool into modules for RuboCop satisfaction.
+
 ## 0.6.1 (2021-02-10)
 
 *   Gently abort when `unreleased_title` not found.

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

@@ -51,13 +51,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

@@ -15,9 +15,9 @@ module GemToys
 					existing_line = @changelog_lines.find { |line| line.start_with? "## #{@new_version} " }
 
 					if existing_line
-						return if (existing_date = existing_line.match(/\((.*)\)/)[1]) == @today
+						return if (existing_date = existing_line.scan(/\(([^()]+)\)/).last.first) == @today
 
-						abort "There is already #{version} version with date #{existing_date}"
+						abort "There is already #{new_version} version with date #{existing_date}"
 					end
 
 					File.write changelog_file_path, new_changelog_content
@@ -32,7 +32,7 @@ module GemToys
 
 					@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.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
 
@@ -100,12 +102,30 @@ 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)
+							menu.choice(:no) { abort }
+							menu.choice(:refresh) do
+								handle_new_version
+								wait_for_manual_check
+							end
+						end
 					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.0'
+	VERSION = '0.10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gem_toys
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Alexander Popov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-03 00:00:00.000000000 Z
+date: 2021-10-15 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.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.21.0
 - !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