gem_comet 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b13645ee861e799d64559a1d4b41de38fe7e11061073387bece2f18c9f6d595f
-  data.tar.gz: 7d83a76d83b2812cb74afbcc7dd406d0980a6ad000caa9901395e0f8e9671ad2
+  metadata.gz: 57c1e8a6cd0cfce646e1f0e2308d6a29dea5c0f741763d7aa721b6d61f5c9c71
+  data.tar.gz: 6bcc4d93b64b5eabfb1e6b824a167a4b54a9dfeadcfacbdccdaa1d81568397ea
 SHA512:
-  metadata.gz: 57d0c128ffe107140aafb153bd8ec3e858bd7643fbd878348bb3f7e0531163e60da7884f1e56116f948523b85d8f4d530ebee3a4e079528db82e4f700ea5c8d9
-  data.tar.gz: 59dd23a66be1ac4fec13fd6fb2d2c7f92edbeae79ce7d02ae4e31e465e10c92babfe25e2bff52380188fc4adf1cd8bba2a8c9bcac14a7eb5ba3eb9f56ab86520
+  metadata.gz: e0db304325a3cdf022c961ffbc24728e1cdd606974de62ed93a64676e95e3b99069e2c76d0ba67476a52f8c6a8614ed4e7be3bf67d08cf551b593fd39764a6fd
+  data.tar.gz: 36a24509001aed657bed2976b4134f6a8155e5bffa9e251b8af555fb742a26b28600642d02138cf7d047dff70c90586fcbbe347b91d703e4a79daa9f94f28255

data/.circleci/config.yml

@@ -5,7 +5,7 @@
 version: 2.1
 
 orbs:
-  ruby-orbs: sue445/ruby-orbs@1.4.3
+  ruby-orbs: sue445/ruby-orbs@1.4.4
   code-climate: rvla/code-climate@0.0.2
 
 references:

data/.gem_comet.yml

@@ -1,3 +1,11 @@
+# [Usage]
+#
+# $ gem install gem_comet
+# $ gem_comet init
+# $ gem_comet release {version number, like as "1.2.3"}
+# $ gem_comet changelog
+# $ gem_comet versions
+
 version: 1.1
 
 release:

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-10-14 23:40:22 +0000 using RuboCop version 0.75.1.
+# on 2019-10-30 23:40:24 +0000 using RuboCop version 0.76.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new

data/CHANGELOG.md

@@ -1,57 +1,77 @@
 # Change log
 
