geet 0.18.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1de41cf090832ac128f258dd82f5545c68bae2517942822aa26fd827d457693
-  data.tar.gz: 7a5d9217809a4e014629eef8a4e2466870849e727012b66e8d925777ab91ac72
+  metadata.gz: 553ba26732cdeab337b64fd735017cbb2e3746e2cfe9558fd6cbcac2ed1e56ae
+  data.tar.gz: 2c3d92f60356d1b5664990cdc15b3ea8782c33e5e48d5c22b6938ebee10a8d71
 SHA512:
-  metadata.gz: 06bfe2fc70359f98cfc6c9fcf4f1bab9be4c00991791902f67a4a1825d62f92a75d20d558951be3f65be6b52238417954e22276e32e77ec09518acdf652b16ca
-  data.tar.gz: 3e16adb89ecbcfea3197d26359cf64bbb83585c0f5bd0889325330d6422c1fe15c460faf0795c86a47b2c254026fe9b08eb7c35ce62832814c7418f8ceb29ff3
+  metadata.gz: c3d20437f87b87cc0e3787383e3fdb1739a5447e9743dc11d790eb76b7241c5802333c37724a428882826c4446b7dc701dc3f4698ca968cf0f4836b994d22921
+  data.tar.gz: 6cee56626453e242679c187a61087322f904427529262fcaf66b2b679a2391430a962809e5809b7a46c4e29075221e1a9a388edc46bf2ba8bd9334d4aeb7b475

data/Gemfile

@@ -15,7 +15,7 @@ group :development do
 end
 
 group :test do
-  gem 'rspec', '~> 3.7.0'
+  gem 'rspec', '~> 3.13.0'
   gem 'vcr', '~> 6.1.0'
   gem 'webmock', '~> 3.1.1'
 end

data/bin/geet

@@ -65,7 +65,7 @@ class GeetLauncher
 
       Services::CommentPr.new(repository).execute(comment, **options)
     when PR_CREATE_COMMAND
-      summary = options[:summary] || edit_pr_summary(base: options[:base])
+      summary = options[:summary] || edit_pr_summary(**options.slice(:base))
       title, description = split_summary(summary)
 
       options = default_to_manual_selection(options, :labels, :milestone, :reviewers)
@@ -90,11 +90,11 @@ class GeetLauncher
 
   private
 
-  def edit_pr_summary(base: nil)
+  def edit_pr_summary(base: :main_branch)
     # Tricky. It would be best to have Git logic exlusively inside the services,
     # but at the same time, the summary editing should be out.
     git = Utils::GitClient.new
-    pr_commits = git.cherry(base: base)
+    pr_commits = git.cherry(base)
 
     cancel_pr_help = "In order to cancel the PR creation, delete the description above.\n"
 

data/geet.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.required_ruby_version = '>= 2.7.0'
   s.authors     = ['Saverio Miroddi']
-  s.date        = '2023-04-20'
+  s.date        = '2024-08-23'
   s.email       = ['saverio.pub2@gmail.com']
   s.homepage    = 'https://github.com/saveriomiroddi/geet'
   s.summary     = 'Commandline interface for performing SCM host operations, eg. create a PR on GitHub'

data/lib/geet/commandline/configuration.rb

@@ -93,6 +93,7 @@ module Geet
       # rubocop:disable Style/MutableConstant
       PR_MERGE_OPTIONS = [
         ['-d', '--delete-branch',                           'Delete the branch after merging'],
+        ['-s', '--squash',                                  'Squash merge'],
         ['-u', '--upstream',                                'List on the upstream repository'],
         long_help: 'Merge the PR for the current branch'
       ]

data/lib/geet/github/pr.rb

@@ -72,10 +72,11 @@ module Geet
 
       # See https://developer.github.com/v3/pulls/#merge-a-pull-request-merge-button
       #
-      def merge
+      def merge(merge_method: nil)
         api_path = "pulls/#{number}/merge"
+        request_data = { merge_method: } if merge_method
 
