gem_toys 0.3.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebbde3bcabf9bc8e53603305bb4c13a0722ff5827007843f52b7d88972b06738
-  data.tar.gz: bb677a539b3d46f210a0777a69498ec786c00de408236ba6f2ab7bd011cb7357
+  metadata.gz: 1b8a68d7567f6698b428f46a2f69694259e066412bedb21b55eda4585b76c70b
+  data.tar.gz: 74cfd96138c6e0a10eacec2235500f775d5f02b0f3ab215f88b0c911a8cf33a2
 SHA512:
-  metadata.gz: 11e5b4915cc7db2ae18e70afa5d22a56e2452f3b0a67a2dcb15b862d97bfac40bbd6dfd2fcb61f6830db8f719cba647974c14f7374c46f774a327f38459b9b5b
-  data.tar.gz: a50682c37f4ab143d0c77a37aeef8d943da8a48227f607b08683482c3aefb2d2d56f2d0d9235e969ac847b37bbe7b49a8f56a1a8bc2b076878af9ca41ffd6c69
+  metadata.gz: 98da90d85c1cb6f361bdef8d7a0ec42d5c0ba500121f3fc9655dacb24f160f9a9c21599afb01bf9ed3672a954c9ef27df384e988b8ad382e505cb1bedb1e1cab
+  data.tar.gz: d236a46c35fcedeb008aafbb4f1836e497c39d2b001b125634a60b114b555fd567b4236aa2294b50f708869a80dd416bf1998a585494c3854ba545128a0729a4

data/CHANGELOG.md

@@ -2,6 +2,37 @@
 
 ## master (unreleased)
 
