geordi 4.1.1 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2af11b387f28e87fc2cb89172b1ea8fdcd87dc4bc62697c18ba4a7cc8ddada28
-  data.tar.gz: c0612fe6e8f266a3b5e5a467018b5f6e484224944057ddd323c9162a0b64d858
+  metadata.gz: 7c5a8befcc3bb1f14b4bd0803491b56ccb7db92daf47aa45eb73f359988ab768
+  data.tar.gz: 244b132d249d3e0d0d851ad79bae5890736e52f202a7bb2bf0c80b3a6d821195
 SHA512:
-  metadata.gz: e96089335890efaf9e8ea9a0cabea1c4a6447e363513f61fa2e2fe55f43637ca24906fd3732fd3eb0b5adb752bd2a752a263a0be772bedba1b7115e69425b5d2
-  data.tar.gz: bad860e3b8a14d06970351213fda638e2b853dfbf107ea6b6f4e018cd2ecdbb767848a2ebdec34757f3c5a9d47e8a2a3181ac40c729b1b3a9cbb26e62aaf1613
+  metadata.gz: 3f57ac5bb0f1e804e2d53ab30e0b5c3742835eabfd5d58755dd4a06b55d5065bc0f3fa7b4d00bca9b4f72ae2329042339203ced4336830c534585e684241570c
+  data.tar.gz: 52c77c467efc9ecf3fc8f26dc713b38d26e79977a55604921ffe62b1f2808562e9f770d0c11ba59045f595df54d07c3a91b8b926361ae00e0330625bc3418c75

data/.travis.yml

@@ -8,12 +8,17 @@ rvm:
   - '2.4.10'
   - '2.5.8'
   - '2.6.6'
+  - '2.7.1'
 
 gemfile:
   - 'Gemfile'
 
 dist: trusty
 
+before_install:
+  - sudo apt-get install -y vnc4server
+  # Fake required password for vncserver
+  - mkdir ~/.vnc && touch ~/.vnc/passwd && chmod 700 ~/.vnc/passwd
 install:
   - gem install bundler:1.17.3
   # Replace default Travis CI bundler script with a version that doesn't

data/CHANGELOG.md

@@ -5,10 +5,25 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## Unreleased
+
 ### Compatible changes
 ### Breaking changes
 
 
+## 4.2.0 2020-10-02
+
+### Compatible changes
+* Add `auto_update_chromedriver` as global setting option to automatically update chromedriver before cucumber 
+  tests, if Chrome and chromedriver versions don't match.
+* Dump command: Add support for multiple databases (#103 by @kajatiger)
+* Add Ruby 2.7 to list of supported Ruby versions
+* Fix #115: `geordi cucumber --modified` command, that corrupted filenames like:
+  ```
+  No such file or directory tures/pages.feature
+  ```
+* Avoid writing an instance of HighLine::String to Geordi config files (closes #114)
+
+
 ## 4.1.1 2020-08-28
 ### Compatible changes
 

data/Gemfile

@@ -3,7 +3,8 @@ source 'http://rubygems.org'
 # Specify your gem's dependencies in geordi.gemspec
 gemspec
 
-gem 'aruba'
+gem 'aruba', '< 1' # Drops support for Ruby 2.2-
+gem 'rake', '< 13' # Drops support for Ruby 2.1
 gem 'rspec-mocks'
 gem 'highline'
 gem 'parallel_tests'

data/Gemfile.lock

@@ -7,70 +7,87 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.8)
-    aruba (0.6.2)
-      childprocess (>= 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    aruba (0.14.14)
+      childprocess (>= 0.6.3, < 4.0.0)
+      contracts (~> 0.9)
+      cucumber (>= 1.3.19)
+      ffi (~> 1.9)
+      rspec-expectations (>= 2.99)
+      thor (>= 0.19, < 2.0)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    builder (3.2.3)
+    backports (3.18.2)
+    builder (3.2.4)
     childprocess (1.0.1)
       rake (< 13.0)
-    coderay (1.1.2)
+    coderay (1.1.3)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    cucumber (1.3.20)
+    contracts (0.16.0)
+    cucumber (3.0.0)
       builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
+      cucumber-core (~> 3.0.0)
+      cucumber-expressions (~> 4.0.3)
+      cucumber-wire (~> 0.0.1)
+      diff-lcs (~> 1.3)
+      gherkin (~> 4.0)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.2)
+    cucumber-core (3.0.0)
+      backports (>= 3.8.0)
+      cucumber-tag_expressions (>= 1.0.1)
+      gherkin (>= 4.1.3)
+    cucumber-expressions (4.0.4)
+    cucumber-tag_expressions (2.0.2)
+    cucumber-wire (0.0.1)
     declarative (0.0.10)
     declarative-option (0.1.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.2.5)
+    diff-lcs (1.4.4)
     equalizer (0.0.11)
-    excon (0.73.0)
+    excon (0.76.0)
     faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.14.0)
       faraday (>= 0.7.4, < 1.0)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
