geordi 4.1.1 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2af11b387f28e87fc2cb89172b1ea8fdcd87dc4bc62697c18ba4a7cc8ddada28
-  data.tar.gz: c0612fe6e8f266a3b5e5a467018b5f6e484224944057ddd323c9162a0b64d858
+  metadata.gz: 4359df61d9901b0d3091ef950530212fb9ba92847425d136a42c4668d6745462
+  data.tar.gz: c6cf00413126337330997068a59f097f226cdc41f9feb97d8523996d77ceeba5
 SHA512:
-  metadata.gz: e96089335890efaf9e8ea9a0cabea1c4a6447e363513f61fa2e2fe55f43637ca24906fd3732fd3eb0b5adb752bd2a752a263a0be772bedba1b7115e69425b5d2
-  data.tar.gz: bad860e3b8a14d06970351213fda638e2b853dfbf107ea6b6f4e018cd2ecdbb767848a2ebdec34757f3c5a9d47e8a2a3181ac40c729b1b3a9cbb26e62aaf1613
+  metadata.gz: 6a2b44bbe812e2a20bd2002ee64f3925108203f188d88e7da0f590cf2b7d2f4e01c744525c778cce47f6e1990ec44b2df65a95adaaa15cb4a6e2d3a8167ceddb
+  data.tar.gz: 0f6441323fc798aba02f8d6947a803504e9bb11d3714001e1840959a90cf3763e590f45e112d94b6494996f78101bd73e5a7fb62440359c9c9b402dd1b9bc2a9

data/.github/workflows/test.yml

@@ -0,0 +1,48 @@
+name: Tests
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+    branches:
+    - master
+jobs:
+  test:
+    runs-on: ubuntu-18.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
+    env:
+      BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: "${{ matrix.ruby }}"
+    - name: Install vncserver
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y tightvncserver
+        # Fake required password for vncserver
+        mkdir ~/.vnc && touch ~/.vnc/passwd && chmod 700 ~/.vnc/passwd
+    - name: Bundle
+      run: |
+        gem install bundler:1.17.3
+        bundle install --no-deployment
+    - name: Run tests
+      run: bundle exec rake
+    

data/.ruby-version

@@ -1 +1 @@
-2.5
+2.5.8

data/CHANGELOG.md

@@ -5,8 +5,44 @@ 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
+
+
+## 5.2.0 2020-12-14
+
+### Compatible changes
+
+* Geordi update will exit with a warning when Ruby version changes during pull.
+* Add `geordi docker` command with support for opening a shell for dockerized dev environments.
+
+
+## 5.1.0 2020-12-04
+
 ### Compatible changes
+* Switch to tightvncserver to be compatible with Ubuntu 20.04. vnc4server is still supported.
+
+
+## 5.0.0 2020-11-25
+
 ### Breaking changes
+* Remove support for Ruby 2.0 and 2.1
+
+
+## 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
@@ -105,6 +141,9 @@ Don't know how to build task 'db:migrate parallel:prepare'
 ### Breaking changes
 - Remove support for Ruby 1.8.7 and Ruby 1.9.3. Bug fixes might still be backported to 2.x, but we will not add any features to 2.x anymore. Please consider to upgrade the Ruby version of your project.
 
+## 2.12.3
+
+* Add `geordi docker` command with support for opening a shell for dockerized dev environments.
 
 ## 2.11.0 2020-05-04
 

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

@@ -1,76 +1,93 @@
 PATH
   remote: .
   specs:
-    geordi (4.1.1)
+    geordi (5.2.0)
       thor (~> 1)
 
 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.2.0)
       builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
+      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)
     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.78.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 (5.1.0)
+    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.19.2)
+    parallel_tests (2.32.0)
       parallel
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rake (10.5.0)
+    public_suffix (3.1.1)
+    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.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.0)
     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

