geet 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1de41cf090832ac128f258dd82f5545c68bae2517942822aa26fd827d457693
-  data.tar.gz: 7a5d9217809a4e014629eef8a4e2466870849e727012b66e8d925777ab91ac72
+  metadata.gz: ef02e27b72e4d7714872d9f980a6d7cf3468e05bf65e6deeeca68675e79f6497
+  data.tar.gz: 602ecc31c63be3570e785e55754f4fee90ddd772906f3cffd93347c1661770ce
 SHA512:
-  metadata.gz: 06bfe2fc70359f98cfc6c9fcf4f1bab9be4c00991791902f67a4a1825d62f92a75d20d558951be3f65be6b52238417954e22276e32e77ec09518acdf652b16ca
-  data.tar.gz: 3e16adb89ecbcfea3197d26359cf64bbb83585c0f5bd0889325330d6422c1fe15c460faf0795c86a47b2c254026fe9b08eb7c35ce62832814c7418f8ceb29ff3
+  metadata.gz: 4222e851d0e92bf2ef4cb947c825e64358129b7640e5f4f15c2d1d2d89f89844211ab39848f6e8e957011dfd8733ece135678ef0829ba75f6f835cb29e2d7baf
+  data.tar.gz: 66c779a300c6b89e2eba2363621e6cea82268b37433226c232f2ea8c0e8eaa20dc1e5598f3bdf95081559e2ac33baa8fdf814e461d8416e4f1d0d29e9ca2f760

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        = '2023-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/services/merge_pr.rb

@@ -23,8 +23,12 @@ module Geet
       end
 
       def execute(delete_branch: false, **)
+        @git_client.fetch
+
         @git_client.push
 
+        check_no_missing_upstream_commits
+
         pr = checked_find_branch_pr
 
         merge_pr(pr)
@@ -55,6 +59,12 @@ module Geet
 
       private
 
+      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)
         @out.puts "Merging PR ##{pr.number}..."
 

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

data/lib/geet/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geet
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Saverio Miroddi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-20 00:00:00.000000000 Z
+date: 2023-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_scripting
@@ -190,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.12
+rubygems_version: 3.4.13
 signing_key: 
 specification_version: 4
 summary: Commandline interface for performing SCM host operations, eg. create a PR