geordi 12.0.0 → 12.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '04677830ab820667757b670bc6702114582031396fbd7e7600e038bcdab4dd47'
-  data.tar.gz: 05cf15e451eb7104f415b5fc06f440088a5f57f9f5835427570d80f4ddf166ce
+  metadata.gz: 8b0ad63b0055ae689422b0aab1ccbf95093e010448e609ba98dec160d32120bb
+  data.tar.gz: bcf3cc151f954a1bc92301b1badc3ce4ccf607a5731b971789b66567cb4b620d
 SHA512:
-  metadata.gz: fdf93074bfa1f08952717dd7e4d0097975e14049fdf9a62a57bfeb969e950fd7d803e45964ef7b5037402c280d788558dd1d195c380524e6267ee56739265c2d
-  data.tar.gz: 3990f5698b00ff8ecca6e4c31e92bdae56a036810fc19b25bbad4ea40bba17523ec0e6831d68871b21a21b88af21f84b3b6600af073a29a17f2455796c56cf05
+  metadata.gz: 0ad4cd385ff82debfbc9cc1efc5475142e2bbe88c6af52925ef681a45679bf51faadbd995bb2cd500118c732187cd8190bd585f6d1ed0315f79a9cccac7c109f
+  data.tar.gz: 60e6c101c9eed979a55150f4b2c0e2dcc3566e949f168eb921b30ab0dd939c458fecb7349abe4e4f6185deb7eab4a35a9273b92437733132fd4cb23de8ab3d80

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.0)
+    geordi (12.1.0)
       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/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)
@@ -158,7 +177,7 @@ module Geordi
       https = Net::HTTP.new(uri.host, uri.port)
       https.use_ssl = true
 
-      query = [{ query: attributes.split.join(' '), variables: variables }].to_json
+      query = { query: attributes.split.join(' '), variables: variables }.to_json
 
       request = Net::HTTP::Post.new(uri.path)
       request.body = query
@@ -167,13 +186,20 @@ module Geordi
       request['Authorization'] = settings.linear_api_key
 
       response = https.request(request)
-      print clear_loading_message
+      parsed_response = JSON.parse(response.body)
 
-      parsed_response = JSON.parse(response.body)[0]
       if parsed_response.key?('errors')
-        raise parsed_response.dig('errors')
+        errors = parsed_response['errors'].map do |error|
+          msg = error.delete('message')
+          "#{msg} #{error.inspect}"
+        end
+        Interaction.fail <<~MSG.strip
+          API request failed:
+          #{errors.join("\n")}
+        MSG
       else
-        parsed_response['data']
+        print clear_loading_message
+        parsed_response.dig('data')
       end
     end
 

data/lib/geordi/settings.rb

@@ -110,7 +110,12 @@ module Geordi
     def save_global_settings
       global_path = GLOBAL_SETTINGS_FILE_NAME
       global_directory = File.dirname(global_path)
-      FileUtils.mkdir_p(global_directory) unless File.directory? global_directory
+
+      unless File.directory?(global_directory)
+        require 'fileutils'
+        FileUtils.mkdir_p(global_directory)
+      end
+
       File.open(global_path, 'w') do |file|
         file.write @global_settings.to_yaml
       end

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '12.0.0'.freeze
+  VERSION = '12.1.0'.freeze
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 12.0.0
+  version: 12.1.0
 platform: ruby
 authors:
 - Henning Koch
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-02-25 00:00:00.000000000 Z
+date: 2025-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -44,6 +45,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- cucumber.yml
 - exe/b
 - exe/dumple
 - exe/geordi
@@ -107,6 +109,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: 
 rdoc_options: []
 require_paths:
 - lib
@@ -121,7 +124,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Collection of command line tools we use in our daily work with Ruby, Rails
   and Linux at makandra.