geordi 12.4.0 → 12.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 173b8f7db8518c9d6da88feff00ca21cb58bd9d764b5e856ac50487e3499b9e4
-  data.tar.gz: e739f43a3388d185467e14d3dd1259fe55856dd3acc05018c97d65916b9032b6
+  metadata.gz: 2e8dcb193d83d352bffb4f62670c93732de779a9471e51f942a0c20ddf19b89b
+  data.tar.gz: 152f889f12fe2cfdeea9b1457bc1b6c9d083169d3400a1189588470fc061f4b2
 SHA512:
-  metadata.gz: 2e2d3897e290d2afa0d8916779ff28fbbd72b692c5ff55a43c586364cca86a2b389c7375cb03beb1ddfdd31ee9973a25cfb8e55215bf59398c3ae9bca7e55580
-  data.tar.gz: 7cbc01ebe625752e6f249d84d58810afad0aec51a669101dcd88bd9026011ab324e8d3ea74682b93c24661bf167ede96217d148509314b35fb5f8b749fd9f55b
+  metadata.gz: 04732b8f09ba0f7eba641fe8fa5cbff9ea625f311ce42db3b588345a7565b4631d4e67e81420b3b4f357afc98fff3021a458cdb08a03daf15ea93110512e444d
+  data.tar.gz: '02938cfa637e316e97b70666a7615696ccc1d881711c8823954529fc109af32ef16f98f132938ce1e04e49c0f007b1e60563e725669aff040eb504e207b7dc5f'

data/CHANGELOG.md

@@ -10,6 +10,12 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 ### Breaking changes
 
 
+## 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.
+
+
 ## 12.4.0 2025-08-29
 
 ### Compatible changes

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    geordi (12.4.0)
+    geordi (12.5.0)
       highline
       thor (~> 1)
 

data/README.md

@@ -170,6 +170,8 @@ 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 with "skip".
+
 When your project is running Capistrano 3, deployment will use `cap deploy`
 instead of `cap deploy:migrations`. You can force using `deploy` by passing the
 -M option: `geordi deploy -M staging`.

data/lib/geordi/commands/branch.rb

@@ -9,8 +9,22 @@ LONGDESC
 option :from_master, aliases: %w[-m --from-main], type: :boolean, desc: 'Branch from master instead of the current branch'
 
 def branch
