geordi 9.3.1 → 9.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53000c0f7a45eb1abdbda692ef86f6add4b03a526a663d2080ae893d739e5e79
-  data.tar.gz: 92f23443438253a43960d00b726646a57e1e9a2c413f167bbce1c4d747addd99
+  metadata.gz: acfbd833f5f9da8e6b157b99109fdb1568d496678446b80d23f972e997601fb6
+  data.tar.gz: 4baee0e83ea956375deb9a379ae620e2c27482045e5f1a0b75f2fcc16017de57
 SHA512:
-  metadata.gz: 37e18e79036a4d13cec85463458f2be6e1752485f747d10873c8a8a8ae29be92580233bb895d8fb73c059d0905cc2a646db34d5fd163228d66d59a215f4c4757
-  data.tar.gz: 9a58e6558bcd390d1f1749764fef54c6b590e3c67899256797afaaf9ebcb4efc10d5cfd91fcbdda113ed2ed8301903d5ecbbf16dc8c1c5a6c8c04f219d1a03a7
+  metadata.gz: 0b98db037dd7d2b647236996c529102e486c30abb7b5037b138db6048ad366a6dfb39d367df8354f3a2a51441eb59382ff908d777bca04a6320efb6ea1fc1562
+  data.tar.gz: 4fd187318f0439a29e1ecf59de2bfebabc3de278b02a82a9b1587e493b11a6d2a24e74f25d702108b3b45b1fd252ad4c1360e66e1399ec034db3684cfce826a6

data/CHANGELOG.md

@@ -6,11 +6,30 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 ## Unreleased
 
 ### Compatible changes
-* Use YAML.safe_load in dumple and allow aliases
 
 ### Breaking changes
 
 
+## 9.4.1 2023-01-09
+
+### Compatible changes
+
+- Ruby 3.2 support
+
+
+## 9.4.0 2022-12-09
+
+### Compatible changes
+* `branch` command: Git user initials are now stored in config file
+* `console` command: Disable irb multiline mode in order to fix ultra-slow pasting performance
+
+
+## 9.3.1 2022-06-07
+
+### Compatible changes
+* Use YAML.safe_load in dumple and allow aliases
+
+
 ## 9.3.0 2022-04-26
 
 ### Compatible changes

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    geordi (9.3.1)
+    geordi (9.4.1)
       thor (~> 1)
 
 GEM
@@ -165,4 +165,4 @@ DEPENDENCIES
   tracker_api
 
 BUNDLED WITH
-   2.3.6
+   2.3.25

data/README.md

@@ -21,16 +21,12 @@ run tests afterwards.
 
 You can always run `geordi help <command>` to quickly look up command help.
 
-### `geordi apache-site VIRTUAL_HOST`
-Enable the given virtual host, disabling all others.
-
-
 ### `geordi branch`
 Check out a feature branch based on a story from Pivotal Tracker.
 
 Example: `geordi branch`
 
-On the first execution we ask for your Pivotal Tracker API token. It will be
+On the first execution we ask for your Pivotal Tracker API token and for your Git user initials. Both will be
 stored in `~/.config/geordi/global.yml`.
 
 **Options**

data/exe/b

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
 call = ARGV.dup
-call = ['bundle', 'exec'] + call if File.exists?('Gemfile')
+call = ['bundle', 'exec'] + call if File.exist?('Gemfile')
 exec *call
-

data/exe/dumple

@@ -27,7 +27,7 @@ end
 
 def cd_to_project_root(fail_gently)
   current = Dir.pwd
-  until File.exists?(DB_CONFIG_PATH)
+  until File.exist?(DB_CONFIG_PATH)
     Dir.chdir '..'
     if current == Dir.pwd
       if fail_gently

data/geordi.gemspec

@@ -13,7 +13,12 @@ Gem::Specification.new do |spec|
   spec.description = spec.summary
   spec.homepage = 'https://makandra.com'
   spec.license = 'MIT'
-  spec.metadata = { 'rubygems_mfa_required' => 'true' }
+  spec.metadata = {
+    'source_code_uri' => 'https://github.com/makandra/geordi',
+    'bug_tracker_uri' => 'https://github.com/makandra/geordi/issues',
+    'changelog_uri' => 'https://github.com/makandra/geordi/blob/master/CHANGELOG.md',
+    'rubygems_mfa_required' => 'true',
+  }
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.

data/lib/geordi/commands/apache_site.rb

@@ -1,4 +1,4 @@
-desc 'apache-site VIRTUAL_HOST', 'Enable the given virtual host, disabling all others'
+desc 'apache-site VIRTUAL_HOST', 'Enable the given virtual host, disabling all others', hide: true
 def apache_site(*args)
   site = args.shift
   old_cwd = Dir.pwd

data/lib/geordi/commands/branch.rb

@@ -2,7 +2,7 @@ desc 'branch', 'Check out a feature branch based on a story from Pivotal Tracker
 long_desc <<-LONGDESC
 Example: `geordi branch`
 
-On the first execution we ask for your Pivotal Tracker API token. It will be
+On the first execution we ask for your Pivotal Tracker API token and for your Git user initials. Both will be
 stored in `~/.config/geordi/global.yml`.
 LONGDESC
 

data/lib/geordi/gitpt.rb

@@ -161,6 +161,11 @@ module Geordi
     end
 
     def git_user_initials
