geordi 9.5.0 → 9.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed94a4f4c3730adc498969884b6019bc690f7348404d87681741a368fad3d9d4
-  data.tar.gz: 71be7102e51bde905e8ce266e024642ddce03007cada78eaff3f56bb1a604391
+  metadata.gz: 3c01ad424ea8f33ca03229ba4d0355201bba562ee1de253f0135838b8e4163c3
+  data.tar.gz: 8d011dfa82297202b05c8620a95e828ba96dcb797fcef6dc60d514e881601cd3
 SHA512:
-  metadata.gz: 829799256546ace81d2e17cb6dcb194aafcb4060cdcb65b337a0d4811967a616fcced13e93337291bde7aa052b6d8b7e08cf07e2984e23a5dd1aa80843014030
-  data.tar.gz: a88924470f394329db5f1cff666e2df6b3b2004eba892a9623c741aaa1de7e28dc705953c14cd88a83da5893aadd1f68e0152d11cd695c298690b78a77f42143
+  metadata.gz: b9f691c5367a2f41937703e18dda5be92f69a4bac77cb31f5c89429156576126675f1c4dd00b84d3eecb1dda328c45fd81eb92cf36c9fd2b8d5689b9c37587ff
+  data.tar.gz: d25a7208ab06766bda59c11d0d1c4a331ee17b8ac2f60d9de82f608759b942c3d067db7d7984929a90ba43775b7772f0b424771489b9f440e711033c955dc9c1

data/CHANGELOG.md

@@ -10,6 +10,13 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 ### Breaking changes
 
 
+# 9.5.1 - 2023-04-26
+
+### Compatible changes
+
+* `cucumber` command: Support the passing of options without "=" 
+
+
 # 9.5.0 2023-03-22
 
 ### Compatible changes

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    geordi (9.5.0)
+    geordi (9.6.0)
       thor (~> 1)
 
 GEM

data/README.md

@@ -34,7 +34,7 @@ stored in `~/.config/geordi/global.yml`.
 
 
 ### `geordi capistrano COMMAND`
-Run a capistrano command on all deploy targets.
+Run a Capistrano command on all deploy targets.
 
 Example: `geordi capistrano deploy`
 

data/geordi.gemspec

@@ -31,8 +31,4 @@ Gem::Specification.new do |spec|
 
   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.
-  ATTENTION
 end

data/lib/geordi/COMMAND_TEMPLATE

@@ -26,6 +26,11 @@ def example
   Interaction.fail 'Option missing' unless options.opt?
 
   Interaction.success 'Done.'
+  Hint.did_you_know [
+    :update,                  # recommendation of another command
+    [:cucumber, :containing], # recommendation of another option
+    'Geordi can automatically update chromedriver before Cucumber tests. See `geordi help chromedriver-update`.', # prose
+  ]
 end
 
 # Command mappings, usually not needed

data/lib/geordi/cli.rb

@@ -2,6 +2,7 @@ require 'thor'
 require 'bundler'
 require 'geordi/interaction'
 require 'geordi/util'
+require 'geordi/hint'
 
 module Geordi
   class CLI < Thor

data/lib/geordi/commands/branch.rb

@@ -11,4 +11,9 @@ option :from_master, aliases: '-m', type: :boolean, desc: 'Branch from master in
 def branch
   require 'geordi/gitpt'
   Gitpt.new.run_branch(from_master: options.from_master)
+
+  Hint.did_you_know [
+    :commit,
+    [:branch, :from_master],
+  ]
 end

data/lib/geordi/commands/capistrano.rb

@@ -1,4 +1,4 @@
-desc 'capistrano COMMAND', 'Run a capistrano command on all deploy targets'
+desc 'capistrano COMMAND', 'Run a Capistrano command on all deploy targets'
 long_desc <<-LONGDESC
 Example: `geordi capistrano deploy`
 LONGDESC

data/lib/geordi/commands/clean.rb

@@ -12,4 +12,8 @@ def clean
     Interaction.note pattern
     `find . -name #{pattern} -exec rm {} ';'`
   end
+
+  Hint.did_you_know [
+    :remove_executable_flags
+  ]
 end

data/lib/geordi/commands/commit.rb

@@ -11,4 +11,8 @@ LONGDESC
 def commit(*git_args)
   require 'geordi/gitpt'
   Gitpt.new.run_commit(git_args)
+
+  Hint.did_you_know [
+    :branch
+  ]
 end

data/lib/geordi/commands/console.rb

