geordi 2.8.0 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d495c07776a3b37bbc4a8a631fefc1faef059e39622bbb7d23ea7ae80e422a5d
-  data.tar.gz: 59e32fcc08b223576f916b32e39f11444474d3815add10cb8df8ea290b4beb49
+  metadata.gz: 5ae46d6ac8d8dd9bf53654f65445df1d0c576833db47db589b76e94cbb5784c0
+  data.tar.gz: 0034075de2f4f848686463486854cfaaee3980918048ce3480c3d6dc50634f0b
 SHA512:
-  metadata.gz: e8090e437315b256f12e64dfff74b52d96734417af94d46dd5303aa74a41d2bf45b47d7abbb9d483f7f8794052e6bebaed336a0320c242b9a1c4eecfdde4cf69
-  data.tar.gz: bb359062fd81a8129bd48b3548bb4db513e6211bc1740003082e759d6cc5a3ba10abbf0db4e2d9a515c181b9b15b15950eafe9d733104a00e1f0789c20400750
+  metadata.gz: c52e541c8204de7e79e2935211251001b9992898770632eca578678eae5b58d4d8edb5c64b2ec82fa4f797109adc76091f9293a4bd2e3a0567c1a65a050791ab
+  data.tar.gz: 63bdba922fb2eaccd2edd3fffe233abc67fce88587606fea218685b4ee682181ea5f8c6daf728227dfa736d838327eef6f1ae930f67dec056dcd6c23fb0d6a85

data/.gitignore

