geordi 9.4.1 → 9.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acfbd833f5f9da8e6b157b99109fdb1568d496678446b80d23f972e997601fb6
-  data.tar.gz: 4baee0e83ea956375deb9a379ae620e2c27482045e5f1a0b75f2fcc16017de57
+  metadata.gz: 506036483e1c31f8fab13388d6f92168227df95506f56ce5e28241f9ef867fc1
+  data.tar.gz: 85ef8a779e3e699865d0eb3f589fd252dd345771946daaed057e3615fcca1ca5
 SHA512:
-  metadata.gz: 0b98db037dd7d2b647236996c529102e486c30abb7b5037b138db6048ad366a6dfb39d367df8354f3a2a51441eb59382ff908d777bca04a6320efb6ea1fc1562
-  data.tar.gz: 4fd187318f0439a29e1ecf59de2bfebabc3de278b02a82a9b1587e493b11a6d2a24e74f25d702108b3b45b1fd252ad4c1360e66e1399ec034db3684cfce826a6
+  metadata.gz: fb8e5d65caf516ff4a4a5da1655ba5cf8001d8d0c875b68908e39e993dfbde7a3cdb4b887318192cb5bf22f5e2555a5d7796061c72fb2cf745c23c87a71c2ade
+  data.tar.gz: 9ddb734143d4162be8e6cf053f7b9aa35f7c72c69558caedcdb4ed9021b6c16b1bfd3ee84d6c13ad089b4af154d0bd0a197873355ab0dafaebc26710150f38d4

data/CHANGELOG.md

@@ -10,11 +10,25 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 ### Breaking changes
 
 
-## 9.4.1 2023-01-09
+# 9.5.1 - 2023-04-26
+
+### Compatible changes
+
+* `cucumber` command: Support the passing of options without "=" 
+
+
+# 9.5.0 2023-03-22
 
 ### Compatible changes
+* `commit` command: The pivotal tracker story is linked in the description of the commit
+* `server` command: Use `daho.im` instead of `vcap.me` when offering the local development URL
+* `rspec` command: chromedriver is updated automatically, if auto-update is configured and the app uses selenium-webdriver
+
 
-- Ruby 3.2 support
+## 9.4.1 2023-01-09
+
+### Compatible changes
+* Ruby 3.2 support
 
 
 ## 9.4.0 2022-12-09

data/Gemfile.lock

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

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/commands/cucumber.rb

@@ -52,22 +52,21 @@ 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
 

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

@@ -10,8 +10,15 @@ LONGDESC
 
 def rspec(*files)
   if File.exist?('spec/spec_helper.rb')
+    require 'geordi/settings'
+
+    settings = Geordi::Settings.new
+
     invoke_geordi 'bundle_install'
     invoke_geordi 'yarn_install'
+    if settings.auto_update_chromedriver && Util.gem_available?('selenium-webdriver')
+      invoke_geordi 'chromedriver_update', quiet_if_matching: true
+    end
 
     Interaction.announce 'Running specs'
 

data/lib/geordi/commands/server.rb

@@ -12,7 +12,7 @@ def server(port = nil)
 
   Interaction.announce 'Booting a development server'
   port ||= options.port
-  Interaction.note "URL: http://#{File.basename(Dir.pwd)}.vcap.me:#{port}"
+  Interaction.note "URL: http://#{File.basename(Dir.pwd)}.daho.im:#{port}"
   puts
 
   command = Util.server_command

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

@@ -22,7 +22,7 @@ module Geordi
 
       story = choose_story
       if story
-        create_commit "[##{story.id}] #{story.name}", *git_args
+        create_commit "[##{story.id}] #{story.name}", "Story: #{story.url}", *git_args
       end
     end
 
@@ -76,7 +76,7 @@ module Geordi
 
     def applicable_stories
       if Util.testing?
-        return ENV['GEORDI_TESTING_NO_PT_STORIES'] == 'true' ? [] : [OpenStruct.new(id: 12, name: 'Test Story')]
+        return ENV['GEORDI_TESTING_NO_PT_STORIES'] == 'true' ? [] : [OpenStruct.new(id: 12, name: 'Test Story', url: 'https://www.story-url.com')]
       end
 
       projects = load_projects
@@ -128,11 +128,11 @@ module Geordi
       nil # Return nothing
     end
 
-    def create_commit(message, *git_args)
+    def create_commit(title, description, *git_args)
       extra = highline.ask("\nAdd an optional message").strip
-      message << ' - ' << extra if extra != ''
+      title << ' - ' << extra if extra != ''
 
-      Util.run!(['git', 'commit', '--allow-empty', '-m', message, *git_args])
+      Util.run!(['git', 'commit', '--allow-empty', '-m', title, '-m', description, *git_args])
     end
 
     def bold(string)

data/lib/geordi/settings.rb

@@ -103,7 +103,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.4.1'.freeze
+  VERSION = '9.5.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 9.4.1
+  version: 9.5.1
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-09 00:00:00.000000000 Z
+date: 2023-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -101,10 +101,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 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.9
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Collection of command line tools we use in our daily work with Ruby, Rails