-  require 'geordi/gitlinear'
-  Gitlinear.new.branch(from_master: options.from_master)
+  require 'geordi/linear_client'
+  require 'geordi/git'
+
+  issue = LinearClient.new.choose_issue
+
+  local_branches = Git.local_branch_names
+  matching_local_branch = local_branches.find { |branch_name| branch_name == issue['branchName'] }
+  matching_local_branch ||= local_branches.find { |branch_name| branch_name.include? issue['identifier'].to_s }
+
+  if matching_local_branch
+    Util.run! ['git', 'checkout', matching_local_branch]
+  else
+    default_branch = Git.default_branch
+    Util.run! ['git', 'checkout', default_branch] if options.from_master
+    Util.run! ['git', 'checkout', '-b', issue['branchName']]
+  end
 
   Hint.did_you_know [
     :commit,

data/lib/geordi/commands/commit.rb

@@ -9,8 +9,23 @@ stored in `~/.config/geordi/global.yml`.
 LONGDESC
 
 def commit(*git_args)
-  require 'geordi/gitlinear'
-  Gitlinear.new.commit(git_args)
+  require 'geordi/linear_client'
+  require 'geordi/git'
+  require 'highline'
+
+  Interaction.warn <<~WARNING unless Git.staged_changes?
+        No staged changes. Will create an empty commit.
+      WARNING
+
+  linear_client = LinearClient.new
+  highline = HighLine.new
+
+  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])
 
   Hint.did_you_know [
     :branch,

data/lib/geordi/commands/deploy.rb

@@ -28,6 +28,8 @@ 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 with "skip".
+
 When your project is running Capistrano 3, deployment will use `cap deploy`
 instead of `cap deploy:migrations`. You can force using `deploy` by passing the
 -M option: `geordi deploy -M staging`.
@@ -39,6 +41,12 @@ option :current_branch, aliases: '-c', type: :boolean,
   desc: 'Set DEPLOY_BRANCH to the current branch during deploy'
 
 def deploy(target_stage = nil)
+  require 'geordi/git'
+  require 'geordi/linear_client'
+
+  settings = Settings.new
+  linear_client = LinearClient.new
+
   # Set/Infer default values
   branch_stage_map = { 'master' => 'staging', 'main' => 'staging', 'production' => 'production' }
   if target_stage && !Util.deploy_targets.include?(target_stage)
@@ -48,7 +56,7 @@ def deploy(target_stage = nil)
   end
 
   # Ask for required information
-  target_stage ||= Interaction.prompt 'Deployment stage:', branch_stage_map.fetch(Util.current_branch, 'staging')
+  target_stage ||= Interaction.prompt 'Deployment stage:', branch_stage_map.fetch(Git.current_branch, 'staging')
   capistrano_config = CapistranoConfig.new(target_stage)
 
   if options.current_branch
@@ -60,18 +68,25 @@ def deploy(target_stage = nil)
       set :branch, ENV['DEPLOY_BRANCH'] || 'master'
     ERROR
 
-    source_branch = target_branch = Util.current_branch
+    source_branch = target_branch = Git.current_branch
   else # Normal deploy
-    source_branch = Interaction.prompt 'Source branch:', Util.current_branch
+    source_branch = Interaction.prompt 'Source branch:', Git.current_branch
 
     deploy_branch = capistrano_config.branch
-    deploy_branch ||= Util.git_default_branch
+    deploy_branch ||= Git.default_branch
     target_branch = Interaction.prompt 'Deploy branch:', deploy_branch
   end
 
+  if settings.linear_integration_set_up?
+    config_state = settings.linear_state_after_deploy(target_stage)
+    config_state = 'skip' if config_state.empty?
+    target_state = Interaction.prompt("Move deployed Linear issues to state:", config_state)
+    target_state = '' if target_state.empty? || target_state == 'skip'
+    settings.persist_linear_state_after_deploy(target_stage, target_state)
+  end
+
   merge_needed = (source_branch != target_branch)
   push_needed = merge_needed || `git cherry -v | wc -l`.strip.to_i > 0
-  push_needed = false if Util.testing? # Hard to test
 
   Interaction.announce "Checking whether your #{source_branch} branch is ready" ############
   Util.run!("git checkout #{source_branch}")
@@ -89,13 +104,23 @@ def deploy(target_stage = nil)
 
   Interaction.announce 'You are about to:' #################################################
   Interaction.note "Merge branch #{source_branch} into #{target_branch}" if merge_needed
+  linear_issue_ids = []
   if push_needed
-    Interaction.note 'Push these commits:' if push_needed
+    Interaction.note 'Push these commits:'
     Util.run!("git --no-pager log origin/#{target_branch}..#{source_branch} --oneline")
+
+    commit_messages = Git.commits_between(source_branch, target_branch)
+    linear_issue_ids = linear_client.extract_issue_ids(commit_messages)
   end
   Interaction.note "Deploy to #{target_stage}"
   Interaction.note "From current branch #{source_branch}" if options.current_branch
 
+  if !linear_issue_ids.empty? && target_state && !target_state.empty?
+    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")
+  end
+
   if Interaction.prompt('Go ahead with the deployment?', 'n', /y|yes/)
     puts
     git_call = []
@@ -115,6 +140,10 @@ def deploy(target_stage = nil)
 
     Util.run!(capistrano_call, show_cmd: true)
 
+    if !linear_issue_ids.empty? && target_state && !target_state.empty?
+      linear_client.move_issues_to_state(linear_issue_ids, target_state)
+    end
+
     Interaction.success 'Deployment complete.'
 
     Hint.did_you_know [

data/lib/geordi/commands/security_update.rb

@@ -9,7 +9,9 @@ will tell each step before performing it.
 LONGDESC
 
 def security_update(step = 'prepare')
-  master = Util.git_default_branch
+  require 'geordi/git'
+
+  master = Git.default_branch
 
   case step
   when 'prepare'

data/lib/geordi/git.rb

@@ -0,0 +1,53 @@
+module Geordi
+  class Git
+    class << self
+      def local_branch_names
+        @local_branch_names ||= begin
+          branch_list_string = if Util.testing?
+            ENV['GEORDI_TESTING_GIT_BRANCHES'].to_s
+          else
+            `git branch --format="%(refname:short)"`
+          end
+
+          branch_list_string.strip.split("\n")
+        end
+      end
+
+      def current_branch
+        if Util.testing?
+          default_branch
+        else
+          `git rev-parse --abbrev-ref HEAD`.strip
+        end
+      end
+
+      def staged_changes?
+        if Util.testing?
+          ENV['GEORDI_TESTING_STAGED_CHANGES'] == 'true'
+        else
+          statuses = `git status --porcelain`.split("\n")
+          statuses.any? { |l| /^[A-Z]/i =~ l }
+        end
+      end
+
+      def default_branch
+        default_branch = if Util.testing?
+          ENV['GEORDI_TESTING_DEFAULT_BRANCH']
+        else
+          head_symref = `git ls-remote --symref origin HEAD`
+          head_symref[%r{\Aref: refs/heads/(\S+)\sHEAD}, 1]
+        end
+
+        default_branch || 'master'
+      end
+
+      def commits_between(source_branch, target_branch)
+        return [ENV['GEORDI_TESTING_GIT_COMMIT']] if Util.testing?
+
+        commits = `git --no-pager log --pretty=format:%s origin/#{target_branch}..#{source_branch}`
+
+        commits&.split("\n")
+      end
+    end
+  end
+end

data/lib/geordi/{gitlinear.rb → linear_client.rb}

@@ -4,7 +4,7 @@ require 'net/http'
 require 'json'
 
 module Geordi
-  class Gitlinear
+  class LinearClient
     # This require-style is to prevent Ruby from loading files of a different
     # version of Geordi.
     require File.expand_path('settings', __dir__)
@@ -16,47 +16,6 @@ module Geordi
       self.settings = Settings.new
     end
 
-    def commit(git_args)
-      Interaction.warn <<~WARNING unless Util.staged_changes?
-        No staged changes. Will create an empty commit.
-      WARNING
-
-      issue = issue_from_branch || choose_issue
-      create_commit "[#{issue['identifier']}] #{issue['title']}", "Issue: #{issue['url']}", *git_args
-    end
-
-    def branch(from_master: false)
-      issue = choose_issue
-
-      local_branches = local_branch_names
-      matching_local_branch = local_branches.find { |branch_name| branch_name == issue['branchName'] }
-      matching_local_branch ||= local_branches.find { |branch_name| branch_name.include? issue['identifier'].to_s }
-
-      if matching_local_branch
-        Util.run! ['git', 'checkout', matching_local_branch]
-      else
-        default_branch = Util.git_default_branch
-        Util.run! ['git', 'checkout', default_branch] if from_master
-        Util.run! ['git', 'checkout', '-b', issue['branchName']]
-      end
-    end
-
-    private
-
-    attr_accessor :highline, :settings
-
-    def local_branch_names
-      @local_branch_names ||= begin
-        branch_list_string = if Util.testing?
-          ENV['GEORDI_TESTING_GIT_BRANCHES'].to_s
-        else
-          `git branch --format="%(refname:short)"`
-        end
-
-        branch_list_string.strip.split("\n")
-      end
-    end
-
     def choose_issue
       if Util.testing?
         return dummy_issue_for_testing
@@ -94,23 +53,64 @@ module Geordi
       nil
     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 }
+
+        skip unless issue && (state_id = state_ids_by_team_id[issue.dig('team', 'id')])
+
+        update_issue_state(issue['id'], state_id)
+      end
+    end
+
     def issue_from_branch
       issue = if Util.testing?
         dummy_issue_for_testing if ENV['GEORDI_TESTING_ISSUE_MATCHES'] == 'true'
       else
-        current_branch = Util.current_branch
-        issue = fetch_linear_issues.find { |issue| issue['branchName'] == current_branch }
+        current_branch = Git.current_branch
+        fetch_linear_issues.find { |issue| issue['branchName'] == current_branch }
       end
 
-      return unless issue
+      if issue
+        id = issue['identifier']
+        title = issue['title']
+
+        Interaction.note 'Auto-detected issue from branch name:'
+        puts HighLine::BOLD + "[#{id}] #{title}" + HighLine::RESET
+
+        issue if Interaction.prompt('Use it?', 'y', /y|yes/i)
+      end
+    end
+
+    def extract_issue_ids(commit_messages)
+      found_ids = []
+
+      regex = /^\[[A-Z]+\d*-\d+\]/
+
+      commit_messages&.each do |line|
+        line&.scan(regex) do |match|
+          found_ids << match
+        end
+      end
 
-      id = issue['identifier']
-      title = issue['title']
+      found_ids.map { |id| id.delete('[]') } # [W-365] => W-365
+    end
 
-      Interaction.note "Auto-detected issue #{HighLine::BOLD}[#{id}] #{title}#{HighLine::RESET} from branch name."
-      Interaction.prompt("Use it?", "y", /y|yes/i) ? issue : nil
+    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
+
     def dummy_issue_for_testing
       settings.linear_api_key
       ENV['GEORDI_TESTING_NO_LINEAR_ISSUES'] == 'true' ? Geordi::Interaction.fail('No issues to offer.') : {
@@ -123,12 +123,6 @@ module Geordi
       }
     end
 
-    def create_commit(title, description, *git_args)
-      extra = highline.ask("\nAdd an optional message").strip
-      title << ' - ' << extra if extra != ''
-      Util.run!(['git', 'commit', '--allow-empty', '-m', title, '-m', description, *git_args])
-    end
-
     def fetch_linear_issues
       @linear_issues ||= begin
         team_ids = settings.linear_team_ids
@@ -150,6 +144,7 @@ module Geordi
               nodes {
                 title
                 identifier
+                id
                 url
                 branchName
                 assignee {
@@ -159,7 +154,10 @@ module Geordi
                 state {
                   name
                   position
-               }
+                }
+                team {
+                  id
+                }
               }
             }
           }
