geordi 5.2.2 → 6.0.0.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cdbb8d2117f5dabfe50dd59aefd6350f0bc4ed432c34b84ed69c1eb7ec4deb8
-  data.tar.gz: 8c698261c37144cb4d5d237bb7617103cb662b442702f629c8a84bc2b90e46fd
+  metadata.gz: eee4c378b0fe08b20405c74876813d2e23eda1e09c92dae4a19146af9f414a2d
+  data.tar.gz: 48bfb8c877fedf002b46aa1f09ea7dde284c9b1358f1c8f1f9c39a0bc3381c03
 SHA512:
-  metadata.gz: 5073101d9cf2117115e5ae56ef1c702f7a809390b11a80aef7d18b8006ce6a57c2519e6ba46c2498bb08fdb7f41c1dc87393dc241faaaddff9f7f02d6fea09e6
-  data.tar.gz: ebbd01ff8e87137f89dccb27f8f57d2aca28c5993631957ec5d1c23cb23b24182b368748bcfb0dadd8f0c4d841218755ac34c4f3ba449333f3aa7b2c6f0c3e25
+  metadata.gz: e24c228acd4170e540b76accc1708bf7df44f3650052c200abfdb2f297770e7660f017a176bd0edbc74202d08c1c4df9d3c05289d91c06501ebcb7f32d28839f
+  data.tar.gz: e817b989c4254f3482a888418fef3ca57f493901cce611ab970faaaf8db6ff259ea67f7417ffb6b964bb6f1063e926afe0503ace94c1ce497e9c92c494c41ec0

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/.ruby-version

@@ -1 +1 @@
-2.5.8
+2.2

data/CHANGELOG.md

@@ -1,33 +1,68 @@
 # 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
 
-## 5.2.2 2020-12-17
+### 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
+
+### Compatible changes
+* Remove auto-bundling from `geordi shell` and remote `geordi console`
+
+
+## 5.2.2 2020-12-17
+
+### Compatible changes
 * Ignore ACL settings when loading a PostgreSQL dump
 
 
 ## 5.2.1 2020-12-15
 
 ### Compatible changes
-
 * Fix a bug regarding `geordi vnc` which was introduced in 5.1.0
 
+
 ## 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.
 

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.2)
+    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,12 +90,8 @@ 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
@@ -96,9 +101,8 @@ errors. In case a feature fails without an error message, try running it with
 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 +115,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,10 +173,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 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`
@@ -220,19 +228,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.
 
@@ -278,7 +273,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]`
@@ -371,18 +369,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
 ---
 
@@ -406,13 +392,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
 ============
 
@@ -423,11 +402,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