-    highline (1.6.21)
+    ffi (1.12.2)
+    gherkin (4.1.3)
+    highline (2.0.3)
     ice_nine (0.11.2)
     launchy (2.4.3)
       addressable (~> 2.3)
     method_source (1.0.0)
-    mimemagic (0.3.4)
-    multi_json (1.13.1)
+    mimemagic (0.3.5)
+    multi_json (1.15.0)
     multi_test (0.1.2)
     multipart-post (2.1.1)
-    parallel (0.5.16)
-    parallel_tests (0.6.18)
+    parallel (1.13.0)
+    parallel_tests (2.23.0)
       parallel
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rake (10.5.0)
+    public_suffix (2.0.5)
+    rake (12.3.3)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
-    rspec-expectations (3.4.0)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
     thor (1.0.1)
     thread_safe (0.3.6)
-    tracker_api (1.10.0)
+    tracker_api (1.11.0)
       addressable
       equalizer
       excon
@@ -91,12 +108,13 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba
+  aruba (< 1)
   geordi!
   highline
   launchy
   parallel_tests
   pry
+  rake (< 13)
   rspec-mocks
   tracker_api
 

data/README.md

@@ -39,6 +39,13 @@ Example: `geordi chromedriver_update`
 This command will find and install the matching chromedriver for the currently
 installed Chrome.
 
+Setting `auto_update_chromedriver` to `true` in your global Geordi config file 
+(`~/.config/geordi/global.yml`), will automatically update chromedriver before 
+cucumber tests, in case Chrome and chromedriver versions don't match
+
+**Options**
+- `[--quiet-if-matching], [--no-quiet-if-matching]`: Suppress notification if chromedriver and chrome versions match
+
 
 ### `geordi clean`
 Remove unneeded files from the current directory.
@@ -169,10 +176,18 @@ offer to edit the whitelist instead.
 - `[--postgres=PORT_OR_SOCKET]`: Use Postgres port or socket
 - `[--mysql=PORT_OR_SOCKET]`: Use MySQL/MariaDB port or socket
 
-
 ### `geordi dump [TARGET]`
 Handle (remote) database dumps.
 
+If you are using multiple databases per environment, pass the database name like this:
+
+    geordi dump -d primary
+
+Loading a dump into one of multiple local databases is not supported yet.
+
+When called with the `--load` option, sources the specified dump into the
+development database.
+
 `geordi dump` (without arguments) dumps the development database with `dumple`.
 
 `geordi dump -l tmp/staging.dump` (with the `--load` option) sources the
@@ -407,7 +422,7 @@ To try Geordi locally, call it like this:
 
     # -I means "add the following directory to load path"
     ruby -Ilib exe/geordi
-    
+
     # From another directory
     ruby -I ../geordi/lib ../geordi/exe/geordi
 

data/Rakefile

@@ -5,7 +5,7 @@ desc 'Default: Run all tests'
 task default: :features
 
 task :features do
-  system 'bundle exec cucumber'
+  exec 'bundle exec cucumber'
 end
 
 task :readme do

data/exe/dumple

@@ -45,9 +45,13 @@ begin
   end
 
   config = YAML::load(ERB.new(File.read(config_path)).result)
+  environment, database = ARGV.reject{ |arg| arg[0].chr == '-' }
+  environment ||= 'production'
+  config = config[environment] or raise "No #{environment} database found.\nUsage: dumple ENVIRONMENT [DATABASE]"
 
-  environment = ARGV.reject{ |arg| arg[0].chr == '-' }.first || 'production'
-  config = config[environment] or raise "No #{environment} database found.\nUsage: dumple ENVIRONMENT"
+  if database
+    config = config[database] or raise %(Unknown #{environment} database "#{database}")
+  end
 
   dump_dir = "#{ENV['HOME']}/dumps"
   unless File.directory?(dump_dir)
@@ -61,7 +65,8 @@ begin
     dump_path = "#{dump_dir}/#{config['database']}_#{Time.now.strftime("%Y%m%d_%H%M%S")}.dump"
   end
 
-  puts "> Dumping database for \"#{environment}\" environment ..."
+  given_database = database ? %(#{database} ) : ""
+  puts "> Dumping #{given_database}database for \"#{environment}\" environment ..."
 
   host = config['host']
   port = config['port']
@@ -90,7 +95,7 @@ begin
     command << " --port=#{port}" if port
     command
   else
-    raise "Adapter \"#{config['adapter']} is not supported"
+    raise "Adapter \"#{config['adapter']}\" is not supported"
   end
   success = system(dump_command)
   success or raise "Creating the dump failed"

data/geordi.gemspec

@@ -11,13 +11,13 @@ Gem::Specification.new do |spec|
 
   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.homepage = 'http://makandra.com'
+  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{^(test|spec|features)/}) }
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(spec|features)/}) }
   end
   spec.bindir = 'exe'
   spec.executables = spec.files.grep(%r(^exe/)) { |f| File.basename(f) }
