geordi 1.2.2 → 1.2.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTk2YTFmM2FlNWE5ZWU2YWU2OGIwNjRhZThhYTZhYzE1OGI3ZmVkNA==
+    ZTRmNjIxM2QxMjA3MjdlZTZiNDAzMDUyNzVjNDY0YTkyM2RjNDFkYQ==
   data.tar.gz: !binary |-
-    OWJiMjlmNWQzNTdhMmI1NTMyOTc5NTBhYWVlN2Q2Y2M3ZjBjNDMxMA==
+    MjZmNjkxNWI4OWQ1ZGM2ZGQyMjhkNjAxOTBmMjU2Y2RlODM1MmQwZQ==
 SHA512:
   metadata.gz: !binary |-
-    YmI5ZDYzMWZkNWRmYzAxZDBkZjFiOTNkMThjZDFlNjUyMDlhNWNhMmJiNGFh
-    MzJiZGE5Zjc0MjhkZTkyYjgxYjU1ODExOGMyMjM3ZmNjZmI3Mzk1MGFhNDc1
-    NWM4ZTNjYWEwYzRhYmI5MTNkMDcxMjAwMmUyMDFhOWM4YTA3OWI=
+    ODgzN2M4YzgwZDAzOTg0ZWQ0ZmE1ZGYxNzhkYmFlMDE0MjYxZmRmNThjNWNi
+    ZDIxMTkzOWFjNDUzZmEwOGQ3ZjAzMTg4YTE1NWVkZTZiODVjMDQ1OTliZmM1
+    ZWM1MmI5YWU5OTZmZTU4NjdjZjc3NjcxZWM2MTg4YzAzODRmZTc=
   data.tar.gz: !binary |-
-    NGQzZTJkNGJkMmY3Y2FjYmFiNGFkNTg4YzVmMmY0NmM2OTViOTNhN2FlYmNm
-    Nzg5NjUyZTcxMTRhNjNkZTZiMjE4NDM5MGYzNjFjMThkNGYzYzVmMTQ0YmYy
-    MDUyZmE4ODg0NGYxNmY1YWE2ZjE5ZmFkNjkwN2Y2MzA5ZWIwMDA=
+    Zjk4MGFmNTNhNDBlZWNiZDhlNzM1ZGMwZmM4ZTZjMTEzYzEzOTUxNGVjODE0
+    ZGNiYWMyODIwMTc4MTgwMjlhOTA5OWJkN2NmOGQyMzQ0N2U0MzRjYjc4OTM5
+    NzY1MGJlOWY5ODNlOWUyNmMxNzdmZjZiZDMwMjEwMmI0OGFiMmY=

data/lib/geordi/commands/cucumber.rb

@@ -25,13 +25,19 @@ def cucumber(*files)
     invoke_cmd 'bundle_install'
 
     announce 'Running features'
-    files << '--format' << 'pretty' << '-b' if options.debug
-    (1 + options.rerun).times do |i|
-      return true if Geordi::Cucumber.new.run(files, :verbose => options.verbose)
+    files << '--format' << 'pretty' << '--backtrace' if options.debug
 
-      announce "Rerun ##{ i + 1 } of #{ options.rerun }"
+    # Normal run
+    unless Geordi::Cucumber.new.run(files, :verbose => options.verbose)
+
+      # Reruns
+      (1 + options.rerun).times do |i|
+        fail 'Features failed.' if (i == options.rerun) # All reruns done?
+
+        announce "Rerun ##{ i + 1 } of #{ options.rerun }"
+        break if Geordi::Cucumber.new.run(%w[--profile rerun], :verbose => options.verbose)
+      end
     end
-    fail 'Features failed.' # Give up
 
   else
     note 'Cucumber not employed.'

data/lib/geordi/cucumber.rb

@@ -184,10 +184,9 @@ module Geordi
     end
 
     def features_can_run_with_parallel_tests?(features)
-      not features.any?{ |feature| feature.include? ":" }
+      features.none? { |f| f.include? ':' }
     end
 
-
     # Check if cucumber_spinner is available
     def spinner_available?
       @spinner_available ||= File.exists?('Gemfile') && File.open('Gemfile').read.scan(/cucumber_spinner/).any?
@@ -210,7 +209,9 @@ module Geordi
     end
 
     def use_parallel_tests?
-      parallel_tests_available? && features_can_run_with_parallel_tests?(features_to_run) && features_to_run.size != 1
+      not(argv.include?('rerun') or features_to_run.size == 1) &&
+        parallel_tests_available? &&
+        features_can_run_with_parallel_tests?(features_to_run)
     end
 
     def try_and_start_vnc

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2016-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor