gotsha 1.2.2 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e0f73be2106c8fd2111cf3e47162d1937dc90f518de9937ae9c520f9326024a
-  data.tar.gz: b3f3bf5f2b1f80e2ade8fe795b6ce1df454d1b0262ed00f991d16810378469a8
+  metadata.gz: e2cc7b0a6d638757b14677caaa43f31683cdabd4726ad8488a2168ef08ca501a
+  data.tar.gz: 9020d7cd3e6145ca125fd761b6d9e25ccf99e6844dad32c2825482b552f81e39
 SHA512:
-  metadata.gz: b1b39081004be11a4b7569e54c42bb346e367b24d64f1603982c9a985b4502a014d0f546d3f158b1d1e9c6012da7a63c3f15e807452a7e9d68f4c969a51f8eaf
-  data.tar.gz: 0ab6697d6d78ec97fcbd69c1241ab8c3ae9f01184f8fcb27cf169a4a0f1f43faa4fb5403f543c8825f02efc4051c6479857b5e4dc62d2fcd6e0ec44a540b6dd9
+  metadata.gz: 508c0197ce27724c515f79239ace2664efe793ec0f39475f89b0efb0bc35ee84548199d86a54761efa28817728a7b1305be5afb283f3649fb17a4f6b0f1eadf6
+  data.tar.gz: e9e2487529629a31be43cb7e4889cc0bda5ee99f97febe8e69a1c1c17168ee4dab2e40f95603496a8a4cbbed19b6134a7faeb427878f6a3034cf574ec3ec4885

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.2.4] - 2026-04-18
+
+- Squash a bug in Ruby loading, happening in Mac with Mise
+## [1.2.3] - 2026-04-18
+
+- Fix small bugs (security and Git integration).
+
 ## [1.2.2] - 2026-01-03
 
 - Fix a bug: hooks did not ignore commented-out settings from config file. They do now.

data/lib/gotsha/action_dispatcher.rb

@@ -2,7 +2,7 @@
 
 module Gotsha
   class ActionDispatcher
-    SKIP_CONFIG_VERIFICATION_FOR = %w[init configure uninstall].freeze
+    SKIP_CONFIG_VERIFICATION_FOR = %w[init configure uninstall help -h --help].freeze
     DEFAULT_ACTION = "help"
     HELP_ACTION_SHORTCUT = "-h"
     VERSION_ACTION_SHORTCUT = "-v"
@@ -16,13 +16,13 @@ module Gotsha
     def call(action_name, *args)
       @action_name = action_name
 
+      return Actions::Help.new.call(action_name) if args == [HELP_ACTION_SHORTCUT]
+      return Actions::Help.new.call(action_name) if args == ["--help"]
+
       verify_configuration!
 
       action_class.new.call(*args)
     rescue ArgumentError
-      return Actions::Help.new.call(action_name) if args == [HELP_ACTION_SHORTCUT]
-      return Actions::Help.new.call(action_name) if args == ["--help"]
-
       raise Errors::HardFail, "too many arguments"
     end
 

data/lib/gotsha/actions/commit.rb

@@ -6,7 +6,9 @@ module Gotsha
       DESCRIPTION = "runs tests on a dummy commit for manual sign-off"
 
       def call
-        BashCommand.silent_run!('git -c core.hooksPath=/dev/null commit --allow-empty -m "Run Gotsha"')
+        command = BashCommand.silent_run!('git -c core.hooksPath=/dev/null commit --allow-empty -m "Run Gotsha"')
+
+        raise Errors::HardFail, "something went wrong" unless command.success?
 
         Test.new.call
       end

data/lib/gotsha/actions/fetch.rb

@@ -6,12 +6,19 @@ module Gotsha
       DESCRIPTION = "fetches Gotsha test results from remote"
 
       def call
-        command = BashCommand.silent_run!("git fetch --force origin 'refs/notes/gotsha:refs/notes/gotsha'")
+        remote = RemoteResolver.resolve
+        command = BashCommand.silent_run!("git fetch --force #{remote} 'refs/notes/gotsha:refs/notes/gotsha'")
 
-        raise(Errors::HardFail, "something went wrong") unless command.success?
+        raise(Errors::HardFail, "something went wrong") unless command.success? || missing_notes_ref?(command)
 
         "fetched"
       end
+
+      private
+
+      def missing_notes_ref?(command)
+        command.text_output.include?("couldn't find remote ref refs/notes/gotsha")
+      end
     end
   end
 end

data/lib/gotsha/actions/push.rb

@@ -6,7 +6,8 @@ module Gotsha
       DESCRIPTION = "pushes Gotsha test results to remote"
 
       def call
