chemistrykit 3.3.0 → 3.3.1

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+#3.3.1 (2013-07-11)
+Fixed bugs related to tagging and alternate configuration files in concurrent runs
+
+- Bumped version to 3.3.1 to prepare for release.
+- final code quality check
+- fixed issue where --all was not getting passed forward in parallel tests and the same with an alternative config file, added tests for those as well
+- fixed duplicatealias for brew option
+
 #3.3.0 (2013-07-09)
 Fixed bugs with tagging and concurrency
 

data/chemistrykit.gemspec

@@ -2,13 +2,13 @@
 
 Gem::Specification.new do |s|
   s.name          = "chemistrykit"
-  s.version       = "3.3.0"
+  s.version       = "3.3.1"
   s.platform      = Gem::Platform::RUBY
   s.authors       = ["Dave Haeffner", "Jason Fox"]
   s.email         = ["dave@arrgyle.com", "jason@arrgyle.com"]
   s.homepage      = "https://github.com/arrgyle/chemistrykit"
   s.summary       = "A simple and opinionated web testing framework for Selenium that follows convention over configuration."
-  s.description   = "Fixed bugs with tagging and concurrency"
+  s.description   = "Fixed bugs related to tagging and alternate configuration files in concurrent runs"
   s.license       = 'MIT'
 
   s.files         = `git ls-files`.split($/)

data/features/concurrency.feature

@@ -94,4 +94,6 @@ Feature: Support for concurency
       end
       """
     When I run `ckit brew --all`
+    Then the stdout should not contain "All examples were filtered out"
+    And the stdout should not contain "0 examples, 0 failures"
     And there should be "4" unique results files in the "evidence" directory

data/features/multi-config.feature

@@ -53,3 +53,19 @@ Feature: Support for multiple configuration files
       Then the stdout should contain "1 example, 0 failures"
       And the following files should exist:
         | evidence_alternate/server.log       |
+
+  Scenario: I can specifiy an alternative configuration with --config with concurrency
+    Given a directory named "evidence_alternate"
+    And a file named "alternate.yaml" with:
+      """
+      concurrency: 4
+      log:
+          path: 'evidence_alternate'
+      selenium_connect:
+          host: 'localhost'
+      """
+      When I run `ckit brew --config alternate.yaml`
+      Then the stdout should contain "1 example, 0 failures"
+      And there should be "1" unique results files in the "evidence_alternate" directory
+      And the following files should exist:
+        | evidence_alternate/server.log       |

data/lib/chemistrykit/cli/cli.rb

@@ -60,7 +60,7 @@ module ChemistryKit
       method_option :tag, type: :array
       method_option :config, default: 'config.yaml', aliases: '-c', desc: 'Supply alternative config file.'
       # TODO there should be a facility to simply pass a path to this command
-      method_option :beakers, aliases: '-a', type: :array
+      method_option :beakers, aliases: '-b', type: :array
       # This is set if the thread is being run in parallel so as not to trigger recursive concurency
       method_option :parallel, default: false
       method_option :results_file, aliases: '-r', default: false, desc: 'Specifiy the name of your results file.'
@@ -104,7 +104,7 @@ module ChemistryKit
 
         # based on concurrency parameter run tests
         if config.concurrency > 1 && ! options['parallel']
-          run_in_parallel beakers, config.concurrency, @tags
+          run_in_parallel beakers, config.concurrency, @tags, options
         else
           run_rspec beakers
         end
@@ -180,9 +180,12 @@ module ChemistryKit
         end
       end
 
-      def run_in_parallel(beakers, concurrency, tags)
-        tag_string = tags.empty? ? nil : '--tag=' + tags[:filter].map { |k, v| "#{k}:#{v}" }.join(' ')
-        args = %w(--type rspec) + ['-n', concurrency.to_s] + ['-o', "#{tag_string} --beakers="] + beakers
+      def run_in_parallel(beakers, concurrency, tags, options)
+        unless options[:all]
+          tag_string = tags.empty? ? nil : '--tag=' + tags[:filter].map { |k, v| "#{k}:#{v}" }.join(' ')
+        end
+        config_string = '--config=' + options['config']
+        args = %w(--type rspec) + ['-n', concurrency.to_s] + ['-o', "#{config_string} #{tag_string} --beakers="] + beakers
         ParallelTests::CLI.new.run(args)
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chemistrykit
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-09 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -220,7 +220,8 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.0
-description: Fixed bugs with tagging and concurrency
+description: Fixed bugs related to tagging and alternate configuration files in concurrent
+  runs
 email:
 - dave@arrgyle.com
 - jason@arrgyle.com
@@ -302,7 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1364358405018714304
+      hash: 2304816470703574176
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25