geordi 5.2.3 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 601c58f6344b5fb02e2514749e216e60a6f6f1cc656d2a37eabb891cc013edfa
-  data.tar.gz: 07b06fa74266f0ba5506b8218e10c78b4156c854cef9bb8bca3fd77ba5b6d30a
+  metadata.gz: 972d947bfb273cec9f5bb3a586ab1ead5021b63466b4322a42b047947c846c45
+  data.tar.gz: fd796ff8f25567d340e24012929ffda3a54eafba1f3b98c718ccdfab4c7b213b
 SHA512:
-  metadata.gz: 533ceae3f15d374526bafa76278914212de5b930250c8375c8f4cde1661e56d4c22093a4266c48b3646b023c4925599e2c46e0f93f38b52430a9748ce1778e7c
-  data.tar.gz: edf3b697d11b5ec5c932ccd6a60311325ea0d8ed50e3d0650aae3f63b8cd514374dfd465212aae82e6585daee7f7466113cf6b1dacbf430a2b7c95269c9b0dc2
+  metadata.gz: 889947c5d0139c9cc1fe4b7cc95ae7b08e83a0966696fce6e800db777c214544a6b8879b478e2999073c863405ff8e98a33c15ec4ad5ac73c92ab35f6084d1ae
+  data.tar.gz: c2771b0ca090e9d68557a6f8e9e1539a7b573f78caa7f66e6bdecc441710a4617fe390735a8f0b97304d10b5583d85b63dec13e7a0d74df421d41820262cd604

data/.github/workflows/test.yml

@@ -25,6 +25,8 @@ jobs:
           gemfile: Gemfile
         - ruby: 2.7.2
           gemfile: Gemfile
+        - ruby: 3.0.0
+          gemfile: Gemfile
     env:
       BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
     steps:
@@ -33,16 +35,14 @@ jobs:
       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: Install VNC viewer
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y xtightvncviewer
     - name: Run tests
       run: bundle exec rake
     

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/CHANGELOG.md

@@ -1,14 +1,46 @@
 # Changelog
 
 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
+* Removed support for serial execution of scenarios tagged with @solo.
+
 ### Breaking changes
 