@@ -169,6 +167,70 @@ module Geordi
       end
     end
 
+    def state_ids_by_team_id(state_name)
+      result = {}
+
+      team_ids = settings.linear_team_ids
+      filter = {
+        "team": {
+          "id": {
+            "in": team_ids,
+          }
+        }
+      }
+      response = query_api(<<~GRAPHQL, filter: filter)
+        query workflowStates($filter: WorkflowStateFilter) {
+          workflowStates(filter: $filter) {
+            nodes {
+              id
+              name
+              team {
+                id
+                name
+              }
+            }
+          }
+        }
+      GRAPHQL
+
+      response = response.dig(*%w[workflowStates nodes])
+
+      team_ids.each do |team_id|
+        found_state = response.find do |item|
+          item["team"]["id"] == team_id && item["name"] == state_name
+        end
+
+        if found_state
+          result[team_id] = found_state["id"]
+        else
+          team_identifier = response.find { |item| item.dig('team', 'id') == team_id }&.dig('team', 'name') || team_id
+          Interaction.warn("Could not find the state \"#{state_name}\" for team \"#{team_identifier}\". Skipping its issues.")
+        end
+      end
+
+      if result.empty?
+        Interaction.fail("The issue state #{state_name.inspect} does not exist.")
+      end
+
+      result
+    end
+
+    def update_issue_state(issue_id, state_id)
+      query_api(<<~GRAPHQL, nil)
+        mutation UpdateIssueState {
+          issueUpdate(
+            id: "#{issue_id}"
+            input: {
+              stateId: "#{state_id}"
+            }
+          )
+          {
+            success
+          }
+        }
+      GRAPHQL
+    end
+
     def query_api(attributes, variables)
       uri = URI(API_ENDPOINT)
       loading_message = "Connecting to #{uri.host} ... "

