geordi 12.1.0 → 12.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b0ad63b0055ae689422b0aab1ccbf95093e010448e609ba98dec160d32120bb
-  data.tar.gz: bcf3cc151f954a1bc92301b1badc3ce4ccf607a5731b971789b66567cb4b620d
+  metadata.gz: 7816d79861151e0a2ea1104ee05c5aac3aeb493868aca61fc6c2022504e8e59a
+  data.tar.gz: c315c203219afb756f6f5377cc07b4794e8588f1fb679f9292b4cd467768e064
 SHA512:
-  metadata.gz: 0ad4cd385ff82debfbc9cc1efc5475142e2bbe88c6af52925ef681a45679bf51faadbd995bb2cd500118c732187cd8190bd585f6d1ed0315f79a9cccac7c109f
-  data.tar.gz: 60e6c101c9eed979a55150f4b2c0e2dcc3566e949f168eb921b30ab0dd939c458fecb7349abe4e4f6185deb7eab4a35a9273b92437733132fd4cb23de8ab3d80
+  metadata.gz: 552844176d5d9f0eaac6c83f2806456b9645734408f865133d3a8e94d8cd0705ad2504a2d4c706691ea51770c63e8685b4889a377d9ef645244b3c601cea5668
+  data.tar.gz: a78a37c05442bb00fdfc6f56a1ec97ab273aed4dc7c3bf422ba0fde5485973972caf6ff5bd0f0deb7d99dde321c014f1359928764608bc44f9f9dd4270d78ad6

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/Gemfile

@@ -6,6 +6,7 @@ gemspec
 gem 'aruba', '< 1' # Drops support for Ruby 2.2-
 gem 'rake', '< 13' # Drops support for Ruby 2.1
 gem 'rspec'
+gem 'abbrev' # Dependency of Highline
 gem 'highline'
 gem 'parallel_tests'
 gem 'launchy'

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    geordi (12.1.0)
+    geordi (12.1.2)
       thor (~> 1)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    abbrev (0.1.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     aruba (0.14.14)
@@ -88,6 +89,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  abbrev
   aruba (< 1)
   cucumber (~> 9)
   geordi!

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/dump_loader.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'abbrev' # Dependency of Highline
 require 'highline'
 require 'geordi/interaction'
 require 'geordi/util'

data/lib/geordi/gitlinear.rb

@@ -1,3 +1,4 @@
+require 'abbrev' # Dependency of Highline
 require 'highline'
 require 'net/http'
 require 'json'

data/lib/geordi/remote.rb

@@ -1,6 +1,7 @@
 require 'geordi/capistrano_config'
 require 'geordi/interaction'
 require 'geordi/util'
+require 'abbrev' # Dependency of Highline
 require 'highline/import'
 require 'pathname'
 require 'fileutils'

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.1.0'.freeze
+  VERSION = '12.1.2'.freeze
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 12.1.0
+  version: 12.1.2
 platform: ruby
 authors:
 - Henning Koch
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-03-05 00:00:00.000000000 Z
+date: 2025-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -109,7 +108,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
@@ -124,8 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Collection of command line tools we use in our daily work with Ruby, Rails
   and Linux at makandra.