@@ -15,6 +15,11 @@ option :select_server, type: :string, aliases: '-s', banner: '[SERVER_NUMBER]',
 def console(target = 'development', *_args)
   require 'geordi/remote'
 
+  Hint.did_you_know [
+    :shelll,
+    [:console, :select_server],
+  ]
+
   if target == 'development'
     invoke_geordi 'bundle_install'
     invoke_geordi 'yarn_install'

data/lib/geordi/commands/cucumber.rb

@@ -52,27 +52,33 @@ def cucumber(*args)
       invoke_geordi 'chromedriver_update', quiet_if_matching: true
     end
 
-    cmd_opts, files = args.partition { |f| f.start_with? '-' }
-    cmd_opts << '--format' << 'pretty' << '--backtrace' if options.debug
+    arguments = args
+    arguments << '--format' << 'pretty' << '--backtrace' if options.debug
 
     # Parallel run of all given features + reruns ##############################
     Interaction.announce 'Running features'
-    normal_run_successful = Geordi::Cucumber.new.run(files, cmd_opts, verbose: options.verbose)
+    normal_run_successful = Geordi::Cucumber.new.run(arguments, verbose: options.verbose)
 
     unless normal_run_successful
-      cmd_opts << '--profile' << 'rerun'
-
+      arguments << '--profile' << 'rerun'
       # Reruns
       (options.rerun + 1).times do |i|
         Interaction.fail 'Features failed.' if i == options.rerun # All reruns done?
 
         Interaction.announce "Rerun ##{i + 1} of #{options.rerun}"
-        break if Geordi::Cucumber.new.run([], cmd_opts, verbose: options.verbose, parallel: false)
+        break if Geordi::Cucumber.new.run(arguments, verbose: options.verbose, parallel: false)
       end
     end
 
     Interaction.success 'Features green.'
 
+    Hint.did_you_know [
+      :rspec,
+      [:cucumber, :modified],
+      [:cucumber, :containing],
+      [:cucumber, :debug],
+      'Geordi can automatically update chromedriver before Cucumber tests. See `geordi help chromedriver-update`.'
+    ]
   else
     Interaction.note 'Cucumber not employed.'
   end

data/lib/geordi/commands/delete_dumps.rb

@@ -38,4 +38,9 @@ def delete_dumps(*locations)
     deletable_dumps.each &File.method(:delete)
     Interaction.success 'Done.'
   end
+
+  Hint.did_you_know [
+    :clean,
+    :drop_databases
+  ]
 end

data/lib/geordi/commands/deploy.rb

@@ -108,6 +108,11 @@ def deploy(target_stage = nil)
     Util.run!(capistrano_call, show_cmd: true)
 
     Interaction.success 'Deployment complete.'
+
+    Hint.did_you_know [
+      :capistrano,
+      :security_update
+    ]
   else
     Util.run!("git checkout #{source_branch}")
     Interaction.fail 'Deployment cancelled.'

data/lib/geordi/commands/drop_databases.rb

@@ -47,4 +47,8 @@ def drop_databases
   cleaner = DBCleaner.new(extra_flags)
   cleaner.clean_mysql unless options.postgres_only
   cleaner.clean_postgres unless options.mysql_only
+
+  Hint.did_you_know [
+    :delete_dumps
+  ]
 end

data/lib/geordi/commands/dump.rb

@@ -68,4 +68,11 @@ def dump(target = nil, *_args)
       Interaction.success "Your #{loader.config['database']} database has now the data of #{target}#{database_label}."
     end
   end
+
+  Hint.did_you_know [
+    :delete_dumps,
+    :drop_databases,
+    :migrate,
+    'Geordi can load a dump directly into the local database if passed a Capistrano stage and the option -l. See `geordi help dump`.'
+  ]
 end

data/lib/geordi/commands/migrate.rb

@@ -8,11 +8,11 @@ with `db:migrate`.
 LONGDESC
 
 def migrate
-  invoke_geordi 'bundle_install'
-  invoke_geordi 'yarn_install'
-  Interaction.announce 'Migrating'
-
   if File.directory?('db/migrate')
+    invoke_geordi 'bundle_install'
+    invoke_geordi 'yarn_install'
+    Interaction.announce 'Migrating'
+
     if Util.file_containing?('Gemfile', /parallel_tests/)
       Interaction.note 'Development and parallel test databases'
       puts

data/lib/geordi/commands/rake.rb

@@ -22,4 +22,8 @@ def rake(*args)
       Util.run!(command, show_cmd: true)
     end
   end