@@ -27,6 +27,6 @@ Gem::Specification.new do |spec|
 
   spec.post_install_message = <<-ATTENTION
 * Binary `geordi` installed
-* Geordi 4.0.0 has removed its deprecated executables. If you want to invoke these commands like before, you may create aliases on your machine. For the alias mapping, please refer to https://github.com/makandra/geordi/commit/68fa92acb146ebde3acb92d7b9556bd4eaa2b4ff
+* Geordi 4 has removed its deprecated executables. If you want to invoke these commands like before, you may create aliases on your machine. For the alias mapping, please refer to https://github.com/makandra/geordi/commit/68fa92acb146ebde3acb92d7b9556bd4eaa2b4ff
   ATTENTION
 end

data/lib/geordi/chromedriver_updater.rb

@@ -5,12 +5,12 @@ require 'tempfile'
 module Geordi
   class ChromedriverUpdater
 
-    def run
+    def run(options)
       chrome_version = determine_chrome_version
       chromedriver_version = determine_chromedriver_version
 
       if skip_update?(chrome_version, chromedriver_version)
-        Interaction.warn("No update required, you are using for both executables the same version #{chrome_version}!")
+        Interaction.note("No update required, you are using for both executables the same version #{chrome_version}!") unless options[:quiet_if_matching]
       else
         chromedriver_zip = download_chromedriver(chrome_version)
         unzip(chromedriver_zip, File.expand_path('~/bin'))

data/lib/geordi/commands/chromedriver_update.rb

@@ -4,10 +4,17 @@ Example: `geordi chromedriver_update`
 
 This command will find and install the matching chromedriver for the currently
 installed Chrome.
+
+Setting `auto_update_chromedriver` to `true` in your global Geordi config file 
+(`~/.config/geordi/global.yml`), will automatically update chromedriver before 
+cucumber tests, in case Chrome and chromedriver versions don't match
 LONGDESC
 
+option :quiet_if_matching, type: :boolean, default: false,
+  desc: 'Suppress notification if chromedriver and chrome versions match'
+
 def chromedriver_update
   require 'geordi/chromedriver_updater'
 
-  ChromedriverUpdater.new.run
+  ChromedriverUpdater.new.run(options)
 end

data/lib/geordi/commands/cucumber.rb

@@ -37,7 +37,7 @@ def cucumber(*args)
   if args.empty?
     # This is not testable as there is no way to stub `git` :(
     if options.modified?
-      modified_features = `git status --short`.split($INPUT_RECORD_SEPARATOR).map do |line|
+      modified_features = `git status --short`.split("\n").map do |line|
         indicators = line.slice!(0..2) # Remove leading indicators
         line if line.include?('.feature') && !indicators.include?('D')
       end.compact
@@ -45,7 +45,7 @@ def cucumber(*args)
     end
 
     if options.containing
-      matching_features = `grep -lri '#{options.containing}' --include=*.feature features/`.split($INPUT_RECORD_SEPARATOR)
+      matching_features = `grep -lri '#{options.containing}' --include=*.feature features/`.split("\n")
       args = matching_features.uniq
     end
   end
@@ -53,8 +53,13 @@ def cucumber(*args)
   if File.directory?('features')
     require 'geordi/cucumber'
 
+    settings = Geordi::Settings.new
+
     invoke_geordi 'bundle_install'
     invoke_geordi 'yarn_install'
+    if settings.auto_update_chromedriver
+      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

data/lib/geordi/commands/dump.rb

@@ -10,13 +10,21 @@ specified target's database and downloads it to `tmp/`.
 
 `geordi dump staging -l` (with a Capistrano deploy target and the `--load`
 option) sources the dump into the development database after downloading it.
+
+If you are using multiple databases per environment, pass the database name like this:
+
+    geordi dump -d primary
+
+Loading a dump into one of multiple local databases is not supported yet.
 DESC
 
 option :load, aliases: '-l', type: :string, desc: 'Load a dump', banner: '[DUMP_FILE]'
