chemistrykit 3.9.1 → 3.10.0

data/.rbenv-version

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

data/.rubocop.yml

@@ -9,3 +9,9 @@ SymbolName:
 
 Documentation:
   Enabled: false
+
+AllCops:
+    Includes:
+        - Gemfile
+    Excludes:
+        - report/config.rb

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+#3.10.0 (2013-09-17)
+Merged various pull requests including subfolders in beaker directory
+
+- Bumped version to 3.10.0 to prepare for release.
+- fixed small typo with tests
+- updated docs to detail catalyst usage
+- updated template not to include depracated log configuration to close #73
+- fixed typo with test, updated variable to be more verbose, changed all the ckit executions in the cucumber tests to use bundle exec
+- updated rvm rbenv managment to new mode
+- locked ruby version until clearing up how that can be managed
+- updated rubo and fixed some code quality issues
+- added contribution clarity to readme docs
+- add a test to run beakers from a sub-directory
+- bump selenium-webdriver to overcome a loading error for rubyzip
+- Beaker directory now supports sub-directories
+
 #3.9.1 (2013-08-26)
 small fix to gemfile
 

data/Gemfile

@@ -1,4 +1,6 @@
-source "https://rubygems.org"
+# Encoding: utf-8
+
+source 'https://rubygems.org'
 
 # Specify dependencies in chemistrykit.gemspec
 gemspec
@@ -6,16 +8,15 @@ gemspec
 gem 'aruba', '~> 0.5.1'
 gem 'cucumber', '~> 1.2.1'
 gem 'rake', '~> 10.0.3'
-gem 'rubocop'
+gem 'rubocop', git: 'git://github.com/bbatsov/rubocop.git', branch: 'master'
 gem 'coveralls', '~> 0.6.7'
 gem 'flog'
 gem 'flay'
 gem 'ruby2ruby'
 gem 'reek', '1.3.1'
 gem 'guard-reek'
+gem 'guard-rspec'
 gem 'guard-rubocop'
-gem "selenium-client", "~> 1.2.18"
+gem 'selenium-client', '~> 1.2.18'
 gem 'compass'
 gem 'zurb-foundation'
-
-

data/Guardfile

@@ -1,5 +1,3 @@
-# Encoding: utf-8
-
 guard :rspec do
   watch(%r{^spec/unit/.+_spec\.rb$})
   watch(%r{^spec/integration/.+_spec\.rb$})

data/README.md