+## v0.5.0 (Nov 02, 2019)
+
+### Feature
+
+* [#48](https://github.com/ryz310/gem_comet/pull/48) Add TODO list for the release flow ([@ryz310](https://github.com/ryz310))
+* [#49](https://github.com/ryz310/gem_comet/pull/49) Add pull request author names to the changelog generator feature ([@ryz310](https://github.com/ryz310))
+* [#54](https://github.com/ryz310/gem_comet/pull/54) Add to todo list to check version numbering ([@ryz310](https://github.com/ryz310))
+
+### Bugfix
+
+* [#50](https://github.com/ryz310/gem_comet/pull/50) Fixed broken version number parsing including obsolete version numbers ([@ryz310](https://github.com/ryz310))
+* [#51](https://github.com/ryz310/gem_comet/pull/51) Fix author name parsing ([@ryz310](https://github.com/ryz310))
+
+### Misc
+
+* [#44](https://github.com/ryz310/gem_comet/pull/44) Configure Renovate ([@ryz310](https://github.com/ryz310))
+* [#46](https://github.com/ryz310/gem_comet/pull/46) Re-generate .rubocop_todo.yml with RuboCop v0.76.0 ([@ryz310](https://github.com/ryz310))
+* [#47](https://github.com/ryz310/gem_comet/pull/47) Update ruby-orbs orb to v1.4.4 ([@ryz310](https://github.com/ryz310))
+* [#53](https://github.com/ryz310/gem_comet/pull/53) Use pr comet stubbing ([@ryz310](https://github.com/ryz310))
+
 ## v0.4.0 (Oct 27, 2019)
 
 ### Feature
 
-* Modify to display gem versions sorted by tagged date ([#32](https://github.com/ryz310/gem_comet/pull/32))
-* Add the legend to creating pull requests ([#33](https://github.com/ryz310/gem_comet/pull/33))
-* Open the GitHub pull request page at release ([#36](https://github.com/ryz310/gem_comet/pull/36))
+* [#32](https://github.com/ryz310/gem_comet/pull/32) Modify to display gem versions sorted by tagged date ([@ryz310](https://github.com/ryz310))
+* [#33](https://github.com/ryz310/gem_comet/pull/33) Add the legend to creating pull requests ([@ryz310](https://github.com/ryz310))
+* [#36](https://github.com/ryz310/gem_comet/pull/36) Open the GitHub pull request page at release ([@ryz310](https://github.com/ryz310))
 
 ### Bugfix
 
-* Fix broken links included by the modified change log ([#34](https://github.com/ryz310/gem_comet/pull/34))
+* [#34](https://github.com/ryz310/gem_comet/pull/34) Fix broken links included by the modified change log ([@ryz310](https://github.com/ryz310))
 
 ### Breaking Change
 
-* Changelog initializer ([#35](https://github.com/ryz310/gem_comet/pull/35))
+* [#35](https://github.com/ryz310/gem_comet/pull/35) Changelog initializer ([@ryz310](https://github.com/ryz310))
     * The `$ gem_comet changelog` command options has changed:
         * Before:
             * `$ gem_comet changelog --from=0.1.0 --to=0.1.1`
         * After:
             * `$ gem_comet changelog --version=v0.1.1`
 
-## 0.3.0 (Oct 19, 2019)
+## v0.3.0 (Oct 19, 2019)
 
 ### Feature
 
-* Enhance the feature of changelog command ([#27](https://github.com/ryz310/gem_comet/pull/27))
+* [#27](https://github.com/ryz310/gem_comet/pull/27) Enhance the feature of changelog command ([@ryz310](https://github.com/ryz310))
 
 ### Misc
 
-* Re-generate .rubocop_todo.yml with RuboCop v0.75.1 ([#25](https://github.com/ryz310/gem_comet/pull/25))
+* [#25](https://github.com/ryz310/gem_comet/pull/25) Re-generate .rubocop_todo.yml with RuboCop v0.75.1 ([@ryz310](https://github.com/ryz310))
 
-## 0.2.0 (Oct 14, 2019)
+## v0.2.0 (Oct 13, 2019)
 
 ### Feature
 
-* Auto generate change log ([#22](https://github.com/ryz310/gem_comet/pull/22))
+* [#22](https://github.com/ryz310/gem_comet/pull/22) Auto generate change log ([@ryz310](https://github.com/ryz310))
 
-## 0.1.1 (Oct 13, 2019)
+## v0.1.1 (Oct 13, 2019)
 
 ### Bugfix
 
-* Fix version number validation ([#16](https://github.com/ryz310/gem_comet/pull/16))
+* [#16](https://github.com/ryz310/gem_comet/pull/16) Fix version number validation ([@ryz310](https://github.com/ryz310))
 
 ### Misc
 
-* Re-generate .rubocop_todo.yml with RuboCop v0.73.0 ([#3](https://github.com/ryz310/gem_comet/pull/3))
-* Re-generate .rubocop_todo.yml with RuboCop v0.74.0 ([#5](https://github.com/ryz310/gem_comet/pull/5))
-* Re-generate .rubocop_todo.yml with RuboCop v0.75.0 ([#13](https://github.com/ryz310/gem_comet/pull/13))
-* ryz310/dependabot/bundler/rake-tw-13.0 ([#9](https://github.com/ryz310/gem_comet/pull/9))
-* ryz310/dependabot/bundler/rubocop-performance-1.5.0 ([#14](https://github.com/ryz310/gem_comet/pull/14))
-* ryz310/dependabot/bundler/rspec-3.9.0 ([#17](https://github.com/ryz310/gem_comet/pull/17))
+* [#3](https://github.com/ryz310/gem_comet/pull/3) Re-generate .rubocop_todo.yml with RuboCop v0.73.0 ([@ryz310](https://github.com/ryz310))
+* [#5](https://github.com/ryz310/gem_comet/pull/5) Re-generate .rubocop_todo.yml with RuboCop v0.74.0 ([@ryz310](https://github.com/ryz310))
+* [#13](https://github.com/ryz310/gem_comet/pull/13) Re-generate .rubocop_todo.yml with RuboCop v0.75.0 ([@ryz310](https://github.com/ryz310))
+* [#9](https://github.com/ryz310/gem_comet/pull/9) ryz310/dependabot/bundler/rake-tw-13.0 ([@ryz310](https://github.com/ryz310))
+* [#14](https://github.com/ryz310/gem_comet/pull/14) ryz310/dependabot/bundler/rubocop-performance-1.5.0 ([@ryz310](https://github.com/ryz310))
+* [#17](https://github.com/ryz310/gem_comet/pull/17) ryz310/dependabot/bundler/rspec-3.9.0 ([@ryz310](https://github.com/ryz310))
 
-## 0.1.0 (Jul 16, 2019)
+## v0.1.0 (Jul 15, 2019)
 
 Initial release :rocket:

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    gem_comet (0.4.0)
-      pr_comet (~> 0.3.0)
+    gem_comet (0.5.0)
+      pr_comet (~> 0.3.1)
       thor
       type_struct
 
@@ -18,7 +18,7 @@ GEM
     docile (1.3.2)
     faraday (0.17.0)
       multipart-post (>= 1.2, < 3)
-    jaro_winkler (1.5.3)
+    jaro_winkler (1.5.4)
     json (2.2.0)
     method_source (0.9.2)
     multipart-post (2.1.1)
@@ -27,7 +27,7 @@ GEM
     parallel (1.18.0)
     parser (2.6.5.0)
       ast (~> 2.4.0)
-    pr_comet (0.3.0)
+    pr_comet (0.3.1)
       octokit
       rainbow
     pry (0.12.2)
@@ -54,7 +54,7 @@ GEM
     rspec-support (3.9.0)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.75.1)
+    rubocop (0.76.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.6)

data/gem_comet.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'pr_comet', '~> 0.3.0'
+  spec.add_runtime_dependency 'pr_comet', '~> 0.3.1'
   spec.add_runtime_dependency 'thor'
   spec.add_runtime_dependency 'type_struct'
 

data/lib/gem_comet/changelog/generator.rb

@@ -50,14 +50,29 @@ module GemComet
         merge_commits.map do |merge_commit|
           next unless merge_commit.match?(MERGE_COMMIT_TITLE)
 
-          pull_request_number = extract_pull_request_number(merge_commit)
-          pull_request_url = get_pull_request_url(pull_request_number)
-          description = extract_description(merge_commit) || extract_branch_name(merge_commit)
+          number = extract_pull_request_number(merge_commit)
+          title = extract_description(merge_commit) || extract_branch_name(merge_commit)
+          author = extract_author_name(merge_commit)
 
-          "* #{description} ([##{pull_request_number}](#{pull_request_url}))"
+          generate_changelog(number, title, author)
         end.compact
       end
 
+      # Generates changelog message as markdown list
+      #
+      # @param number [Integer] The pull request number
+      # @param title [String] The pull request title
+      # @param author [String] The author of the PR
+      # @return [String] Changelog message as markdown list
+      def generate_changelog(number, title, author)
+        [
+          '*',
+          "[##{number}](#{get_pull_request_url(number)})",
+          title,
+          "([@#{author}](https://github.com/#{author}))"
+        ].join(' ')
+      end
+
       # Extracts PR number from merge commit string.
       #
       # @param merge_commit [String] The target string
@@ -92,6 +107,14 @@ module GemComet
         MERGE_COMMIT_TITLE.match(merge_commit).captures.last.chomp.strip
       end
 
+      # Extracts the author of the PR from merge commit string.
+      #
+      # @param merge_commit [String] The target string
+      # @return [String] Author name
+      def extract_author_name(merge_commit)
+        extract_branch_name(merge_commit).split('/').first
+      end
+
       # Parces the merge commit log, which to separate by each commit.
       #
       # @return [Array<String>] Array of git commit log

data/lib/gem_comet/release/release_pr.rb

@@ -18,7 +18,20 @@ module GemComet
       end
 
       def create_pull_request
-        pr_comet.create!(title: "Release v#{version}", body: LEGEND, validate: false)
+        pr_comet.create!(
+          title: "Release v#{version}",
+          body: pull_request_body,
+          validate: false
+        )
+      end
+
+      def pull_request_body
+        template = File.read(template_file_path)
+        ERB.new(template, nil, '-').result(binding)
+      end
+
+      def template_file_path
+        File.expand_path('../../../template/release_pr.md.erb', __dir__)
       end
     end
   end

data/lib/gem_comet/release/update_pr.rb

@@ -8,12 +8,13 @@ module GemComet
         @version = version
         @pr_comet = PrComet.new(base: base_branch, branch: "update/v#{version}")
         @version_editor = VersionEditor.new
+        @prev_version = version_editor.current_version
         @changelog_editor = Changelog::Editor.new
       end
 
       private
 
-      attr_reader :version, :pr_comet, :version_editor, :changelog_editor
+      attr_reader :version, :prev_version, :pr_comet, :version_editor, :changelog_editor
 
       def call
         update_changelog
@@ -40,7 +41,16 @@ module GemComet
       end
 
       def create_pull_request
-        pr_comet.create!(title: "Update v#{version}", body: LEGEND)
+        pr_comet.create!(title: "Update v#{version}", body: pull_request_body)
+      end
+
+      def pull_request_body
+        template = File.read(template_file_path)
+        ERB.new(template, nil, '-').result(binding)
+      end
+
+      def template_file_path
+        File.expand_path('../../../template/update_pr.md.erb', __dir__)
       end
     end
   end

data/lib/gem_comet/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GemComet
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/lib/gem_comet/version_history.rb

@@ -41,7 +41,8 @@ module GemComet
     # @return [Array<Array<String>>] An array of versions and date
     #   e.g. [['v0.1.0', '2019-07-15'], ['v0.2.0', '2019-10-14']]
     def array_of_version_and_date
-      @array_of_version_and_date ||= git_tag_list.lines.map(&:chomp).map(&:split).sort_by(&:last)
+      @array_of_version_and_date ||=
+        git_tag_list.lines.map(&:chomp).map(&:split).reject(&:empty?).sort_by(&:last)
     end
 
     # Finds an index of the specified version number

data/lib/gem_comet.rb

@@ -21,7 +21,3 @@ require 'gem_comet/release'
 require 'gem_comet/release/update_pr'
 require 'gem_comet/release/release_pr'
 require 'gem_comet/cli'
-
-module GemComet
-  LEGEND = 'Generated by [gem_comet](https://github.com/ryz310/gem_comet)'
-end

data/renovate.json

@@ -0,0 +1,5 @@
+{
+  "extends": [
+    "config:base"
+  ]
+}

data/template/release_pr.md.erb

@@ -0,0 +1,5 @@
+# TODO
+
+- [ ] Merge "Update v<%= version %>" first
+
+Generated by [gem_comet](https://github.com/ryz310/gem_comet)

data/template/update_pr.md.erb

@@ -0,0 +1,6 @@
+# TODO
+
+- [ ] Check version numbering: v<%= version %> (was v<%= prev_version %>)
+- [ ] Edit the CHANGELOG.md
+
+Generated by [gem_comet](https://github.com/ryz310/gem_comet)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gem_comet
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - ryz310
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-27 00:00:00.000000000 Z
+date: 2019-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pr_comet
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -235,8 +235,11 @@ files:
 - lib/gem_comet/version.rb
 - lib/gem_comet/version_editor.rb
 - lib/gem_comet/version_history.rb
+- renovate.json
 - template/.gem_comet.yml.erb
 - template/CHANGELOG.md.erb
+- template/release_pr.md.erb
+- template/update_pr.md.erb
 homepage: https://github.com/ryz310/gem_comet
 licenses:
 - MIT