+
+  Hint.did_you_know [
+    :capistrano
+  ]
 end

data/lib/geordi/commands/remove_executable_flags.rb

@@ -12,4 +12,8 @@ def remove_executable_flags
   end
 
   Interaction.success 'Done.'
+
+  Hint.did_you_know [
+    :clean
+  ]
 end

data/lib/geordi/commands/rspec.rb

@@ -45,6 +45,10 @@ def rspec(*files)
 
       puts
       Util.run!(command.join(' '), fail_message: 'Specs failed.')
+
+      Hint.did_you_know [
+        :cucumber
+      ]
     end
   else
     Interaction.note 'RSpec not employed.'

data/lib/geordi/commands/server.rb

@@ -6,6 +6,10 @@ option :public, aliases: '-P', type: :boolean,
   desc: 'Make the server accessible from the local network'
 
 def server(port = nil)
+  Hint.did_you_know [
+    [:server, :public]
+  ]
+
   invoke_geordi 'bundle_install'
   invoke_geordi 'yarn_install'
   require 'geordi/util'

data/lib/geordi/commands/setup.rb

@@ -27,6 +27,10 @@ def setup
 
   Interaction.success 'Successfully set up the project.'
 
+  Hint.did_you_know [
+    :update
+  ] unless options.dump || options.test
+
   invoke_geordi 'dump', options.dump, load: true if options.dump
   invoke_geordi 'tests' if options.test
 end

data/lib/geordi/commands/shell.rb

@@ -15,6 +15,10 @@ option :select_server, type: :string, aliases: '-s', banner: '[SERVER_NUMBER]',
 def shelll(target, *_args)
   require 'geordi/remote'
 
+  Hint.did_you_know [
+    :console
+  ]
+
   Interaction.announce 'Opening a shell on ' + target
   Geordi::Remote.new(target).shell(options)
 end

data/lib/geordi/commands/tests.rb

@@ -35,4 +35,8 @@ def tests(*args)
 
     Interaction.success 'Successfully ran tests.'
   end
+
+  Hint.did_you_know [
+    :deploy
+  ]
 end

data/lib/geordi/commands/update.rb

@@ -27,7 +27,12 @@ def update
 
     Interaction.success 'Successfully updated the project.'
 
+    Hint.did_you_know [
+      :setup
+    ] unless options.dump || options.test
+
     invoke_geordi 'dump', options.dump, load: true if options.dump
     invoke_geordi 'tests' if options.test
   end
+
 end

data/lib/geordi/cucumber.rb

@@ -8,9 +8,14 @@ require File.expand_path('settings', __dir__)
 
 module Geordi
   class Cucumber
+    def run(arguments, options = {})
+      split_arguments = arguments.map { |arg| arg.split('=') }.flatten
+
+      self.argv = split_arguments.map do |arg|
+        # Ensure arguments containing white space are kept together
+        arg.match?(/\S\s\S/) ? %('#{arg}') : arg
+      end
 
-    def run(files, cucumber_options, options = {})
-      self.argv = files + cucumber_options.map { |option| option.split('=') }.flatten
       self.settings = Geordi::Settings.new
 
       consolidate_rerun_txt_files
@@ -32,24 +37,30 @@ module Geordi
       unless argv.include?('--format') || argv.include?('-f')
         format_args = spinner_available? ? ['--format', 'CucumberSpinner::CuriousProgressBarFormatter'] : ['--format', 'progress']
       end
+      if argv.include?('rerun')
+        drop_command_line_features!
+      end
       [ Util.binstub_or_fallback('cucumber'), format_args, escape_shell_args(argv)].flatten.compact.join(' ')
     end
 
     def parallel_execution_command
       Interaction.note 'Using parallel_tests'
-      self.argv = argv - command_line_features
+      drop_command_line_features!
 
       type_arg = Util.gem_version('parallel_tests') > Gem::Version.new('0.7.0') ? 'cucumber' : 'features'
       features = features_to_run
       features = find_all_features_recursively('features') if features.empty?
-
       [
         'bundle exec parallel_test -t ' + type_arg,
-        %(-o '#{command_line_options.join(' ')}'),
+        %(-o "#{command_line_options.join(' ')}"),
         "-- #{features.join(' ')}",
       ].compact.join(' ')
     end
 