+## 6.0.0 2021-04-06
+
+### Compatible changes
+* `geordi commit` will continue even if one of the given projects is inaccessible. It will only fail if no stories could be found at all.
+
+### Breaking changes
+* Removed VNC test browser support for integration tests.
+  * Please use a headless Chrome setup <https://makandracards.com/makandra/492109-capybara-running-tests-with-headless-chrome>. 
+  * You might also want to get rid of your local VNC server `sudo apt remove tightvncserver`.
+
+## 5.4.0 2021-02-01
+
+### Compatible changes
+* Add `geordi branch` command that checks out a feature branch based on a story from Pivotal Tracker
+* Faster MySQL dumping with [`--single-transaction` and `--quick`](https://dev.mysql.com/doc/refman/5.7/en/mysqldump.html#option_mysqldump_single-transaction)
+* Allow pivotal tracker ids in the global config file
+* Fix missing require for `Fileutils` in the dump load command (#145)
+* Document `PARALLEL_TEST_PROCESSORS`
+
+
+## 5.3.0 2021-02-01
+
+### Compatible changes
+* Changed: Dumping and loading a database will not keep the database dump in `tmp/` but delete it once the operation finishes successfully. Example: `geordi dump staging -l` will remove the file `tmp/staging.dump` after it loaded the dump.
+
+
+## 5.2.4 2021-01-29
+
+### Compatible changes
+* Fix and improve delete-dumps command (now supporting multiple arguments)
+
 
 ## 5.2.3 2021-01-27
 

data/Gemfile

@@ -5,7 +5,7 @@ gemspec
 
 gem 'aruba', '< 1' # Drops support for Ruby 2.2-
 gem 'rake', '< 13' # Drops support for Ruby 2.1
-gem 'rspec-mocks'
+gem 'rspec'
 gem 'highline'
 gem 'parallel_tests'
 gem 'launchy'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    geordi (5.2.3)
+    geordi (6.0.0)
       thor (~> 1)
 
 GEM
@@ -62,10 +62,15 @@ GEM
     launchy (2.4.3)
       addressable (~> 2.3)
     method_source (1.0.0)
-    mimemagic (0.3.5)
+    mimemagic (0.3.9)
+      nokogiri (~> 1)
+      rake
+    mini_portile2 (2.4.0)
     multi_json (1.15.0)
     multi_test (0.1.2)
     multipart-post (2.1.1)
+    nokogiri (1.9.1)
+      mini_portile2 (~> 2.4.0)
     parallel (1.19.2)
     parallel_tests (2.32.0)
       parallel
@@ -78,10 +83,16 @@ GEM
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
     rspec-expectations (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.0)
@@ -115,7 +126,7 @@ DEPENDENCIES
   parallel_tests
   pry
   rake (< 13)
-  rspec-mocks
+  rspec
   tracker_api
 
 BUNDLED WITH

data/README.md

@@ -25,6 +25,15 @@ You can always run `geordi help <command>` to quickly look up command help.
 Enable the given virtual host, disabling all others.
 
 
+### `geordi branch`
+Check out a feature branch based on a story from Pivotal Tracker.
+
+Example: `geordi branch`
+
+On the first execution we ask for your Pivotal Tracker API token. It will be
+stored in `~/.config/geordi/global.yml`.
+
+
 ### `geordi capistrano COMMAND`
 Run a capistrano command on all deploy targets.
 
@@ -81,24 +90,15 @@ Run Cucumber features.
 
 Example: `geordi cucumber features/authentication_feature:3`
 
-Runs Cucumber with `bundle exec`, using parallel tests, with a VNC session
-holding Selenium test browsers, support for using a dedicated testing browser
-and beta support for re-running failed scenarios.
-
-- *@solo:* Generally, features are run in parallel. However, scenarios tagged
-with @solo are excluded from the parallel run and executed sequentially instead.
+Runs Cucumber with `bundle exec`, using parallel tests and with support for
+re-running failed scenarios.
 
-- *Debugging:* In some cases, the dot-printing Cucumber formatter swallows
-errors. In case a feature fails without an error message, try running it with
-`--debug` or `-d`.
+Any unknown option will be passed through to Cucumber, e.g. `--format=pretty`.
+Make sure to connect option and value with an equals sign, i.e. have each option
+a contiguous string.
 
-- *Options:* Any unknown option will be passed through to Cucumber,
-e.g. `--format=pretty`. Make sure to connect option and value with an equals
-sign, i.e. have each option a contiguous string.
-
-- *VNC:* By default, test browsers will run in a VNC session. When using a
-headless test browser anyway, you can disable VNC by setting `use_vnc: false`
-in `.geordi.yml` in the project root.
+In order to limit processes in a parallel run, you can set an environment
+variable like this: `PARALLEL_TEST_PROCESSORS=6 geordi cucumber`
 
 **Options**
 - `-m, [--modified], [--no-modified]`: Run all modified features
@@ -111,13 +111,13 @@ in `.geordi.yml` in the project root.
 ### `geordi delete-dumps [DIRECTORY]`
 Delete database dump files (*.dump).
 
-Example: `geordi delete_dumps` or `geordi delete_dumps ~/tmp/dumps`
+Example: `geordi delete-dumps` or `geordi delete-dumps ~/tmp/dumps`
 
-Recursively search for files ending in `*.dump` and offer to delete those. When
+Recursively searches for files ending in `.dump` and offers to delete them. When
 no argument is given, two default directories are searched for dump files: the
 current working directory and `~/dumps` (for dumps created with geordi).
 
-Geordi will ask for confirmation before actually deleting files.
+Will ask for confirmation before actually deleting files.
 
 
 ### `geordi deploy [STAGE]`
@@ -169,11 +169,14 @@ There are three subcommands:
 
 - `geordi docker setup`
   Fetches all docker containers.
+
 - `geordi docker shell`
   Runs the docker service named 'main'.
-  Append `--secondary` to open a second shell in a already running container.
+  Append `--secondary` to open a second shell in an already running container.
+
 - `geordi docker vnc`
   Opens a VNC viewer to connect to the VNC server in the container.
+  Append `--setup` to be guided through the setup of VNC viewer.
 
 
 ### `geordi drop-databases`
@@ -221,19 +224,6 @@ Loading a dump into one of multiple local databases is not supported yet.
 - `-d, [--database=NAME]`: Database name, if there are multiple databases
 
 
-### `geordi firefox COMMAND`
-Run a command with VNC and test browser set up (alias: chrome).
-
-Example: `geordi firefox b cucumber` or `geordi firefox --setup 24.0`
-
-Useful when you need Firefox for Selenium or the VNC set up, but can't use the
-`geordi cucumber` command. This command is aliased `chrome` for users running
-Selenium in Chrome.
-
-**Options**
-- `[--setup=FIREFOX_VERSION]`: Install a special test runner Firefox with the given version
-
-
 ### `geordi help [COMMAND]`
 Describe available commands or one specific command.
 
@@ -279,7 +269,10 @@ Run RSpec.
 
 Example: `geordi rspec spec/models/user_spec.rb:13`
 
-Runs RSpec with RSpec 1/2 support, parallel_tests detection and `bundle exec`.
+Runs RSpec with version 1/2 support, parallel_tests detection and `bundle exec`.
+
+In order to limit processes in a parallel run, you can set an environment
+variable like this: `PARALLEL_TEST_PROCESSORS=6 geordi rspec`
 
 
 ### `geordi security-update [STEP]`
@@ -372,18 +365,6 @@ Performs: `git pull`, `bundle install` (if necessary) and migrates (if applicabl
 ### `geordi version`
 Print the current version of geordi.
 
-
-### `geordi vnc`
-Show the hidden VNC window.
-
-Example: `geordi vnc` or `geordi vnc --setup`
-
-Launch a VNC session to the hidden screen where `geordi cucumber` runs Selenium
-tests.
-
-**Options**
-- `[--setup], [--no-setup]`: Guide through the setup of VNC
-
 b
 ---
 
@@ -407,13 +388,6 @@ Stores a timestamped database dump for the given Rails environment in `~/dumps`:
 - `--compress`: After dumping, run gzip to compress the dump in place
 
 
-launchy_browser
----------------
-
-Used by the `geordi cucumber` command. Makes launchy open pages in the user's
-browser, as opposed to opening it within the VNC window.
-
-
 Contributing
 ============
 
@@ -424,11 +398,9 @@ Once you have completed your modifications, please update CHANGELOG and README
 as needed. Use `rake readme` to regenerate the Geordi section of the README from
 the command documentations.
 
-Make sure tests are green in the default Ruby *plus* in the oldest Ruby > 1.8
-that you have installed on your system (1.8.7 support has been dropped).
-
-Before releasing your changes, wait for the Travis results to see that tests
-passed in all Ruby versions.
+Make sure tests are green in the oldest supported Ruby version. Before releasing
+a new gem version, wait for the CI results to see that tests are green in all
+Ruby versions.
 
 
 Adding a new command

data/exe/dumple

@@ -78,6 +78,13 @@ begin
     command << " -p\"#{config['password']}\""
     command << " #{config['database']}"
     command << " -r #{dump_path}"
+    # Using a transaction to allow concurrent request while creating a dump.
+    # This works only reliable for InnoDB tables.
+    # More details: https://dev.mysql.com/doc/refman/5.7/en/mysqldump.html#option_mysqldump_single-transaction
+    command << ' --single-transaction'
+    # Disable buffering in memory to avoid a memory overflow for large tables
+    # More details https://dev.mysql.com/doc/refman/5.7/en/mysqldump.html#option_mysqldump_quick
+    command << ' --quick'
     if port
       command << " -h#{host || '127.0.0.1'} -P#{port}"
     else

data/geordi.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'thor', '~> 1'
 
-  #spec.post_install_message = <<-ATTENTION
-  #ATTENTION
+  spec.post_install_message = <<-ATTENTION
+Support for sequential running of integration tests tagged with @solo has been dropped.
+  ATTENTION
 end

data/lib/geordi/chromedriver_updater.rb

@@ -10,7 +10,7 @@ module Geordi
       chromedriver_version = determine_chromedriver_version
 
       if skip_update?(chrome_version, chromedriver_version)
-        Interaction.note("No update required, you are using for both executables the same version #{chrome_version}!") unless options[:quiet_if_matching]
+        Interaction.success "No update required: both Chrome and chromedriver are on v#{chrome_version}!" unless options[:quiet_if_matching]
       else
         chromedriver_zip = download_chromedriver(chrome_version)
         unzip(chromedriver_zip, File.expand_path('~/bin'))
@@ -18,7 +18,7 @@ module Geordi
         chromedriver_zip.unlink
 
         # We need to determine the version again, as it could be nil in case no chromedriver was installed before
-        Interaction.note "Chromedriver updated to version #{determine_chromedriver_version}"
+        Interaction.success "Chromedriver updated to v#{determine_chromedriver_version}."
       end
     end
 
@@ -31,7 +31,7 @@ module Geordi
       end
 
       if !status.success? || chrome_version.nil?
-        Interaction.fail('Could not determine the current Google Chrome version')
+        Interaction.fail('Could not determine the version of Google Chrome.')
       else
         chrome_version.to_i
       end
@@ -46,7 +46,7 @@ module Geordi
       end
 
       if !status.success? || chromedriver_version.nil?
-        Interaction.fail('Could not determine the current chromedriver version')
+        Interaction.fail('Could not determine the version of chromedriver.')
       else
         chromedriver_version.to_i
       end
@@ -68,7 +68,7 @@ module Geordi
 
         file
       else
-        Interaction.fail("Could not download chromedriver version #{latest_version}")
+        Interaction.fail("Could not download chromedriver v#{latest_version}.")
       end
     end
 
@@ -79,7 +79,7 @@ module Geordi
       if response.is_a?(Net::HTTPSuccess)
         response.body.to_s
       else
-        Interaction.fail("Could not find the latest version for Google Chrome version #{chrome_version}")
+        Interaction.fail("Could not download the chromedriver v#{chrome_version}.")
       end
     end
 
@@ -87,7 +87,7 @@ module Geordi
       _stdout_str, _error_str, status = Open3.capture3('unzip', '-d', output_dir, '-o', zip.path)
 
       unless status.success?
-        Interaction.fail("Could not unzip #{zip.path}")
+        Interaction.fail("Could not unzip #{zip.path}.")
       end
     end
   end

data/lib/geordi/cli.rb

@@ -15,12 +15,12 @@ module Geordi
       class_eval File.read(file), file
     end
 
-    private
-
-    # fix weird implementation of #invoke
-    def invoke_geordi(name, *args)
-      options = args.last.is_a?(Hash) ? args.pop : {}
-      invoke(name, args, options)
+    no_commands do
+      # fix weird implementation of #invoke
+      def invoke_geordi(name, *args)
+        options = args.last.is_a?(Hash) ? args.pop : {}
+        invoke(name, args, options)
+      end
     end
 
   end

data/lib/geordi/commands/branch.rb

@@ -0,0 +1,12 @@
+desc 'branch', 'Check out a feature branch based on a story from Pivotal Tracker'
+long_desc <<-LONGDESC
+Example: `geordi branch`
+
+On the first execution we ask for your Pivotal Tracker API token. It will be
+stored in `~/.config/geordi/global.yml`.
+LONGDESC
+
+def branch
+  require 'geordi/gitpt'
+  Gitpt.new.run_branch
+end

data/lib/geordi/commands/commit.rb

@@ -10,5 +10,5 @@ LONGDESC
 
 def commit(*git_args)
   require 'geordi/gitpt'
-  Gitpt.new.run(git_args)
+  Gitpt.new.run_commit(git_args)
 end

data/lib/geordi/commands/cucumber.rb

@@ -2,24 +2,15 @@ desc 'cucumber [FILES and OPTIONS]', 'Run Cucumber features'
 long_desc <<-LONGDESC
 Example: `geordi cucumber features/authentication_feature:3`
 
-Runs Cucumber with `bundle exec`, using parallel tests, with a VNC session
-holding Selenium test browsers, support for using a dedicated testing browser
-and beta support for re-running failed scenarios.
+Runs Cucumber with `bundle exec`, using parallel tests and with support for
+re-running failed scenarios.
 
-- *@solo:* Generally, features are run in parallel. However, scenarios tagged
-with @solo are excluded from the parallel run and executed sequentially instead.
+Any unknown option will be passed through to Cucumber, e.g. `--format=pretty`.
+Make sure to connect option and value with an equals sign, i.e. have each option
+a contiguous string.
 
-- *Debugging:* In some cases, the dot-printing Cucumber formatter swallows
-errors. In case a feature fails without an error message, try running it with
-`--debug` or `-d`.
-
-- *Options:* Any unknown option will be passed through to Cucumber,
-e.g. `--format=pretty`. Make sure to connect option and value with an equals
-sign, i.e. have each option a contiguous string.
-
-- *VNC:* By default, test browsers will run in a VNC session. When using a
-headless test browser anyway, you can disable VNC by setting `use_vnc: false`
-in `.geordi.yml` in the project root.
+In order to limit processes in a parallel run, you can set an environment
+variable like this: `PARALLEL_TEST_PROCESSORS=6 geordi cucumber`
 LONGDESC
 
 option :modified, aliases: '-m', type: :boolean,
@@ -64,28 +55,6 @@ def cucumber(*args)
     cmd_opts, files = args.partition { |f| f.start_with? '-' }
     cmd_opts << '--format' << 'pretty' << '--backtrace' if options.debug
 
-    # Serial run of @solo scenarios ############################################
-    if files.any? { |f| f.include? ':' }
-      Interaction.note '@solo run skipped when called with line numbers' if options.verbose
-    else
-      solo_files = if files.empty?
-        'features' # Proper grepping
-      else
-        files.join(' ')
-      end
-
-      solo_tag_usages = `grep -r '@solo' #{solo_files}`.split("\n")
-
-      if solo_tag_usages.any?
-        solo_cmd_opts = cmd_opts.dup
-        solo_cmd_opts << '--tags' << '@solo'
-
-        Interaction.announce 'Running @solo features'
-        solo_success = Geordi::Cucumber.new.run files, solo_cmd_opts, verbose: options.verbose, parallel: false
-        solo_success || Interaction.fail('Features failed.')
-      end
-    end
-
     # Parallel run of all given features + reruns ##############################
     Interaction.announce 'Running features'
     normal_run_successful = Geordi::Cucumber.new.run(files, cmd_opts, verbose: options.verbose)