@@ -1,4 +1,4 @@
-Geordi [![Build Status](https://travis-ci.org/makandra/geordi.svg?branch=master)](https://travis-ci.org/makandra/geordi)
+Geordi [![Tests](https://github.com/makandra/geordi/workflows/Tests/badge.svg)](https://github.com/makandra/geordi/actions)
 ======
 
 Geordi is a collection of command line tools we use in our daily work with
@@ -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.
@@ -150,6 +157,24 @@ instead of `cap deploy:migrations`. You can force using `deploy` by passing the
 - `-c, [--current-branch], [--no-current-branch]`: Set DEPLOY_BRANCH to the current branch during deploy
 
 
+### `geordi docker`
+Manage docker containers for the current project.
+
+Manage docker containers to run your project dockerized.
+
+It expects a `docker-compose.yml` file that specifies all services, and a service
+named "main" that opens a shell for the project.
+
+There are three subcommands:
+
+- `geordi docker setup`
+  Fetches all docker containers.
+- `geordi docker shell`
+  Runs the docker service named 'main'.
+- `geordi docker vnc`
+  Opens a VNC viewer to connect to the VNC server in the container.
+
+
 ### `geordi drop-databases`
 Interactively delete local databases.
 
@@ -184,8 +209,15 @@ 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.
+
 **Options**
 - `-l, [--load=[DUMP_FILE]]`: Load a dump
+- `-d, [--database=NAME]`: Database name, if there are multiple databases
 
 
 ### `geordi firefox COMMAND`
@@ -369,7 +401,9 @@ Stores a timestamped database dump for the given Rails environment in `~/dumps`:
 
     dumple development
 
-See http://makandracards.com/makandra/1008-dump-your-database-with-dumple
+**Options**
+- `-i`: Print disk usage of `~/dumps`
+- `--compress`: After dumping, run gzip to compress the dump in place
 
 
 launchy_browser
@@ -407,7 +441,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/exe/geordi

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+
 require 'geordi/util'
 
 Geordi::Util.installing_missing_gems do

data/geordi.gemspec

@@ -5,19 +5,19 @@ require 'geordi/version'
 Gem::Specification.new do |spec|
   spec.name = 'geordi'
   spec.version = Geordi::VERSION
-  spec.required_ruby_version = '>= 2.0.0'
+  spec.required_ruby_version = '>= 2.2.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.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) }
@@ -25,8 +25,6 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'thor', '~> 1'
 
-  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
-  ATTENTION
+  #spec.post_install_message = <<-ATTENTION
+  #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/_setup_vnc.rb

@@ -23,26 +23,24 @@ def _setup_vnc
     Interaction.success 'It appears you already have a VNC server installed. Good job!'
   else
     puts 'Please run:'
-    Interaction.note_cmd 'sudo apt-get install vnc4server'
+    Interaction.note_cmd 'sudo apt-get install tightvncserver'
+    puts 'In case this package is not available, you may try vnc4server instead.'
     Interaction.prompt 'Continue ...'
 
     puts
+
     Interaction.note 'We will now set a password for your VNC server.'
     puts Util.strip_heredoc <<-TEXT
-      When running our cucumber script, you will not actually need this
-      password, and there is no security risk. However, if you start a vncserver
-      without our cucumber script, a user with your password can connect to
-      your machine.
+      When running our cucumber script, this password will be used while also
+      restricting access to the local machine. However, if you start a vncserver
+      without our cucumber script, keep in mind that a user with this password
+      can connect to your machine.
 
     TEXT
     puts 'Please run:'
-    Interaction.note_cmd 'vncserver :20'
+    Interaction.note_cmd 'vncpasswd'
     Interaction.warn 'Enter a secure password!'
     Interaction.prompt 'Continue ...'
-
-    puts 'Now stop the server again. Please run:'
-    Interaction.note_cmd 'vncserver -kill :20'
-    Interaction.prompt 'Continue ...'
   end
 
   Interaction.announce 'Setup VNC viewer'

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

@@ -9,10 +9,6 @@ stored in `~/.config/geordi/global.yml`.
 LONGDESC
 
 def commit(*git_args)
-  raise <<-TEXT if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.1')
-Unsupported Ruby Version #{RUBY_VERSION}. `geordi commit` requires Ruby 2.1+.
-  TEXT
-
   require 'geordi/gitpt'
   Gitpt.new.run(git_args)
 end

data/lib/geordi/commands/create_database_yml.rb

@@ -7,7 +7,7 @@ def create_database_yml
     Interaction.announce 'Creating ' + real_yml
 
     sample = File.read(sample_yml)
-    adapter = sample.match(/adapter: (\w+)\n/).captures.first
+    adapter = sample.match(/adapter: (\w+)/).captures.first
 
     print "Please enter your #{adapter} password: "
     db_password = STDIN.gets.strip

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

@@ -0,0 +1,44 @@
+class DockerCLI < Thor
+  desc 'setup', 'Setup docker and fetch required docker-container for the current project.'
+  def setup
+    docker.setup
+  end
+
+  desc 'shell', 'Open a shell in the main docker container for the current project.'
+  option :secondary, default: false, type: :boolean
+  map 'shell' => '_shell'
+  def _shell
+    docker.shell(:secondary => options[:secondary])
+  end
+
+  desc 'vnc', 'Open a vnc viewer connecting to the docker container.'
+  def vnc
+    docker.vnc
+  end
+
+  private
+
+  def docker
+    require 'geordi/docker'
+    Geordi::Docker.new
+  end
+end
+
+desc 'docker', 'Manage docker containers for the current project.'
+long_desc <<-LONGDESC
+Manage docker containers to run your project dockerized.
+
+It expects a `docker-compose.yml` file that specifies all services, and a service
+named "main" that opens a shell for the project.
+
+There are three subcommands:
+
+- `geordi docker setup`
+  Fetches all docker containers.
+- `geordi docker shell`
+  Runs the docker service named 'main'.
+- `geordi docker vnc`
+  Opens a VNC viewer to connect to the VNC server in the container.
+
+LONGDESC
+subcommand 'docker', DockerCLI

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

@@ -10,13 +10,24 @@ option :dump, type: :string, aliases: '-d', banner: 'TARGET',
 option :test, type: :boolean, aliases: '-t', desc: 'After updating, run tests'
 
 def update
+  old_ruby_version = File.read('.ruby-version').chomp
+
   Interaction.announce 'Updating repository'
   Util.run!('git pull', show_cmd: true)
 
-  invoke_geordi 'migrate'
+  ruby_version = File.read('.ruby-version').chomp
+  ruby_version_changed = !ruby_version.empty? && (ruby_version != old_ruby_version)
+
+  if ruby_version_changed
+    puts
+    Interaction.warn 'Ruby version changed during git pull. Please run again to use the new version.'
+    exit(1)
+  else
+    invoke_geordi 'migrate'
 
-  Interaction.success 'Successfully updated the project.'
+    Interaction.success 'Successfully updated the project.'
 
-  invoke_geordi 'dump', options.dump, load: true if options.dump
-  invoke_geordi 'tests' if 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

@@ -11,8 +11,10 @@ module Geordi
   class Cucumber
 
     VNC_DISPLAY = ':17'.freeze
-    VNC_SERVER_COMMAND = "vncserver #{VNC_DISPLAY} -localhost -nolisten tcp -SecurityTypes None -geometry 1280x1024".freeze
-    VNC_VIEWER_COMMAND = "vncviewer #{VNC_DISPLAY}".freeze
+    VNC_PASSWORD_FILE = File.absolute_path('~/.vnc/passwd').freeze # default for "vncpasswd"
+    VNC_SERVER_DEFAULT_OPTIONS = "-localhost -nolisten tcp -geometry 1280x1024 -rfbauth #{VNC_PASSWORD_FILE}".freeze
+    VNC_SERVER_COMMAND = "vncserver #{VNC_DISPLAY} #{ENV.fetch('GEORDI_VNC_OPTIONS', VNC_SERVER_DEFAULT_OPTIONS)}".freeze
+    VNC_VIEWER_COMMAND = "vncviewer -passwd #{VNC_PASSWORD_FILE}".freeze
     VNC_ENV_VARIABLES = %w[DISPLAY BROWSER LAUNCHY_BROWSER].freeze
 
     def run(files, cucumber_options, options = {})
@@ -30,10 +32,10 @@ module Geordi
       system command # Util.run! would reset the Firefox PATH
     end
 
-    def launch_vnc_viewer
+    def launch_vnc_viewer(source = VNC_DISPLAY)
       fork do
         error = capture_stderr do
-          system(VNC_VIEWER_COMMAND)
+          system("#{VNC_VIEWER_COMMAND} #{source}")
         end
         unless $?.success?
           if $?.exitstatus == 127

data/lib/geordi/docker.rb

@@ -0,0 +1,116 @@
+require 'geordi/interaction'
+require 'geordi/cucumber'
+require 'yaml'
+
+module Geordi
+  class Docker
+    DOCKER_COMPOSE_FILE = 'docker-compose.yml'.freeze
+
+    include Interaction
+
+    def setup
+      check_installation_and_config
+      announce('Fetching containers...')
+      if execute(:system, 'docker-compose', 'pull')
+        success('Fetch successful.')
+      else
+        fail('Fetch failed.')
+      end
+    end
+
+    def shell(options = {})
+      check_installation_and_config
+      if options[:secondary]
+        attach_to_running_shell
+      else
+        run_shell
+      end
+    end
+
+    def vnc
+      Cucumber.new.launch_vnc_viewer('::5967')
+    end
+
+    private
+
+    def attach_to_running_shell
+      running_containers = execute(:`, 'docker-compose ps').split("\n")
+      if (main_container_line = running_containers.grep(/_main_run/).first)
+        container_name = main_container_line.split(' ').first
+        execute(:exec, 'docker', 'exec', '-it', container_name, 'bash')
+      else
+        fail('Could not find a running shell. Start without --secondary first.')
+      end
+    end
+
+    def run_shell
+      command = [:system, 'docker-compose', 'run', '--service-ports']
+      command += ssh_agent_forward
+      command += ['main']
+      execute(*command)
+      execute(:system, 'docker-compose', 'stop')
+    end
+
+    def execute(kind, *args)
+      if ENV['GEORDI_TESTING']
+        puts "Stubbed run #{args.join(' ')}"
+        if kind == :`
+          mock_parse(*args)
+        else
+          mock_run(*args)
+        end
+      else
+        send(kind, *args)
+      end
+    end
+
+    def mock_run(*args)
+      # exists just to be stubbed in tests
+      true
+    end
+
+    def mock_parse(*args)
+      # exists just to be stubbed in tests
+      'command output'
+    end
+
+    def check_installation_and_config
+      unless command_exists?('docker')
+        fail('You need to install docker first with `sudo apt install docker`. After installation please log out and back in to your system once.')
+      end
+
+      unless command_exists?('docker-compose')
+        fail('You need to install docker-compose first with `sudo apt install docker-compose`.')
+      end
+
+      unless docker_compose_config && (services = docker_compose_config['services']) && services.key?('main')
+        fail('Your project does not seem to be properly set up. Expected to find a docker-compose.yml which defines a service named "main".')
+      end
+    end
+
+    def command_exists?(command)
+      execute(:system, "which #{command} > /dev/null")
+    end
+
+    def docker_compose_config
+      @docker_compose_config ||= if File.exists?(DOCKER_COMPOSE_FILE)
+        if YAML.respond_to?(:safe_load)
+          YAML.safe_load(File.read(DOCKER_COMPOSE_FILE))
+        else
+          YAML.load(File.read(DOCKER_COMPOSE_FILE))
+        end
+      end
+    rescue
+      false
+    end
+
+    def ssh_agent_forward
+      if (auth_sock = ENV['SSH_AUTH_SOCK'])
+        dirname = File.dirname(auth_sock)
+        ['-v', "#{dirname}:#{dirname}", '-e', "SSH_AUTH_SOCK=#{auth_sock}"]
+      else
+        []
+      end
+    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/util.rb

@@ -43,13 +43,14 @@ module Geordi
         if command.is_a?(Array)
           real_command, *arguments = *command
           command = [real_command.split(' '), arguments].flatten
-          printable_command = command.join(', ')
+          show_command = command
         else
-          printable_command = command
+          show_command = [command]
         end
 
         if show_cmd
-          Interaction.note_cmd printable_command
+          # Join with spaces for better readability and copy-pasting
+          Interaction.note_cmd show_command.join(' ')
         end
 
         if confirm
@@ -57,12 +58,13 @@ module Geordi
         end
 
         if testing?
-          puts "Util.run! #{printable_command}"
+          # Join with commas for precise argument distinction
+          puts "Util.run! #{show_command.join(', ')}"
         else
           # Remove Geordi's Bundler environment when running commands.
           success = if !defined?(Bundler)
             system(*command)
-          elsif Gem::Version.new(Bundler::VERSION) >= Gem::Version.new('2.1.2')
+          elsif Gem::Version.new(Bundler::VERSION) >= Gem::Version.new('1.17.3')
             Bundler.with_original_env do
               system(*command)
             end

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '4.1.1'.freeze
+  VERSION = '5.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: 5.2.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-28 00:00:00.000000000 Z
+date: 2020-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -36,9 +36,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".ruby-version"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -68,6 +68,7 @@ files:
 - lib/geordi/commands/cucumber.rb
 - lib/geordi/commands/delete_dumps.rb
 - lib/geordi/commands/deploy.rb
+- lib/geordi/commands/docker.rb
 - lib/geordi/commands/drop_databases.rb
 - lib/geordi/commands/dump.rb
 - lib/geordi/commands/firefox.rb
@@ -89,6 +90,7 @@ files:
 - lib/geordi/commands/yarn_install.rb
 - lib/geordi/cucumber.rb
 - lib/geordi/db_cleaner.rb
+- lib/geordi/docker.rb
 - lib/geordi/dump_loader.rb
 - lib/geordi/firefox_for_selenium.rb
 - lib/geordi/gitpt.rb
@@ -97,13 +99,11 @@ 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
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -111,14 +111,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !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

data/.travis.yml

@@ -1,23 +0,0 @@
-language: ruby
-
-rvm:
-  - '2.0.0'
-  - '2.1.10'
-  - '2.2.10'
-  - '2.3.8'
-  - '2.4.10'
-  - '2.5.8'
-  - '2.6.6'
-
-gemfile:
-  - 'Gemfile'
-
-dist: trusty
-
-install:
-  - gem install bundler:1.17.3
-  # Replace default Travis CI bundler script with a version that doesn't
-  # explode when lockfile doesn't match recently bumped version
-  - bundle install --no-deployment --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
-
-script: bundle exec rake