+option :database, aliases: '-d', type: :string, desc: 'Database name, if there are multiple databases', banner: 'NAME'
 
 def dump(target = nil, *_args)
   require 'geordi/dump_loader'
   require 'geordi/remote'
+  database = options[:database] ? "#{options[:database]} " : ''
 
   if target.nil?
     if options.load
@@ -33,12 +41,14 @@ def dump(target = nil, *_args)
 
     else
       Interaction.announce 'Dumping the development database'
-      Util.run!('dumple development')
-      Interaction.success 'Successfully dumped the development database.'
+      Util.run!("dumple development #{database}")
+      Interaction.success "Successfully dumped the #{database}development database."
     end
 
   else
-    Interaction.announce 'Dumping the database of ' + target
+    database_label = options[:database] ? " (#{database}database)" : ""
+
+    Interaction.announce "Dumping the database of #{target}#{database_label}"
     dump_path = Geordi::Remote.new(target).dump(options)
 
     if options.load
@@ -47,7 +57,7 @@ def dump(target = nil, *_args)
       Interaction.announce "Sourcing dump into the #{loader.config['database']} db"
       loader.load
 
-      Interaction.success "Your #{loader.config['database']} database has now the data of #{target}."
+      Interaction.success "Your #{loader.config['database']} database has now the data of #{target}#{database_label}."
     end
   end
 end

data/lib/geordi/remote.rb

@@ -31,9 +31,10 @@ module Geordi
     end
 
     def dump(options = {})
+      database = options[:database] ? " #{options[:database]}" : ''
       # Generate dump on the server
       shell options.merge({
-        remote_command: "dumple #{@config.env} --for_download",
+        remote_command: "dumple #{@config.env}#{database} --for_download",
       })
 
       destination_directory = File.join(@config.root, 'tmp')
@@ -45,7 +46,7 @@ module Geordi
       server = @config.primary_server
       Util.run!("scp -C #{@config.user(server)}@#{server}:#{REMOTE_DUMP_PATH} #{destination_path}")
 
-      Interaction.success "Dumped the #{@stage} database to #{relative_destination}."
+      Interaction.success "Dumped the#{database} #{@stage} database to #{relative_destination}."
 
       destination_path
     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 ].freeze
+    ALLOWED_GLOBAL_SETTINGS = %w[ pivotal_tracker_api_key auto_update_chromedriver ].freeze
     ALLOWED_LOCAL_SETTINGS = %w[ use_vnc pivotal_tracker_project_ids ].freeze
 
     def initialize
@@ -25,6 +25,15 @@ module Geordi
       save_global_settings
     end
 
+    def auto_update_chromedriver
+      @global_settings["auto_update_chromedriver"] || false
+    end
+
+    def auto_update_chromedriver=(value)
+      @global_settings['auto_update_chromedriver'] = value
+      save_global_settings
+    end
+
     # Local settings
     # They should not be changed by geordi to avoid unexpected diffs, therefore
     # there are no setters for these settings
@@ -129,7 +138,7 @@ module Geordi
     def inquire_pt_api_key
       Geordi::Interaction.warn 'Your settings are missing or invalid.'
       Geordi::Interaction.warn "Please configure your Pivotal Tracker access."
-      token = Geordi::Interaction.prompt 'Your API key:'
+      token = Geordi::Interaction.prompt('Your API key:').to_s # Just be sure
       self.pivotal_tracker_api_key = token
       puts
 

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '4.1.1'.freeze
+  VERSION = '4.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.2.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-28 00:00:00.000000000 Z
+date: 2020-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -97,13 +97,13 @@ files:
 - lib/geordi/settings.rb
 - lib/geordi/util.rb
 - lib/geordi/version.rb
-homepage: http://makandra.com
+homepage: https://makandra.com
 licenses:
 - MIT
 metadata: {}
 post_install_message: |
   * Binary `geordi` installed
-  * Geordi 4.0.0 has removed its deprecated executables. If you want to invoke these commands like before, you may create aliases on your machine. For the alias mapping, please refer to https://github.com/makandra/geordi/commit/68fa92acb146ebde3acb92d7b9556bd4eaa2b4ff
+  * Geordi 4 has removed its deprecated executables. If you want to invoke these commands like before, you may create aliases on your machine. For the alias mapping, please refer to https://github.com/makandra/geordi/commit/68fa92acb146ebde3acb92d7b9556bd4eaa2b4ff
 rdoc_options: []
 require_paths:
 - lib
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Collection of command line tools we use in our daily work with Ruby, Rails