data/lib/geordi/settings.rb

@@ -16,7 +16,7 @@ module Geordi
       linear_team_ids
     ].freeze
 
-    ALLOWED_LOCAL_SETTINGS = %w[ linear_team_ids irb_flags ].freeze
+    ALLOWED_LOCAL_SETTINGS = %w[ linear_team_ids linear_state_after_deploy irb_flags].freeze
 
     SETTINGS_WARNED = 'GEORDI_INVALID_SETTINGS_WARNED'
 
@@ -75,6 +75,32 @@ module Geordi
       team_ids
     end
 
+    def linear_integration_set_up?
+      team_ids = get_linear_team_ids
+      !team_ids.empty?
+    end
+
+    def linear_state_after_deploy(stage)
+      config_state = @local_settings['linear_state_after_deploy']
+
+      if config_state && config_state[stage]
+        config_state[stage]
+      else
+        ''
+      end
+    end
+
+    def persist_linear_state_after_deploy(stage, target_state)
+      config_state = @local_settings.dig('linear_state_after_deploy', stage)
+
+      unless target_state.eql?(config_state)
+        @local_settings['linear_state_after_deploy'] ||= Hash.new
+        @local_settings['linear_state_after_deploy'][stage] = target_state
+        save_local_settings
+      end
+    end
+
+
     private
 
     def read_settings