@@ -1,4 +1,4 @@
-#ChemistryKit 3.9.1 (2013-08-26)
+#ChemistryKit 3.10.0 (2013-09-17)
 
 [![Gem Version](https://badge.fury.io/rb/chemistrykit.png)](http://badge.fury.io/rb/chemistrykit) [![Build Status](https://travis-ci.org/arrgyle/chemistrykit.png?branch=develop)](https://travis-ci.org/jrobertfox/chef-broiler-platter) [![Code Climate](https://codeclimate.com/github/arrgyle/chemistrykit.png)](https://codeclimate.com/github/arrgyle/chemistrykit) [![Coverage Status](https://coveralls.io/repos/arrgyle/chemistrykit/badge.png?branch=develop)](https://coveralls.io/r/arrgyle/chemistrykit?branch=develop)
 
@@ -74,11 +74,11 @@ To exclude a tag, put a ~ in front of it.
 During development it is often helpful to just run a specific beaker, this can be accomplished with the `--beakers` flag:
 
     ckit brew --beakers=beakers/wip_beaker.rb
-    
+
 ####Special Tags
 There are some tags that can be used to control various aspects of the harness. The following are supported:
 
-- `public: SOME_VALUE` - If you are running your harness against sauce labs, then you can control how the permissions are set for a particular beaker according to the visibility options detailed at the bottom of [this page](https://saucelabs.com/docs/additional-config). For example if you wanted a test to be private you could add `public: 'private'` to your beaker tags.  
+- `public: SOME_VALUE` - If you are running your harness against sauce labs, then you can control how the permissions are set for a particular beaker according to the visibility options detailed at the bottom of [this page](https://saucelabs.com/docs/additional-config). For example if you wanted a test to be private you could add `public: 'private'` to your beaker tags.
 
 ###Formula Loading
 Code in the `formula` directory can be used to build out page objects and helper functions to facilitate your testing. The files are loaded in a particular way:
@@ -149,9 +149,29 @@ Would get you (assuming `sub_account1` has a type of `sub_account`, and a field
 
 Inside your formula. COOL!
 
-
 The FormulaLab will handle the heavy lifting of assembling your formula with a driver and correct chemist (if the formula needs one). Also note that the specific instance of chemist is cached so that any changes your formula makes to the chemist is reflected in other formulas that use it.
 
+###Catalysts! Driving Tests with Data
+In addition to using **Chemists** to mix data into your test barness, you can also use **Catalysts** simple key-value stores that can be populated from a CSV file. Formulas can set and get a catalyst or use the `catalyize` method to directly inject the data into the formula by file name. Once you have a catalyst, simply access the values by their keys:
+
+```Ruby
+# my_beaker.rb
+describe "my beaker", :depth => 'shallow' do
+  let(:my_formula) { @formula_lab.mix('my_other_formula') }
+  
+  my_formula.catalyst = ChemistryKit::Catalyst.new('/path/to/data.csv')
+  # or 
+  my_formula.catalyze('/path/to/data.csv')
+end
+
+# my_formula.rb
+module Formulas
+  class MyFormula < Formula
+    some_value = catalyst.my_key
+  end
+end
+```
+
 ###Execution Order
 Chemistry Kit executes specs in a random order. This is intentional. Knowing the order a spec will be executed in allows for dependencies between them to creep in. Sometimes unintentionally. By having them go in a random order parallelization becomes a much easier.
 
@@ -256,6 +276,8 @@ This project conforms to the [neverstopbuilding/craftsmanship](https://github.co
 - Documentation expectations
 - Release process
 
+Most importantly, submit your pull requests to the `develop` branch.
+
 ###Check out the user group!
 [https://groups.google.com/forum/#!forum/chemistrykit-users](https://groups.google.com/forum/#!forum/chemistrykit-users)
 

data/Rakefile

@@ -68,12 +68,12 @@ end
 
 # TODO: fix all the smells and turn on failing on error
 Reek::Rake::Task.new do |t|
-    t.fail_on_error = false
-    t.verbose = false
-    t.reek_opts = '--quiet'
+  t.fail_on_error = false
+  t.verbose = false
+  t.reek_opts = '--quiet'
 end
 
-# TODO This could probably be more cleanly automated
+# TODO: This could probably be more cleanly automated
 desc 'Start a release (Requires Git Flow)'
 task :release_start, [:version, :no_verify] do |t, args|
   version = args['version']
@@ -110,7 +110,7 @@ task :release_start, [:version, :no_verify] do |t, args|
   puts "You've started release #{version}, make any last minute updates now.\n"
 end
 
-# TODO This could probablly be more cleanly automated
+# TODO: This could probably be more cleanly automated
 desc 'Finish a release (Requires Git Flow and Gem Deploy Permissions'
 task :release_finish, :update_message do |t, args|
   message   = args['update_message']
@@ -166,7 +166,7 @@ task :release_finish, :update_message do |t, args|
   system "rm chemistrykit-#{version}.gem"
 
   # finish the release
-  # TODO there is a bug with git flow, and you still need to deal with merge
+  # TODO: there is a bug with git flow, and you still need to deal with merge
   # messages, might just do this with git directly
   system "git flow release finish -m'#{version}' #{version}"
 

data/chemistrykit.gemspec

@@ -2,13 +2,13 @@
 
 Gem::Specification.new do |s|
   s.name          = 'chemistrykit'
-  s.version       = '3.9.1'
+  s.version       = '3.10.0'
   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   = 'small fix to gemfile'
+  s.description   = 'Merged various pull requests including subfolders in beaker directory'
   s.license       = 'MIT'
 
   s.files         = `git ls-files`.split($/)
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'thor', '~> 0.17.0'
   s.add_dependency 'rspec', '~> 2.14.1'
   s.add_dependency 'builder', '~> 3.2.2'
-  s.add_dependency 'selenium-webdriver', '~> 2.29.0'
+  s.add_dependency 'selenium-webdriver', '~> 2.35.1'
   s.add_dependency 'rest-client', '~> 1.6.7'
   s.add_dependency 'selenium-connect', '~> 3.7.0'
   s.add_dependency 'parallel_tests', '~> 0.15.0'

data/features/basic_auth.feature

@@ -6,7 +6,7 @@ This way tests will be able to execute without being prompted by a modal dialog
 
 
 Background:
-  Given I run `ckit new basic_auth_harness`
+  Given I run `bundle exec ckit new basic_auth_harness`
   And I cd to "basic_auth_harness"
   And a file named "beakers/basic_auth_1_beaker.rb" with:
     """
@@ -25,7 +25,7 @@ Scenario: Pre-load HTTP before each test
         password:   'admin'
         http_path:   '/'
     """
-  When I run `ckit brew`
+  When I run `bundle exec ckit brew`
   Then the stdout should contain "1 example, 0 failures"
 
 Scenario: Pre-load HTTP before each test without the http_path set
@@ -36,7 +36,7 @@ Scenario: Pre-load HTTP before each test without the http_path set
         username:   'admin'
         password:   'admin'
     """
-  When I run `ckit brew`
+  When I run `bundle exec ckit brew`
   Then the stdout should contain "1 example, 0 failures"
 
 Scenario: Works without Basic Auth
@@ -44,5 +44,5 @@ Scenario: Works without Basic Auth
     """
     base_url: 'http://google.com'
     """
-  When I run `ckit brew`
+  When I run `bundle exec ckit brew`
   Then the stdout should contain "1 example, 0 failures"

data/features/brew.feature

@@ -8,7 +8,7 @@ Feature: Brewing a ChemistryKit project
     2. With Sauce Ondemand
 
   Background: Setup the project
-    Given I run `ckit new booker`
+    Given I run `bundle exec ckit new booker`
     And I cd to "booker"
     And a file named "formulas/bookie.rb" with:
       """
@@ -37,7 +37,7 @@ Feature: Brewing a ChemistryKit project
       selenium_connect:
           host: 'localhost'
       """
-    When I run `ckit brew`
+    When I run `bundle exec ckit brew`
     Then the stdout should contain "1 example, 0 failures"
     And the following files should exist:
       | evidence/junit_0.xml |
@@ -59,9 +59,29 @@ Feature: Brewing a ChemistryKit project
         end
       end
       """
-    When I run `ckit brew --beakers=beakers/other_beaker.rb`
+    When I run `bundle exec ckit brew --beakers=beakers/other_beaker.rb`
     Then the stdout should contain "1 example, 0 failures"
 
+  Scenario: Brew beakers where the beakers directory contains a sub-directory
+    Given a file named "config.yaml" with:
+      """
+      selenium_connect:
+          log: 'evidence'
+          host: 'localhost'
+      """
+    And a file named "beakers/sub/other_beaker.rb" with:
+      """
+      describe "SubDirectory" do
+        let(:book) { Formulas::Bookie.new(@driver) }
+
+        it "loads an external web page" do
+          book.open "http://www.google.com"
+        end
+      end
+      """
+    When I run `bundle exec ckit brew --all`
+    Then the stdout should contain "2 examples, 0 failures"
+
   Scenario: Run all the tests regardless of tag
     Given a file named "config.yaml" with:
       """
@@ -78,7 +98,7 @@ Feature: Brewing a ChemistryKit project
         end
       end
       """
-    When I run `ckit brew --all`
+    When I run `bundle exec ckit brew --all`
     Then the stdout should contain "2 examples, 0 failures"
 
   Scenario: Saucelabs
@@ -103,7 +123,7 @@ Feature: Brewing a ChemistryKit project
       end
     end
     """
-    When I run `ckit brew --beakers=beakers/failure.rb`
+    When I run `bundle exec ckit brew --beakers=beakers/failure.rb`
     Then the stdout should contain "1 example, 1 failure"
     And there should be "1" "failed image" log files in "evidence/failing_beaker/failing_beaker_loads_an_external_web_page"
     And there should be "1" "report" log files in "evidence/failing_beaker/failing_beaker_loads_an_external_web_page"
@@ -127,7 +147,7 @@ Feature: Brewing a ChemistryKit project
         end
       end
       """
-    When I run `ckit brew --beakers=beakers/other_beaker.rb`
+    When I run `bundle exec ckit brew --beakers=beakers/other_beaker.rb`
     Then the stdout should contain "RSpec::Retry: 2nd try"
     Then the stdout should contain "RSpec::Retry: 3rd try"
 
@@ -150,7 +170,7 @@ Feature: Brewing a ChemistryKit project
         end
       end
       """
-    When I run `ckit brew --beakers=beakers/other_beaker.rb --retry=3`
+    When I run `bundle exec ckit brew --beakers=beakers/other_beaker.rb --retry=3`
     Then the stdout should contain "RSpec::Retry: 2nd try"
     Then the stdout should contain "RSpec::Retry: 3rd try"
 

data/features/catalyst.feature

@@ -2,7 +2,7 @@ Feature: Catalyst
 Catalyst: n. A pocket of data (consumed from a CSV file) used to drive a test that needs it.
 
   Scenario: Use a catalyst value to drive a test
-    Given I run `ckit new catalyst-example`
+    Given I run `bundle exec ckit new catalyst-example`
     And I cd to "catalyst-example"
 
     And a file named "formulas/lib/catalysts/google_test_data.csv" with:
@@ -83,5 +83,5 @@ Catalyst: n. A pocket of data (consumed from a CSV file) used to drive a test th
       selenium_connect:
           host: 'localhost'
       """
-    When I run `ckit brew`
+    When I run `bundle exec ckit brew`
     Then the stdout should contain "1 example, 0 failures"

data/features/chemists.feature

@@ -1,7 +1,7 @@
 Feature: Brewing a ChemistryKit project
 
   Background: Setup the project
-    Given I run `ckit new chemists-test`
+    Given I run `bundle exec ckit new chemists-test`
     And I cd to "chemists-test"
     And a file named "chemists/chemists.csv" with:
       """
@@ -112,7 +112,7 @@ Feature: Brewing a ChemistryKit project
         end
       end
       """
-    When I run `ckit brew`
+    When I run `bundle exec ckit brew`
     Then the stdout should contain "1 example, 0 failures"
 
   Scenario: Chemist formula loading with formula_lab
@@ -128,7 +128,7 @@ Feature: Brewing a ChemistryKit project
         end
       end
       """
-    When I run `ckit brew`
+    When I run `bundle exec ckit brew`
     Then the stdout should contain "1 example, 0 failures"
 
   Scenario: Loading multiple formulas in a beaker
@@ -157,7 +157,7 @@ Feature: Brewing a ChemistryKit project
       Key,Type,Email,Name,Password
       other1,other,other@email.com,Mr. Other,abc123$
       """
-    When I run `ckit brew`
+    When I run `bundle exec ckit brew`
     Then the stdout should contain "2 examples, 0 failures"
 
   @announce
@@ -179,5 +179,5 @@ Feature: Brewing a ChemistryKit project
       Key,Type,Item
       other1,some_sub_account,some
       """
-    When I run `ckit brew`
+    When I run `bundle exec ckit brew`
     Then the stdout should contain "1 example, 0 failures"

data/features/concurrency.feature

@@ -4,7 +4,7 @@ Feature: Support for concurency
   I want to run them in parallel
 
   Background:
-    Given I run `ckit new concurrency-test`
+    Given I run `bundle exec ckit new concurrency-test`
     And I cd to "concurrency-test"
     And a file named "beakers/first_beaker.rb" with:
     """
@@ -40,14 +40,14 @@ Feature: Support for concurency
       """
 
   Scenario: I can run the tests in parallel
-    When I run `ckit brew`
+    When I run `bundle exec ckit brew`
     Then the stdout should contain "4 processes for 2 beakers"
     And the stdout should contain "3 examples, 0 failures"
     And the file "evidence/results_junit.xml" should not exist
     And there should be "2" unique results files in the "evidence" directory
 
   Scenario: I can run a specific beaker in parallel
-    When I run `ckit brew --beakers=beakers/first_beaker.rb`
+    When I run `bundle exec ckit brew --beakers=beakers/first_beaker.rb`
     Then the stdout should contain "4 processes for 1 beakers"
     And the stdout should contain "2 examples, 0 failures"
 
@@ -70,7 +70,7 @@ Feature: Support for concurency
         end
       end
       """
-    When I run `ckit brew --tag item:test`
+    When I run `bundle exec ckit brew --tag item:test`
     And the stdout should contain "2 examples, 0 failures"
 
     Scenario: I can all beakers in parallel
@@ -92,7 +92,7 @@ Feature: Support for concurency
         end
       end
       """
-    When I run `ckit brew --all`
+    When I run `bundle exec 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/exit_status.feature

@@ -1,7 +1,7 @@
 Feature: Exit Status
 
   Background:
-    Given I run `ckit new cheese`
+    Given I run `bundle exec ckit new cheese`
     And I cd to "cheese"
     And a file named "config.yaml" with:
       """
@@ -19,7 +19,7 @@ Feature: Exit Status
       end
     end
     """
-    When I run `ckit brew`
+    When I run `bundle exec ckit brew`
     Then the exit code should be 0
 
   Scenario: Failing
@@ -32,5 +32,5 @@ Feature: Exit Status
       end
     end
     """
-    When I run `ckit brew`
+    When I run `bundle exec ckit brew`
     Then the exit code should be 1

data/features/global-config.feature

@@ -4,7 +4,7 @@ Feature: Initialize a global configuration
   I want to specify configurations in a central file so they are available in test scripts
 
   Scenario: Use a configuration option in a beaker
-    Given I run `ckit new global-config-test`
+    Given I run `bundle exec ckit new global-config-test`
     And I cd to "global-config-test"
     And a file named "beakers/test_beaker.rb" with:
     """
@@ -21,5 +21,5 @@ Feature: Initialize a global configuration
     selenium_connect:
         host: 'localhost'
     """
-    When I run `ckit brew`
+    When I run `bundle exec ckit brew`
     Then the stdout should contain "1 example, 0 failures"

data/features/load_page_objects.feature

@@ -2,7 +2,7 @@ Feature: Load Page Objects
 Formulas should be loaded in the correct order with thier dependencies
 
   Scenario: Load the libs first
-    Given I run `ckit new big-project`
+    Given I run `bundle exec ckit new big-project`
     And I cd to "big-project"
     And a file named "config.yaml" with:
       """
@@ -44,5 +44,5 @@ Formulas should be loaded in the correct order with thier dependencies
       end
       """
 
-    When I run `ckit brew`
+    When I run `bundle exec ckit brew`
     Then the stdout should contain "1 example, 0 failures"

data/features/multi-config.feature

@@ -5,7 +5,7 @@ Feature: Support for multiple configuration files
   I want to specify different configuration files on the command line
 
   Background:
-    Given I run `ckit new config-test`
+    Given I run `bundle exec ckit new config-test`
     And I cd to "config-test"
     And a file named "beakers/test_beaker.rb" with:
     """
@@ -24,7 +24,7 @@ Feature: Support for multiple configuration files
           log: 'evidence_config'
           host: 'localhost'
       """
-    When I run `ckit brew`
+    When I run `bundle exec ckit brew`
     Then the stdout should contain "1 example, 0 failures"
     And the following files should exist:
       | evidence_config/cheese/cheese_loads_an_external_web_page/server.log |
@@ -37,7 +37,7 @@ Feature: Support for multiple configuration files
           log: 'evidence_alternate'
           host: 'localhost'
       """
-      When I run `ckit brew --config alternate.yaml`
+      When I run `bundle exec ckit brew --config alternate.yaml`
       Then the stdout should contain "1 example, 0 failures"
       And the following files should exist:
         | evidence_alternate/cheese/cheese_loads_an_external_web_page/server.log |
@@ -50,7 +50,7 @@ Feature: Support for multiple configuration files
           log: 'evidence_alternate'
           host: 'localhost'
       """
-      When I run `ckit brew -c alternate.yaml`
+      When I run `bundle exec ckit brew -c alternate.yaml`
       Then the stdout should contain "1 example, 0 failures"
       And the following files should exist:
        | evidence_alternate/cheese/cheese_loads_an_external_web_page/server.log |
@@ -63,7 +63,7 @@ Feature: Support for multiple configuration files
           log: 'evidence_alternate'
           host: 'localhost'
       """
-      When I run `ckit brew --config alternate.yaml`
+      When I run `bundle exec ckit brew --config alternate.yaml`
       Then the stdout should contain "1 example, 0 failures"
       And the following files should exist:
       | evidence_alternate/cheese/cheese_loads_an_external_web_page/server.log |

data/features/reporting.feature

@@ -5,7 +5,7 @@ Feature: Advanced HTML Reports
   I want a detailed HTML report of failures
 
   Background:
-    Given I run `ckit new reporting-test`
+    Given I run `bundle exec ckit new reporting-test`
     And I cd to "reporting-test"
     And a file named "beakers/first_beaker.rb" with:
     """
@@ -49,7 +49,7 @@ Feature: Advanced HTML Reports
       """
 
   Scenario: I can run the tests
-    When I run `ckit brew`
+    When I run `bundle exec ckit brew`
     Then the stdout should contain "5 examples, 3 failures, 1 pending"
     And the following files should exist:
       | evidence/final_results.html |
@@ -62,7 +62,7 @@ Feature: Advanced HTML Reports
       selenium_connect:
           browser: 'chrome'
       """
-    When I run `ckit brew`
+    When I run `bundle exec ckit brew`
     Then the stdout should contain "5 examples, 3 failures, 1 pending"
     And the following files should exist:
       | evidence/final_results.html |
@@ -79,7 +79,7 @@ Feature: Advanced HTML Reports
           sauce_api_key: 'ab7a6e17-16df-42d2-9ef6-c8d2539cc38a'
           description: 'concurrency check'
       """
-    When I run `ckit brew`
+    When I run `bundle exec ckit brew`
     Then the stdout should contain "2 processes for 3 beakers"
     And the following files should exist:
       | evidence/final_results.html |
@@ -94,7 +94,7 @@ Feature: Advanced HTML Reports
       end
     end
     """
-  When I run `ckit brew --beakers=beakers/fourth_beaker.rb`
+  When I run `bundle exec ckit brew --beakers=beakers/fourth_beaker.rb`
   And the following files should exist:
       | evidence/final_results.html |
 
@@ -109,7 +109,7 @@ Given a file named "beakers/fifth_beaker.rb" with:
       end
     end
   """
-  When I run `ckit brew --beakers=beakers/fifth_beaker.rb`
+  When I run `bundle exec ckit brew --beakers=beakers/fifth_beaker.rb`
   And the following files should exist:
       | evidence/final_results.html |
 

data/features/sauce.feature

@@ -2,7 +2,7 @@
 Feature: Sauce specific feature tests
 
   Background:
-    Given I run `ckit new sauce-test`
+    Given I run `bundle exec ckit new sauce-test`
     And I cd to "sauce-test"
     And a file named "beakers/first_beaker.rb" with:
     """
@@ -26,7 +26,7 @@ Feature: Sauce specific feature tests
       """
 
   Scenario: Default permission config should work
-    When I run `ckit brew`
+    When I run `bundle exec ckit brew`
     Then the stdout should contain "1 example, 0 failures"
     And the file "evidence/sauce_beaker/sauce_beaker_test/sauce_job.log" should contain "private"
 
@@ -40,7 +40,7 @@ Feature: Sauce specific feature tests
       end
     end
     """
-    When I run `ckit brew`
+    When I run `bundle exec ckit brew`
     Then the stdout should contain "1 example, 0 failures"
     And the file "evidence/sauce_beaker/sauce_beaker_test/sauce_job.log" should contain "share"
     And the file "evidence/sauce_beaker/sauce_beaker_test/sauce_job.log" should contain "crazy:test_tag"

data/features/split_testing.feature

@@ -1,7 +1,7 @@
 Feature: opting out of ab tests based on configuration
 
 Background:
-    Given I run `ckit new split-test`
+    Given I run `bundle exec ckit new split-test`
     And I cd to "split-test"
     And a file named "beakers/first_beaker.rb" with:
     """
@@ -24,5 +24,5 @@ Background:
       """
 
   Scenario: opt out is on
-    When I run `ckit brew`
+    When I run `bundle exec ckit brew`
     Then the stdout should contain "1 example, 0 failures"

data/features/support/env.rb

@@ -4,6 +4,6 @@ require 'aruba/cucumber'
 
 Before do
   FileUtils.rm_rf('build/tmp')
-  @aruba_timeout_seconds = 150
+  @aruba_timeout_seconds = (3 * 60)
   @dirs = ['build/tmp']
 end

data/features/tags.feature

@@ -1,10 +1,11 @@
+@announce
 Feature: Listing all the tags
   In order to see all the tags I'm using
   As a harness developer
   I want to run a command to list all the tags
 
   Background: Setup the project
-    Given I run `ckit new tags-test`
+    Given I run `bundle exec ckit new tags-test`
     And I cd to "tags-test"
 
   Scenario: Get the tag for a single beaker
@@ -18,7 +19,7 @@ Feature: Listing all the tags
         end
       end
       """
-    When I run `ckit tags`
+    When I run `bundle exec ckit tags`
     Then the stdout should contain "depth:shallow"
 
   Scenario: Get the tags inside a beaker
@@ -35,7 +36,7 @@ Feature: Listing all the tags
         end
       end
       """
-    When I run `ckit tags`
+    When I run `bundle exec ckit tags`
     Then the stdout should contain "depth:shallow"
     And the stdout should contain "depth:deep"
 
@@ -66,8 +67,8 @@ Feature: Listing all the tags
         end
       end
       """
-    When I run `ckit tags`
-    Then the stdout from "ckit tags" should contain:
+    When I run `bundle exec ckit tags`
+    Then the stdout from "bundle exec ckit tags" should contain:
       """
       ....
       Tags used in harness:

data/lib/chemistrykit/cli/cli.rb

@@ -45,7 +45,7 @@ module ChemistryKit
 
       desc 'tags', 'Lists all tags in use in the test harness.'
       def tags
-        beakers = Dir.glob(File.join(Dir.getwd, 'beakers/*'))
+        beakers = Dir.glob(File.join(Dir.getwd, 'beakers/**/*')).select { |file| !File.directory?(file) }
         ::RSpec.configure do |c|
           c.add_setting :used_tags
           c.before(:suite) { ::RSpec.configuration.used_tags = [] }
@@ -88,7 +88,7 @@ module ChemistryKit
         load_page_objects
 
         # get those beakers that should be executed
-        beakers = options['beakers'] ? options['beakers'] : Dir.glob(File.join(Dir.getwd, 'beakers/*'))
+        beakers = options['beakers'] ? options['beakers'] : Dir.glob(File.join(Dir.getwd, 'beakers/**/*')).select { |file| !File.directory?(file) }
 
         if options['beakers']
           # if a beaker(s) defined use them
@@ -97,7 +97,7 @@ module ChemistryKit
           setup_tags(options['tag'])
         else
           # beakers default to everything
-          beakers = Dir.glob(File.join(Dir.getwd, 'beakers/*'))
+          beakers = Dir.glob(File.join(Dir.getwd, 'beakers/**/*')).select { |file| !File.directory?(file) }
 
           if options['tag']
 

data/lib/chemistrykit/formula/formula_lab.rb

@@ -71,13 +71,11 @@ module ChemistryKit
         end
 
         # TODO: try to resolve this backreff thing
-        # rubocop:disable AvoidPerlBackrefs
         def get_class_name(formula_file)
           string = formula_file.match(/(#{@formulas_dir.split('/').last}.*#{@formula})\.rb$/)[1]
           string = string.sub(/^[a-z\d]*/) { $&.capitalize }
-          string.gsub(/(?:_|(\/))([a-z\d]*)/) { "#{$1}#{$2.capitalize}" }.gsub('/', '::')
+          string.gsub(/(?:_|(\/))([a-z\d]*)/) { "#{$1}#{$2.capitalize}" }.gsub('/', '::') # rubocop:disable PerlBackrefs
         end
-        # rubocop:enable AvoidPerlBackrefs
 
         # "borrowed" from http://api.rubyonrails.org/classes/ActiveSupport/Inflector.html#method-i-constantize
         # TODO: this could be simplified, refactored out, or just use the activestate module some how

data/lib/chemistrykit/rspec/html_formatter.rb

@@ -249,6 +249,3 @@ module ChemistryKit
     end
   end
 end
-
-
-

data/lib/templates/chemistrykit/config.yaml.tt

@@ -1,12 +1,8 @@
 # Default Chemisty Kit Configuration File
 
-base_url: http://google.com
+base_url: http://google.com #change to the base url of your system under test
 retries_on_failure: 1 #defaults to 1, set the number of times a test should be retried on failure
 concurrency: 1
-log:
-    path: #you may override the default log path 'evidence'
-    results_file: #you may override the default file name 'results_junit.xml'
-    format: #you may override the default format 'junit'
 selenium_connect:
     #Setup & Debugging
     jar:
@@ -29,3 +25,15 @@ selenium_connect:
         os:
         browser_version:
         job_name:
+
+# Uncomment the below to set up a basic authentication call for your tests
+# basic_auth:
+#    username: 'user'
+#    password: 'pass'
+#    http_path: '/basic'
+#    https_path: '/secure'
+
+# Uncomment the below if you use optimizely in your test environment and want to opt out of it
+# split_testing:
+#     provider: 'optimizely'
+#     opt_out: true

data/spec/unit/lib/chemistrykit/config/basic_auth_spec.rb

@@ -12,7 +12,8 @@ describe ChemistryKit::Config::BasicAuth do
   VALID_HTTPS_PATH = '/secure'
 
   before(:each) do
-    @opts = { username: VALID_USERNAME,
+    @opts = {
+      username: VALID_USERNAME,
       password: VALID_PASSWORD,
       base_url: VALID_URL,
       http_path: VALID_HTTP_PATH,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chemistrykit
 version: !ruby/object:Gem::Version
-  version: 3.9.1
+  version: 3.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-26 00:00:00.000000000 Z
+date: 2013-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -67,7 +67,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.29.0
+        version: 2.35.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,7 +75,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.29.0
+        version: 2.35.1
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -204,7 +204,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.2
-description: small fix to gemfile
+description: Merged various pull requests including subfolders in beaker directory
 email:
 - dave@arrgyle.com
 - jason@arrgyle.com
@@ -215,10 +215,10 @@ extra_rdoc_files: []
 files:
 - .coveralls.yml
 - .gitignore
+- .rbenv-version
 - .rspec
 - .rubocop.yml
 - .ruby-gemset
-- .ruby-version
 - .travis.yml
 - CHANGELOG.md
 - CONTRIBUTORS.md
@@ -352,12 +352,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -219025540182541966
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A simple and opinionated web testing framework for Selenium that follows

data/.ruby-version

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