@@ -5,3 +5,4 @@ pkg/*
 .DS_Store
 .pt_project_id
 tmp
+.byebug_history

data/CHANGELOG.md

@@ -5,10 +5,44 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 
 ## Unreleased
+
+### Compatible changes
+
+### Breaking changes
+
+
+## 2.11.0 2020-05-04
+
 ### Compatible changes
+- Added the possibility to change the Rails root for the capistrano config via the environment variable `RAILS_ROOT`. This allows you as a gem developer to run a command like `RAILS_ROOT=~/Projects/my-blog geordi console staging` whereas `geordi` uses the capistrano config from `my-blog`. Otherwise you would need to follow the instructions of [this card](https://makandracards.com/makandra/46617-how-to-use-a-local-gem-in-your-gemfile) to test changes in the gem locally.
+- Bug fix for "no staged changes" even if there are changes present (#83).
+- Fixed deprecation warning for `Thor exit with status 0 on errors` (#84).
+- Replaced `Bundler.with_unbundled_env` with `Bundler.with_original_env` (#77). This is a better replacement than 42cd1c4.
+- Add deprecation warning `Deprecation warning: Ruby 1.8.7 and 1.9.3 support will be dropped in Geordi 3.x.` to Geordi 2.
+- Fix error `thor requires Ruby version >= 2.0.0` for Ruby 1.8.7 and 1.9.3 (https://github.com/makandra/geordi/issues/79#issuecomment-598664191).
+
 ### Breaking changes
 
 
+## 2.10.1 2020-02-17
+
+### Compatible changes
+- Add host parameter to mysql dump loader
+
+## 2.10.0 2020-02-11
+
+### Compatible changes
+- Fixes [#78](https://github.com/makandra/geordi/pull/78): Add compatibility for more than 9 CPU cores in
+  `geordi drop-databases`.
+
+
+## 2.9.0 2020-01-03
+
+### Compatible changes
+- Fixes [#37](https://github.com/makandra/geordi/issues/37): `geordi cucumber` crashes with `--format=pretty`
+- Fixes [#27](https://github.com/makandra/geordi/issues/27): Cucumber rerun switch does work when passing files
+
+
 ## 2.8.0 2020-01-02
 
 ### Compatible changes

data/Gemfile

@@ -4,6 +4,7 @@ source 'http://rubygems.org'
 gemspec
 
 gem 'aruba'
+gem 'contracts', '=0.9'
 gem 'rspec-mocks'
 gem 'highline'
 gem 'parallel_tests'

data/Gemfile.lock

@@ -1,62 +1,65 @@
 PATH
   remote: .
   specs:
-    geordi (2.8.0)
-      thor (>= 0.18.0)
+    geordi (2.12.0)
+      thor (~> 0.18.0)
 
 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)
+    aruba (0.8.1)
+      childprocess (~> 0.5.6)
+      contracts (~> 0.9)
+      cucumber (>= 1.3.19)
+      rspec-expectations (>= 2.99)
     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)
-    childprocess (1.0.1)
-      rake (< 13.0)
-    coderay (1.1.2)
+    builder (3.2.4)
+    childprocess (0.5.9)
+      ffi (~> 1.0, >= 1.0.11)
+    coderay (1.1.3)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
+    contracts (0.9)
     cucumber (1.3.20)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.2)
-    declarative (0.0.10)
+    declarative (0.0.20)
     declarative-option (0.1.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
     equalizer (0.0.11)
-    excon (0.67.0)
-    faraday (0.17.0)
+    excon (0.78.0)
+    faraday (1.1.0)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.13.1)
-      faraday (>= 0.7.4, < 1.0)
+      ruby2_keywords
+    faraday_middleware (1.0.0)
+      faraday (~> 1.0)
+    ffi (1.9.18)
     gherkin (2.12.2)
       multi_json (~> 1.3)
     highline (1.6.21)
     ice_nine (0.11.2)
     launchy (2.4.3)
       addressable (~> 2.3)
-    method_source (0.9.2)
-    mimemagic (0.3.3)
-    multi_json (1.13.1)
+    method_source (1.0.0)
+    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
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rake (10.5.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
@@ -68,9 +71,10 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    thor (0.20.3)
+    ruby2_keywords (0.0.2)
+    thor (0.18.1)
     thread_safe (0.3.6)
-    tracker_api (1.10.0)
+    tracker_api (1.11.0)
       addressable
       equalizer
       excon
@@ -92,6 +96,7 @@ PLATFORMS
 
 DEPENDENCIES
   aruba
+  contracts (= 0.9)
   geordi!
   highline
   launchy

data/README.md

@@ -54,6 +54,11 @@ Commit using a story title from Pivotal Tracker.
 
 Example: `geordi commit`
 
+Any extra arguments are forwarded to `git commit -m <message>`.
+
+If there are no staged changes, prints a warning but will continue to create
+an empty commit.
+
 On the first execution we ask for your Pivotal Tracker API token. It will be
 stored in `~/.gitpt`.
 
@@ -135,6 +140,23 @@ instead of `cap deploy:migrations`. You can force using `deploy` by passing the
 -M option: `geordi deploy -M staging`.
 
 
+### `geordi docker`
+
+Manage docker containers for the current project.
+
+Manage docker containers to run your project dockerized.
+
+It expects a docker-compose file that specifies all services, and a service
+named "main" that opens a shell for the project.
+
+There are two subcommands:
+
+- geordi docker setup
+  Builds all docker containers.
+- geordi docker shell
+  Runs the docker service named 'main'.
+
+
 ### `geordi drop-databases`
 
 Interactively delete local databases.
@@ -385,6 +407,9 @@ calling your local geordi like so (adjust paths to your needs):
 
     # @option -I: add directory to load path
     ruby -I ../geordi/lib ../geordi/bin/geordi <command>
+    
+    # with debugger
+    ruby -r byebug -I ../geordi/lib ../geordi/bin/geordi <command>
 
 Don't forget to update this README. The whole `geordi` section is auto-generated
 by `rake readme`. Also remember to add your changes to the CHANGELOG.

data/bin/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/features/cucumber.feature

@@ -64,6 +64,63 @@ Feature: The cucumber command
       And the output should contain "Features failed."
 
 
+  Scenario: A rerun should only consider the specified file
+    Note that we need a cucumber.yml to write the rerun.txt and read the rerun.txt for the reruns.
+
+    Given a file named "features/step_definitions/test_steps.rb" with:
+    """
+    Given /^this test fails$/ do
+      raise
+    end
+
+    Given /^I use puts with text "(.*)"$/ do |ann|
+      puts(ann)
+    end
+    """
+      And a file named "features/some.feature" with:
+      """
+      Feature: Failing feature
+        Scenario: Passing scenario
+          And I use puts with text "Running passing Feature"
+
+        Scenario: Failing scenario
+          And I use puts with text "Running failing Feature"
+          And this test fails
+      """
+      And an empty file named "tmp/rerun.txt"
+      And a file named "cucumber.yml" with:
+      """
+      <%
+      rerun_log = 'tmp/rerun.txt'
+      rerun_failures = File.file?(rerun_log) ? File.read(rerun_log).gsub("\n", ' ') : ''
+      log_failures = "--format=rerun --out=#{rerun_log}"
+      %>
+      default: features <%= log_failures %>
+      rerun: <%= rerun_failures %> <%= log_failures %>
+      """
+
+    When I run `geordi cucumber --rerun=1 features/some.feature`
+    Then the output should contain:
+    """
+    # Rerun #1 of 1
+    > Rerunning failed scenarios
+    > Run `geordi vnc` to view the Selenium test browsers
+
+    Using the rerun profile...
+
+    Running failing Feature
+    .F
+
+    (::) failed steps (::)
+
+     (RuntimeError)
+    features/some.feature:7:in `And this test fails'
+
+    Failing Scenarios:
+    cucumber -p rerun features/some.feature:5 # Scenario: Failing scenario
+    """
+
+
   Scenario: Running all features in a given subfolder
     Given a file named "features/sub/one.feature" with:
     """
@@ -191,3 +248,14 @@ Feature: The cucumber command
     When I run `geordi cucumber --containing given`
     Then the output should contain "Only: features/given.feature"
     But the output should not contain "other.feature"
+
+
+  Scenario: Passing a format argument will skip the default format for a single run
+    Given a file named "features/single.feature" with:
+    """
+    Feature: Running a single feature
+      Scenario: A single scenario
+    """
+
+    When I run `geordi cucumber features/single.feature --format=pretty --verbose`
+    Then the output should contain "b cucumber features/single.feature --format pretty"

data/features/docker.feature

@@ -0,0 +1,59 @@
+@same-process
+Feature: The docker command
+
+  Scenario: Setup checks for existence of docker
+    Given the docker command cannot find the "docker" binary
+    When I run `geordi docker setup`
+    Then the output should contain "which docker"
+      And the output should contain "x You need to install docker first"
+
+
+  Scenario: Setup checks for existence of docker-compose
+    Given the docker command cannot find the "docker-compose" binary
+    When I run `geordi docker setup`
+    Then the output should contain "which docker-compose"
+      And the output should contain "x You need to install docker-compose first"
+
+
+  Scenario: Setup checks for existence of docker-compose.yml
+    When I run `geordi docker setup`
+    Then the output should contain "x Your project does not seem to be properly set up."
+
+
+  Scenario: Setup checks for service named "main"
+    Given a file named "docker-compose.yml" with:
+    """
+    foo: bar
+    """
+
+    When I run `geordi docker setup`
+    Then the output should contain "x Your project does not seem to be properly set up."
+
+
+  Scenario: Setup runs docker-compose build
+    Given a file named "docker-compose.yml" with:
+    """
+    services:
+      main: foo
+    """
+
+    When I run `geordi docker setup`
+    Then the output should contain "docker-compose build"
+
+
+  Scenario: Shell checks for existence of docker
+    Given the docker command cannot find the "docker" binary
+    When I run `geordi docker shell`
+    Then the output should contain "which docker"
+      And the output should contain "x You need to install docker first"
+
+
+  Scenario: Shell runs docker-compose run maiun
+    Given a file named "docker-compose.yml" with:
+    """
+    services:
+      main: foo
+    """
+
+    When I run `geordi docker shell`
+    Then the output should contain "docker-compose run --service-ports main"

data/features/step_definitions/docker_command_steps.rb

@@ -0,0 +1,10 @@
+Given(/the docker command cannot find the "(.*?)" binary/) do |command|
+  require 'geordi/docker'
+  expect_any_instance_of(Geordi::Docker).to receive(:mock_run).at_least(:once).and_wrap_original do |original, *args|
+    if args[0] =~ /which #{Regexp.escape(command)}/
+      false
+    else
+      original.call(*args)
+    end
+  end
+end

data/features/support/aruba.rb

@@ -0,0 +1,60 @@
+require 'aruba/cucumber'
+require 'aruba/in_process'
+require 'geordi/cli'
+
+# https://github.com/erikhuda/thor/wiki/Integrating-with-Aruba-In-Process-Runs
+class InProcessCliRunner
+
+  # Allow everything fun to be injected from the outside while defaulting to normal implementations.
+  def initialize(argv, stdin = STDIN, stdout = STDOUT, stderr = STDERR, kernel = Kernel)
+    @argv, @stdin, @stdout, @stderr, @kernel = argv, stdin, stdout, stderr, kernel
+  end
+
+  def execute!
+    exit_code = begin
+      # Thor accesses these streams directly rather than letting them be injected, so we replace them...
+      $stderr = @stderr
+      $stdin = @stdin
+      $stdout = @stdout
+
+      # Run our normal Thor app the way we know and love.
+      previous_program_name = $PROGRAM_NAME
+      $PROGRAM_NAME = 'geordi'
+      Geordi::CLI.start(@argv)
+
+      # Thor::Base#start does not have a return value, assume success if no exception is raised.
+      0
+    rescue StandardError => e
+      # The ruby interpreter would pipe this to STDERR and exit 1 in the case of an unhandled exception
+      b = e.backtrace
+      @stderr.puts("#{b.shift}: #{e.message} (#{e.class})")
+      @stderr.puts(b.map{|s| "\tfrom #{s}"}.join("\n"))
+      1
+    rescue SystemExit => e
+      e.status
+    ensure
+      # add additional cleanup code here
+
+      $stderr = STDERR
+      $stdin = STDIN
+      $stdout = STDOUT
+      $PROGRAM_NAME = previous_program_name
+    end
+
+    # Proxy our exit code back to the injected kernel.
+    @kernel.exit(exit_code)
+  end
+end
+
+Aruba.configure do |config|
+  config.main_class = InProcessCliRunner
+  config.command_launcher = :spawn
+end
+
+Before('@same-process') do
+  aruba.config.command_launcher = :in_process
+end
+
+Before do
+  @aruba_timeout_seconds = 5
+end

data/features/support/env.rb

@@ -1,4 +1,5 @@
-require 'aruba/cucumber'
+require 'cucumber/rspec/doubles'
+
 
 if Gem::Version.new(RUBY_VERSION) > Gem::Version.new('1.8.7')
   require 'pry'

data/geordi.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'thor', '>= 0.18.0'
+  s.add_runtime_dependency 'thor', '~> 0.18.0'
 
   s.post_install_message = <<-ATTENTION
 * Binary `geordi` installed

data/lib/geordi/capistrano_config.rb

@@ -53,18 +53,21 @@ module Geordi
     end
 
     def find_project_root!
-      current = Dir.pwd
-      until File.exists?('Capfile')
-        Dir.chdir '..'
-        raise <<-ERROR if current == Dir.pwd
-Could not locate Capfile.
-
-Are you calling me from within a Rails project?
-Maybe Capistrano is not installed in this project.
-        ERROR
-
-        current = Dir.pwd
+      current = ENV['RAILS_ROOT'] || Dir.pwd
+
+      until File.exists?(File.join(current, 'Capfile'))
+        if current == '/' || current == '/home' || !File.directory?(current)
+          raise <<-ERROR
+  Could not locate Capfile.
+
+  Are you calling me from within a Rails project?
+  Maybe Capistrano is not installed in this project.
+          ERROR
+        else
+          current = File.dirname(current)
+        end
       end
+
       current
     end
 

data/lib/geordi/cli.rb

@@ -5,8 +5,17 @@ require 'geordi/util'
 
 module Geordi
   class CLI < Thor
+
+    if Geordi::Util.ruby_version <= Gem::Version.new('2.0.0')
+      warn "Deprecation warning: Ruby 1.8.7 and 1.9.3 support will be dropped in Geordi 3.x."
+    end
+
     include Geordi::Interaction
 
+    def self.exit_on_failure?
+      true
+    end
+
     # load all tasks defined in lib/geordi/commands
     Dir[File.expand_path '../commands/*.rb', __FILE__].each do |file|
       class_eval File.read(file), file

data/lib/geordi/commands/cucumber.rb

@@ -88,7 +88,7 @@ def cucumber(*args)
         fail 'Features failed.' if (i == options.rerun) # All reruns done?
 
         announce "Rerun ##{ i + 1 } of #{ options.rerun }"
-        break if Geordi::Cucumber.new.run(files, cmd_opts, :verbose => options.verbose, :parallel => false)
+        break if Geordi::Cucumber.new.run([], cmd_opts, :verbose => options.verbose, :parallel => false)
       end
     end
 

data/lib/geordi/commands/docker.rb

@@ -0,0 +1,36 @@
+class DockerCLI < Thor
+  desc 'setup', 'Setup docker and build 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.'
+  map 'shell' => '_shell'
+  def _shell
+    docker.shell
+  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 file that specifies all services, and a service
+named "main" that opens a shell for the project.
+
+There are two subcommands:
+
+- geordi docker setup
+  Builds all docker containers.
+- geordi docker shell
+  Runs the docker service named 'main'.
+
+LONGDESC
+subcommand 'docker', DockerCLI

data/lib/geordi/cucumber.rb

@@ -11,12 +11,13 @@ module Geordi
     include Geordi::Interaction
 
     VNC_DISPLAY = ':17'
-    VNC_SERVER_COMMAND = "vncserver #{VNC_DISPLAY} -localhost -nolisten tcp -SecurityTypes None -geometry 1280x1024"
+    VNC_SERVER_DEFAULT_OPTIONS = '-localhost -nolisten tcp -SecurityTypes None -geometry 1280x1024'
+    VNC_SERVER_COMMAND = "vncserver #{VNC_DISPLAY} #{ENV.fetch('GEORDI_VNC_OPTIONS', VNC_SERVER_DEFAULT_OPTIONS)}"
     VNC_VIEWER_COMMAND = "vncviewer #{VNC_DISPLAY}"
     VNC_ENV_VARIABLES = %w[DISPLAY BROWSER LAUNCHY_BROWSER]
 
     def run(files, cucumber_options, options = {})
-      self.argv = files + cucumber_options
+      self.argv = files + cucumber_options.map { |option| option.split('=') }.flatten
 
       consolidate_rerun_txt_files
       show_features_to_run

data/lib/geordi/db_cleaner.rb

@@ -12,7 +12,7 @@ module Geordi
       puts '               and `sudo mysql`            for MariaDB (which uses PAM auth)'
       `sudo true`
       fail 'sudo access is required for database operations as database users' if $? != 0
-      @derivative_dbname = /_(test\d?|development|cucumber)$/
+      @derivative_dbname = /_(test\d*|development|cucumber)$/
       base_directory = ENV['XDG_CONFIG_HOME']
       base_directory = "#{Dir.home}" if base_directory.nil?
       @whitelist_directory = File.join(base_directory, '.config', 'geordi', 'whitelists')
@@ -34,7 +34,7 @@ module Geordi
       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.
+# 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
@@ -253,7 +253,7 @@ HEREDOC
       # Allow explicit whitelisting of derivative databases like projectname_test2
       if whitelist_content.include? database_name
         true
-      # whitelisting `projectname` also whitelists `projectname_test\d+`, `projectname_development`
+      # whitelisting `projectname` also whitelists `projectname_test\d*`, `projectname_development`
       elsif whitelist_content.include? database_name.sub(@derivative_dbname, '')
         true
       else

data/lib/geordi/docker.rb

@@ -0,0 +1,71 @@
+require 'geordi/interaction'
+require 'yaml'
+
+module Geordi
+  class Docker
+    DOCKER_COMPOSE_FILE = 'docker-compose.yml'.freeze
+
+    include Interaction
+
+    def setup
+      check_installation_and_config
+      announce('Building containers...')
+      if execute(:system, 'docker-compose', 'build')
+        success('Build successful.')
+      else
+        fail('Build failed.')
+      end
+    end
+
+    def shell
+      check_installation_and_config
+      execute(:exec, 'docker-compose', 'run', '--service-ports', 'main')
+    end
+
+    private
+
+    def execute(kind, *args)
+      if ENV['GEORDI_TESTING']
+        puts "Stubbed run #{args.join(' ')}"
+        mock_run(*args)
+      else
+        send(kind, *args)
+      end
+    end
+
+    def mock_run(*args)
+      # exists just to be stubbed in tests
+      true
+    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
+      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
+  end
+end

data/lib/geordi/dump_loader.rb

@@ -18,12 +18,13 @@ module Geordi
       @config['development']
     end
     alias_method :config, :development_database_config
-  
+
     def mysql_command
       command = 'mysql --silent'
       command << ' -p' << config['password'].to_s if config['password']
       command << ' -u' << config['username'].to_s if config['username']
       command << ' --port=' << config['port'].to_s if config['port']
+      command << ' --host=' << config['host'].to_s if config['host']
       command << ' --default-character-set=utf8'
       command << ' ' << config['database'].to_s
       command << ' < ' << dump_file

data/lib/geordi/util.rb

@@ -51,8 +51,8 @@ module Geordi
           # Remove Geordi's Bundler environment when running commands.
           success = if !defined?(Bundler)
             system(*commands)
-          elsif Gem::Version.new(Bundler::VERSION) >= Gem::Version.new('2.1.2')
-            Bundler.with_unbundled_env do
+          elsif Gem::Version.new(Bundler::VERSION) >= Gem::Version.new('1.17.3')
+            Bundler.with_original_env do
               system(*commands)
             end
           else
@@ -94,7 +94,7 @@ module Geordi
           ENV['GEORDI_TESTING_STAGED_CHANGES'] == 'true'
         else
           statuses = `git status --porcelain`.split("\n")
-          statuses.any? { |l| l.start_with? 'A' }
+          statuses.any? { |l| l.start_with? /[A-Z]/i }
         end
       end
 
@@ -161,6 +161,10 @@ module Geordi
         nil
       end
 
+      def ruby_version
+        Gem::Version.new(RUBY_VERSION)
+      end
+
       def file_containing?(file, regex)
         File.exists?(file) and File.read(file).scan(regex).any?
       end

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '2.8.0'
+  VERSION = '2.12.0'
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.12.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-02 00:00:00.000000000 Z
+date: 2020-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.18.0
 description: Collection of command line tools we use in our daily work with Ruby,
@@ -81,14 +81,17 @@ files:
 - features/console.feature
 - features/cucumber.feature
 - features/deploy.feature
+- features/docker.feature
 - features/dump.feature
 - features/firefox.feature
 - features/server.feature
 - features/setup.feature
 - features/shell.feature
+- features/step_definitions/docker_command_steps.rb
+- features/step_definitions/miscellaneous_steps.rb
+- features/support/aruba.rb
 - features/support/env.rb
 - features/support/step_definitions/aruba_backport_steps.rb
-- features/support/step_definitions/miscellaneous_steps.rb
 - geordi.gemspec
 - lib/geordi.rb
 - lib/geordi/COMMAND_TEMPLATE
@@ -108,6 +111,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/eurest.rb
@@ -130,6 +134,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