geordi 12.2.0 → 12.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9e766c4baaefc4065662e1efa4004110d2ba16eb4da7021cffbf1bea8b83b77
-  data.tar.gz: e131a2fccc5ba9db7b992c58fe42b402fcc59651d7c52935cb8a2f6b543d0c85
+  metadata.gz: 173b8f7db8518c9d6da88feff00ca21cb58bd9d764b5e856ac50487e3499b9e4
+  data.tar.gz: e739f43a3388d185467e14d3dd1259fe55856dd3acc05018c97d65916b9032b6
 SHA512:
-  metadata.gz: 2f9b6cb8eb4446380a744db6abb19f15a040ab6a2d0bbca5d54454d46ec308d687d2e4a11ddabc51c37bccbe0033cbf43882dcb69fedc4e9398cd09071df88a3
-  data.tar.gz: c36974d65e12a0b4020cf1dfe5e9303dc8bba71aa3082ff675a002fb6d68469af7da4e5774d67c233414755cb8a068fb8f7dd46d2d3ac8069ec963c515d9bb3d
+  metadata.gz: 2e2d3897e290d2afa0d8916779ff28fbbd72b692c5ff55a43c586364cca86a2b389c7375cb03beb1ddfdd31ee9973a25cfb8e55215bf59398c3ae9bca7e55580
+  data.tar.gz: 7cbc01ebe625752e6f249d84d58810afad0aec51a669101dcd88bd9026011ab324e8d3ea74682b93c24661bf167ede96217d148509314b35fb5f8b749fd9f55b

data/CHANGELOG.md

@@ -10,10 +10,22 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 ### Breaking changes
 
 
+## 12.4.0 2025-08-29
+
+### Compatible changes
++ `geordi console` will now also take irb_flags from the local config file into account. These will have precedence over the global config file and flags automatically set by geordi.
+
+
+## 12.3.0 2025-08-04
+
+### Compatible changes
+* Add highline as a runtime dependency
+
+
 ## 12.2.0 2025-07-03
 
 ### Compatible changes
-* `geordi deploy` will now respect the configured deploy branch from teh Capistrano config. Previously, it would choose "production" for a deploy to the production stage, and master/main else.
+* `geordi deploy` will now respect the configured deploy branch from the Capistrano config. Previously, it would choose "production" for a deploy to the production stage, and master/main else.
 
 
 ## 12.1.0 2025-05-03

data/Gemfile

@@ -7,7 +7,6 @@ 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'
 gem 'pry-byebug'

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    geordi (12.2.0)
+    geordi (12.4.0)
+      highline
       thor (~> 1)
 
 GEM
@@ -93,7 +94,6 @@ DEPENDENCIES
   aruba (< 1)
   cucumber (~> 9)
   geordi!
-  highline
   launchy
   parallel_tests
   pry-byebug

data/README.md

@@ -95,7 +95,12 @@ Remote: `geordi console staging`
 Selecting the server: `geordi console staging -s` shows a menu with all available
 servers. When passed a number, directly connects to the selected server.
 
-IRB flags can be given as `irb_flags: '...'` in the global Geordi config file (`~/.config/geordi/global.yml`).
+IRB flags can be given as `irb_flags: '...'` in the global or local Geordi config file
+(`~/.config/geordi/global.yml` / `./.geordi.yml`). If you define irb_flags in both files, the local config file will be
+used. For IRB >=1.2 in combination with Ruby <3 geordi automatically sets the `--nomultiline` flag, to prevent slow
+pasting. You can override this behavior by setting `--multiline` in the global config file or by defining `irb_flags` 
+in the local config file. The latter will always turn off the automatic behavior, even if you don't set any values for 
+the irb_flags key.
 
 **Options**
 - `-s, --select-server=[SERVER_NUMBER]`: Select a server to connect to

data/geordi.gemspec

@@ -30,5 +30,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'thor', '~> 1'
+  spec.add_runtime_dependency 'highline'
   # Development dependencies are defined in the Gemfile (therefore no `spec.add_development_dependency` directives)
 end

data/lib/geordi/commands/console.rb

@@ -7,7 +7,13 @@ Remote: `geordi console staging`
 Selecting the server: `geordi console staging -s` shows a menu with all available
 servers. When passed a number, directly connects to the selected server.
 
-IRB flags can be given as `irb_flags: '...'` in the global Geordi config file (`~/.config/geordi/global.yml`).
+IRB flags can be given as `irb_flags: '...'` in the global or local Geordi config file
+(`~/.config/geordi/global.yml` / `./.geordi.yml`). If you define irb_flags in both files, the local config file will be
+used. For IRB >=1.2 in combination with Ruby <3 geordi automatically sets the `--nomultiline` flag, to prevent slow
+pasting. You can override this behavior by setting `--multiline` in the global config file or by defining `irb_flags` 
+in the local config file. The latter will always turn off the automatic behavior, even if you don't set any values for 
+the irb_flags key.
+
 LONGDESC
 
 # This option is duplicated in shelll.rb

data/lib/geordi/settings.rb

@@ -16,7 +16,7 @@ module Geordi
       linear_team_ids
     ].freeze
 
-    ALLOWED_LOCAL_SETTINGS = %w[ linear_team_ids ].freeze
+    ALLOWED_LOCAL_SETTINGS = %w[ linear_team_ids irb_flags ].freeze
 
     SETTINGS_WARNED = 'GEORDI_INVALID_SETTINGS_WARNED'
 
@@ -26,7 +26,11 @@ module Geordi
 
     # Global settings
     def irb_flags
-      @global_settings['irb_flags']
+      if @local_settings.key? 'irb_flags'
+        [@local_settings['irb_flags'].to_s, :local]
+      elsif @global_settings.key? 'irb_flags'
+        [@global_settings['irb_flags'].to_s, :global]
+      end
     end
 
     def linear_api_key

data/lib/geordi/util.rb

@@ -94,13 +94,18 @@ module Geordi
         elsif gem_major_version('rails') == 3
           "#{binstub_or_fallback('rails')} console #{environment}"
         else
-          use_multiline = if irb_version >= Gem::Version.new('1.2') && ruby_version < Gem::Version.new('3.0')
+
+          irb_flags_from_config, source = Settings.new.irb_flags
+          irb_flags = ""
+
+          if irb_version >= Gem::Version.new('1.2') && ruby_version < Gem::Version.new('3.0') && (source != :local)
             Interaction.note 'Using --nomultiline switch for faster pasting'
-            '--nomultiline'
+            irb_flags << '--nomultiline '
           end
 
-          irb_flags = [use_multiline, Settings.new.irb_flags].join(' ').strip
-          irb_flags.prepend('-- ') unless irb_flags.empty?
+          irb_flags << irb_flags_from_config if irb_flags_from_config
+
+          irb_flags.prepend('-- ').strip! unless irb_flags.empty?
 
           "#{binstub_or_fallback('rails')} console -e #{environment} #{irb_flags}"
         end

data/lib/geordi/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 12.2.0
+  version: 12.4.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-07-03 00:00:00.000000000 Z
+date: 2025-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Collection of command line tools we use in our daily work with Ruby,
   Rails and Linux at makandra.
 email: