geet 0.28.2 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c532c156ba96e5c0fc54a5a85be8eb0912fede8e160ccd5107a2904df2f638c
-  data.tar.gz: 5365945814030ca17470f1b2cd8a02e0a6de5ef315e9028a51ba873005efb719
+  metadata.gz: 2831ac20b611ce85881660ca5eed68be1b713a22ab2c10fa2f4cc7678c8d6307
+  data.tar.gz: 93208d52279d38a41e4ff7deccd73b91404370c56b791d226d9f7a680f9c8aec
 SHA512:
-  metadata.gz: 5f6d7d4588a41492faed07b2a6c5ad6239fbf9cb5f261a79f51955d9c60bade516ca64bdf63ea375746885f89c5484c8c3b8ce0a5a2f2ebd699bb669bd047bd9
-  data.tar.gz: 17dec4695b03b19a4360d4157dbc8cc6ee7e521daf5a4a04c486f238819b4e85a6c922b2230ec8848af995148927b0082f570c69e5414b216d2dbb24f4248bf8
+  metadata.gz: bd957bdf51d0dfc4c015d0b800e43668c55eef6aa445302e960a85840785a2ce5a171468c0dcf83b4f9f43483a5eaf03afaf4ec02d4607261341b7f56c6165b7
+  data.tar.gz: 1c7d2c8e204c933fce79d22ced60530fae5868e1728dae2d8c9033152f22e9489cbf5a50cecaac103c1b341c068d744ac9eb8717bf77f94770f7cf767452d27c

data/README.md

@@ -23,7 +23,7 @@ Everything is tracked in detail via [issues](https://github.com/saveriomiroddi/g
 
 Geet requires the API token environment variable to be set, eg:
 
-    export GITHUB_API_TOKEN=0123456789abcdef0123456789abcdef
+    export GH_TOKEN=0123456789abcdef0123456789abcdef
 
 All the commands need to be run from the git repository.
 

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-04-02"
+  s.date        = "2026-05-12"
   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

@@ -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/git/repository.rb

@@ -202,7 +202,7 @@ module Geet
 
       sig { returns(String) }
       def extract_env_api_token
-        ENV["GITHUB_API_TOKEN"] || raise("GITHUB_API_TOKEN not set!")
+        ENV["GH_TOKEN"] || raise("GH_TOKEN not set!")
       end
     end
   end

data/lib/geet/services/create_gist.rb

@@ -10,7 +10,7 @@ module Geet
 
       include Geet::Helpers::OsHelper
 
-      API_TOKEN_KEY = "GITHUB_API_TOKEN"
+      API_TOKEN_KEY = "GH_TOKEN"
       DEFAULT_GIT_CLIENT = Geet::Utils::GitClient.new
 
       sig { params(out: T.any(IO, StringIO)).void }

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.28.2"
+  VERSION = "0.30.0"
 end

data/spec/spec_helper.rb

@@ -18,7 +18,7 @@ VCR.configure do |config|
   # See https://github.com/vcr/vcr/issues/201
   config.filter_sensitive_data("<GITHUB_CREDENTIALS>") do
     user = ""
-    api_token = ENV.fetch("GITHUB_API_TOKEN")
+    api_token = ENV.fetch("GH_TOKEN")
 
     Base64.strict_encode64("#{user}:#{api_token}")
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: geet
 version: !ruby/object:Gem::Version
-  version: 0.28.2
+  version: 0.30.0
 platform: ruby
 authors:
 - Saverio Miroddi
 bindir: bin
 cert_chain: []
-date: 2026-04-02 00:00:00.000000000 Z
+date: 2026-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64