geordi 6.0.1 → 7.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57407a29854dbd2b1b1d854d652377db25791fd36353cfdcbd56a2dfbddb5a1d
-  data.tar.gz: 27f83bb707fc85575e348b6f83ce74b86baffe1d224a6fe3794ee19a3ed7ff00
+  metadata.gz: e8c141d6bb76920354f1a772f6d7a3f88f4ee41fc11766ae40c9bc664ae3d914
+  data.tar.gz: e1d000833fb2d445b164529da4051fc25c846b7b0a5c12a0469a3fe745e6c2da
 SHA512:
-  metadata.gz: 6e3cfe2af06cde2485cd95d1e2b48743bc37e7b7987bf5f1f337d60f919de6014c719d472875940c8f8b5b53da1453e0e7f923e28e1b31d671c4a105531f3f78
-  data.tar.gz: 49317f106b384e010f9c7854691f298f9e8909531c956a3a57989d496bb9cc324c9ed388818697d0ca55f8522b2c3ae7af369c774d854049e0b5ed7fd157c8a3
+  metadata.gz: d9f630cfa71810205a6db1b23c304c13e14b7ad3380fb71539940e1c0af6802f74b13c6461f673e3aaa456a89dfc2a3b74fda29a865c605d4c5e4ce8890c1cfb
+  data.tar.gz: dab2ddb18a29a96872478cd896951608ffdf2baa37c604e6124522810241fb5ecee69f9c2cafdde791992914d02fa926e195556592a5e82e067f37eadd7797f3

data/.github/workflows/test.yml

@@ -8,25 +8,17 @@ on:
     - master
 jobs:
   test:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
         include:
-        - ruby: 2.2.10
-          gemfile: Gemfile
-        - ruby: 2.3.8
-          gemfile: Gemfile
-        - ruby: 2.4.10
-          gemfile: Gemfile
-        - ruby: 2.5.8
-          gemfile: Gemfile
-        - ruby: 2.6.6
-          gemfile: Gemfile
-        - ruby: 2.7.2
-          gemfile: Gemfile
-        - ruby: 3.0.0
-          gemfile: Gemfile
+          - ruby: 2.5.7
+            gemfile: Gemfile
+          - ruby: 2.7.4
+            gemfile: Gemfile
+          - ruby: 3.0.2
+            gemfile: Gemfile
     env:
       BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
     steps:
@@ -37,7 +29,7 @@ jobs:
         ruby-version: "${{ matrix.ruby }}"
     - name: Bundle
       run: |
-        gem install bundler:1.17.3
+        gem install bundler:2.2.26
         bundle install --no-deployment
     - name: Install VNC viewer
       run: |

data/.ruby-version

@@ -1 +1 @@
-2.2
+2.5.7

data/CHANGELOG.md

@@ -6,7 +6,24 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 ## Unreleased
 
 ### Compatible changes
+
+### Breaking changes
+
+
+## 7.0.2 2021-10-06
+
+### Compatible changes
+* fix `YAML.safe_load` for `psych` >= 4
+
+## 7.0.1 2021-08-13
+
+### Compatible changes
+* Fix missing `thor` dependency
+
+## 7.0.0 2021-08-25
+
 ### Breaking changes
+* Drop support for Ruby < 2.5.0
 
 
 ## 6.1.0 2021-07-15

data/Gemfile

@@ -9,5 +9,6 @@ gem 'rspec'
 gem 'highline'
 gem 'parallel_tests'
 gem 'launchy'
-gem 'byebug'
+gem 'pry-byebug'
 gem 'tracker_api'
+gem 'cucumber', '~> 4'

data/Gemfile.lock

@@ -1,12 +1,18 @@
 PATH
   remote: .
   specs:
-    geordi (6.0.1)
+    geordi (7.0.2)
       thor (~> 1)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    activesupport (6.1.4.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     aruba (0.14.14)
@@ -20,30 +26,42 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    backports (3.18.2)
     builder (3.2.4)
-    byebug (10.0.2)
+    byebug (11.1.3)
     childprocess (1.0.1)
       rake (< 13.0)
+    coderay (1.1.3)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
+    concurrent-ruby (1.1.9)
     contracts (0.16.0)
-    cucumber (3.2.0)
-      builder (>= 2.1.2)
-      cucumber-core (~> 3.2.0)
-      cucumber-expressions (~> 6.0.1)
-      cucumber-wire (~> 0.0.1)
-      diff-lcs (~> 1.3)
-      gherkin (~> 5.1.0)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.2)
-    cucumber-core (3.2.1)
-      backports (>= 3.8.0)
-      cucumber-tag_expressions (~> 1.1.0)
-      gherkin (~> 5.0)
-    cucumber-expressions (6.0.1)
-    cucumber-tag_expressions (1.1.1)
-    cucumber-wire (0.0.1)
+    cucumber (4.0.0)
+      builder (~> 3.2, >= 3.2.3)
+      cucumber-core (~> 7.0, >= 7.0.0)
+      cucumber-cucumber-expressions (~> 10.1, >= 10.1.0)
+      cucumber-gherkin (~> 13.0, >= 13.0.0)
+      cucumber-html-formatter (~> 6.0, >= 6.0.1)
+      cucumber-messages (~> 12.1, >= 12.1.1)
+      cucumber-wire (~> 3.0, >= 3.0.0)
+      diff-lcs (~> 1.3, >= 1.3)
+      multi_test (~> 0.1, >= 0.1.2)
+      sys-uname (~> 1.0, >= 1.0.2)
+    cucumber-core (7.0.0)
+      cucumber-gherkin (~> 13.0, >= 13.0.0)
+      cucumber-messages (~> 12.1, >= 12.1.1)
+      cucumber-tag-expressions (~> 2.0, >= 2.0.4)
+    cucumber-cucumber-expressions (10.3.0)
+    cucumber-gherkin (13.0.0)
+      cucumber-messages (~> 12.0, >= 12.0.0)
+    cucumber-html-formatter (6.0.3)
+      cucumber-messages (~> 12.1, >= 12.1.1)
+    cucumber-messages (12.4.0)
+      protobuf-cucumber (~> 3.10, >= 3.10.8)
+    cucumber-tag-expressions (2.0.4)
+    cucumber-wire (3.0.0)
+      cucumber-core (~> 7.0, >= 7.0.0)
+      cucumber-cucumber-expressions (~> 10.1, >= 10.1.0)
+      cucumber-messages (~> 12.1, >= 12.1.1)
     declarative (0.0.10)
     declarative-option (0.1.0)
     descendants_tracker (0.0.4)
@@ -56,15 +74,19 @@ GEM
     faraday_middleware (0.14.0)
       faraday (>= 0.7.4, < 1.0)
     ffi (1.12.2)
-    gherkin (5.1.0)
     highline (2.0.3)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     launchy (2.4.3)
       addressable (~> 2.3)
+    method_source (1.0.0)
+    middleware (0.1.0)
     mimemagic (0.3.9)
       nokogiri (~> 1)
       rake
     mini_portile2 (2.4.0)
+    minitest (5.14.4)
     multi_json (1.15.0)
     multi_test (0.1.2)
     multipart-post (2.1.1)
@@ -73,6 +95,17 @@ GEM
     parallel (1.19.2)
     parallel_tests (2.32.0)
       parallel
+    protobuf-cucumber (3.10.8)
+      activesupport (>= 3.2)
+      middleware
+      thor
+      thread_safe
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
     public_suffix (3.1.1)
     rake (12.3.3)
     representable (3.0.4)
@@ -92,6 +125,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.0)
+    sys-uname (1.2.2)
+      ffi (~> 1.1)
     thor (1.0.1)
     thread_safe (0.3.6)
     tracker_api (1.11.0)
@@ -104,26 +139,30 @@ GEM
       multi_json
       representable
       virtus
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     uber (0.1.0)
     virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   aruba (< 1)
-  byebug
+  cucumber (~> 4)
   geordi!
   highline
   launchy
   parallel_tests
+  pry-byebug
   rake (< 13)
   rspec
   tracker_api
 
 BUNDLED WITH
-   1.17.3
+   2.2.26