+    def drop_command_line_features!
+      self.argv = argv - command_line_features
+    end
+
     def escape_shell_args(*args)
       args.flatten.collect do |arg|
         arg.gsub(/([\\ "])/) { |_match| "\\#{Regexp.last_match(1)}" }
@@ -57,8 +68,10 @@ module Geordi
     end
 
     def show_features_to_run
-      if command_line_options.include? 'rerun'
+      if command_line_options.include?('rerun')
         Interaction.note 'Rerunning failed scenarios'
+      elsif command_line_tag_options.any?
+        Interaction.note "Only features matching tag option #{command_line_tag_options.join(',')}"
       elsif features_to_run.empty?
         Interaction.note 'All features in features/'
       else
@@ -111,6 +124,14 @@ module Geordi
       end
     end
 
+    def command_line_tag_options
+      [].tap do |tag_options|
+        command_line_options.each_cons(2) do |option, tags|
+          tag_options << tags if option =~ /--tags|-t/
+        end
+      end
+    end
+
     def consolidate_rerun_txt_files
       parallel_rerun_files = Dir.glob('parallel_rerun*.txt')
       unless parallel_rerun_files.empty?

data/lib/geordi/hint.rb

@@ -0,0 +1,48 @@
+# Use the methods in this file to hint at other geordi features
+require File.expand_path('settings', __dir__)
+
+module Geordi
+  class Hint
+    class << self
+
+      def did_you_know(hints)
+        settings_probability =  Settings.new.hint_probability
+        default_probability = (Util.testing? ? 0 : 10) # Percent
+        should_print_hint = Random.new.rand(100) <= (settings_probability || default_probability)
+
+        generated_hints = hints.map(&method(:generate))
+        if generated_hints.any? && should_print_hint
+          puts
+          puts generated_hints.sample
+          puts 'You can configure the probability for these hints by setting hint_probability to a unitless percent number in ~/.config/geordi/global.yml' unless settings_probability
+        end
+
+        generated_hints
+      end
+
+      private
+
+      def generate(hint)
+        if hint.is_a?(Symbol)
+          command = Geordi::CLI.commands[hint.to_s]
+          description = downcase_first_letter(command.description)
+          "Did you know? `geordi #{command.name}` can #{description}."
+        elsif hint.is_a?(Array)
+          command = Geordi::CLI.commands[hint[0].to_s]
+          option = command.options[hint[1]]
+          banner = option.banner.nil? ? '' : " #{option.banner}"
+          description = downcase_first_letter(option.description)
+          "Did you know? `geordi #{command.name} #{option.aliases.first}#{banner}` can #{description}."
+        elsif hint.is_a?(String)
+          "Did you know? #{hint}"
+        else
+          raise "Unsupported hint input #{hint.inspect}"
+        end
+      end
+
+      def downcase_first_letter(str)
+        str[0].downcase + str[1..-1]
+      end
+    end
+  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 git_initials].freeze
+    ALLOWED_GLOBAL_SETTINGS = %w[ pivotal_tracker_api_key auto_update_chromedriver pivotal_tracker_project_ids git_initials hint_probability ].freeze
     ALLOWED_LOCAL_SETTINGS = %w[ pivotal_tracker_project_ids ].freeze
 
     SETTINGS_WARNED = 'GEORDI_INVALID_SETTINGS_WARNED'
@@ -27,6 +27,10 @@ module Geordi
       save_global_settings
     end
 
+    def hint_probability
+      @global_settings['hint_probability']
+    end
+
     def git_initials
       @global_settings['git_initials']
     end
@@ -103,7 +107,7 @@ module Geordi
       invalid_keys = settings.keys - allowed_keys
       unless invalid_keys.empty?
         Interaction.warn "Unknown settings in #{file}: #{invalid_keys.join(", ")}"
-        Interaction.note "Supported settings in #{file} are: #{allowed_keys.join(", ")}"
+        puts "Supported settings in #{file} are: #{allowed_keys.join(", ")}"
       end
     end
 

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '9.5.0'.freeze
+  VERSION = '9.6.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 9.5.0
+  version: 9.6.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-22 00:00:00.000000000 Z
+date: 2023-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -88,6 +88,7 @@ files:
 - lib/geordi/db_cleaner.rb
 - lib/geordi/dump_loader.rb
 - lib/geordi/gitpt.rb
+- lib/geordi/hint.rb
 - lib/geordi/interaction.rb
 - lib/geordi/remote.rb
 - lib/geordi/settings.rb
@@ -101,10 +102,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: 'Support for sequential running of integration tests tagged
-  with @solo has been dropped.
-
-  '
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -119,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Collection of command line tools we use in our daily work with Ruby, Rails