-        @api_interface.send_request(api_path, http_method: :put)
+        @api_interface.send_request(api_path, http_method: :put, data: request_data)
       end
 
       def request_review(reviewers)

data/lib/geet/services/merge_pr.rb

@@ -22,12 +22,18 @@ module Geet
         @git_client = git_client
       end
 
-      def execute(delete_branch: false, **)
+      def execute(delete_branch: false, squash: false, **)
+        merge_method = 'squash' if squash
+
+        @git_client.fetch
+
         @git_client.push
 
+        check_no_missing_upstream_commits
+
         pr = checked_find_branch_pr
 
-        merge_pr(pr)
+        merge_pr(pr, merge_method:)
 
         if delete_branch
           branch = @git_client.current_branch
@@ -47,7 +53,10 @@ module Geet
           checkout_branch(main_branch)
           rebase
 
-          delete_local_branch(pr_branch)
+          # When squashing, we need to force delete, since Git doesn't recognize that the branch has
+          # been merged.
+          #
+          delete_local_branch(pr_branch, force: squash)
         end
 
         pr
@@ -55,10 +64,16 @@ module Geet
 
       private
 
-      def merge_pr(pr)
+      def check_no_missing_upstream_commits
+        missing_upstream_commits = @git_client.cherry('HEAD', head: :main_branch)
+
+        raise "Found #{missing_upstream_commits.size} missing upstream commits!" if missing_upstream_commits.any?
+      end
+
+      def merge_pr(pr, merge_method: nil)
         @out.puts "Merging PR ##{pr.number}..."
 
-        pr.merge
+        pr.merge(merge_method:)
       end
 
       def delete_remote_branch(branch)
@@ -85,10 +100,10 @@ module Geet
         @git_client.rebase
       end
 
-      def delete_local_branch(branch)
+      def delete_local_branch(branch, force:)
         @out.puts "Deleting local branch #{branch}..."
 
-        @git_client.delete_branch(branch)
+        @git_client.delete_branch(branch, force:)
       end
     end
   end

data/lib/geet/utils/git_client.rb

@@ -48,13 +48,19 @@ module Geet
       # BRANCH/TREE APIS
       ##########################################################################
 
-      # Return the commit SHAs between HEAD and `base`, excluding the already applied commits
+      # Return the commit SHAs between :head and :upstream, excluding the already applied commits
       # (which start with `-`)
       #
-      def cherry(base: nil)
-        base ||= main_branch
+      # - upstream: String; pass :main_branch to use the main branch
+      # - head:     String (optional); pass :main_branch to use the main branch
+      #
+      def cherry(upstream, head: nil)
+        upstream = main_branch if upstream == :main_branch
+        head = main_branch if head == :main_branch
+
+        git_params = [upstream, head].compact.map(&:shellescape)
 
-        raw_commits = execute_git_command("cherry #{base.shellescape}")
+        raw_commits = execute_git_command("cherry #{git_params.join(' ')}")
 
         raw_commits.split("\n").grep(/^\+/).map { |line| line[3..-1] }
       end
@@ -226,10 +232,10 @@ module Geet
         execute_git_command("checkout #{branch.shellescape}")
       end
 
-      # Unforced deletion.
-      #
-      def delete_branch(branch)
-        execute_git_command("branch --delete #{branch.shellescape}")
+      def delete_branch(branch, force:)
+        force_option = "--force" if force
+
+        execute_git_command("branch --delete #{force_option} #{branch.shellescape}")
       end
 
       def rebase

data/lib/geet/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Geet
-  VERSION = '0.18.0'
+  VERSION = '0.21.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geet
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Saverio Miroddi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-20 00:00:00.000000000 Z
+date: 2024-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_scripting
@@ -175,7 +175,7 @@ homepage: https://github.com/saveriomiroddi/geet
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -190,8 +190,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.12
-signing_key: 
+rubygems_version: 3.5.9
+signing_key:
 specification_version: 4
 summary: Commandline interface for performing SCM host operations, eg. create a PR
   on GitHub