geordi 5.3.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 693551524b9b50f70e2daf649cd8184cc197b1576153beaf675ebaae01a88e84
-  data.tar.gz: 915a4c3e1449f0883e31bd828a850354db26bcdcf57523ffdf28ade6e51bee1e
+  metadata.gz: 57407a29854dbd2b1b1d854d652377db25791fd36353cfdcbd56a2dfbddb5a1d
+  data.tar.gz: 27f83bb707fc85575e348b6f83ce74b86baffe1d224a6fe3794ee19a3ed7ff00
 SHA512:
-  metadata.gz: bcbd43ffb224b54a7ba553c6bbcab6931d06b15df4a5e2e3eb9a93fe019187df47174bb2b61030a54d2408fb80235a1937eae7ff0a0f3c17e58756d3cbfc94b0
-  data.tar.gz: 03ef92df5d677f51ee70bec10bf035034824980b5c16c15c38e587de5b2a2cf683ddbce64067695e566fc9ee207d26af6f1986d909210b9fda61d9570bb91add
+  metadata.gz: 6e3cfe2af06cde2485cd95d1e2b48743bc37e7b7987bf5f1f337d60f919de6014c719d472875940c8f8b5b53da1453e0e7f923e28e1b31d671c4a105531f3f78
+  data.tar.gz: 49317f106b384e010f9c7854691f298f9e8909531c956a3a57989d496bb9cc324c9ed388818697d0ca55f8522b2c3ae7af369c774d854049e0b5ed7fd157c8a3

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,7 +1,6 @@
 # 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
@@ -9,6 +8,40 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 ### Compatible changes
 ### Breaking changes
 
+
+## 6.1.0 2021-07-15
+
+### Compatible changes
+* Improve parsing of Capistrano files ([#162](https://github.com/makandra/geordi/issues/162))
+* `geordi tests` now takes test files as arguments and passes them to either RSpec or Cucumber ([#152](https://github.com/makandra/geordi/issues/152))
+
+
+## 6.0.0 2021-06-02
+
+### 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 – Headless Chrome has
+  matured and is almost a drop-in replacement. Also, key binding issues have
+  increased with VNC and recent Linux.
+  * 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`.
+* Removed support for serial execution of scenarios tagged with @solo. Serial
+  execution is not needed with Headless Chrome, as Headless instances cannot
+  interfere (like, stealing focus).
+
+
+## 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

data/Gemfile

@@ -5,9 +5,9 @@ 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'
-gem 'pry'
+gem 'byebug'
 gem 'tracker_api'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    geordi (5.3.0)
+    geordi (6.0.1)
       thor (~> 1)
 
 GEM
@@ -22,9 +22,9 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     backports (3.18.2)
     builder (3.2.4)
+    byebug (10.0.2)
     childprocess (1.0.1)
       rake (< 13.0)
-    coderay (1.1.3)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     contracts (0.16.0)
@@ -61,27 +61,34 @@ GEM
     ice_nine (0.11.2)
     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
-    pry (0.13.1)
-      coderay (~> 1.1)
-      method_source (~> 1.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 (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)
@@ -109,13 +116,13 @@ PLATFORMS
 
 DEPENDENCIES
   aruba (< 1)
+  byebug
   geordi!
   highline
   launchy
   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
@@ -176,6 +176,7 @@ There are three subcommands:
 
 - `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`
@@ -223,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.
 
@@ -281,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]`
@@ -351,9 +342,15 @@ servers. When passed a number, directly connects to the selected server.
 - `-s, [--select-server=[SERVER_NUMBER]]`: Select a server to connect to
 
 
-### `geordi tests`
+### `geordi tests [FILES]`
 Run all employed tests.
 
+When running `geordi tests` without any arguments, all unit tests, rspec specs
+and cucumber features will be run.
+
+When passing arguments, Geordi will forward them to either `rspec` or `cucumber`,
+depending on what the first argument indicates.
+
 
 ### `geordi unit`
 Run Test::Unit.
@@ -374,18 +371,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
 ---
 
@@ -409,13 +394,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
 ============
 

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

@@ -11,7 +11,7 @@ module Geordi
 
     def user(server)
       cap2user = deploy_info[/^\s*set\s*:user,\s*['"](.*?)['"]/, 1]
-      cap2user || deploy_info[/^\s*server\s*['"]#{server}['"],.*user.{1,4}['"](.*?)['"]/m, 1]
+      cap2user || deploy_info[/^\s*server\s*['"]#{server}['"],.*user.{1,4}['"](.*?)['"]/, 1]
     end
 
     def servers
@@ -42,14 +42,23 @@ module Geordi
     attr_accessor :deploy_info, :stage
 
     def load_deploy_info
+      lines = []
       self.deploy_info = ''
 
       if stage
-        deploy_info << File.read(File.join(root, "config/deploy/#{stage}.rb"))
-        deploy_info << "\n"
+        lines += File.readlines(File.join(root, "config/deploy/#{stage}.rb"))
       end
 
-      deploy_info << File.read(File.join(root, 'config/deploy.rb'))
+      lines += File.readlines(File.join(root, 'config/deploy.rb'))
+
+      lines.each do |line|
+        next if line =~ /^\s*#/ # Omit comment lines
+        line.chomp! if line =~ /[\\,]\s*$/ # Join wrapped lines
+
+        deploy_info << line
+      end
+
+      deploy_info
     end
 
     def find_project_root!

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