@@ -125,6 +151,16 @@ module Geordi
       end
     end
 
+    def save_local_settings
+      unless Util.testing?
+        local_path = LOCAL_SETTINGS_FILE_NAME
+
+        File.open(local_path, 'w') do |file|
+          file.write @local_settings.to_yaml
+        end
+      end
+    end
+
     def inquire_linear_api_key
       Geordi::Interaction.note 'Create a personal API key here: https://linear.app/makandra/settings/account/security'
       token = Geordi::Interaction.prompt("Please enter the API key:")
@@ -135,6 +171,13 @@ module Geordi
       token
     end
 
+    def get_linear_team_ids
+      local_team_ids = normalize_team_ids(@local_settings['linear_team_ids'])
+      global_team_ids = normalize_team_ids(@global_settings['linear_team_ids'])
+
+      local_team_ids | global_team_ids
+    end
+
     def normalize_team_ids(team_ids)
       case team_ids
       when Array

data/lib/geordi/util.rb

@@ -119,22 +119,6 @@ module Geordi
         end
       end
 
-      def current_branch
-        if testing?
-          git_default_branch
-        else
-          `git rev-parse --abbrev-ref HEAD`.strip
-        end
-      end
-
-      def staged_changes?
-        if testing?
-          ENV['GEORDI_TESTING_STAGED_CHANGES'] == 'true'
-        else
-          statuses = `git status --porcelain`.split("\n")
-          statuses.any? { |l| /^[A-Z]/i =~ l }
-        end
-      end
 
       def deploy_targets
         Dir['config/deploy/*'].map do |f|
@@ -221,18 +205,6 @@ module Geordi
       def rspec_path?(path)
         %r{(^|\/)spec|_spec\.rb($|:)}.match?(path)
       end
-
-      def git_default_branch
-        default_branch = if testing?
-          ENV['GEORDI_TESTING_DEFAULT_BRANCH']
-        else
-          head_symref = `git ls-remote --symref origin HEAD`
-          head_symref[%r{\Aref: refs/heads/(\S+)\sHEAD}, 1]
-        end
-
-        default_branch || 'master'
-      end
-
     end
   end
 end

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '12.4.0'.freeze
+  VERSION = '12.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 12.4.0
+  version: 12.5.0
 platform: ruby
 authors:
 - Henning Koch
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-08-29 00:00:00.000000000 Z
+date: 2025-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -102,9 +102,10 @@ files:
 - lib/geordi/cucumber.rb
 - lib/geordi/db_cleaner.rb
 - lib/geordi/dump_loader.rb
-- lib/geordi/gitlinear.rb
+- lib/geordi/git.rb
 - lib/geordi/hint.rb
 - lib/geordi/interaction.rb
+- lib/geordi/linear_client.rb
 - lib/geordi/remote.rb
 - lib/geordi/settings.rb
 - lib/geordi/util.rb
@@ -123,7 +124,7 @@ 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: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -139,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Collection of command line tools we use in our daily work with Ruby, Rails
   and Linux at makandra.