+## 0.7.0 (2021-03-04)
+
+## 0.6.1 (2021-02-10)
+
+*   Gently abort when `unreleased_title` not found.
+*   Improve documentation about `:unreleased_title` option.
+
+## 0.6.0 (2021-02-10)
+
+*   Support Ruby 3.
+*   Fix error with undefined `FileUtils`.
+*   Fix error with `release` tool via updating `alt_memery` to a fixed version.
+*   Update development dependencies.
+
+## 0.5.0 (2020-11-29)
+
+*   Add `versions` tool with `releases` alias.
+*   Add `version` tool.
+*   Add an ability to release new `major`, `minor` or `patch` version.
+    Just specify keyword instead of number and it'll increase correctly.
+*   Print `git diff` for files which will be commited on `release`.
+*   Drop Ruby 2.4 support.
+    [Support of Ruby 2.4 has ended](https://www.ruby-lang.org/en/news/2020/04/05/support-of-ruby-2-4-has-ended/).
+*   Add and use `memery` dependency.
+*   Update `rubocop`, `remark`.
+
+## 0.4.0 (2020-09-21)
+
+*   Improve version update script, support files with other String constants.
+*   Update bundle.
+
 ## 0.3.0 (2020-07-11)
 
 *   Add support for Ruby 2.4

data/README.md

@@ -35,7 +35,15 @@ gem install gem_toys
 ```ruby
 # .toys.rb
 require 'gem_toys'
-expand GemToys::Template
+expand GemToys::Template,
+  ## default is `CHANGELOG.md`
+  changelog_file_name: 'ChangeLog.md',
+  ## default is `## master (unreleased)`
+  unreleased_title: '## 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`
+  version_tag_prefix: ''
 
 # `gem` namespace created, aliases are optional, but handful
 alias_tool :g, :gem
@@ -73,8 +81,7 @@ Then, run `toys rspec` to run the tests.
 
 To install this gem onto your local machine, run `toys gem install`.
 
-To release a new version, run `toys gem release %version%`.
-See how it works [here](https://github.com/AlexWayfer/gem_toys#release).
+To release a new version, run `toys gem release %version%`. See how it works [here](#release).
 
 ## Contributing
 

data/lib/gem_toys/template.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'date'
 require 'toys-core'
 
 require_relative 'template/common_code'
@@ -10,10 +9,17 @@ module GemToys
 	class Template
 		include Toys::Template
 
-		attr_reader :version_file_path, :unreleased_title
+		attr_reader :changelog_file_name, :version_file_path, :version_tag_prefix, :unreleased_title
 
-		def initialize(version_file_path: nil, unreleased_title: '## master (unreleased)')
+		def initialize(
+			changelog_file_name: 'CHANGELOG.md',
+			version_file_path: nil,
+			version_tag_prefix: 'v',
+			unreleased_title: '## master (unreleased)'
+		)
+			@changelog_file_name = changelog_file_name
 			@version_file_path = version_file_path
+			@version_tag_prefix = version_tag_prefix
 			@unreleased_title = unreleased_title
 		end
 
@@ -32,6 +38,8 @@ module GemToys
 						@template = template
 
 						sh 'gem build'
+
+						require 'fileutils'
 						FileUtils.mkdir_p pkg_directory
 						FileUtils.mv "#{context_directory}/#{gem_file_name}", current_gem_file
 					end
@@ -46,94 +54,28 @@ module GemToys
 					end
 				end
 
-				tool :release do
-					required_arg :version
-
+				tool :version do
 					to_run do
 						@template = template
 
-						update_version_file
-
-						## Update CHANGELOG
-						update_changelog_file
-
-						## Build new gem file
-						exec_tool 'gem build'
-
-						wait_for_manual_check
-
-						## Checkout to a new git branch, required for protected `master` with CI
-						# sh "git switch -c v#{version}"
-
-						commit_changes
-
-						## Tag commit
-						puts 'Tagging the commit...'
-						sh "git tag -a v#{version} -m 'Version #{version}'"
-
-						## Push commit
-						puts 'Pushing commit...'
-						sh 'git push'
-
-						## Push tags
-						puts 'Pushing tags...'
-						sh 'git push --tags'
-
-						puts 'Pushing gem...'
-						sh "gem push #{current_gem_file}"
-					end
-
-					private
-
-					def update_version_file
-						puts 'Updating version file...'
-
-						File.write version_file_path, version_file_content.sub(/'.+'/, "'#{version}'")
-					end
-
-					TODAY = Date.today.to_s
-
-					def update_changelog_file
-						puts 'Updating changelog file...'
-
-						@changelog_lines = File.readlines(changelog_file_path)
-
-						existing_line = find_version_line_in_changelog_file
-
-						if existing_line
-							return if (existing_date = existing_line.match(/\((.*)\)/)[1]) == TODAY
-
-							abort "There is already #{version} version with date #{existing_date}"
+						version = rubygems_versions.find(-> { current_version_hash }) do |rubygems_version|
+							rubygems_version[:number] == current_version
 						end
 
-						File.write changelog_file_path, new_changelog_content
-					end
-
-					def find_version_line_in_changelog_file
-						@changelog_lines.find { |line| line.start_with? "## #{version} " }
+						puts_versions [version]
 					end
+				end
 
-					def new_changelog_content
-						unreleased_title = @template.unreleased_title
-						@changelog_lines.insert(
-							@changelog_lines.index("#{unreleased_title}\n") + 2,
-							'#' * unreleased_title.scan(/^#+/).first.size + " #{version} (#{TODAY})\n\n"
-						).join
-					end
-
-					def commit_changes
-						puts 'Committing changes...'
-
-						sh "git add #{version_file_path} #{changelog_file_path}"
-
-						sh "git commit -m 'Update version to #{version}'"
-					end
+				require_relative 'template/versions'
+				expand Template::Versions,
+					version_file_path: template.version_file_path
 
-					def wait_for_manual_check
-						STDOUT.puts 'Please, validate files and commits before pushing.'
-						STDIN.gets
-					end
-				end
+				require_relative 'template/release'
+				expand Template::Release,
+					changelog_file_name: template.changelog_file_name,
+					version_file_path: template.version_file_path,
+					version_tag_prefix: template.version_tag_prefix,
+					unreleased_title: template.unreleased_title
 			end
 		end
 	end

data/lib/gem_toys/template/common_code.rb

@@ -1,19 +1,22 @@
 # frozen_string_literal: true
 
+require 'memery'
+
 module GemToys
 	## Template with gem tools, should be expanded in toys file
 	class Template
 		## Module for common code between nested tools
 		module CommonCode
+			include Memery
+
 			private
 
-			def project_name
-				@project_name ||= File.basename context_directory
+			memoize def project_name
+				File.basename context_directory
 			end
 
-			def version_file_path
-				@version_file_path ||=
-					@template.version_file_path ||
+			memoize def version_file_path
+				@template.version_file_path ||
 					begin
 						project_path = project_name.tr '-', '/'
 						File.join context_directory, 'lib', project_path, 'version.rb'
@@ -24,25 +27,58 @@ module GemToys
 				File.read version_file_path
 			end
 
-			def current_version
-				@current_version ||= version_file_content.match(/VERSION = '(.+)'/)[1]
+			memoize def current_version
+				version_file_content.match(/VERSION = '(.+)'/)[1]
 			end
 
-			def changelog_file_path
-				@changelog_file_path ||= File.join context_directory, 'CHANGELOG.md'
+			memoize def changelog_file_path
+				File.join context_directory, @template.changelog_file_name
 			end
 
-			def gem_file_name
-				@gem_file_name ||= "#{project_name}-#{current_version}.gem"
+			memoize def gem_file_name
+				"#{project_name}-#{current_version}.gem"
 			end
 
-			def pkg_directory
-				@pkg_directory ||= "#{context_directory}/pkg"
+			memoize def pkg_directory
+				"#{context_directory}/pkg"
 			end
 
 			def current_gem_file
 				"#{pkg_directory}/#{gem_file_name}"
 			end
+
+			memoize def rubygems_connection
+				require 'faraday'
+				require 'faraday_middleware'
+
+				Faraday.new 'https://rubygems.org/api/v1' do |conn|
+					conn.response :json, parser_options: { symbolize_names: true }
+				end
+			end
+
+			memoize def rubygems_versions
+				rubygems_connection.get("versions/#{project_name}.json").body
+			end
+
+			def current_version_hash
+				{ number: current_version, created_at: 'unreleased' }
+			end
+
+			def puts_versions(versions)
+				require 'date'
+
+				longest_version_number = versions.map { |version| version[:number].length }.max
+
+				versions.each do |version|
+					created_at = begin
+						DateTime.parse(version[:created_at]).strftime('%F %R')
+					rescue Date::Error
+						version[:created_at]
+					end
+
+					puts "#{version[:number].ljust(longest_version_number)}  (#{created_at})"
+				end
+			end
 		end
 	end
 end

data/lib/gem_toys/template/release.rb

@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+
+require_relative 'release/changelog'
+require_relative 'release/git'
+
+module GemToys
+	class Template
+		## Template with gem release tool, expanding internally
+		class Release
+			include Toys::Template
+
+			attr_reader :changelog_file_name, :version_file_path, :version_tag_prefix, :unreleased_title
+
+			def initialize(
+				changelog_file_name:,
+				version_file_path:,
+				version_tag_prefix:,
+				unreleased_title:
+			)
+				@changelog_file_name = changelog_file_name
+				@version_file_path = version_file_path
+				@version_tag_prefix = version_tag_prefix
+				@unreleased_title = unreleased_title
+			end
+
+			on_expand do |template|
+				tool :release do
+					include Release::Changelog
+					include Release::Git
+
+					required_arg :new_version
+
+					to_run do
+						require 'date'
+
+						@template = template
+
+						@today = Date.today.to_s
+
+						handle_new_version
+
+						update_version_file
+
+						## Update CHANGELOG
+						update_changelog_file
+
+						## Build new gem file
+						exec_tool 'gem build'
+
+						wait_for_manual_check
+
+						## Commit, tag, push
+						process_git
+
+						puts 'Pushing gem...'
+						sh "gem push #{current_gem_file}"
+					end
+
+					private
+
+					self::VERSION_TYPES = %w[
+						major
+						minor
+						patch
+					].freeze
+
+					def handle_new_version
+						## https://github.com/dazuma/toys/issues/103
+						@new_version =
+							if (version_index = self.class::VERSION_TYPES.index(new_version))
+								current_version_parts =
+									current_version.split('.')[0..(self.class::VERSION_TYPES.count - 1)]
+								handle_keyword_in_new_version current_version_parts, version_index
+							else
+								new_version
+							end
+
+						clear_memery_cache! :current_version
+					end
+
+					def handle_keyword_in_new_version(current_version_parts, version_index)
+						current_version_parts.map.with_index do |version_part, index|
+							if index < version_index
+								version_part
+							elsif index == version_index
+								Integer(version_part) + 1
+							else
+								0
+							end
+						end.join('.')
+					end
+
+					def update_version_file
+						puts 'Updating version file...'
+
+						File.write(
+							version_file_path,
+							version_file_content.sub(/(VERSION = )'.+'/, "\\1'#{@new_version}'")
+						)
+					end
+
+					def wait_for_manual_check
+						$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
+				end
+			end
+		end
+	end
+end

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

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module GemToys
+	class Template
+		class Release
+			## Helper module with methods about CHANGELOG file for `release` tool
+			module Changelog
+				private
+
+				def update_changelog_file
+					puts 'Updating changelog file...'
+
+					@changelog_lines = File.readlines(changelog_file_path)
+
+					existing_line = @changelog_lines.find { |line| line.start_with? "## #{@new_version} " }
+
+					if existing_line
+						return if (existing_date = existing_line.match(/\((.*)\)/)[1]) == @today
+
+						abort "There is already #{version} version with date #{existing_date}"
+					end
+
+					File.write changelog_file_path, new_changelog_content
+				end
+
+				def new_changelog_content
+					unreleased_title = @template.unreleased_title
+
+					unreleased_title_index = @changelog_lines.index("#{unreleased_title}\n")
+
+					abort_without_unreleased_title unless unreleased_title_index
+
+					@changelog_lines.insert(
+						unreleased_title_index + 2,
+						'#' * unreleased_title.scan(/^#+/).first.size + " #{@new_version} (#{@today})\n\n"
+					).join
+				end
+
+				def abort_without_unreleased_title
+					abort <<~TEXT
+						`#{@template.unreleased_title}` not found in the `#{@template.changelog_file_name}` as the title for unreleased changes.
+						Please, use `:unreleased_title` option if you have non-default one.
+					TEXT
+				end
+			end
+		end
+	end
+end

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

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module GemToys
+	class Template
+		class Release
+			## Helper module with methods about `git` for `release` tool
+			module Git
+				private
+
+				def process_git
+					new_version_git_tag = "#{@template.version_tag_prefix}#{@new_version}"
+
+					## Checkout to a new git branch, required for protected `master` with CI
+					# sh "git switch -c #{new_version_git_tag}"
+
+					commit_changes
+
+					## Tag commit
+					puts 'Tagging the commit...'
+					sh "git tag -a #{new_version_git_tag} -m 'Version #{@new_version}'"
+
+					## Push commit
+					puts 'Pushing commit...'
+					sh 'git push'
+
+					## Push tags
+					puts 'Pushing tags...'
+					sh 'git push --tags'
+				end
+
+				def commit_changes
+					puts 'Committing changes...'
+
+					sh "git add #{version_file_path} #{changelog_file_path}"
+
+					sh "git commit -m 'Update version to #{@new_version}'"
+				end
+			end
+		end
+	end
+end

data/lib/gem_toys/template/versions.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module GemToys
+	class Template
+		## Template with gem versions tool, expanding internally
+		class Versions
+			include Toys::Template
+
+			attr_reader :version_file_path
+
+			def initialize(version_file_path:)
+				@version_file_path = version_file_path
+			end
+
+			on_expand do |template|
+				tool :versions do
+					to_run do
+						@template = template
+
+						versions = rubygems_versions
+
+						versions.unshift current_version_hash if current_version != versions.first[:number]
+
+						puts_versions versions
+					end
+				end
+				alias_tool :releases, :versions
+			end
+		end
+	end
+end

data/lib/gem_toys/version.rb

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

metadata

@@ -1,15 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: gem_toys
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Alexander Popov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-11 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: alt_memery
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -44,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.20
+        version: 0.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.20
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +128,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.21.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.21.2
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.87.0
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.87.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 description: 'Toys template for gems, like building, releasing, etc.
 
   '
@@ -151,6 +193,10 @@ files:
 - lib/gem_toys.rb
 - lib/gem_toys/template.rb
 - lib/gem_toys/template/common_code.rb
+- lib/gem_toys/template/release.rb
+- lib/gem_toys/template/release/changelog.rb
+- lib/gem_toys/template/release/git.rb
+- lib/gem_toys/template/versions.rb
 - lib/gem_toys/version.rb
 homepage: https://github.com/AlexWayfer/gem_toys
 licenses:
@@ -167,14 +213,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Toys template for gems