geordi 12.0.1 → 12.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc23c0e80257e2e7aaf7fc1a5072b2f43ff1f4c256c02da05e1c2147344d4221
-  data.tar.gz: 589328ecc0caa7b2215de91a390b1b4fa9180ca53dba33a39427cf557602886a
+  metadata.gz: 04313c8ce7c7ad6e748f4b75a35deb5e888c66bbbc1070e1213677b610c971f1
+  data.tar.gz: 210726dbce934e3d0db120b4f7a5aa2eba7bbb4d4056868e8e083eadcbec02c2
 SHA512:
-  metadata.gz: 4666832d3b69baf2d7fb61ead61cda680ad42bb037585cbc960186a883a32a026fe779c5525d4a7d06dc872de092eb6afaa8da9796d3a42bbb4885b15eaf7b66
-  data.tar.gz: d13e207305efbde114b771a0866013d6eb248ba3e42b1924accc556a55cf0999046881c4637666f85e127f602f24321b2b3fe91a4a41ea45e5e2b496c7c48620
+  metadata.gz: a52a0c665afd173e9371cad4fa64a65dc3fea587f9c415f376aa3706799b222e55917a8e47ad0e4a8d71b78e35c0ed2b5115cc0f0ef95a9c720e1de25b51d809
+  data.tar.gz: 00c8b800c1ea5b89e63e178c26448a93db8de1cb566ddf324facfb99ede4df107e19100eeee0bf42fac1c4db5d8e7c6d43a919bd4e6015d5481ecfdb22587c5d

data/.github/workflows/test.yml

@@ -8,7 +8,7 @@ on:
     - master
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:

data/CHANGELOG.md

@@ -6,6 +6,7 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 ## Unreleased
 
 ### Compatible changes
+* `geordi commit` will now auto-suggest a matching issue based on the current branch
 
 ### Breaking changes
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    geordi (12.0.1)
+    geordi (12.1.1)
       thor (~> 1)
 
 GEM
@@ -50,16 +50,14 @@ GEM
     cucumber-tag-expressions (6.1.2)
     diff-lcs (1.6.0)
     ffi (1.12.2)
-    highline (3.1.2)
-      reline
-    io-console (0.8.0)
+    highline (2.1.0)
     launchy (2.5.0)
       addressable (~> 2.7)
     method_source (1.1.0)
     mini_mime (1.1.5)
     multi_test (1.1.0)
     parallel (1.19.2)
-    parallel_tests (4.9.1)
+    parallel_tests (4.7.1)
       parallel
     pry (0.14.2)
       coderay (~> 1.1)
@@ -69,8 +67,6 @@ GEM
       pry (>= 0.13, < 0.15)
     public_suffix (3.1.1)
     rake (12.3.3)
-    reline (0.6.0)
-      io-console (~> 0.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -103,4 +99,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   2.3.27
+   2.4.22

data/cucumber.yml

@@ -0,0 +1 @@
+default: --publish-quiet # Do not advertise to publish Cucumber results

data/lib/geordi/db_cleaner.rb

@@ -29,6 +29,7 @@ module Geordi
       end
       @mysql_command = decide_mysql_command(extra_flags['mysql'])
       @postgres_command = decide_postgres_command(extra_flags['postgres'])
+      @texteditor = Geordi::Util.get_texteditor
     end
 
     def edit_allowlist(dbtype)
@@ -89,8 +90,7 @@ module Geordi
         tmp.write("#{line[0]} #{line[1]}\n")
       end
       tmp.close
-      texteditor = Geordi::Util.decide_texteditor
-      system("#{texteditor} #{tmp.path}")
+      system("#{@texteditor} #{tmp.path}")
       File.open(tmp.path, 'r') do |wl_edited|
         allowlisted_dbs = []
         allowlist_storage = File.open(allowlist, 'w')

data/lib/geordi/gitlinear.rb

@@ -20,7 +20,7 @@ module Geordi
         No staged changes. Will create an empty commit.
       WARNING
 
-      issue = choose_issue
+      issue = issue_from_branch || choose_issue
       create_commit "[#{issue['identifier']}] #{issue['title']}", "Issue: #{issue['url']}", *git_args
     end
 
@@ -93,6 +93,23 @@ module Geordi
       nil
     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 }
