pr_comet 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c89befe4fe216196ff74e572a7c0661e7ebd30c914ee8e805ea6abd12b5f37e
-  data.tar.gz: 1f74020285bc9816f5b015c78d23309c2136f40e854d07b745c0eadf3a378471
+  metadata.gz: 85cd89906ec3936b19baf0285df362c1c85e174b3e629b3561606ce2603da969
+  data.tar.gz: 315b3d930e793c616a3e141acf8c1cbf21212b4ac18f22515588b4e3a00e8457
 SHA512:
-  metadata.gz: 44c3a4cc2a2970b8940421158971fb4936edb9317496dc835a173274f6ef627837f74b79744c900b28383d6c9144fada4b7ab9a72c27724108cc87639a3a20a2
-  data.tar.gz: a4a1bb1b077668648d5e4926fbb21341e0a98f4b9fe948bbcd0a8e118c109f77b8f7a03526dbac5840cd254efe01117727077865ef238e4caa2e7d578e5638a2
+  metadata.gz: a6ec85517c9fae4c6fd3bef6bdfeeae6616d8e9737eef41e1901f7e483e1f92572dff967c2f8202d58df4c99a648a6291cd5d104c532762d80e48b67590060ab
+  data.tar.gz: 625ac832cb54b16f2d868c47c3453c7e0fd826c056cf8912259f5ffadb1fdcf1daaa39f3487434e4a963cc62131678776cc6b96bf38fd8b0cd47c2878c713569

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pr_comet (0.2.1)
+    pr_comet (0.3.0)
       octokit
       rainbow
 

data/bin/release

@@ -8,14 +8,15 @@ require 'pr_comet'
 
 VERSION_FORMAT = /\A\d+\.\d+\.\d+(\.(pre|beta|rc)\d?)?\z/.freeze
 version = ARGV[0]
-pr_comet = PrComet.new(base: 'master', branch: "update/v#{version}")
+update_pr = PrComet.new(base: 'master', branch: "update/v#{version}")
+release_pr = PrComet.new(base: 'production', branch: 'master')
 
 # Verifying
 abort 'usage: bin/release VERSION' if version.nil?
 abort 'A version must be like a `1.2.3`' unless version =~ VERSION_FORMAT
 
 # Modify a version file
-pr_comet.commit ':comet: Update version' do
+update_pr.commit ':comet: Update version' do
   File.write('lib/pr_comet/version.rb', <<~VERSION)
     # frozen_string_literal: true
 
@@ -26,9 +27,10 @@ pr_comet.commit ':comet: Update version' do
 end
 
 # Bundle Update
-pr_comet.commit ':comet: Run $ bundle update' do
+update_pr.commit ':comet: Run $ bundle update' do
   `bundle update`
 end
 
 # Create a pull request
-pr_comet.create!(title: "Update v#{version}", body: '')
+update_pr.create!(title: "Update v#{version}", body: '')
+release_pr.create!(title: "Release v#{version}", body: '', validate: false)

data/lib/pr_comet/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class PrComet
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/lib/pr_comet.rb

@@ -42,44 +42,67 @@ class PrComet
     result
   end
 
-  # Create a pull request
-  # You should call #commit before calling this method
+  # Create a pull request. You should call #commit before calling this method.
+  # If you want to create a blank PR, you can do it with `validate: false`
+  # option.
   #
-  # @param title [String] Title for the pull request
-  # @param body [String] The body for the pull request
-  # @param labels [Array<String>]
+  # @param options [Hash]
+  #   Options for the PR creation.
+  # @option title [String]
+  #   The title for the pull request
+  # @option body [String]
+  #   The body for the pull request
+  # @option labels [Array<String>]
   #   List of labels. It is a optional parameter. You can add labels to the
   #   created PR.
-  # @param project_column_name [String]
+  # @option project_column_name [String]
   #   A project column name. It is a optional parameter. You can add the created
   #   PR to the GitHub project.
-  # @param project_id [Integer]
+  # @option project_id [Integer]
   #   A target project ID. It is a optional parameter. If does not supplied,
   #   this method will find a project which associated the repository.
-  #   When the repository has multiple projects, you should supply this.
-  # @return [Boolean] Return true if it is successed.
-  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/LineLength
-  def create!(title:, body:, labels: nil, project_column_name: nil, project_id: nil)
-    return false unless git_condition_valid?
+  #   When the repository is associated with multiple projects, you should
+  #   supply this.
+  # @option validate [Boolean]
+  #   Verifies the branch has commits and checkout to the topic branch. If you
+  #   want to create a blank PR, set "false" to this option. default: true.
+  # @return [Boolean]
+  #   Return true if it is successed.
+  # rubocop:disable Metrics/AbcSize
+  def create!(**options)
+    options[:validate] = true if options[:validate].nil?
+    return false if options[:validate] && !git_condition_valid?
 
     git.push(github_token_url, topic_branch)
-    pr_number = github.create_pull_request(
-      base: base_branch, head: topic_branch, title: title, body: body
-    )
-    github.add_labels(pr_number, *labels) unless labels.nil?
-    unless project_column_name.nil?
-      github.add_to_project(
-        pr_number, column_name: project_column_name, project_id: project_id
-      )
+    pr_number = github.create_pull_request(generate_create_pr_options(options))
+    github.add_labels(pr_number, *options[:labels]) unless options[:labels].nil?
+    unless options[:project_column_name].nil?
+      github.add_to_project(pr_number, generate_add_to_project_options(options))
     end
     true
   end
-  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Metrics/LineLength
+  # rubocop:enable Metrics/AbcSize
 
   private
 
   attr_reader :git, :github, :base_branch, :topic_branch, :initial_sha1
 
+  def generate_create_pr_options(**options)
+    {
+      base: base_branch,
+      head: topic_branch,
+      title: options[:title],
+      body: options[:body]
+    }
+  end
+
+  def generate_add_to_project_options(**options)
+    {
+      column_name: options[:project_column_name],
+      project_id: options[:project_id]
+    }
+  end
+
   def git_condition_valid?
     !git.current_sha1?(initial_sha1) && git.current_branch?(topic_branch)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pr_comet
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - ryz310