geet 0.29.0 → 0.30.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cc15ce51e73bea607f37e1b46cfeeea160fd578373dd691ca426f605a761410
-  data.tar.gz: 775d0a7d562a5efa412186bc209978006ac05cc9c6c6926d485c15bd6ca2def0
+  metadata.gz: 17e1a6a9c31e72000fc09feb1cec44ed731bf86f645133ba90f21448bd7a73eb
+  data.tar.gz: 46ce4484514700a897b8558062f7bb2729b1863a2135fb05007c5854fbed37b9
 SHA512:
-  metadata.gz: c11603363f1ef2c3a0bce61bdb292c9957a243064ab1f6318011d2aef98e2922db8eac2f44b2fcd54d3f93ba31b60a886ae0eca7505dec23882d8c923907a3c7
-  data.tar.gz: 9934a7935c4ad0c9b54f6aaa059cb74739a2e6806878de852491bcdc4ab5af81dbfa462bd895a5e7417cb875927b4766b09e2c6dd4b43c40056edee5b41f8a20
+  metadata.gz: 72fe78de09b97764add24958707a3adb96e0cbdebfc52bf8f4234a625a6763c740ca39d3045e40e583f820121b784fdf25d38c97ae6993955a89e3876be87846
+  data.tar.gz: 7c84aab8d706442305bc4f12d629040a9345b253efdaa6ed44d64591056664d2780b739e28f2dac299f5a0d2d69dcc4fe6bc26744f657d967572ddc474f438b1

data/geet.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.required_ruby_version = ">= 3.2.0"
   s.authors     = ["Saverio Miroddi"]
-  s.date        = "2026-05-12"
+  s.date        = "2026-07-07"
   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"
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency "base64", "~> 0.3.0"
   s.add_runtime_dependency "ostruct", "~> 0.6.3"
-  s.add_runtime_dependency "simple_scripting", "~> 0.14.0"
+  s.add_runtime_dependency "simple_scripting", "~> 0.14"
   s.add_runtime_dependency "sorbet-runtime", "= 0.6.12883"
   s.add_runtime_dependency "tty-prompt", "~> 0.23.1"
   s.add_runtime_dependency "zeitwerk", "~> 2.7"

data/lib/geet/commandline/configuration.rb

@@ -96,6 +96,7 @@ module Geet
       # rubocop:disable Style/MutableConstant
       PR_MERGE_OPTIONS = T.let([
         ["-d", "--delete-branch",                           "Delete the branch after merging"],
+        ["-r", "--rebase",                                  "Rebase merge"],
         ["-s", "--squash",                                  "Squash merge"],
         ["-u", "--upstream",                                "List on the upstream repository"],
         long_help: "Merge the PR for the current branch",

data/lib/geet/services/merge_pr.rb

@@ -29,11 +29,15 @@ module Geet
       sig {
         params(
           delete_branch: T::Boolean,
+          rebase: T::Boolean,
           squash: T::Boolean
         )
         .returns(Github::PR)
       }
-      def execute(delete_branch: false, squash: false)
+      def execute(delete_branch: false, rebase: false, squash: false)
+        raise "Can't specify both --rebase and --squash" if rebase && squash
+
+        merge_method = "rebase" if rebase
         merge_method = "squash" if squash
 
         @git_client.fetch
@@ -62,12 +66,12 @@ module Geet
           # currently, it's not important.
           #
           checkout_branch(main_branch)
-          rebase
+          rebase_main
 
-          # When squashing, we need to force delete, since Git doesn't recognize that the branch has
-          # been merged.
+          # When squashing or rebasing, we need to force delete, since Git doesn't recognize that the
+          # branch has been merged (the commits on the main branch have different SHAs).
           #
-          delete_local_branch(pr_branch, force: squash)
+          delete_local_branch(pr_branch, force: squash || rebase)
         end
 
         pr
@@ -112,7 +116,7 @@ module Geet
       end
 
       sig { void }
-      def rebase
+      def rebase_main
         @out.puts "Rebasing..."
 
         @git_client.rebase

data/lib/geet/version.rb

@@ -2,5 +2,5 @@
 # typed: strict
 
 module Geet
-  VERSION = "0.29.0"
+  VERSION = "0.30.1"
 end

data/spec/unit/services/merge_pr_spec.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+# typed: false
+
+require "spec_helper"
+
+require_relative "../../../lib/geet/git/repository"
+require_relative "../../../lib/geet/services/merge_pr"
+
+describe Geet::Services::MergePr do
+  describe "#execute" do
+    let(:repository) { instance_double(Geet::Git::Repository) }
+    let(:git_client) { instance_double(Geet::Utils::GitClient) }
+
+    subject { described_class.new(repository, out: StringIO.new, git_client: git_client) }
+
+    it "raises when both --rebase and --squash are passed" do
+      expect { subject.execute(rebase: true, squash: true) }
+        .to raise_error("Can't specify both --rebase and --squash")
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: geet
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.30.1
 platform: ruby
 authors:
 - Saverio Miroddi
 bindir: bin
 cert_chain: []
-date: 2026-05-12 00:00:00.000000000 Z
+date: 2026-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -43,14 +43,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: sorbet-runtime
   requirement: !ruby/object:Gem::Requirement
@@ -251,6 +251,7 @@ files:
 - spec/integration/open_repo_spec.rb
 - spec/spec_helper.rb
 - spec/unit/github/pr_spec.rb
+- spec/unit/services/merge_pr_spec.rb
 - spec/vcr_cassettes/create_gist_private.yml
 - spec/vcr_cassettes/create_gist_public.yml
 - spec/vcr_cassettes/create_issue.yml
@@ -296,7 +297,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.7
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Commandline interface for performing SCM host operations, eg. create a PR
   on GitHub