+      end
+
+      return unless issue
+
+      id = issue['identifier']
+      title = issue['title']
+
+      Interaction.note "Auto-detected issue #{HighLine::BOLD}[#{id}] #{title}#{HighLine::RESET} from branch name."
+      Interaction.prompt("Use it?", "y", /y|yes/i) ? issue : nil
+    end
+
     def dummy_issue_for_testing
       settings.linear_api_key
       ENV['GEORDI_TESTING_NO_LINEAR_ISSUES'] == 'true' ? Geordi::Interaction.fail('No issues to offer.') : {
@@ -112,41 +129,43 @@ module Geordi
     end
 
     def fetch_linear_issues
-      team_ids = settings.linear_team_ids
-      filter = {
-        "team": {
-          "id": {
-            "in": team_ids,
-          }
-        },
-        "state": {
-          "type": {
-            "eq": "started"
+      @linear_issues ||= begin
+        team_ids = settings.linear_team_ids
+        filter = {
+          "team": {
+            "id": {
+              "in": team_ids,
+            }
+          },
+          "state": {
+            "type": {
+              "eq": "started"
+            }
           }
         }
-      }
-      response = query_api(<<~GRAPHQL, filter: filter)
-        query Issues($filter: IssueFilter) {
-          issues(filter: $filter) {
-            nodes {
-              title
-              identifier
-              url
-              branchName
-              assignee {
-                displayName
-                isMe
+        response = query_api(<<~GRAPHQL, filter: filter)
+          query Issues($filter: IssueFilter) {
+            issues(filter: $filter) {
+              nodes {
+                title
+                identifier
+                url
+                branchName
+                assignee {
+                  displayName
+                  isMe
+                }
+                state {
+                  name
+                  position
+               }
               }
-              state {
-                name
-                position
-             }
             }
           }
-        }
-      GRAPHQL
+        GRAPHQL
 
-      response.dig(*%w[issues nodes])
+        response.dig(*%w[issues nodes])
+      end
     end
 
     def query_api(attributes, variables)

data/lib/geordi/settings.rb

@@ -122,7 +122,7 @@ module Geordi
     end
 
     def inquire_linear_api_key
-      Geordi::Interaction.note 'Create an API key here: https://linear.app/makandra/settings/api'
+      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:")
       self.linear_api_key = token
       Interaction.note("API key stored in #{GLOBAL_SETTINGS_FILE_NAME}.")

data/lib/geordi/util.rb

@@ -137,13 +137,12 @@ module Geordi
         end
       end
 
-      # try to guess user's favorite cli text editor
-      def decide_texteditor
-        %w[/usr/bin/editor vi].each do |texteditor|
-          if cmd_exists?(texteditor) && texteditor.start_with?('$')
-            return ENV[texteditor[1..-1]]
-          elsif cmd_exists? texteditor
-            return texteditor
+      def get_texteditor
+        %w[/usr/bin/editor vi].find { |c| cmd_exists?(c) }.tap do |editor|
+          if editor == '/usr/bin/editor'
+            Interaction.note 'Choose text editor with: sudo update-alternatives --config editor'
+          elsif editor == nil
+            Interaction.fail 'Could not find a text editor.'
           end
         end
       end

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '12.0.1'.freeze
+  VERSION = '12.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 12.0.1
+  version: 12.1.1
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-02-25 00:00:00.000000000 Z
+date: 2025-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -45,6 +45,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- cucumber.yml
 - exe/b
 - exe/dumple
 - exe/geordi