+      if settings.git_initials
+        Interaction.note "Using Git user initials from #{Settings::GLOBAL_SETTINGS_FILE_NAME}"
+        return settings.git_initials
+      end
+
       stdout_str = if Util.testing?
         ENV['GEORDI_TESTING_GIT_USERNAME']
       else
@@ -176,6 +181,7 @@ module Geordi
       if git_user_initials.nil?
         Interaction.fail('Could not determine the git user\'s initials.')
       else
+        settings.git_initials = git_user_initials
         git_user_initials
       end
     end

data/lib/geordi/settings.rb

@@ -8,7 +8,7 @@ module Geordi
     GLOBAL_SETTINGS_FILE_NAME = Util.testing? ? './tmp/global_settings.yml'.freeze : File.join(ENV['HOME'], '.config/geordi/global.yml').freeze
     LOCAL_SETTINGS_FILE_NAME = Util.testing? ? './tmp/local_settings.yml'.freeze : './.geordi.yml'.freeze
 
-    ALLOWED_GLOBAL_SETTINGS = %w[ pivotal_tracker_api_key auto_update_chromedriver pivotal_tracker_project_ids ].freeze
+    ALLOWED_GLOBAL_SETTINGS = %w[ pivotal_tracker_api_key auto_update_chromedriver pivotal_tracker_project_ids git_initials].freeze
     ALLOWED_LOCAL_SETTINGS = %w[ pivotal_tracker_project_ids ].freeze
 
     SETTINGS_WARNED = 'GEORDI_INVALID_SETTINGS_WARNED'
@@ -27,6 +27,15 @@ module Geordi
       save_global_settings
     end
 
+    def git_initials
+      @global_settings['git_initials']
+    end
+
+    def git_initials=(value)
+      @global_settings['git_initials'] = value
+      save_global_settings
+    end
+
     def auto_update_chromedriver
       @global_settings["auto_update_chromedriver"] || false
     end
@@ -68,10 +77,10 @@ module Geordi
       global_path = GLOBAL_SETTINGS_FILE_NAME
       local_path = LOCAL_SETTINGS_FILE_NAME
 
-      global_settings = if File.exists?(global_path)
+      global_settings = if File.exist?(global_path)
         YAML.safe_load(File.read(global_path))
       end
-      local_settings = if File.exists?(local_path)
+      local_settings = if File.exist?(local_path)
         YAML.safe_load(File.read(local_path))
       end
 
@@ -79,7 +88,7 @@ module Geordi
       unless ENV[SETTINGS_WARNED]
         check_for_invalid_keys(global_settings, ALLOWED_GLOBAL_SETTINGS, global_path)
         check_for_invalid_keys(local_settings, ALLOWED_LOCAL_SETTINGS, local_path)
-        Interaction.warn "Unsupported config file \".firefox-version\". Please remove it." if File.exists?('.firefox-version')
+        Interaction.warn "Unsupported config file \".firefox-version\". Please remove it." if File.exist?('.firefox-version')
 
         ENV[SETTINGS_WARNED] = 'true'
       end

data/lib/geordi/util.rb

@@ -80,16 +80,23 @@ module Geordi
       def binstub_or_fallback(executable)
         binstub_file = "bin/#{executable}"
 
-        File.exists?(binstub_file) ? binstub_file : "bundle exec #{executable}"
+        File.exist?(binstub_file) ? binstub_file : "bundle exec #{executable}"
       end
 
       def console_command(environment)
         if gem_major_version('rails') == 2
-          'script/console ' + environment
+          "script/console #{environment}"
         elsif gem_major_version('rails') == 3
           "#{binstub_or_fallback('rails')} console #{environment}"
         else
-          "#{binstub_or_fallback('rails')} console -e #{environment}"
+          "#{binstub_or_fallback('rails')} console -e #{environment} #{use_multiline_flag}"
+        end
+      end
+
+      def use_multiline_flag
+        if irb_version >= Gem::Version.new('1.2') && ruby_version < Gem::Version.new('3.0')
+          Interaction.note 'Using --nomultiline switch for faster pasting'
+          '-- --nomultiline'
         end
       end
 
@@ -182,6 +189,20 @@ module Geordi
         !!ENV['GEORDI_TESTING']
       end
 
+      def irb_version
+        version_string = if testing?
+          ENV['GEORDI_TESTING_IRB_VERSION']
+        else
+          `irb --version`[/irb (\d\.\d\.\d)/, 1]
+        end
+
+        Gem::Version.new(version_string)
+      end
+
+      def ruby_version
+        version_string = testing? ? ENV['GEORDI_TESTING_RUBY_VERSION'] : RUBY_VERSION
+        Gem::Version.new(version_string)
+      end
     end
   end
 end

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '9.3.1'.freeze
+  VERSION = '9.4.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 9.3.1
+  version: 9.4.1
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-07 00:00:00.000000000 Z
+date: 2023-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -97,6 +97,9 @@ homepage: https://makandra.com
 licenses:
 - MIT
 metadata:
+  source_code_uri: https://github.com/makandra/geordi
+  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: 'Support for sequential running of integration tests tagged
   with @solo has been dropped.
@@ -116,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.9
 signing_key: 
 specification_version: 4
 summary: Collection of command line tools we use in our daily work with Ruby, Rails