gem_comet 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e992b42942e26870fca6a89bcb9f315e784a55b0af467e722eb9484b8ea0a91
-  data.tar.gz: 90402f9d8725fec32adfa11f57bb6bc9681b51d504b4023c3c34e49ef504bdd0
+  metadata.gz: e11e63f7c4687ba1b98858b475b9eaa471cc96bde4be53df6fac06ea5a06069c
+  data.tar.gz: 20bc0f22daf10dae7078160799e8c1beaa5e4bca084dcc973db68f06ea7dd7b2
 SHA512:
-  metadata.gz: 53e9e981b9f0719393f29e2c2c97e0bbcbb603d17d00f3ba231f9a7dc060c56338df04ebb3529e344ec565eb3ee118ab7d87bce03d38133226381f0b1e35fafe
-  data.tar.gz: 68c7a8357214f401e873dcc8f1c2a230184cddf088f51726fa485fa5ba51620772d728f38cea996aafff100dcdeb55fd740c818402c4b93e8c299e2db5295630
+  metadata.gz: d45c9585a76e9bef8682e2f22350d9af725728092c9c653885b9337221adf41b08b17fbf4ea677fcf19211d42a5f2698d0236b233432262c907df840d8e25180
+  data.tar.gz: e069789e5c5c56f8427d375c7eac37027551a3eb0a34ee15bc852d3699c8515afad061160973b1f3eecf0d389383e664ded2c0f232c55c3c37350a83ba13abe8

data/.circleci/config.yml

@@ -42,7 +42,7 @@ commands:
       - code-climate/format-coverage:
           input-type: simplecov
           prefix: $(readlink -f .)
-          coverage-file: coverage/.resultset.json
+          coverage-file: coverage/coverage.json
           output: coverage/codeclimate.$CIRCLE_BUILD_NUM.json
       - persist_to_workspace:
           root: coverage
@@ -97,9 +97,6 @@ commands:
       <<: *ruby_version
     steps:
       - checkout
-      - run:
-          name: Install bundler v1.x for ruby 2.7
-          command: gem install bundler:1.17.3
       - ruby-orbs/bundle-install:
           cache_key_prefix: v1-dependencies-<< parameters.ruby_version >>
   test_and_build:

data/.gem_comet.yml

@@ -6,10 +6,18 @@
 # $ gem_comet changelog
 # $ gem_comet versions
 
-version: 1.1
+version: 1.2
 
 release:
   base_branch: master
   release_branch: release
   version_file_path: lib/gem_comet/version.rb
   changelog_file_path: CHANGELOG.md
+changelog:
+  categories:
+    - Feature
+    - Bugfix
+    - Breaking Change
+    - Rubocop Challenger
+    - Dependabot
+    - Misc

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Change log
 
+## v0.8.0 (Jan 11, 2021)
+
+### Feature
+
+* [#223](https://github.com/ryz310/gem_comet/pull/223) Add verbose option ([@ryz310](https://github.com/ryz310))
+* [#226](https://github.com/ryz310/gem_comet/pull/226) Add categories option ([@ryz310](https://github.com/ryz310))
+
+### Dependabot
+
+* [#201](https://github.com/ryz310/gem_comet/pull/201) Update bundler requirement from ~> 1.16 to ~> 2.2 ([@ryz310](https://github.com/ryz310))
+* [#221](https://github.com/ryz310/gem_comet/pull/221) ryz310/dependabot/bundler/rubocop-1.8.0 ([@ryz310](https://github.com/ryz310))
+* [#222](https://github.com/ryz310/gem_comet/pull/222) Update simplecov requirement from = 0.17.1 to = 0.21.2 ([@ryz310](https://github.com/ryz310))
+* [#227](https://github.com/ryz310/gem_comet/pull/227) ryz310/dependabot/bundler/rubocop-1.8.1 ([@ryz310](https://github.com/ryz310))
+
 ## v0.7.2 (Jan 04, 2021)
 
 ### Bugfix

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    gem_comet (0.7.2)
-      pr_comet (~> 0.4.0)
+    gem_comet (0.8.0)
+      pr_comet (~> 0.5.1)
       thor
       type_struct
 
@@ -21,7 +21,6 @@ GEM
       multipart-post (>= 1.2, < 3)
       ruby2_keywords
     faraday-net_http (1.0.0)
-    json (2.5.1)
     method_source (1.0.0)
     multipart-post (2.1.1)
     octokit (4.20.0)
@@ -30,7 +29,7 @@ GEM
     parallel (1.20.1)
     parser (3.0.0.0)
       ast (~> 2.4.1)
-    pr_comet (0.4.0)
+    pr_comet (0.5.1)
       octokit
       rainbow
     pry (0.13.1)
@@ -59,15 +58,15 @@ GEM
     rspec-support (3.10.1)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.7.0)
+    rubocop (1.8.1)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
       rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.4.0)
       parser (>= 2.7.1.5)
     rubocop-performance (1.9.2)
@@ -81,21 +80,22 @@ GEM
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
-    simplecov (0.17.1)
+    simplecov (0.21.2)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
     thor (1.0.1)
     type_struct (0.8.0)
-    unicode-display_width (1.7.0)
+    unicode-display_width (2.0.0)
     yard (0.9.26)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 2.2)
   gem_comet!
   pry-byebug
   rake (~> 13.0)
@@ -104,8 +104,8 @@ DEPENDENCIES
   rubocop
   rubocop-performance
   rubocop-rspec
-  simplecov (= 0.17.1)
+  simplecov (= 0.21.2)
   yard
 
 BUNDLED WITH
-   1.17.3
+   2.2.4

data/gem_comet.gemspec

@@ -24,11 +24,11 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.7.0'
 
-  spec.add_runtime_dependency 'pr_comet', '~> 0.4.0'
+  spec.add_runtime_dependency 'pr_comet', '~> 0.5.1'
   spec.add_runtime_dependency 'thor'
   spec.add_runtime_dependency 'type_struct'
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'bundler', '~> 2.2'
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec'
@@ -36,6 +36,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'rubocop-performance'
   spec.add_development_dependency 'rubocop-rspec'
-  spec.add_development_dependency 'simplecov', '0.17.1'
+  spec.add_development_dependency 'simplecov', '0.21.2'
   spec.add_development_dependency 'yard'
 end

data/lib/gem_comet/changelog/generator.rb

@@ -17,6 +17,7 @@ module GemComet
       private
 
       MERGE_COMMIT_TITLE = /Merge pull request #(\d+) from (.+)/.freeze
+      DEFAULT_CATEGORIES = ['Feature', 'Bugfix', 'Breaking Change', 'Misc'].freeze
 
       # Returns changelogs as markdown format from current version to HEAD commit.
       #
@@ -27,10 +28,7 @@ module GemComet
 
           ## #{title} (#{versioning_date})
 
-          ### Feature
-          ### Bugfix
-          ### Breaking Change
-          ### Misc
+          #{changelog_categories.join("\n")}
 
           #{changelogs.reverse.join("\n")}
         MARKDOWN
@@ -43,6 +41,13 @@ module GemComet
         VersionHistory.new.versioning_date_of(version).strftime('%b %d, %Y')
       end
 
+      # Returns array of changelog categories reading from the config file.
+      #
+      # @return [Array<String>] Array of changelog categories as markdown format
+      def changelog_categories
+        (Config.call.changelog&.categories || DEFAULT_CATEGORIES).map { |c| "### #{c}" }
+      end
+
       # Returns array of changelogs as markdown format.
       #
       # @return [Array<String>] Array of changelogs as markdown format

data/lib/gem_comet/cli.rb

@@ -20,8 +20,12 @@ module GemComet
     end
 
     desc 'release VERSION', 'Creates update PR and release PR'
+    option :verbose,
+           type: :boolean,
+           default: false,
+           desc: 'Displays executing commands.'
     def release(version)
-      Release.call(version: version)
+      Release.call(version: version, verbose: options[:verbose])
     rescue StandardError => e
       puts e.message
     end

data/lib/gem_comet/config.rb

@@ -6,16 +6,23 @@ module GemComet
     using TypeStruct::Union::Ext
 
     CONFIG_FILE_PATH = '.gem_comet.yml'
-    CURRENT_VERSION = 1.1
+    CURRENT_VERSION = 1.2
 
-    V1_1 = TypeStruct.new(
+    Release = TypeStruct.new(
+      base_branch: String,
+      release_branch: String,
+      version_file_path: String,
+      changelog_file_path: String | nil
+    )
+
+    Changelog = TypeStruct.new(
+      categories: TypeStruct::ArrayOf.new(String)
+    )
+
+    V1_2 = TypeStruct.new(
       version: 1.0...2.0,
-      release: TypeStruct.new(
-        base_branch: String,
-        release_branch: String,
-        version_file_path: String,
-        changelog_file_path: String | nil
-      )
+      release: Release,
+      changelog: Changelog | nil
     )
 
     def initialize; end
@@ -23,7 +30,7 @@ module GemComet
     private
 
     def call
-      V1_1.from_hash(YAML.safe_load(File.open(CONFIG_FILE_PATH)))
+      V1_2.from_hash(YAML.safe_load(File.open(CONFIG_FILE_PATH)))
     rescue Errno::ENOENT
       raise 'Not initialized. Please run `$ gem_comet init`.'
     rescue TypeStruct::MultiTypeError => e

data/lib/gem_comet/release.rb

@@ -3,16 +3,17 @@
 module GemComet
   # Creates pull requests for gem release and that preparation
   class Release < ServiceAbstract
-    def initialize(version:)
+    def initialize(version:, verbose: false)
       verify_version_number(version)
 
       @version = version
       @config = Config.call
+      @verbose = verbose
     end
 
     private
 
-    attr_reader :version, :config
+    attr_reader :version, :config, :verbose
 
     def call
       VerifyGitCondition.call
@@ -24,7 +25,8 @@ module GemComet
     def update_pr_args
       {
         version: version,
-        base_branch: config.release.base_branch
+        base_branch: config.release.base_branch,
+        verbose: verbose
       }
     end
 
@@ -32,7 +34,8 @@ module GemComet
       {
         version: version,
         base_branch: config.release.base_branch,
-        release_branch: config.release.release_branch
+        release_branch: config.release.release_branch,
+        verbose: verbose
       }
     end
 

data/lib/gem_comet/release/create_release_pr.rb

@@ -8,9 +8,9 @@ module GemComet
 
       attr_reader :version, :pr_comet
 
-      def initialize(version:, base_branch:, release_branch:)
+      def initialize(version:, base_branch:, release_branch:, verbose: false)
         @version = version
-        @pr_comet = PrComet.new(base: release_branch, branch: base_branch)
+        @pr_comet = PrComet.new(base: release_branch, branch: base_branch, verbose: verbose)
       end
 
       def call

data/lib/gem_comet/release/create_update_pr.rb

@@ -4,9 +4,9 @@ module GemComet
   class Release
     # Creates a pull request for release preparation
     class CreateUpdatePR < ServiceAbstract
-      def initialize(version:, base_branch:)
+      def initialize(version:, base_branch:, verbose: false)
         @version = version
-        @pr_comet = PrComet.new(base: base_branch, branch: "update/v#{version}")
+        @pr_comet = PrComet.new(base: base_branch, branch: "update/v#{version}", verbose: verbose)
         @version_editor = VersionEditor.new
         @prev_version = version_editor.current_version
         @changelog_editor = Changelog::Editor.new

data/lib/gem_comet/version.rb

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

data/template/.gem_comet.yml.erb

@@ -13,3 +13,9 @@ release:
   release_branch: release
   version_file_path: '{Path of your version file}'
   changelog_file_path: CHANGELOG.md # optional
+changelog:
+  categories:
+    - Feature
+    - Bugfix
+    - Breaking Change
+    - Misc

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gem_comet
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - ryz310
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-04 00:00:00.000000000 Z
+date: 2021-01-11 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.4.0
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: 0.21.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: 0.21.2
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement