geordi 1.4.2 → 1.4.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 87d8d2aedced0e3ecb654e08fc2c78c1a5c2c463
+  data.tar.gz: bc8f991eaaa88f1660486c3a6aefc9fb07e2a061
+SHA512:
+  metadata.gz: 9df5ded7314adcbbb35ba3722aa39e9e2cccfbda1e668486620454c9034efa267884f2058643ed88c8a3ffa931ee9a9104e3c23e5bf055f573c19af42ca629a0
+  data.tar.gz: 49ce0690a6dd0dd75600e6b6c012e60eafad2606d2e42a067b3a98c6cdbf0e5d58ebd3982c213e9b0449ce09ba6ee3da2b900e9d513dc4fc34eb32d51170552a

data/Gemfile

@@ -9,4 +9,4 @@ gem 'pry'
 gem 'highline'
 
 # Required for running features that test parallel test execution
-gem 'parallel_tests'
+gem 'parallel_tests' if ENV['GEORDI_TESTING']

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    geordi (1.4.2)
+    geordi (1.4.3)
       thor (>= 0.18.0)
 
 GEM
@@ -37,9 +37,6 @@ GEM
     method_source (0.8.2)
     multi_json (1.11.2)
     multi_test (0.1.2)
-    parallel (1.9.0)
-    parallel_tests (2.7.1)
-      parallel
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -61,7 +58,6 @@ DEPENDENCIES
   aruba
   geordi!
   highline
-  parallel_tests
   pry
   rspec-mocks
 

data/features/cucumber.feature

@@ -72,15 +72,15 @@ Feature: The cucumber command
     """
 
     When I run `geordi cucumber features/sub`
-    Then the output should contain "> Only: features/sub/one.feature, features/sub/two.feature"
+    Then the output should contain "> Only: features/sub/two.feature, features/sub/one.feature"
       And the output should contain "> Using parallel_tests"
 
 
   Scenario: Using the @solo tag
 
     The cucumber command runs all features without the @solo tag. If any of the
-    .feature files contains '@solo', it boots Cucumber a second time and runs
-    only the features tagged with @solo.
+    specified .feature files contains '@solo', it boots Cucumber a second time
+    and runs only those of the features tagged with @solo.
 
     Given a file named "features/no_solo.feature" with:
     """
@@ -94,7 +94,7 @@ Feature: The cucumber command
       Scenario: This scenario must NOT run in parallel
     """
 
-    When I run `geordi cucumber --verbose`
+    When I run `geordi cucumber --verbose features`
     Then the output should contain "# Running features"
       And the output should match /^> .*cucumber .*--tags ~@solo/
       And the output should contain "# Running @solo features"
@@ -102,13 +102,24 @@ Feature: The cucumber command
 
 
   Scenario: When there are no scenarios tagged @solo, the extra run is skipped
-    Given a file named "features/no_solo.feature" with:
+    Given a file named "features/no_solo/one.feature" with:
     """
     Feature: Test without solo tag
       Scenario: This scenario can run in parallel
     """
+    And a file named "features/no_solo/two.feature" with:
+    """
+    Feature: A second test to provoke a parallel run
+      Scenario: Something
+    """
+    And a file named "features/solo.feature" with:
+    """
+    Feature: Solo test
+      @solo
+      Scenario: This scenario is not even run during this test
+    """
 
-    When I run `geordi cucumber --verbose`
+    When I run `geordi cucumber features/no_solo --verbose`
     Then the output should contain "# Running features"
       And the output should match /^> .*cucumber .*--tags ~@solo/
     But the output should not contain "# Running @solo features"

data/lib/geordi/commands/cucumber.rb

@@ -1,4 +1,4 @@
-desc 'cucumber [FILES]', 'Run Cucumber features'
+desc 'cucumber [FILES and OPTIONS]', 'Run Cucumber features'
 long_desc <<-LONGDESC
 Example: `geordi cucumber features/authentication_feature:3`
 
@@ -24,32 +24,38 @@ option :debug, :aliases => '-d', :type => :boolean,
 option :rerun, :aliases => '-r', :type => :numeric, :default => 0,
   :desc => 'Rerun features up to N times while failing'
 
-def cucumber(*files)
+def cucumber(*args)
   if File.directory?('features')
     require 'geordi/cucumber'
 
     invoke_cmd 'bundle_install'
 
+    cmd_opts, files = args.partition { |f| f.start_with? '-' }
+    cmd_opts << '--format' << 'pretty' << '--backtrace' if options.debug
+
     announce 'Running features'
-    files << '--format' << 'pretty' << '--backtrace' if options.debug
 
     # Normal run
-    unless Geordi::Cucumber.new.run(files, :verbose => options.verbose)
+    unless Geordi::Cucumber.new.run(files, cmd_opts, :verbose => options.verbose)
+      cmd_opts << '--profile' << 'rerun'
 
       # 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, :parallel => false)
+        break if Geordi::Cucumber.new.run(files, cmd_opts, :verbose => options.verbose, :parallel => false)
       end
     end
 
     # Serial run of @solo scenarios
-    solo_tag_usages = `grep -r '@solo' features`.split("\n")
+    files << 'features' if files.empty? # Proper grepping
+    solo_tag_usages = `grep -r '@solo' #{ files.join(' ') }`.split("\n")
     if solo_tag_usages.any?
+      cmd_opts << '--tags' << '@solo'
+
       announce 'Running @solo features'
-      Geordi::Cucumber.new.run %w[--tags @solo], :verbose => options.verbose, :parallel => false
+      Geordi::Cucumber.new.run files, cmd_opts, :verbose => options.verbose, :parallel => false
     end
 
   else

data/lib/geordi/cucumber.rb

@@ -15,8 +15,8 @@ module Geordi
     VNC_VIEWER_COMMAND = "vncviewer #{VNC_DISPLAY}"
     VNC_ENV_VARIABLES = %w[DISPLAY BROWSER LAUNCHY_BROWSER]
 
-    def run(files, options = {})
-      self.argv = files
+    def run(files, cucumber_options, options = {})
+      self.argv = files + cucumber_options
 
       consolidate_rerun_txt_files
       show_features_to_run
@@ -25,7 +25,7 @@ module Geordi
       command = use_parallel_tests?(options) ? parallel_execution_command : serial_execution_command
       note_cmd(command) if options[:verbose]
 
-      puts
+      puts # Make newline
       system command # Util.system! would reset the Firefox PATH
     end
 

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '1.4.2'
+  VERSION = '1.4.3'
 end

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 1.4.2
-  prerelease: 
+  version: 1.4.3
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-25 00:00:00.000000000 Z
+date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.18.0
 description: Collection of command line tools we use in our daily work with Ruby,
@@ -53,8 +50,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
+- ".gitignore"
+- ".ruby-version"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -131,29 +128,26 @@ files:
 homepage: http://makandra.com
 licenses:
 - MIT
-post_install_message: ! '* Binary `geordi` installed
-
-'
+metadata: {}
+post_install_message: "* Binary `geordi` installed\n"
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: geordi
-rubygems_version: 1.8.23.2
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Collection of command line tools we use in our daily work with Ruby, Rails
   and Linux at makandra.
 test_files: []