geordi 4.1.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e69ce9156f933f0ae381e109b7359fe4da6243036028093ab9ce0f79408bfaad
-  data.tar.gz: d6d16d8a1aca0fecc4669aa0b28251c508574f7d4d5ba3fae5d82d92385894fd
+  metadata.gz: 7807d5539f7a89704caedcb84cbbe86fdf249f0d118419a208bc6de5a56d163d
+  data.tar.gz: 3e3ab52311d9148bb515d373e1404bf84a112111ab49935fb30e3694b04d2365
 SHA512:
-  metadata.gz: 8d514a744b90c1d637a91db63ca3c58a36262e3493844a268eea48c920779f98ead441eeff42a9d544e0b0feb6baeb0d9314906531c1b9c3955bbb0758b2e316
-  data.tar.gz: c75477cfb8ffb09895f1b6214ef762218e85b831adb4348ea58ed4cae6dd70a213feb7e2df3dc0740a97b0e70394be4878abeff57fb4aefd47a50eed7af5f10d
+  metadata.gz: '09e3ced6e1773f894560ec79ac6625ebc61af0e6eb0592785a5e273c6fb3df514691803072719854534d311cc6e8c8b1d62e9f4d184b31ca6b9e7bd74f5ad102'
+  data.tar.gz: 8d74f8a681f19d9f8d5d08ee95a4d4e2a30074d97021692f0734a40a14821ed6a204b435ffa615de57b5925994a65f00294f8492eafbe59baddc81daa5bfb034

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,10 +5,59 @@ 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
+* Switch to tightvncserver to be compatible with Ubuntu 20.04. vnc4server is still supported.
+
 ### Breaking changes
 
 
+## 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
+### Compatible changes
+
+* Fixed: System calls are not executed properly if no bin stub is present. This resulted in errors like:
+
+  ```
+  % geordi rspec
+
+  # Running specs
+  > All specs at once (using parallel_tests)
+
+  x Specs failed.
+  ```
+
+  or
+
+  ```
+  % geordi migrate
+
+  # Migrating
+  > Development and parallel test databases
+
+  x Something went wrong.
+  ```
+
+
 ## 4.1.0 2020-08-18
 
 ### 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

@@ -1,76 +1,93 @@
 PATH
   remote: .
   specs:
-    geordi (4.1.0)
+    geordi (5.0.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.
@@ -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
@@ -369,7 +384,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 +424,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

@@ -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) }
@@ -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/COMMAND_TEMPLATE

@@ -21,7 +21,7 @@ option :opt, type: :boolean, aliases: '-o', banner: 'VALUE_NAME', desc: 'If set,
 
 def example
   # Invoke other commands like this:
-  invoke_cmd 'other_command', 'argument', an: 'option'
+  invoke_geordi 'other_command', 'argument', an: 'option'
 
   Interaction.fail 'Option missing' unless options.opt?
 

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

@@ -18,7 +18,7 @@ module Geordi
     private
 
     # fix weird implementation of #invoke
-    def invoke_cmd(name, *args)
+    def invoke_geordi(name, *args)
       options = args.last.is_a?(Hash) ? args.pop : {}
       invoke(name, args, options)
     end

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'