git_helper 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7959639f26bda279bb9154f76ba1d5041802d5ac63fbb02d6df3ca85d55040ca
-  data.tar.gz: 59144b9c94dd74ac2bc8c05417363ee37f926a2266fe623e3c13032750910025
+  metadata.gz: d7f6658d90f9abf6f52b670fcd9e09ac4fc5964abbf70d0e88d21c6d3838d598
+  data.tar.gz: 420511dc29ead38efe88f841b76bb42f1b086b5c76369202056d7856002886ef
 SHA512:
-  metadata.gz: 104ed8f0605c4471b0e4163dfe7148a4a5b2139871150e5577ed371035419122d9c64571aa2ff0897d812e5a08982c3cbd544e6d9936d36d792df2f0fbe9248d
-  data.tar.gz: 4eef1f32e7c147279228388ade7056a46568cacae9fe61dcd58534b42b50c2eb422a8fd9c043ff9fdf138595dccf8a17d7771be877fa2c2ba6bf13eaaa9ec5ff
+  metadata.gz: e8ee96f3180249acb8a25a549fa937852ff8a3a836a41d445dd7e5ea9f941f5b00408e174378e7c0b259a137cc96ce0ee3f52f3af7c3156f263e10f3253e1c3d
+  data.tar.gz: bd1b57e904dcb2a29a2f85688038af87908499240e0b86f0e75c5cebb0ebd6de4e538b25dab598df247ff8a2bc82da665d0a6c57e2c41ac470a47cb20c226a46

data/lib/git_helper/highline_cli.rb

@@ -43,8 +43,7 @@ module GitHelper
       !!(answer =~ /^y/i)
     end
 
-    def merge_method
-      merge_options = [ 'merge', 'squash', 'rebase' ]
+    def merge_method(merge_options)
       index = ask_options("Merge method?", merge_options)
       merge_options[index]
     end

data/lib/git_helper/merge_request.rb

@@ -12,6 +12,8 @@ module GitHelper
         options = {
           source_branch: local_branch,
           target_branch: base_branch,
+          squash: squash_merge_request,
+          remove_source_branch: remove_source_branch,
           description: new_mr_body
         }
 
@@ -37,12 +39,18 @@ module GitHelper
         # Ask these questions right away
         mr_id
         options = {}
-        options[:should_remove_source_branch] = remove_source_branch
-        options[:squash] = squash_merge_request
-        options[:squash_commit_message] = existing_mr_title
+        options[:should_remove_source_branch] = existing_mr.should_remove_source_branch || existing_mr.force_remove_source_branch
+        options[:squash] = existing_mr.squash
+        options[:squash_commit_message] = existing_mr.title
 
         puts "Merging merge request: #{mr_id}"
         merge = gitlab_client.accept_merge_request(local_project, mr_id, options)
+
+        if merge.merge_commit_sha.nil?
+          options[:squash] = true
+          merge = gitlab_client.accept_merge_request(local_project, mr_id, options)
+        end
+
         puts "Merge request successfully merged: #{merge.merge_commit_sha}"
       rescue Gitlab::Error::MethodNotAllowed => e
         puts 'Could not merge merge request:'
@@ -88,7 +96,7 @@ module GitHelper
     end
 
     private def remove_source_branch
-      @remove_source_branch ||= cli.remove_source_branch?
+      @remove_source_branch ||= existing_project.remove_source_branch_after_merge || cli.remove_source_branch?
     end
 
     private def new_mr_title
@@ -128,8 +136,12 @@ module GitHelper
       @template_name_to_apply
     end
 
-    private def existing_mr_title
-      @existing_mr_title ||= gitlab_client.merge_request(local_project, mr_id).title
+    private def existing_mr
+      @existing_mr ||= gitlab_client.merge_request(local_project, mr_id)
+    end
+
+    private def existing_project
+      @existing_project ||= gitlab_client.project(local_project)
     end
 
     private def gitlab_client

data/lib/git_helper/pull_request.rb

@@ -36,7 +36,7 @@ module GitHelper
         merge_method
 
         puts "Merging pull request: #{pr_id}"
-        merge = octokit_client.merge_pull_request(local_repo, pr_id, existing_pr_title, { merge_method: merge_method })
+        merge = octokit_client.merge_pull_request(local_repo, pr_id, existing_pr.title, { merge_method: merge_method })
         puts "Pull request successfully merged: #{merge.sha}"
       rescue Octokit::UnprocessableEntity => e
         puts 'Could not merge pull request:'
@@ -95,7 +95,16 @@ module GitHelper
     end
 
     private def merge_method
-      @merge_method ||= cli.merge_method
+      @merge_method ||= merge_options.length == 1 ? merge_options.first : cli.merge_method(merge_options)
+    end
+
+    private def merge_options
+      return @merge_options if @merge_options
+      merge_options = []
+      merge_options << 'merge' if existing_project.allow_merge_commit
+      merge_options << 'squash' if existing_project.allow_squash_merge
+      merge_options << 'rebase' if existing_project.allow_rebase_merge
+      @merge_options = merge_options
     end
 
     private def new_pr_title
@@ -135,8 +144,12 @@ module GitHelper
       @template_name_to_apply
     end
 
-    private def existing_pr_title
-      @existing_pr_title ||= octokit_client.pull_request(local_repo, pr_id).title
+    private def existing_pr
+      @existing_pr ||= octokit_client.pull_request(local_repo, pr_id)
+    end
+
+    private def existing_project
+      @existing_project ||= octokit_client.repository(local_repo)
     end
 
     private def octokit_client

data/lib/git_helper/version.rb

@@ -1,3 +1,3 @@
 module GitHelper
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_helper
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Emma Sax