chef-workflow-testlib 0.1.1 → 0.2.0

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+* 0.2.0 (unreleased)
+  * **important**: All chef-workflow-tasklib unit tests from now on should
+    inherit from MiniTest::Unit::ProvisionedTestCase, what provisioners to use
+    is determined by the configuration.
+    * the EC2 and Vagrant-specific versions are going away in a future release.
+  * Like all other parts of chef-workflow, all classes were prefixed with the namespace ChefWorkflow
+
+* 0.1.1 December 21, 2012
+  * Fix gemspec. Here's to touching the stove.
+
+* 0.1.0 December 21, 2012
+  * Initial public release

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Erik Hollensbe
+Copyright (c) 2012, 2013 Erik Hollensbe
 
 MIT License
 
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,4 +1,5 @@
-# Chef Workflow - Test Libraries and Tooling
+Chef Workflow - Test Libraries and Tooling
+------------------------------------------
 
 This gem provides a set of libraries to drive
 [minitest](https://github.com/seattlerb/minitest) integration for a number of things:
@@ -8,309 +9,41 @@ This gem provides a set of libraries to drive
 3. testing interoperability between machines
 4. testing advanced functionality in chef, like search.
 
-**It is not intended for testing individual cookbooks.** The default
-provisioning systems expect roles, for example, but it's a different tool for a
-different problem. If you want to verify your open-source cookbooks against a
-variety of environments, I strongly suggest you look at
-[test-kitchen](https://github.com/opscode/test-kitchen), which is intended to
-solve this problem.
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'chef-workflow-testlib'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install chef-workflow-testlib
-
-## Quick Start
-
-The easiest way to get started is to integrate
+This library is not intended for testing individual cookbooks, or even a
+`run_list` on a single machine.
 [chef-workflow-tasklib](https://github.com/chef-workflow/chef-workflow-tasklib)
-into your environment. This has a number of benefits, such as working within
-the same system to control machine provisioning, building a chef server,
-uploading your repository to a chef server, several options for driving tests,
-and so on. Once you've set that up, use the instructions over there to build a
-test chef server.
-
-So, after you've done that go ahead and create a `test` directory at the root
-of your repository. Inside that, create a `test_mytest.rb` that provisions a
-few machines and performs a search on them. This actually doesn't have much
-real-world application, but it'll get you familiar with the workflow.
-
-You will need some working roles to perform this test. We'll name these roles
-`my_role` and `my_other_role` in the example, but you'll need to replace them
-with roles you actually use.
-
-This test will use `vagrant` to provision your machines, bootstrap them with
-knife, then run your tests. After it's done, it will tear those machines down.
-If the nodes fail to come up for any reason, your test should yield an error
-and deprovision the machines.
-
-```ruby
-require 'chef-workflow/helper'
-class MyTest < MiniTest::Unit::VagrantTestCase
-  def self.before_suite
-    provision('my_role')
-    provision('my_other_role')
-    wait_for('my_role')
-    wait_for('my_other_role')
-  end
-
-  def self.after_suite
-    deprovision('my_role')
-    deprovision('my_other_role')
-  end
-
-  def test_searching_one
-    assert_search_count(:node, 'roles:my_role', 1)
-  end
-
-  def test_searching_two
-    assert_search_count(:node, 'roles:my_other_role', 1)
-  end
-end
-```
-
-Then run your test suite with `bundle exec rake test:build`, which will perform
-an upload of your repository to the test chef server, and run your tests.
-
-We're quite aware this takes a while to run, and does very little. There are a
-couple of ways to deal with this, but involve understanding the system a little
-more; something we're about to cover.
-
-## Dealing with Slow
-
-Ok, so we got our test suite off the ground, and boy do those tests take a
-while to run. I have two bits of good news for you:
-
-You aren't locked into using Vagrant, and while Vagrant has limitations which
-make it impossible to parallelize, machine provisions don't have to be serial.
-EC2 support allows you to provision many machines in parallel, which can
-improve run time. The provisioning system is also flexible enough to support
-other systems too, so if you'd like to see your favorite system get some love,
-the best way to do so is to file an issue or pull request.
-
-The second is that in most scenarios, you have a few servers that you don't
-really care about for this test, but need to be available for the machine to
-function or converge properly, like a DNS or syslog server. All provisioning is
-tracked and the state information is actually written to disk in your
-`.chef-workflow` directory.  What that means is that if you don't need to
-rebuild your machines, you don't actually have to until you're ready to.
-
-### State Management with MiniTest Subclasses
-
-Let's start off easy. Take our example above, and remove the deprovisioning
-lines in the `after_suite` call:
-
-```ruby
-require 'chef-workflow/helper'
-class MyTest < MiniTest::Unit::VagrantTestCase
-  def self.before_suite
-    provision('my_role')
-    provision('my_other_role')
-    wait_for('my_role')
-    wait_for('my_other_role')
-  end
-
-  def self.after_suite
-    # omg, where did they go?
-  end
-
-  def test_searching_one
-    assert_search_count(:node, 'roles:my_role', 1)
-  end
-
-  def test_searching_two
-    assert_search_count(:node, 'roles:my_other_role', 1)
-  end
-end
-```
-
-And run your tests again. Go ahead, run them twice. The second time should be
-pretty quick, in the order of a second or so. This is because your machines
-weren't provisioned the second time; the system determined they were already
-built and didn't have to provision them again.
-
-So how do we clean them up? `bundle exec rake chef:clean:machines`, or add our
-deprovisioning lines back in and run the suite again. The state for a provision
-lasts until the machine is deprovisioned, whether or not that's the same test
-run. The rake task just reaps everything except for your chef server.
-
-Now that we've seen the obvious performance increase, what is this good for?
-
-### Pre-baking essential infra with MiniTest subclasses
-
-MiniTest (and all SUnit alikes) leverage subclassing pretty heavily when done
-right to manage a common set of test dependencies. For example, we have a
-subclass called 'WithInfra' in our test suite that looks like this:
-
-```ruby
-class MiniTest::Unit::VagrantTestCase::WithInfra < MiniTest::Unit::VagrantTestCase
-  include SSHHelper
-
-  def self.before_suite
-    super
-
-    provision('bind_master')
-    provision('syslog_server')
-
-    wait_for('bind_master', 'syslog_server')
-
-    ssh_role_command('bind_master', 'chef-client')
-    ssh_role_command('syslog_server', 'chef-client')
-  end
-end
-```
-
-`SSHHelper` is a small mixin that provides `ssh_role_command` and other bits of
-ssh-related functionality. In this case, our syslog depends on working DNS and
-our BIND depends on working syslog; while they have cookbooks that are smart
-enough to walk past those dependencies in the first chef run, once they're both
-up converging them again will resolve each other and configure them
-appropriately.
-
-The good news is that we don't have to (but can) tear these servers down during
-a run or even between runs if they're not causing problems, and you can always
-check from a fresh provision by running the `chef:clean:machines` task before
-`test`, or simply `test:rebuild`, which does a full deprovision, repository
-upload, and test run. This saves you time (and money, in the EC2 case) and
-still gives you a way to do a "full" run without a lot of extra work.
-
-An actual test suite that uses this looks like this:
-
-```ruby
-class TestBIND < MiniTest::Unit::VagrantTestCase::WithInfra
-  def self.before_suite 
-    provision('bind_slave', 1, %w[bind_master syslog_server])
-    wait_for('bind_slave')
-  end
-
-  def test_something
-    # maybe a test that nsupdates the master and ensures it made it to slave
-    # could go here
-  end
-
-  def self.after_suite
-    deprovision('bind_slave') 
-  end
-end
-```
-
-This test when run will create, test, and destroy the bind slave, but leave the
-master and the syslog server alone -- something that we will undoubtedly need
-for the next test case.
-
-### Dependency-based Provisioning
-
-All provisions have a dependency list. Until they are satisfied, the stated
-provision will not happen. This is mostly noticable in threaded provisioning
-mode where multiple provisions can occur at once.
-
-To wait for a specific machine to provision before continuing the test process,
-use the `wait_for` method.
-
-We can see this in our example above:
-
-```ruby
-  def self.before_suite 
-    provision('bind_slave', 1, %w[bind_master syslog_server])
-    wait_for('bind_slave')
-  end
-```
-
-In this instance, a `bind_slave` provision is scheduled, which depends on the
-`bind_master` and `syslog_server` provisions. The `wait_for` statement is used
-to control the test flow, so that it does not continue before `bind_slave`
-provisions, which is what we want to actually test in this test case. Properly
-used, this can enhance provisioning times by letting the scheduler provision
-things as soon as they are capable of being provisioned, where you just care
-about the servers you wish to test at any given point, instead of having to
-manage this problem yourself.
-
-You can't declare provisions that are dependent on provisions that don't exist
--- this will raise an exception. So, don't worry about fat-fingering it. :)
-
-Here's a more advanced example that abuses the performance characteristics of the
-scheduler. In this instance, we intend to test our monitoring system, which
-will assert the "alive" status of many servers. We provision numerous ones in
-the setup, and only wait for what we care about in each unit test.
-
-```ruby
-class TestNagios < MiniTest::Unit::VagrantTestCase
-  def self.before_suite
-    provision('syslog_server')
-    provision('bind_master', 1, %w[syslog_server])
-    # we just care about bind for all these
-    provision('bind_slave', 1, %w[bind_master])
-    provision('web_server', 1, %w[bind_master])
-    provision('db_server', 1, %w[bind_master])
-    provision('nagios_server', 1, %w[bind_master])
-    # we need the nagios server available for all tests, so wait for that
-    wait_for('nagios_server')
-  end
-
-  def test_dns_monitoring
-    wait_for('bind_master', 'bind_slave')
-    # ensure monitoring works
-  end
+contains functionality to do this with minitest-chef-handler if you so desire.
 
-  def test_web_monitoring
-    wait_for('web_server')
-    # ensure monitoring works
-  end
+Most of the Meat is on the Wiki
+-------------------------------
 
-  def test_db_monitoring
-    wait_for('db_server')
-    # ensure monitoring works
-  end
+This project is a part of
+[chef-workflow](https://github.com/chef-workflow/chef-workflow).
 
-  def self.after_suite
-    %w[
-        bind_master 
-        bind_slave 
-        syslog_server 
-        web_server 
-        db_server 
-        nagios_server
-    ].each { |x| deprovision(x) }
-  end
-end
-```
+Our [wiki](https://github.com/chef-workflow/chef-workflow/wiki) contains
+a fair amount of information, including how to try chef-workflow without
+actually doing anything more than cloning a repository and running a few
+commands.
 
-The flow of this test is as such:
+Contributing
+------------
 
-As soon as `bind_master` completes, `bind_slave`, `web_server`, `db_server`,
-and `nagios_server` will begin provisioning. `setup` will wait until
-`nagios_server` completes, and normal testing will begin. Each test waits for
-its testable unit to finish provisioning before running the actual tests
-against those units. With rare exception, after a test or two, the `wait_for`
-commands will succeed immediately, largely because they have been provsioning
-in the background while the other tests have been running.
+* fork the project
+* make a branch
+* add your stuff
+* push your branch to your repo
+* send a pull request
 
-If you're curious how all this works under the hood, see the
-[chef-workflow](https://github.com/chef-workflow/chef-workflow) documentation on
-the subject.
+**Note:** modifications to gem metadata, author lists, and other credits
+without rationale will be rejected immediately.
 
-## Contributing
+Credits
+-------
 
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
-6. Adjustment of the license terms or the author credits will result in a
-   rejected pull request. It ain't cool, yo.
+Author: [Erik Hollensbe](https://github.com/erikh)
 
-## Authors
+These companies have assisted by donating time, financial resources, and
+employment to those working on chef-workflow. Supporting OSS is really really
+cool and we should reciprocate.
 
-This work was partially sponsored by [HotelTonight](http://hoteltonight.com),
-and you should check them out. They use this system for testing their
-infrastructure. The programming was done primarily by [Erik
-Hollensbe](https://github.com/erikh).
+* [HotelTonight](http://www.hoteltonight.com) 

data/chef-workflow-testlib.gemspec

@@ -5,7 +5,7 @@ require 'chef-workflow-testlib/version'
 
 Gem::Specification.new do |gem|
   gem.name          = "chef-workflow-testlib"
-  gem.version       = Chef::Workflow::Testlib::VERSION
+  gem.version       = ChefWorkflow::Testlib::VERSION
   gem.authors       = ["Erik Hollensbe"]
   gem.email         = ["erik+github@hollensbe.org"]
   gem.description   = %q{Test helpers and assertions for chef-workflow}
@@ -17,9 +17,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'chef-workflow', '~> 0.1.0'
+  gem.add_dependency 'chef-workflow', '~> 0.2.0'
   gem.add_dependency 'minitest', '~> 4.3.0'
-  gem.add_dependency 'net-ssh', '~> 2.2.2'
 
   gem.add_development_dependency 'rdoc'
   gem.add_development_dependency 'rake'

data/lib/chef-workflow-testlib/version.rb

@@ -1,7 +1,5 @@
-class Chef
-  module Workflow
-    module Testlib
-      VERSION = "0.1.1"
-    end
+module ChefWorkflow
+  module Testlib
+    VERSION = "0.2.0"
   end
 end

data/lib/chef-workflow/helpers/chef.rb

@@ -1,15 +1,17 @@
 require 'chef/search/query'
 require 'chef/config'
 
-#
-# Small helper library, intended to be mixed into others that provides short
-# helpers for doing complicated things with the Chef API.
-#
-module ChefHelper
+module ChefWorkflow
   #
-  # Perform a search and return the names of the nodes that match the search.
+  # Small helper library, intended to be mixed into others that provides short
+  # helpers for doing complicated things with the Chef API.
   #
-  def perform_search(type, query)
-    Chef::Search::Query.new.search(type, query).first.map(&:name)
+  module ChefHelper
+    #
+    # Perform a search and return the names of the nodes that match the search.
+    #
+    def perform_search(type, query)
+      Chef::Search::Query.new.search(type, query).first.map(&:name)
+    end
   end
 end

data/lib/chef-workflow/helpers/minitest.rb

@@ -5,7 +5,7 @@ require 'minitest/unit'
 # Small assertion library for minitest to assist with remote chef tests.
 #
 module MiniTest::Assertions::RemoteChef
-  include ChefHelper
+  include ChefWorkflow::ChefHelper
 
   #
   # Assert that a search included the node names.

data/lib/chef-workflow/helpers/provision.rb

@@ -1,36 +1,50 @@
+require 'chef-workflow/support/general'
 require 'chef-workflow/support/scheduler'
+require 'chef-workflow/support/vm/helpers/knife'
 
-$SCHEDULER ||= Scheduler.new
-
-#
-# Helper for provisioning. Intended to be instanced and assigned to the
-# provision_helper attribute of a ProvisionedTestCase.
-#
-# All methods except `provision`, which is shorthand, are passed directly to
-# the scheduler.
-#
-class ProvisionHelper
-  def schedule_provision(*args)
-    $SCHEDULER.schedule_provision(*args)
-  end
+$SCHEDULER ||= ChefWorkflow::Scheduler.new
 
-  def deprovision(group_name)
-    $SCHEDULER.deprovision_group(group_name)
-  end
-  
-  def wait_for(*args)
-    $SCHEDULER.wait_for(*args)
-  end
+module ChefWorkflow
+  #
+  # Helper for provisioning. Intended to be instanced and assigned to the
+  # provision_helper attribute of a ProvisionedTestCase.
+  #
+  # All methods except `provision`, which is shorthand, are passed directly to
+  # the scheduler.
+  #
+  class ProvisionHelper
 
-  def serial=(arg)
-    $SCHEDULER.serial = arg
-  end
+    include ChefWorkflow::KnifeProvisionHelper
 
-  def run
-    $SCHEDULER.run
-  end
+    def schedule_provision(*args)
+      $SCHEDULER.schedule_provision(*args)
+    end
+
+    def deprovision(group_name)
+      $SCHEDULER.deprovision_group(group_name)
+    end
+    
+    def wait_for(*args)
+      $SCHEDULER.wait_for(*args)
+    end
+
+    def serial=(arg)
+      $SCHEDULER.serial = arg
+    end
+
+    def run
+      $SCHEDULER.run
+    end
 
-  def provision(group_name, number_of_servers, dependencies)
-    raise "Please override this method"
+    def provision(group_name, number_of_servers, dependencies)
+      schedule_provision(
+        group_name, 
+        [
+          ChefWorkflow::GeneralSupport.machine_provisioner.new(group_name, number_of_servers), 
+          build_knife_provisioner
+        ], 
+        dependencies
+      )
+    end
   end
 end

data/lib/chef-workflow/test-case/ec2.rb

@@ -1,41 +1,7 @@
-require 'chef-workflow/support/vm/ec2'
-require 'chef-workflow/support/vm/knife'
-require 'tempfile'
 require 'chef-workflow/test-case/provisioned'
-require 'chef-workflow/helpers/provision'
-require 'chef-workflow/helpers/ssh'
 
 #
-# Subclass of ProvisionHelper, centered around EC2. Pulls some
-# configuration from KnifeSupport and then drives VM::EC2Provisioner and
-# VM::KnifeProvisioner.
-#
-class EC2ProvisionHelper < ProvisionHelper
-  def provision(group_name, number_of_servers=1, dependencies=[])
-    kp              = VM::KnifeProvisioner.new
-    kp.username     = KnifeSupport.singleton.ssh_user
-    kp.password     = KnifeSupport.singleton.ssh_password
-    kp.use_sudo     = KnifeSupport.singleton.use_sudo
-    kp.ssh_key      = KnifeSupport.singleton.ssh_identity_file
-    kp.environment  = KnifeSupport.singleton.test_environment
-
-    schedule_provision(
-      group_name, 
-      [
-        VM::EC2Provisioner.new(group_name, number_of_servers), 
-        kp
-      ], 
-      dependencies
-    )
-  end
-end
-
-#
-# ProvisionedTestCase that uses EC2ProvisionHelper
+# ProvisionedTestCase that uses EC2. Not actually necessary anymore.
 #
 class MiniTest::Unit::EC2TestCase < MiniTest::Unit::ProvisionedTestCase
-  include SSHHelper
-  extend SSHHelper
-
-  self.provision_helper = EC2ProvisionHelper.new
 end

data/lib/chef-workflow/test-case/provisioned.rb

@@ -1,5 +1,7 @@
 require 'chef-workflow/support/knife'
+require 'chef-workflow/support/ssh'
 require 'chef-workflow/runner/provisioned'
+require 'chef-workflow/helpers/provision'
 
 #
 # Basic provisioned test case. Generally not intended for direct use but
@@ -9,6 +11,9 @@ require 'chef-workflow/runner/provisioned'
 # helper, which will be used for many methods this class provides.
 #
 class MiniTest::Unit::ProvisionedTestCase < MiniTest::Unit::TestCase
+  include ChefWorkflow::SSHHelper
+  extend ChefWorkflow::SSHHelper
+
   module ProvisionHelper
     def inherited(klass)
       unless klass.provision_helper
@@ -61,20 +66,22 @@ class MiniTest::Unit::ProvisionedTestCase < MiniTest::Unit::TestCase
     # Obtains the IP addresses for a given role as an array.
     #
     def get_role_ips(role)
-      IPSupport.singleton.get_role_ips(role)
+      ChefWorkflow::IPSupport.get_role_ips(role)
     end
 
     #
     # Easy way to reference KnifeSupport for getting configuration data.
     #
     def knife_config
-      KnifeSupport.singleton
+      ChefWorkflow::KnifeSupport
     end
   end
 
   include ProvisionHelper
   extend ProvisionHelper
 
+  self.provision_helper = ChefWorkflow::ProvisionHelper.new # FIXME fix this crap
+
   #
   # Hook before the suite starts. Be sure in your subclasses to call this with
   # `super`. Provisions machines configured as dependencies and starts the
@@ -83,6 +90,6 @@ class MiniTest::Unit::ProvisionedTestCase < MiniTest::Unit::TestCase
   def self.before_suite
     super
 
-    Chef::Config.from_file(KnifeSupport.singleton.knife_config_path)
+    Chef::Config.from_file(ChefWorkflow::KnifeSupport.knife_config_path)
   end
 end

data/lib/chef-workflow/test-case/vagrant.rb

@@ -1,44 +1,7 @@
-require 'chef-workflow/support/vagrant'
-require 'chef-workflow/support/vm/vagrant'
-require 'chef-workflow/support/vm/knife'
-require 'tempfile'
 require 'chef-workflow/test-case/provisioned'
-require 'chef-workflow/helpers/provision'
-require 'chef-workflow/helpers/ssh'
 
 #
-# Subclass of ProvisionHelper, centered around Vagrant. Pulls some
-# configuration from KnifeSupport and then drives VM::VagrantProvisioner and
-# VM::KnifeProvisioner.
-#
-class VagrantProvisionHelper < ProvisionHelper
-  def provision(group_name, number_of_servers=1, dependencies=[])
-    self.serial = true
-
-    kp              = VM::KnifeProvisioner.new
-    kp.username     = KnifeSupport.singleton.ssh_user
-    kp.password     = KnifeSupport.singleton.ssh_password
-    kp.use_sudo     = KnifeSupport.singleton.use_sudo
-    kp.ssh_key      = KnifeSupport.singleton.ssh_identity_file
-    kp.environment  = KnifeSupport.singleton.test_environment
-
-    schedule_provision(
-      group_name, 
-      [
-        VM::VagrantProvisioner.new(group_name, number_of_servers), 
-        kp
-      ], 
-      dependencies
-    )
-  end
-end
-
-#
-# ProvisionedTestCase that uses VagrantProvisionHelper.
+# ProvisionedTestCase that uses Vagrant. Not actually needed anymore.
 #
 class MiniTest::Unit::VagrantTestCase < MiniTest::Unit::ProvisionedTestCase
-  include SSHHelper
-  extend SSHHelper
-
-  self.provision_helper = VagrantProvisionHelper.new
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-workflow-testlib
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-21 00:00:00.000000000 Z
+date: 2013-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-workflow
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -43,22 +43,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.3.0
-- !ruby/object:Gem::Dependency
-  name: net-ssh
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -99,6 +83,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -110,7 +95,6 @@ files:
 - lib/chef-workflow/helpers/chef.rb
 - lib/chef-workflow/helpers/minitest.rb
 - lib/chef-workflow/helpers/provision.rb
-- lib/chef-workflow/helpers/ssh.rb
 - lib/chef-workflow/runner/provisioned.rb
 - lib/chef-workflow/test-case/ec2.rb
 - lib/chef-workflow/test-case/provisioned.rb
@@ -135,9 +119,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Test helpers and assertions for chef-workflow
 test_files: []
-has_rdoc: 

data/lib/chef-workflow/helpers/ssh.rb

@@ -1,99 +0,0 @@
-require 'chef-workflow/support/ip'
-require 'chef-workflow/support/knife'
-require 'chef-workflow/support/debug'
-require 'net/ssh'
-
-#
-# Helper for performing SSH on groups of servers. Intended to be mixed into
-# test case classes.
-#
-module SSHHelper
-  include KnifePluginSupport
-  include DebugSupport
-
-  #
-  # run a command against a group of servers. These commands are run in
-  # parallel, but the command itself does not complete until all the threads
-  # have finished running.
-  #
-  def ssh_role_command(role, command)
-    t = []
-    IPSupport.singleton.get_role_ips(role).each do |ip|
-      t.push(
-        Thread.new do
-          ssh_command(ip, command)
-        end
-      )
-    end
-    t.each(&:join)
-  end
-
-  #
-  # takes a block which it uses inside of the open_channel block that Net::SSH
-  # uses. Intended to provide a consistent way of setting up Net::SSH  Makes
-  # heavy use of KnifeSupport to determine how to drive the command.
-  #
-  def configure_ssh_command(ip, command)
-    command = "#{KnifeSupport.singleton.use_sudo ? 'sudo ': ''}#{command}"
-
-    options = { }
-
-    options[:password] = KnifeSupport.singleton.ssh_password          if KnifeSupport.singleton.ssh_password
-    options[:keys]     = [KnifeSupport.singleton.ssh_identity_file]   if KnifeSupport.singleton.ssh_identity_file
-
-    Net::SSH.start(ip, KnifeSupport.singleton.ssh_user, options) do |ssh|
-      ssh.open_channel do |ch|
-        ch.on_open_failed do |ch, code, desc|
-          raise "Connection Error to #{ip}: #{desc}"
-        end
-
-        ch.exec(command) do |ch, success|
-          yield ch, success
-        end
-      end
-
-      ssh.loop
-    end
-  end
-
-  #
-  # Run a command against a single IP. Returns the exit status.
-  # 
-  #
-  def ssh_command(ip, command)
-    configure_ssh_command(ip, command) do |ch, success|
-      return 1 unless success
-
-      if_debug(2) do
-        ch.on_data do |ch, data|
-          $stderr.puts data
-        end
-      end
-
-      ch.on_request("exit-status") do |ch, data|
-        return data.read_long
-      end
-    end
-  end
-
-  #
-  # run a command, and instead of capturing the exit status, return the data
-  # captured during the command run.
-  #
-  def ssh_capture(ip, command)
-    retval = ""
-    configure_ssh_command(ip, command) do |ch, success|
-      return "" unless success
-
-      ch.on_data do |ch, data|
-        retval << data
-      end
-
-      ch.on_request("exit-status") do |ch, data|
-        return retval
-      end
-    end
-
-    return retval
-  end
-end