geordi 1.7.1 → 1.8.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OWEzNDNmNTdhZGMwODNkMmQxZTcxYzY1MTE4NzFmNTk4NTk1NWFkMA==
-  data.tar.gz: !binary |-
-    NmQ1YjAyNjcxODlhMTk2ZGY2NmY1NGMzOTg4ZDY4MjA4MWI2MTM4OQ==
+SHA256:
+  metadata.gz: c07036b9657ebe6dfccf09dbc5c74e9b449b1eed88fc04ca5e880284dcbdc1e7
+  data.tar.gz: 1bf48b1318b06182ccfe8bc0e294c7344195ed654e28c983f6c44bdea0bde7cf
 SHA512:
-  metadata.gz: !binary |-
-    NGQzNDE2Y2UxY2YwMGM0NzY2YjE1NWU1YmNmOTQxMjBkNjYxODZlNTg1MDk4
-    YTNjNGVhODA5YjU0Y2M2ZjNlNjYyODQ3NjRhYzIwYTY0Yzk5ODQwM2JmMjE1
-    YzdmYTg1MGE1OGIxNDljNTBlOWU4OWUzNTVhYWQzZDE1ZDY4MjQ=
-  data.tar.gz: !binary |-
-    Zjk0ZDY5Mjg4MDRjNzcwNmVkNDcyZTAwZGUxMGI4YWViMDE3MDAyYzFkYmQ2
-    M2FjMmVjMmM1YzQ5MjcxMGYwZDc4NmM3Y2U5NGJmMDkxMDAwZDg0YmQ0MWI1
-    NWMzYzBjNGMxYTM1MjdlZmE4ZmJhNDA0M2RiZTA5ZTcxMjgyNzc=
+  metadata.gz: ae4590a4eb870deec8055b6e4cea3e433b85dc202b94be155fa78d2b8ce8f05b9126c73c2151b04ccf1d09fd5cedf2e80b2f49b80b3efabba61fe551cf5e92e2
+  data.tar.gz: 2829290660f89550294c2f83423bfa5608533f6f952b951def2ccf39fec167a5146dfe9d84b94eb40f6707085d7a1ba27cc81b0014892d86092e1c9eb05f8602

data/lib/geordi/cucumber.rb

@@ -79,21 +79,27 @@ module Geordi
     def parallel_execution_command
       note 'Using parallel_tests'
       self.argv = argv - command_line_features
-      gem 'parallel_tests', parallel_tests_version
-      require 'parallel_tests'
 
-      type_arg = Gem::Version.new(::ParallelTests::VERSION) > Gem::Version.new('0.7.0') ? 'cucumber' : 'features'
+      type_arg = Gem::Version.new(parallel_tests_version) > Gem::Version.new('0.7.0') ? 'cucumber' : 'features'
       features = features_to_run
       features = find_all_features_recursively('features') if features.empty?
 
       [
         use_firefox_for_selenium,
         'b parallel_test -t ' + type_arg,
-        "-o '#{ command_line_options.join(' ') } --tags ~@solo'",
+        %(-o '#{ command_line_options.join(' ') } --tags "#{not_tag('@solo')}"'),
         "-- #{ features.join(' ') }"
       ].compact.join(' ')
     end
 
+    def not_tag(name)
+      if cucumber_version < '3'
+        "~#{name}"
+      else
+        "not #{name}"
+      end
+    end
+
     def use_firefox_for_selenium
       path = Geordi::FirefoxForSelenium.path_from_config
       if path
@@ -198,16 +204,27 @@ module Geordi
       not parallel_tests_version.nil?
     end
 
-    # get the current parallel test version used in Gemfile.lock (nil if not available)
     def parallel_tests_version
-      @parallel_tests_version ||= begin
-        parallel_tests = `bundle list`.split("\n").detect{ |x| x =~ /parallel_tests/ }
-        if parallel_tests
-          parallel_tests.scan( /\(([\d\.]+).*\)/ ).flatten.first
-        end
+      @parallel_tests_version ||= gem_version('parallel_tests')
+    end
+
+    def cucumber_version
+      @cucumber_version ||= gem_version('cucumber')
+    end
+
+    # Get the version string for the given gem by parsing Gemfile.lock.
+    # Returns nil if the gem is not used.
+    def gem_version(gem)
+      gem_line = bundle_list.split("\n").detect{ |x| x.include?(gem) }
+      if gem_line
+        gem_line.scan( /\(([\d\.]+).*\)/ ).flatten.first
       end
     end
 
+    def bundle_list
+      @bundle_list ||= `bundle list`
+    end
+
     def use_parallel_tests?(options)
       options.fetch(:parallel, true) &&
         features_to_run.size != 1 &&

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '1.7.1'
+  VERSION = '1.8.0'
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-09 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.18.0
 description: Collection of command line tools we use in our daily work with Ruby,
@@ -50,8 +50,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -129,25 +128,23 @@ homepage: http://makandra.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: ! '* Binary `geordi` installed
-
-'
+post_install_message: "* Binary `geordi` installed\n"
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: geordi
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Collection of command line tools we use in our daily work with Ruby, Rails

data/.ruby-version

@@ -1 +0,0 @@
-1.9.3