geordi 12.6.2 → 12.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82d19a3fa4a8f87dbabccaa717770bd143c6ed3d6f899443dd5032396112dfdf
-  data.tar.gz: 6e2067c01c9ea400b51a4e66886bbd3626d0b21fb06412372e16333b0c810b42
+  metadata.gz: 1abf3be3e77c751d438bf3ee3b95a9552ba675dfce857adf796bc3885ba68804
+  data.tar.gz: 5118fa1fd8d510c9f34bcc7931d0e136dbb64d59dc21f557ad323d32647d873d
 SHA512:
-  metadata.gz: bef2284d579d11de45367b3a31ea0bf15f1a850f1aa73213fb48fc969498d5282fbeb429af301dd8e3ab040fe60f1dba75a205354b200e68306dda6543dd0eeb
-  data.tar.gz: 56aea49f59fc45cd027f381001b1ffa783021fcb15ab1c2e42e6ab770b767e4d9fee1d4b0641fd2e8574a268e26f6b5036db7899654eb9ad6304d707f81017e5
+  metadata.gz: dc001fe1a1d6fc826e4e0de10a950091f283771f50fcaa801e8d9376ca448b86dafc76ef6bf5612c819724c3c92ea25daea82d8740ec14520aabd654543fe2cd
+  data.tar.gz: c74907212b99944097fb569807824475455ec683382fbbad08920b830ef7f41019097f017fd5b0c6800e32c08e3e9f6ba990792afd5305b4e8e71f0ad65d8555

data/.github/workflows/test.yml

@@ -21,6 +21,8 @@ jobs:
             gemfile: Gemfile
           - ruby: 3.4.2
             gemfile: Gemfile
+          - ruby: 4.0.0
+            gemfile: Gemfile
     env:
       BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
     steps:

data/CHANGELOG.md

@@ -10,6 +10,14 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 ### Breaking changes
 
 
+## 12.7.0 2026-07-16
+
+### Compatible changes
+* `geordi deploy` will now consider actually *deployed* commits for moving Linear issues
+* Support for Ruby 4 added
+* `geordi commit`: No longer add Linear URL to commit message (breaks Linear <-> Gitlab integration)
+
+
 ## 12.6.2 2026-01-30
 
 ### Compatible changes
@@ -35,7 +43,7 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 ## 12.5.0 2025-09-09
 
 ### Compatible changes
-* `geordi deploy` will now offer to move deployed issues to a new state if linear_team_ids are configured.
+* `geordi deploy` will now offer to move pushed issues to a new state if linear_team_ids are configured.
 
 
 ## 12.4.0 2025-08-29

data/Gemfile

@@ -3,10 +3,14 @@ source 'http://rubygems.org'
 # Specify your gem's dependencies in geordi.gemspec
 gemspec
 
-gem 'aruba', '< 1' # Drops support for Ruby 2.2-
-gem 'rake', '< 13' # Drops support for Ruby 2.1
+# Former standard gems, see https://stdgems.org/
+gem 'logger' # Dependency of aruba
+gem 'abbrev' # Dependency of highline
+gem 'ostruct' # Dependency of pry-byebug
+
+gem 'aruba'
+gem 'rake'
 gem 'rspec'
-gem 'abbrev' # Dependency of Highline
 gem 'parallel_tests'
 gem 'launchy'
 gem 'pry-byebug'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    geordi (12.6.2)
+    geordi (12.7.0)
       highline
       thor (~> 1)
 
@@ -55,9 +55,11 @@ GEM
     highline (2.1.0)
     launchy (2.5.0)
       addressable (~> 2.7)
+    logger (1.7.0)
     method_source (1.1.0)
     mini_mime (1.1.5)
     multi_test (1.1.0)
+    ostruct (0.6.3)
     parallel (1.19.2)
     parallel_tests (4.7.1)
       parallel
@@ -91,13 +93,15 @@ PLATFORMS
 
 DEPENDENCIES
   abbrev
-  aruba (< 1)
+  aruba
   cucumber (~> 9)
   geordi!
   launchy
+  logger
+  ostruct
   parallel_tests
   pry-byebug
-  rake (< 13)
+  rake
   rspec
 
 BUNDLED WITH

data/README.md

@@ -170,7 +170,21 @@ Finds available Capistrano stages by their prefix, e.g. `geordi deploy p` will
 deploy production, `geordi deploy mak` will deploy a `makandra` stage if there
 is a file config/deploy/makandra.rb.
 
-If Linear team ids are configured (see `geordi commit`), will offer to move deployed issues to a new state. Disable this with "skip".
+If Linear team ids are configured (see `geordi commit`), will offer to move deployed issues to a new state.
+Disable this with "skip".
+By default, Geordi will only consider issues it pushes itself during deploy.
+To consider all new commits deployed to the server, add this Capistrano task to your project:
+
+namespace :app do
+  desc 'Show current revision'
+  task :revision do
+    on roles :app do
+      within current_path do
+        info "REVISION: #{capture(:cat, 'REVISION')}"
+      end
+    end
+  end
+end
 
 If your project is running Capistrano 2, Geordi will use `cap deploy:migrations` by default. Skip migrations by passing the -M option: `geordi deploy -M staging`.
 

