geet 0.17.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18fd41718ab7e1322b2538472d9fff0f30cf5d6b78a4ab08018aff39916d4784
-  data.tar.gz: 6f93925acac8e405e6d2a76d52c376aa235f8f6c80885f94d3a6999fefd0d807
+  metadata.gz: ef02e27b72e4d7714872d9f980a6d7cf3468e05bf65e6deeeca68675e79f6497
+  data.tar.gz: 602ecc31c63be3570e785e55754f4fee90ddd772906f3cffd93347c1661770ce
 SHA512:
-  metadata.gz: cf2abde4501d11687ec1021be64b275a13523d13f06470122a1e39101c006a527178e3ffc74df715f5d465e7a99c55925878a82e505441081336147bffb2c28e
-  data.tar.gz: 77299aebb4ad0964e42523c71613380f5a484d943d225a9c54740922f4a7fcc32231dad61bb64d88dc39b1d12175702817383cc40f5414005354773a020c685d
+  metadata.gz: 4222e851d0e92bf2ef4cb947c825e64358129b7640e5f4f15c2d1d2d89f89844211ab39848f6e8e957011dfd8733ece135678ef0829ba75f6f835cb29e2d7baf
+  data.tar.gz: 66c779a300c6b89e2eba2363621e6cea82268b37433226c232f2ea8c0e8eaa20dc1e5598f3bdf95081559e2ac33baa8fdf814e461d8416e4f1d0d29e9ca2f760

data/.rubocop.yml

@@ -1,6 +1,6 @@
 inherit_from: .rubocop_todo.yml
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
 
 Layout/ExtraSpacing:
   Enabled: false

data/Gemfile

@@ -16,6 +16,6 @@ end
 
 group :test do
   gem 'rspec', '~> 3.7.0'
-  gem 'vcr', '~> 3.0.3'
+  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,16 +90,16 @@ 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"
 
     summary =
-      if File.exists?(SUMMARY_BACKUP)
+      if File.exist?(SUMMARY_BACKUP)
         prepopulated_summary = IO.read(SUMMARY_BACKUP)
 
         Commandline::Editor.new.edit_content(content: prepopulated_summary, help: SUMMARY_TEMPLATE + cancel_pr_help)

data/geet.gemspec

@@ -8,16 +8,16 @@ Gem::Specification.new do |s|
   s.name        = 'geet'
   s.version     = Geet::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.required_ruby_version = '>= 2.6.0'
+  s.required_ruby_version = '>= 2.7.0'
   s.authors     = ['Saverio Miroddi']
-  s.date        = '2023-02-10'
+  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'
   s.description = 'Commandline interface for performing SCM host operations, eg. create a PR on GitHub, with support for multiple hosts.'
   s.license     = 'GPL-3.0'
 
-  s.add_runtime_dependency 'simple_scripting', '~> 0.11.0'
+  s.add_runtime_dependency 'simple_scripting', '~> 0.14.0'
   s.add_runtime_dependency 'tty-prompt', '~> 0.23.1'
 
   s.add_development_dependency 'rake', '~> 12.3'

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.17.0'
+  VERSION = '0.19.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geet
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Saverio Miroddi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-10 00:00:00.000000000 Z
+date: 2023-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_scripting
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
@@ -183,14 +183,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.13
 signing_key: 
 specification_version: 4
 summary: Commandline interface for performing SCM host operations, eg. create a PR