data/geordi.gemspec

@@ -5,25 +5,26 @@ require 'geordi/version'
 Gem::Specification.new do |spec|
   spec.name = 'geordi'
   spec.version = Geordi::VERSION
-  spec.required_ruby_version = '>= 2.2.0'
+  spec.required_ruby_version = '>= 2.3.0'
   spec.authors = ['Henning Koch']
   spec.email = ['henning.koch@makandra.de']
 
   spec.summary = 'Collection of command line tools we use in our daily work with Ruby, Rails and Linux at makandra.'
-  spec.description = 'Collection of command line tools we use in our daily work with Ruby, Rails and Linux at makandra.'
+  spec.description = spec.summary
   spec.homepage = 'https://makandra.com'
   spec.license = 'MIT'
 
   # 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.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(spec|features)/}) }
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir = 'exe'
   spec.executables = spec.files.grep(%r(^exe/)) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'thor', '~> 1'
+  # Development dependencies are defined in the Gemfile (therefore no `spec.add_development_dependency` directives)
 
   spec.post_install_message = <<-ATTENTION
 Support for sequential running of integration tests tagged with @solo has been dropped.

data/lib/geordi/capistrano_config.rb

@@ -66,11 +66,11 @@ module Geordi
 
       until File.exist?(File.join(current, 'Capfile'))
         if current == '/' || current == '/home' || !File.directory?(current)
-          raise <<-ERROR
-  Could not locate Capfile.
+          raise <<~ERROR
+            Could not locate Capfile.
 
-  Are you calling me from within a Rails project?
-  Maybe Capistrano is not installed in this project.
+            Are you calling me from within a Rails project?
+            Maybe Capistrano is not installed in this project.
           ERROR
         else
           current = File.dirname(current)

data/lib/geordi/commands/deploy.rb

@@ -48,11 +48,11 @@ def deploy(target_stage = nil)
   target_stage ||= Interaction.prompt 'Deployment stage:', branch_stage_map.fetch(Util.current_branch, 'staging')
   if options.current_branch
     stage_file = "config/deploy/#{target_stage}.rb"
-    Util.file_containing?(stage_file, 'DEPLOY_BRANCH') || Interaction.fail(<<-ERROR)
-To deploy from the current branch, configure #{stage_file} to respect the
-environment variable DEPLOY_BRANCH. Example:
+    Util.file_containing?(stage_file, 'DEPLOY_BRANCH') || Interaction.fail(<<~ERROR)
+      To deploy from the current branch, configure #{stage_file} to respect the
+      environment variable DEPLOY_BRANCH. Example:
 
-set :branch, ENV['DEPLOY_BRANCH'] || 'master'
+      set :branch, ENV['DEPLOY_BRANCH'] || 'master'
     ERROR
 
     source_branch = target_branch = Util.current_branch

data/lib/geordi/db_cleaner.rb

@@ -30,15 +30,15 @@ module Geordi
       end
       all_dbs = list_all_dbs(dbtype)
       tmp = Tempfile.open("geordi_whitelist_#{dbtype}")
-      tmp.write <<-HEREDOC
-# Put each whitelisted database on a new line.
-# System databases will never be deleted.
-# When you whitelist foo, foo_development and foo_test\\d* are whitelisted, too.
-# This works even if foo does not exist. Also, you will only see foo in this list.
-#
-# Syntax: keep foo
-#         drop bar
-HEREDOC
+      tmp.write <<~HEREDOC
+        # Put each whitelisted database on a new line.
+        # System databases will never be deleted.
+        # When you whitelist foo, foo_development and foo_test\\d* are whitelisted, too.
+        # This works even if foo does not exist. Also, you will only see foo in this list.
+        #
+        # Syntax: keep foo
+        #         drop bar
+      HEREDOC
       tmpfile_content = Array.new
       all_dbs.each do |db|
         next if is_whitelisted?(dbtype, db)
@@ -65,11 +65,11 @@ HEREDOC
         tmpfile_content.push(['keep', db_name]) unless db_name.empty?
       end
       if warn_manual_whitelist