-        command = BashCommand.silent_run!("git push --no-verify --force origin refs/notes/gotsha:refs/notes/gotsha")
+        remote = RemoteResolver.resolve
+        command = BashCommand.silent_run!("git push --no-verify --force #{remote} refs/notes/gotsha:refs/notes/gotsha")
 
         raise(Errors::HardFail, "something went wrong") unless command.success?
 

data/lib/gotsha/actions/uninstall.rb

@@ -10,6 +10,7 @@ module Gotsha
 
         File.exist?(Config::CONFIG_DIR) && FileUtils.rm_rf(Config::CONFIG_DIR)
         File.exist?(Config::GH_CONFIG_FILE) && FileUtils.rm(Config::GH_CONFIG_FILE)
+        File.exist?(Config::GL_CONFIG_FILE) && FileUtils.rm(Config::GL_CONFIG_FILE)
 
         puts "Unsetting Git hooks path..."
         BashCommand.silent_run!("git config --unset core.hooksPath")

data/lib/gotsha/bash_command.rb

@@ -18,7 +18,7 @@ module Gotsha
       exit_code = nil
 
       # This block is an ugly workaround to ensure the color output is stored both on Linux and Mac
-      PTY.spawn("bash", "-lc", "#{command}; printf \"\\n#{MARKER}%d\\n\" $?") do |r, _w, pid|
+      PTY.spawn("bash", "-c", "#{command}; printf \"\\n#{MARKER}%d\\n\" $?") do |r, _w, pid|
         r.each do |line|
           if line.start_with?(MARKER)
             exit_code = line.sub(MARKER, "").to_i

data/lib/gotsha/remote_resolver.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "open3"
+
+module Gotsha
+  module RemoteResolver
+    def self.resolve
+      branch_name = BashCommand.run!("git branch --show-current").text_output
+      return "origin" if branch_name.empty?
+
+      push_remote = git_config("branch.#{branch_name}.pushRemote")
+      return push_remote unless push_remote.empty?
+
+      branch_remote = git_config("branch.#{branch_name}.remote")
+      return branch_remote unless branch_remote.empty?
+
+      "origin"
+    end
+
+    def self.git_config(key)
+      stdout, _status = Open3.capture2("git", "config", "--get", key)
+      stdout.strip
+    end
+
+    private_class_method :git_config
+  end
+end

data/lib/gotsha/user_config.rb

@@ -4,15 +4,26 @@ module Gotsha
   class UserConfig
     def self.get(key)
       config = new.to_h
+      env_key = "GOTSHA_#{key.to_s.upcase}"
+      env_value = ENV[env_key]
 
-      ENV["GOTSHA_#{key.to_s.upcase}"] || # this allows changing config via ENV vars
-        config[key]
+      return config[key] if key.to_sym == :commands
+      return coerce_env_value(env_value) unless env_value.nil?
+
+      config[key]
     end
 
     def self.blank?
       new.to_h.empty?
     end
 
+    def self.coerce_env_value(value)
+      return true if value == "true"
+      return false if value == "false"
+
+      value
+    end
+
     def to_h
       TomlRB.load_file(Config::CONFIG_FILE).transform_keys(&:to_sym)
     rescue Errno::ENOENT

data/lib/gotsha/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gotsha
-  VERSION = "1.2.2"
+  VERSION = "1.2.4"
 end

data/lib/gotsha.rb

@@ -18,6 +18,7 @@ require_relative "gotsha/actions/version"
 require_relative "gotsha/bash_command"
 require_relative "gotsha/config"
 require_relative "gotsha/errors"
+require_relative "gotsha/remote_resolver"
 require_relative "gotsha/user_config"
 require_relative "gotsha/version"
 

data/mise.toml

@@ -0,0 +1,2 @@
+[tools]
+ruby = "latest"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotsha
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.4
 platform: ruby
 authors:
 - Vitek Meloun
@@ -56,6 +56,7 @@ files:
 - lib/gotsha/bash_command.rb
 - lib/gotsha/config.rb
 - lib/gotsha/errors.rb
+- lib/gotsha/remote_resolver.rb
 - lib/gotsha/templates/config.toml
 - lib/gotsha/templates/git_hooks/post-commit
 - lib/gotsha/templates/git_hooks/pre-push
@@ -63,6 +64,7 @@ files:
 - lib/gotsha/templates/gitlab_action_example.yml
 - lib/gotsha/user_config.rb
 - lib/gotsha/version.rb
+- mise.toml
 - sig/gotsha.rbs
 - web/favicon.ico
 - web/img/commit.png
@@ -92,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: 'Gotsha: your local testing CI'
 test_files: []