geordi 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 972d947bfb273cec9f5bb3a586ab1ead5021b63466b4322a42b047947c846c45
-  data.tar.gz: fd796ff8f25567d340e24012929ffda3a54eafba1f3b98c718ccdfab4c7b213b
+  metadata.gz: 57407a29854dbd2b1b1d854d652377db25791fd36353cfdcbd56a2dfbddb5a1d
+  data.tar.gz: 27f83bb707fc85575e348b6f83ce74b86baffe1d224a6fe3794ee19a3ed7ff00
 SHA512:
-  metadata.gz: 889947c5d0139c9cc1fe4b7cc95ae7b08e83a0966696fce6e800db777c214544a6b8879b478e2999073c863405ff8e98a33c15ec4ad5ac73c92ab35f6084d1ae
-  data.tar.gz: c2771b0ca090e9d68557a6f8e9e1539a7b573f78caa7f66e6bdecc441710a4617fe390735a8f0b97304d10b5583d85b63dec13e7a0d74df421d41820262cd604
+  metadata.gz: 6e3cfe2af06cde2485cd95d1e2b48743bc37e7b7987bf5f1f337d60f919de6014c719d472875940c8f8b5b53da1453e0e7f923e28e1b31d671c4a105531f3f78
+  data.tar.gz: 49317f106b384e010f9c7854691f298f9e8909531c956a3a57989d496bb9cc324c9ed388818697d0ca55f8522b2c3ae7af369c774d854049e0b5ed7fd157c8a3

data/CHANGELOG.md

@@ -6,19 +6,31 @@ 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
+
+## 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.
+* 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
 

data/Gemfile

@@ -9,5 +9,5 @@ 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 (6.0.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,7 +61,6 @@ GEM
     ice_nine (0.11.2)
     launchy (2.4.3)
       addressable (~> 2.3)
-    method_source (1.0.0)
     mimemagic (0.3.9)
       nokogiri (~> 1)
       rake
@@ -74,9 +73,6 @@ GEM
     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)
@@ -120,11 +116,11 @@ PLATFORMS
 
 DEPENDENCIES
   aruba (< 1)
+  byebug
   geordi!
   highline
   launchy
   parallel_tests
-  pry
   rake (< 13)
   rspec
   tracker_api

data/README.md

@@ -342,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.

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/commands/tests.rb

@@ -1,14 +1,38 @@
-desc 'tests', 'Run all employed tests'
-def tests
-  rake_result = invoke_geordi 'with_rake'
-
-  # Since `rake` usually is configured to run all tests, only run them if `rake`
-  # did not perform
-  if rake_result == :did_not_perform
-    invoke_geordi 'unit'
-    invoke_geordi 'rspec'
-    invoke_geordi 'cucumber'
-  end
+desc 'tests [FILES]', 'Run all employed tests'
+long_desc <<-LONGDESC
+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.
+LONGDESC
+
+def tests(*args)
+  if args.any?
+    args, opts = Thor::Options.split(args)
+    error_message = "When passing arguments, the first argument must be either an RSpec or a Cucumber path."
+
+    if args.empty?
+      Interaction.fail error_message
+    elsif args.first.start_with? 'spec'
+      invoke 'rspec', args, opts
+    elsif args.first.start_with? 'features'
+      invoke 'cucumber', args, opts
+    else
+      Interaction.fail error_message
+    end
 
-  Interaction.success 'Successfully ran tests.'
+  else
+    rake_result = invoke_geordi 'with_rake'
+
+    # Since `rake` usually is configured to run all tests, only run them if `rake`
+    # did not perform
+    if rake_result == :did_not_perform
+      invoke_geordi 'unit'
+      invoke_geordi 'rspec'
+      invoke_geordi 'cucumber'
+    end
+
+    Interaction.success 'Successfully ran tests.'
+  end
 end

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '6.0.0'.freeze
+  VERSION = '6.0.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-02 00:00:00.000000000 Z
+date: 2021-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -102,7 +102,7 @@ metadata: {}
 post_install_message: 'Support for sequential running of integration tests tagged
   with @solo has been dropped.
 
-'
+  '
 rdoc_options: []
 require_paths:
 - lib