-        Interaction.warn <<-ERROR_MSG.gsub(/^\s*/, '')
-        Your whitelist #{whitelist} seems to have been generated manually.
-        In that case, make sure to use only one database name per line and omit the 'keep' prefix."
+        Interaction.warn <<~ERROR_MSG
+          Your whitelist #{whitelist} seems to have been generated manually.
+          In that case, make sure to use only one database name per line and omit the 'keep' prefix."
 
-        Launching the editor.
+          Launching the editor.
         ERROR_MSG
       end
       tmpfile_content.sort_by! { |k| k[1] }

data/lib/geordi/docker.rb

@@ -50,8 +50,8 @@ module Geordi
       end
 
       puts
-      puts Util.strip_heredoc <<-TEXT
-    Done. You can view the VNC window with `geordi docker vnc`.
+      puts <<~TEXT
+        Done. You can view the VNC window with `geordi docker vnc`.
       TEXT
 
       Interaction.success 'Happy cuking!'

data/lib/geordi/dump_loader.rb

@@ -14,8 +14,15 @@ module Geordi
       require 'yaml'
 
       evaluated_config_file = ERB.new(File.read('config/database.yml')).result
+
       # Allow aliases and a special set of classes like symbols and time objects
-      @config ||= YAML.safe_load(evaluated_config_file, [Symbol, Time], [], true)
+      permitted_classes = [Symbol, Time]
+      @config ||= if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0')
+        YAML.safe_load(evaluated_config_file, permitted_classes: permitted_classes, aliases: true)
+      else
+        YAML.safe_load(evaluated_config_file, permitted_classes, [], true)
+      end
+
       @config['development']
     end
     alias_method :config, :development_database_config

data/lib/geordi/gitpt.rb

@@ -16,8 +16,8 @@ module Geordi
     end
 
     def run_commit(git_args)
-      Interaction.warn <<-WARNING unless Util.staged_changes?
-No staged changes. Will create an empty commit.
+      Interaction.warn <<~WARNING unless Util.staged_changes?
+        No staged changes. Will create an empty commit.
       WARNING
 
       story = choose_story
@@ -103,8 +103,6 @@ No staged changes. Will create an empty commit.
         menu.header = 'Choose a story'
 
         stories.each do |story|
-          print '.' # Progress
-
           state = story.current_state
           owners = story.owners
           owner_is_me = owners.collect(&:id).include?(my_id)
@@ -173,7 +171,7 @@ No staged changes. Will create an empty commit.
         stdout_str.strip.split(' ').map(&:chars).map(&:first).join.downcase
       end
 
-      git_user_initials = Interaction.prompt 'Enter your initals:', git_user_initials
+      git_user_initials = Interaction.prompt 'Enter your initials:', git_user_initials
 
       if git_user_initials.nil?
         Interaction.fail('Could not determine the git user\'s initials.')

data/lib/geordi/settings.rb

@@ -138,7 +138,7 @@ module Geordi
         project_ids = File.read('.pt_project_id')
         puts # Make sure to start on a new line (e.g. when invoked after a #print)
         Geordi::Interaction.warn "The usage of the .pt_project_id file is deprecated."
-        Geordi::Interaction.note Util.strip_heredoc(<<-INSTRUCTIONS)
+        Geordi::Interaction.note(<<~INSTRUCTIONS)
           Please remove this file from your project and add or extend the .geordi.yml file with the following content:
             pivotal_tracker_project_ids: #{project_ids}
         INSTRUCTIONS

data/lib/geordi/util.rb

@@ -182,12 +182,6 @@ module Geordi
         !!ENV['GEORDI_TESTING']
       end
 
-      def strip_heredoc(string)
-        leading_whitespace = (string.match(/\A( +)[^ ]+/) || [])[1]
-        string.gsub! /^#{leading_whitespace}/, '' if leading_whitespace
-        string
-      end
-
     end
   end
 end

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '6.0.1'.freeze
+  VERSION = '7.0.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 7.0.2
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-15 00:00:00.000000000 Z
+date: 2021-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -110,14 +110,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.26
 signing_key: 
 specification_version: 4
 summary: Collection of command line tools we use in our daily work with Ruby, Rails