data/lib/geordi/capistrano_config.rb

@@ -51,6 +51,19 @@ module Geordi
       'bash --login'
     end
 
+    def self.current_app_revisions(target_stage)
+      return ['a76fdd46e5319a202f7daa3f0fbdadb0c6f44408'] if Util.testing?
+      output = `cap #{target_stage} app:revision`
+
+      # git revisions are in SHA-1 format => 40-byte hexadecimal string
+      output.scan(/[a-f0-9]{40}/).uniq
+    end
+
+    def self.task_defined?(task_name)
+      return true if Util.testing?
+      `cap -T`.split.include?(task_name)
+    end
+
     private
 
     attr_accessor :deploy_info, :stage

data/lib/geordi/commands/commit.rb

@@ -22,10 +22,9 @@ def commit(*git_args)
 
   issue = linear_client.issue_from_branch || linear_client.choose_issue
   title = "[#{issue['identifier']}] #{issue['title']}"
-  description = "Issue: #{issue['url']}"
   extra = highline.ask("\nAdd an optional message").strip
   title << ' - ' << extra if extra != ''
-  Util.run!(['git', 'commit', '--allow-empty', '-m', title, '-m', description, *git_args])
+  Util.run!(['git', 'commit', '--allow-empty', '-m', title, *git_args])
 
   Hint.did_you_know [
     :branch,

data/lib/geordi/commands/deploy.rb

@@ -28,7 +28,21 @@ Finds available Capistrano stages by their prefix, e.g. `geordi deploy p` will
 deploy production, `geordi deploy mak` will deploy a `makandra` stage if there
 is a file config/deploy/makandra.rb.
 
-If Linear team ids are configured (see `geordi commit`), will offer to move deployed issues to a new state. Disable this with "skip".
+If Linear team ids are configured (see `geordi commit`), will offer to move deployed issues to a new state.
+Disable this with "skip".
+By default, Geordi will only consider issues it pushes itself during deploy.
+To consider all new commits deployed to the server, add this Capistrano task to your project:
+
+namespace :app do
+  desc 'Show current revision'
+  task :revision do
+    on roles :app do
+      within current_path do
+        info "REVISION: \#{capture(:cat, 'REVISION')}"
+      end
+    end
+  end
+end
 
 If your project is running Capistrano 2, Geordi will use `cap deploy:migrations` by default. Skip migrations by passing the -M option: `geordi deploy -M staging`.
 LONGDESC
@@ -84,12 +98,7 @@ def deploy(target_stage = nil)
 
   merge_needed = (source_branch != target_branch)
   push_needed = merge_needed || `git cherry -v | wc -l`.strip.to_i > 0
-  linear_issue_ids = []
-  if push_needed
-    commit_messages = Git.commits_between(source_branch, target_branch)
-    linear_issue_ids = LinearClient.extract_issue_ids(commit_messages)
-  end
-  move_issues = !linear_issue_ids.empty? && target_state && !target_state.empty?
+  move_issues = target_state && !target_state.empty?
 
   # Checks #####################################################################
   Interaction.note "Checking whether your #{source_branch} branch is ready"
@@ -117,9 +126,11 @@ def deploy(target_stage = nil)
   Interaction.note "From current branch #{source_branch}" if options.current_branch
 
   if move_issues
-    relevant_commits = linear_client.filter_by_issue_ids(commit_messages, linear_issue_ids)
-    Interaction.note("Move these Linear issues to state \"#{target_state}\":")
-    puts relevant_commits.join("\n")
+    linear_issue_ids, relevant_commits = Util.determine_issues_to_move(source_branch, target_branch, target_stage, linear_client: linear_client)
+    if relevant_commits.any?
+      Interaction.note("Move these Linear issues to state \"#{target_state}\":")
+      puts relevant_commits.uniq.join("\n")
+    end
   end
 
   # Execute ####################################################################
@@ -142,7 +153,7 @@ def deploy(target_stage = nil)
 
     Util.run!(capistrano_call, show_cmd: true)
 
-    if move_issues
+    if move_issues && !linear_issue_ids.empty?
       linear_client.move_issues_to_state(linear_issue_ids, target_state)
       settings.persist_linear_state_after_deploy(target_stage, target_state)
     end

data/lib/geordi/git.rb

@@ -41,10 +41,10 @@ module Geordi
         default_branch || 'master'
       end
 
-      def commits_between(source_branch, target_branch)
+      def commits_between(source, target)
         return [ENV['GEORDI_TESTING_GIT_COMMIT']] if Util.testing?
 
-        commits = `git --no-pager log --pretty=format:%s origin/#{target_branch}..#{source_branch}`
+        commits = `git --no-pager log --pretty=format:%s #{source}..#{target}`
 
         commits&.split("\n")
       end

data/lib/geordi/linear_client.rb

@@ -25,6 +25,12 @@ module Geordi
       found_ids.map { |id| id.delete('[]') } # [W-365] => W-365
     end
 
+    def self.filter_by_issue_ids(list_of_strings, issue_ids)
+      list_of_strings.select do |message|
+        issue_ids.any? { |id| message.start_with?("[#{id}]") }
+      end
+    end
+
     def initialize
       self.highline = HighLine.new
       self.settings = Settings.new
@@ -67,16 +73,28 @@ module Geordi
       nil
     end
 
+    def filter_existing_issue_ids(identifiers)
+      return identifiers if Util.testing?
+      issues = fetch_linear_issues
+      identifiers.select { |id| issues.any? { |i| i['identifier'] == id } }
+    end
+
     def move_issues_to_state(issue_identifiers, state)
       return if Util.testing?
 
       issues = fetch_linear_issues # This only retrieves issues for the configured linear team ids
-      state_ids_by_team_id = state_ids_by_team_id(state)
 
-      issue_identifiers.each do |identifier|
-        issue = issues.find { |i| i['identifier'] == identifier }
+      # Only look up states for teams that actually have issues being moved
+      # This avoids warning about missing states in teams with no relevant issues.
+      relevant_issues = issue_identifiers.filter_map { |id| issues.find { |i| i['identifier'] == id } }
+      return if relevant_issues.empty?
 
-        next unless issue && (state_id = state_ids_by_team_id[issue.dig('team', 'id')])
+      relevant_team_ids = relevant_issues.map { |i| i.dig('team', 'id') }.uniq
+
+      state_ids_by_team_id = state_ids_by_team_id(state, team_ids: relevant_team_ids)
+
+      relevant_issues.each do |issue|
+        next unless (state_id = state_ids_by_team_id[issue.dig('team', 'id')])
 
         update_issue_state(issue['id'], state_id)
       end
@@ -101,12 +119,6 @@ module Geordi
       end
     end
 
-    def filter_by_issue_ids(list_of_strings, issue_ids)
-      list_of_strings.select do |message|
-        issue_ids.any? { |id| message.start_with?("[#{id}]") }
-      end
-    end
-
     private
 
     attr_accessor :highline, :settings
@@ -167,10 +179,9 @@ module Geordi
       end
     end
 
-    def state_ids_by_team_id(state_name)
+    def state_ids_by_team_id(state_name, team_ids: settings.linear_team_ids)
       result = {}
 
-      team_ids = settings.linear_team_ids
       filter = {
         "team": {
           "id": {

data/lib/geordi/util.rb

@@ -220,6 +220,32 @@ module Geordi
         %r{(^|\/)spec|_spec\.rb($|:)}.match?(path)
       end
 
+      def determine_issues_to_move(source_branch, target_branch, target_stage, linear_client: LinearClient.new)
+        commit_messages = []
+        if CapistranoConfig.task_defined?('app:revision')
+          revision = CapistranoConfig.current_app_revisions(target_stage)
+
+          if revision.empty?
+            Interaction.fail 'Could not read a server revision from app:revision output.'
+          elsif revision.size > 1
+            Interaction.warn 'Currently deployed revision differs on servers.'
+            Interaction.confirm_or_cancel('Continue deployment without moving Linear issues?')
+          else
+            # there is one consistent revision deployed across all target servers => Linear issues can be moved
+            commit_messages = Git.commits_between(revision.first, source_branch)
+          end
+        else
+          Interaction.warn 'Missing Capistrano task "app:revision". See `geordi help deploy`.'
+          puts 'Without it, Geordi can only consider pushed commits for moving Linear issues.'
+          commit_messages = Git.commits_between("origin/#{target_branch}", source_branch)
+        end
+
+        linear_issue_ids = LinearClient.extract_issue_ids(commit_messages)
+        linear_issue_ids = linear_client.filter_existing_issue_ids(linear_issue_ids)
+        relevant_commits = LinearClient.filter_by_issue_ids(commit_messages, linear_issue_ids)
+        [linear_issue_ids, relevant_commits]
+      end
+
     end
   end
 end

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '12.6.2'.freeze
+  VERSION = '12.7.0'.freeze
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 12.6.2
+  version: 12.7.0
 platform: ruby
 authors:
 - Henning Koch
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-01-30 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -124,7 +123,6 @@ metadata:
   bug_tracker_uri: https://github.com/makandra/geordi/issues
   changelog_uri: https://github.com/makandra/geordi/blob/master/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -139,8 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Collection of command line tools we use in our daily work with Ruby, Rails
   and Linux at makandra.