cuken 0.1.12 → 0.1.13

data/VERSION

@@ -1 +1 @@
-0.1.12
+0.1.13

data/cuken.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cuken}
-  s.version = "0.1.12"
+  s.version = "0.1.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Hedgehog"]
@@ -39,13 +39,15 @@ Gem::Specification.new do |s|
     "features/chef_examples/cookbooks_repo.feature",
     "features/chef_examples/knife_admin_client.feature",
     "features/chef_examples/knife_client_create.feature",
-    "features/chef_examples/zenoss/01_chef_server_setup.feature",
-    "features/chef_examples/zenoss/02_monitor_vm_setup.feature",
-    "features/chef_examples/zenoss/03_monitor_chef_setup.feature",
+    "features/chef_examples/zenoss_example/01_chef_server_setup.feature",
+    "features/chef_examples/zenoss_example/02_monitor_vm_setup.feature",
+    "features/chef_examples/zenoss_example/03_monitor_chef_setup.feature",
     "features/chef_steps/common_steps.feature",
     "features/chef_steps/cookbook_steps.feature",
+    "features/chef_steps/data_bag_steps.feature",
     "features/chef_steps/knife_steps.feature",
     "features/chef_steps/node_steps.feature",
+    "features/chef_steps/role_steps.feature",
     "features/command_examples/commands.feature",
     "features/command_steps/command_steps.feature",
     "features/cuken.feature",
@@ -372,13 +374,13 @@ Gem::Specification.new do |s|
     "features/data/node-load-test.rb",
     "features/data/node-simple.rb",
     "features/data/repositories/chef-repo/.gitignore",
-    "features/data/repositories/chef-repo/README.md",
+    "features/data/repositories/chef-repo/README.md.relish",
     "features/data/repositories/chef-repo/Rakefile",
-    "features/data/repositories/chef-repo/certificates/README.md",
+    "features/data/repositories/chef-repo/certificates/README.md.relish",
     "features/data/repositories/chef-repo/config/rake.rb",
-    "features/data/repositories/chef-repo/cookbooks/README.md",
-    "features/data/repositories/chef-repo/data_bags/README.md",
-    "features/data/repositories/chef-repo/roles/README.md",
+    "features/data/repositories/chef-repo/cookbooks/README.md.relish",
+    "features/data/repositories/chef-repo/data_bags/README.md.relish",
+    "features/data/repositories/chef-repo/roles/README.md.relish",
     "features/data/repositories/cookbooks/attribute_include/README.rdoc",
     "features/data/repositories/cookbooks/attribute_include/attributes/a.rb",
     "features/data/repositories/cookbooks/attribute_include/attributes/b.rb",

data/features/.nav

@@ -2,27 +2,34 @@
 - about.md (About Cuken's Reusable Steps)
 - LICENSE (License)
 - NOTICE (Notice)
-- generic_steps:
-  - generic_steps.feature
-- file_steps:
-  - file_steps.feature
-- command_steps:
-  - command_steps.feature
-- ssh_steps:
-  - ssh_steps.feature
 - chef_steps:
   - common_steps.feature
-  - knife_steps.feature
   - cookbook_steps.feature
+  - knife_steps.feature
+  - data_bag_steps.feature
+  - knife_steps.feature
   - node_steps.feature
-- file_examples:
-  - files.feature
-- command_examples:
-  - commands.feature
-- ssh_examples:
-  - ssh.feature
+  - role_steps.feature
+- command_steps:
+  - command_steps.feature
+- file_steps:
+  - file_steps.feature
+- generic_steps:
+  - generic_steps.feature
+- ssh_steps:
+  - ssh_steps.feature
 - chef_examples:
   - cookbooks_metadata.feature
   - cookbooks_repo.feature
   - cookbooks_cookbook.feature
+- command_examples:
+  - commands.feature
+- file_examples:
+  - files.feature
+- ssh_examples:
+  - ssh.feature
+- zenoss_example:
+  - 01_chef_server_setup.feature
+  - 02_monitor_vm_setup.feature
+  - 03_monitor_chef_setup.feature
 

data/features/about.md

@@ -1,8 +1,7 @@
 # About Cuken's Reusable Steps
 
 These [Cucumber][0] features summarise the steps defined in
-[Cuken][1] and [Aruba][2]. Cuken's step+API structure is modeled on Aruba, and
-largely uses Aruba's steps and API.
+[Cuken][1] and [Aruba][2]. Cuken's step+API structure is modeled on Aruba.
 
 Cucumber features where these steps might be useful have been variously described as:
 - Infrastructure integration tests
@@ -17,12 +16,21 @@ The Chef steps assume you have Chef server accessible on `localhost:4040`.
 If you have ideas to clarify or improve any of these cucumber features,
 please submit an [issue][9] or [pull request][8].
 
+## The Zenoss Example
+This is a proof of concept rather than best practice example.
+It is modeled on Matt Ray's blip.tv [screencast][17].  The intention is that you read, adjust and then run the features
+in the numbered order.
+Some things to adjust are the writable GitHub URI's, and the location of the Vagrant basebox.
+In the final version all examples should 'just-run', until then, or until you make a pull request to change it,
+it is more convenient for me.
+
 ## The Chef vs Vagrant/Aruba JSON Issue
 Due to several JSON gem conflicts between Chef and the Vagrant/Aruba gems, Cuken is only intended
 to work with the 0.10 series of Chef.  Of course you are free to work whatever
 magic you wish for the 0.9.x releases.
 
 ## Opinons
+Cuken is an 'Opinionated library':
 Virtual machines are [Vagrant][11] VM's.
 Vagrant VM's are all named.
 Configuration management and system integration is done with [Opscode's Chef][12].
@@ -72,8 +80,9 @@ outside of that ephemeral area and verifying the contents.
 ### Chef
 In most cases Chef operations refer to the remote server, e.g. 'I create the Data Bag "...".  The reason we leave remote
 implicit in these steps, are:
-a) to keep steps descriptions succint yet informative/accurate.
-b) a 'local' version of this step is not accurate because local, filesystem, operations are properly done with the file
+
+ a) to keep steps descriptions succint yet informative/accurate.
+ b) a 'local' version of this step is not accurate because local, filesystem, operations are properly done with the file
 and directory steps and API, and are not done through Chef/Knife.
 
 Cookbooks are are checked out into the branch 'cuken'.
@@ -150,6 +159,8 @@ convinced this approach is a long term disaster, review Bundler's code base circ
 - General passwordless and interactive SSH steps (currently Vagrant VM specific)
 - Cloud launch and basic management steps, i.e. CRUD operations for Cloud VM
 - Updating packages on a VM, and repackaging the VM, essentialy CRUD too.
+- Remove 'should' from steps
+- Make output steps expression consistent with file/directory steps
 
 ## Prior Art:
 - [Aruba][2] confirmed the utility of reusable steps.
@@ -175,4 +186,4 @@ convinced this approach is a long term disaster, review Bundler's code base circ
 [14]: http://book.git-scm.com/4_rebasing.html
 [15]: http://book.git-scm.com/4_interactive_rebasing.html
 [16]: https://github.com/aslakhellesoy/aruba/issues/69
-
+[17]: http://blip.tv/file/4687890

data/features/chef_examples/{zenoss → zenoss_example}/01_chef_server_setup.feature

@@ -1,5 +1,5 @@
 @announce
-Feature: Zenoss Monitoring
+Feature: 01) Chef-Server VM
   In order to launch a Zenoss server
   As a admin/developer
   I want to define the Chef admin client configuration via executable features
@@ -176,7 +176,7 @@ Feature: Zenoss Monitoring
 
   Scenario: Start the Chef server VM
     Given the Chef root directory "/tmp/chef" exists
-      And the VM "chef" is not "running"
+      And the state of VM "chef" is not "running"
       And the Vagrantfile "/tmp/chef/Vagrantfile" exists
      When I launch the VM "chef"
      Then the state of VM "chef" is "running"

data/features/chef_examples/{zenoss → zenoss_example}/02_monitor_vm_setup.feature

@@ -1,5 +1,5 @@
 @announce
-Feature: Zenoss Monitoring
+Feature: 02) Prepare Monitor VM
   In order to launch a Zenoss server
   As a admin/developer
   I want to define the VM configuration via executable features

data/features/chef_examples/{zenoss → zenoss_example}/03_monitor_chef_setup.feature

@@ -1,5 +1,5 @@
 @announce
-Feature: Zenoss Monitoring
+Feature: 03) Launch Monitor VM
   In order to launch a Zenoss server
   As a admin/developer
   I want to define the Chef configuration via executable features
@@ -42,7 +42,7 @@ Feature: Zenoss Monitoring
        And a Cookbooks path "/tmp/monitor/cookbooks/"
        And a Cookbooks path "/tmp/monitor/site-cookbooks/"
        And the Knife file "/tmp/monitor/.chef/knife.rb"
-      When I load the Cookbook Roles:
+      When I load the Roles:
            | site-cookbook | role                            |
            | zenoss        | Class_Server-SSH-Linux.rb       |
            | zenoss        | Class_Server-SSH-Linux-MySQL.rb |

data/features/chef_steps/common_steps.feature

@@ -1,5 +1,5 @@
 @chef @common @step_features
-Feature: Listing common steps
+Feature: Common steps
   In order to test automated Chef deployments.
   As an administrator.
   I want to know what generic steps are available.
@@ -10,16 +10,25 @@ Feature: Listing common steps
   Scenario: Common Chef
     Then these steps are defined for "cuken/cucumber/chef/common.rb":
       | step                                                            |
-      |a default base Chef repository in "([^"]*)"                      |
-      |I clone the remote Chef repository branch "([^"]*)" to "([^"]*)" |
-      |the Chef server URI "([^"]*)"                                    |
-      |the Chef client "([^"]*)" exists                                 |
       |the Chef admin client "([^"]*)" exists                           |
+      |the Chef client "([^"]*)" exists                                 |
       |the Chef client private key path "([^"]*)"                       |
+      |the Chef root directory "([^"]*)" exists                         |
+      |the Chef server URI "([^"]*)"                                    |
+
+  Scenario: Chef actions
+    Then these steps are defined for "cuken/cucumber/chef/common.rb":
+      | step                                                            |
+      |I create the Chef admin client "([^"]*)"                         |
+      |I create the Chef client "([^"]*)"                               |
+      |I delete the Chef admin client "([^"]*)"                         |
+      |I delete the Chef client "([^"]*)"                               |
 
   Scenario: Local and remote Chef repository commands
     Then these steps are defined for "cuken/cucumber/chef/common.rb":
       | step                                                            |
+      |a default base Chef repository in "([^"]*)"                      |
+      |I clone the remote Chef repository branch "([^"]*)" to "([^"]*)" |
       |the local Chef repository "([^"]*)"                              |
       |the local Chef repository exists                                 |
       |the remote Chef repository "([^"]*)"                             |

data/features/chef_steps/cookbook_steps.feature

@@ -1,5 +1,5 @@
 @chef @cookbook @step_features
-Feature: Listing Cookbook steps
+Feature: Cookbook steps
   In order to test automated Chef deployments
   As an administrator
   I want to know what Cookbook steps are available
@@ -7,7 +7,7 @@ Feature: Listing Cookbook steps
   Background:
     Given that "cuken/chef" has been required
 
-  Scenario: Common Chef
+  Scenario: Generic Cookbook steps
     Then these steps are defined for "cuken/cucumber/chef/cookbook.rb":
       | step                                                                |
       |a Cookbook path "([^"]*)"                                            |
@@ -16,16 +16,36 @@ Feature: Listing Cookbook steps
       |I successfully generate Cookbook "([^"]*)" metadata                  |
       |the local Cookbook "([^"]*)" exists                                  |
 
-  Scenario: Local and remote Cookbook repository commands
+  Scenario: Cookbook action steps
     Then these steps are defined for "cuken/cucumber/chef/cookbook.rb":
       | step                                                                |
-      |I clone the Cookbooks:                                               |
-      |I clone the Cookbook "([^"]*)" branch "([^"]*)" to "([^"]*)"         |
       |I clone the remote Cookbook repository branch "([^"]*)" to "([^"]*)" |
+      |I clone the Cookbook "([^"]*)" branch "([^"]*)" to "([^"]*)"         |
+      |I clone the Cookbooks:                                               |
+      |I load the Cookbooks:                                                |
+      |I successfully generate all Cookbook metadata                        |
+      |I successfully generate Cookbook "([^"]*)" metadata                  |
+
+  Scenario: Local Cookbook and repository commands
+    Then these steps are defined for "cuken/cucumber/chef/cookbook.rb":
+      | step                                                                |
       |the local Cookbook repository "([^"]*)"                              |
       |the local Cookbook repository exists                                 |
+      |these local Cookbooks exist:                                         |
+      |the local Cookbook repository "([^"]*)"                              |
+      |the local Cookbook repository exists                                 |
+      |the local Cookbook "([^"]*)" exists                                  |
+      |the local Site\-Cookbook "([^"]*)" exists                            |
+      |the local Site\-Cookbook repository exists                           |
+      |these local Cookbooks exist:                                         |
+      |these local Cookbooks no not exist:                                  |
+      |these local Site\-Cookbooks exist:                                   |
+
+  Scenario: Remote Cookbook and repository commands
+    Then these steps are defined for "cuken/cucumber/chef/cookbook.rb":
+      | step                                                                |
       |the remote Cookbook repository "([^"]*)"                             |
       |the remote Cookbooks URI "([^"]*)"                                   |
-      |these local Cookbooks exist:                                         |
-      |these local Site-Cookbooks exist:                                         |
+      |these remote Cookbooks exist:                                        |
+      |these remote Cookbooks do not exist:                                 |
 

data/features/chef_steps/data_bag_steps.feature

@@ -0,0 +1,18 @@
+@chef @data_bag @step_features
+Feature: Data Bag steps
+  In order to test automated Chef deployments
+  As an administrator
+  I want to know what Data Bag steps are available
+
+  Background:
+    Given that "cuken/chef" has been required
+
+  Scenario: Common Data Bag steps
+    Then these steps are defined for "cuken/cucumber/chef/data_bag.rb":
+      | step                                |
+      |I add these Cookbook Data Bag items: |
+      |I create the Data Bag "([^"]*)"      |
+      |these Data Bags exist:               |
+      |these Data Bags do not exist:        |
+      |these Data Bags contain:             |
+      |these Data Bags do not contain:      |

data/features/chef_steps/knife_steps.feature

@@ -1,5 +1,5 @@
 @chef @knife @step_features
-Feature: Listing Knife steps
+Feature: Knife steps
   In order to test automated Chef deployments
   As an administrator
   I want to know what Knife steps are available

data/features/chef_steps/node_steps.feature

@@ -1,15 +1,16 @@
-@chef @cookbook @step_features
-Feature: Listing Node steps
+@chef @node @step_features
+Feature: Node steps
   In order to test automated Chef deployments
   As an administrator
-  I want to know what Cookbook steps are available
+  I want to know what Node steps are available
 
   Background:
     Given that "cuken/chef" has been required
 
-  Scenario: Common Node
+  Scenario: Common Node steps
     Then these steps are defined for "cuken/cucumber/chef/node.rb":
-      | step                      |
-      | a validated Node          |
-      | the Node "([^"]*)" exists |
-      | the Nodes are:            |
+      | step                           |
+      |a validated Node                |
+      |I add these Roles to the Nodes: |
+      |the Node "([^"]*)" exists       |
+      |the Nodes are:                  |

data/features/chef_steps/role_steps.feature

@@ -0,0 +1,17 @@
+@chef @role @step_features
+Feature: Role steps
+  In order to test automated Chef deployments
+  As an administrator
+  I want to know what Role steps are available
+
+  Background:
+    Given that "cuken/chef" has been required
+
+  Scenario: Common Role steps
+    Then these steps are defined for "cuken/cucumber/chef/role.rb":
+      | step                       |
+      |I load the Roles:           |
+      |these Roles exist:          |
+      |these Roles do not exist:   |
+      |the Roles are:              |
+

data/features/command_steps/command_steps.feature

@@ -1,5 +1,5 @@
 @step_features
-Feature: Listing command steps
+Feature: Command steps
   In order to test a running system
   As an administrator
   I want to know what command steps are available

data/features/file_steps/file_steps.feature

@@ -1,5 +1,5 @@
 @step_features
-Feature: Listing file steps
+Feature: File and Directory steps
   In order to test a running system
   As an administrator
   I want to know what files steps are available
@@ -38,7 +38,7 @@ Feature: Listing file steps
       |the (.)time of "([^"]*)" changes                        |
       |we record the a-mtime of "([^"]*)"                      |
 
-  Scenario: File and directory content
+  Scenario: File content
     Then these steps are defined for "cuken/cucumber/file.rb":
       | step                                                               |
       |the file "([^"]*)" contains:                                        |
@@ -56,3 +56,16 @@ Feature: Listing file steps
       |I overwrite "([^"]*)":                                              |
       |I append to "([^"]*)":                                              |
 
+  Scenario: File placement
+    Then these steps are defined for "cuken/cucumber/file.rb":
+      | step                                         |
+      |I place "([^"]*)" in "([^"]*)"                |
+      |I place all in "([^"]*)" in "([^"]*)"         |
+      |the placed directory "([^"]*)" exists         |
+      |the placed directory "([^"]*)" does not exist |
+      |the placed file "([^"]*)" contains:           |
+      |the placed file "([^"]*)" contains "([^"]*)"  |
+      |the placed file "([^"]*)" exists              |
+      |the placed file "([^"]*)" does not exist      |
+
+

data/features/generic_steps/generic_steps.feature

@@ -1,13 +1,14 @@
 @step_features
-Feature: Listing common steps
+Feature: Generic steps
   In order to test a running system
   As an administrator
   I want to know what common steps are available
 
   Background:
-    Given that "cuken/common" has been required
+      Given that "cuken/common" has been required
 
   Scenario: Common execution
-    Then these steps are defined for "cuken/cucumber/common.rb":
-      | step                                                   |
-      |wait "([^"]*)" seconds                                  |
+       Then these steps are defined for "cuken/cucumber/common.rb":
+            | step                              |
+            |wait "([^"]*)" seconds             |
+            |I'm using a clean gemset "([^"]*)" |

data/features/ssh_steps/ssh_steps.feature

@@ -1,5 +1,5 @@
 @step_features
-Feature: Listing SSH steps
+Feature: SSH steps
   In order to test a running system
   As an administrator
   I want to know what SSH steps are available

data/features/step_definitions/cuken_steps.rb

@@ -26,7 +26,7 @@ Then /^these steps are defined for "([^\"]*)":$/ do |file, table|
   rsc = ::Cucumber::Runtime::SupportCode.new 'ui', :autoload_code_paths => 'lib/cuken/cucumber'
   rsc.load_files! ["lib/#{file}", "#{ENV['GEM_HOME']}/gems/aruba-0.3.6/lib/aruba/cucumber.rb"]
   sd_array = rsc.step_definitions
-  #sd_array.each{|sd| puts sd.regexp_source}
+  # sd_array.each{|sd| puts sd.regexp_source}
   table.hashes.each do |hsh|
     sd_array.each{|sd| res = sd.regexp_source == %Q{/^#{hsh['step']}$/}; break('found') if res}.should == 'found'
   end

data/lib/cuken/api/chef/common.rb

@@ -68,6 +68,7 @@ module ::Cuken
           'knife '
         end
 
+        # TODO: Once a method is spec'd refactor to use this and knife_config_file_error_handling
         def run_knife(argv=[])
           argv << '--config' << chef.knife_config_file.to_s
           with_args *argv do
@@ -136,6 +137,37 @@ module ::Cuken
           check_placed_directory_presence([chef.root_dir], expect_presence)
         end
 
+        def create_client(client_name, admin = false)
+          chef.client_private_key_path = chef.root_dir + "/.chef/#{client_name}.pem"
+          data = {:name => client_name,
+                  :file => chef.client_private_key_path,
+                  :no_editor => true,
+                  :config_file => chef.knife_config_file}
+          argv = ['client', 'create', data[:name], '--file', data[:file], '--config', data[:config_file],'--no-editor']
+          argv << '--admin' if admin
+          unless Pathname(chef.client_private_key_path).exist?
+            with_args *argv do
+              ::Chef::Application::Knife.new.run
+            end
+          else
+            #TODO: Verify client exists on the Chef server, and has matching public key.
+          end
+        end
+
+        def delete_client(client_name)
+          chef.client_private_key_path = chef.root_dir + "/.chef/#{client_name}.pem"
+          data = {:name => client_name,
+                  :file => chef.client_private_key_path,
+                  :no_editor => true,
+                  :yes => true,
+                  :print_after => true,
+                  :config_file => chef.knife_config_file}
+          argv = ['client', 'delete', data[:name], '--no-editor', '--yes' ]
+          with_args *argv do
+            ::Chef::Application::Knife.new.run
+          end
+        end
+
       end
     end
   end

data/lib/cuken/api/chef/knife.rb

@@ -72,44 +72,12 @@ module ::Cuken
           CliTemplate.option(:yes, :long => "--yes", :boolean => true, :default => true)
         end
 
-        def create_client(client_name)
-          chef.client_private_key_path = chef.root_dir + "/.chef/#{client_name}.pem"
-          data = {:name => client_name,
-                  :admin => true,
-                  :file => chef.client_private_key_path,
-                  :no_editor => true,
-                  :config_file => chef.knife_config_file}
-          argv = ['client', 'create', data[:name], '--file', data[:file], '--config', data[:config_file],'--no-editor']
-          argv << '--admin' if data[:admin]
-          unless Pathname(chef.client_private_key_path).exist?
-            with_args *argv do
-              ::Chef::Application::Knife.new.run # (args, CliTemplate.options)
-            end
-          else
-            #TODO: Verify client exists on the Chef server, and has matching public key.
-          end
-        end
-
         def show_client(client_name)
           chef.client_private_key_path = chef.root_dir + "/.chef/#{client_name}.pem"
           data = {:name => client_name,
                   :config_file => chef.knife_config_file}
           argv = ['client', 'show', data[:name], '--config', data[:config_file],'--no-editor']
           argv << '--admin' if data[:admin]
-          with_args *argv do
-            ::Chef::Application::Knife.new.run # (args, CliTemplate.options)
-          end
-        end
-
-        def delete_client(client_name)
-          chef.client_private_key_path = chef.root_dir + "/.chef/#{client_name}.pem"
-          data = {:name => client_name,
-                  :file => chef.client_private_key_path,
-                  :no_editor => true,
-                  :yes => true,
-                  :print_after => true,
-                  :config_file => chef.knife_config_file}
-          argv = ['client', 'delete', data[:name], '--no-editor', '--yes' ]
           with_args *argv do
             ::Chef::Application::Knife.new.run
           end

data/lib/cuken/api/chef.rb

@@ -68,7 +68,6 @@ module ::Cuken
         if repo = res[/ERROR: (.*) doesn't exist. Did you enter it correctly?/,1]
           raise RuntimeError, "ERROR: #{repo} doesn't exist. Did you enter it correctly? #{repo}", caller
         end
-
       end
 
       def chef_clone_repo(ckbk_path, cookbook = false, repo = chef.remote_chef_repo, type = {'branch' => 'master'})
@@ -121,7 +120,7 @@ module ::Cuken
         end
         cmd += " -c #{chef.knife_config_file.expand_path.to_s}" if chef.knife_config_file.expand_path.exist?
         cmd += " -o #{ckbk_pth}" if ckbk_pth_opt
-        cmd += " --log_level debug" if chef.knife_debug
+        # cmd += " --log_level debug" if chef.knife_debug
         chef.root_dir ||= current_dir
         in_chef_root do
           if interactive

data/lib/cuken/cucumber/chef/common.rb

@@ -24,6 +24,22 @@ Given /^the Chef server URI "([^"]*)"$/ do |uri|
   chef.uri = uri
 end
 
+When /^I create the Chef admin client "([^"]*)"$/ do |client_name|
+  create_client(client_name, true)
+end
+
+When /^I create the Chef client "([^"]*)"$/ do |client_name|
+  create_client(client_name)
+end
+
+When /^I delete the Chef admin client "([^"]*)"$/ do |client_name|
+  delete_client(client_name)
+end
+
+When /^I delete the Chef client "([^"]*)"$/ do |client_name|
+  delete_client(client_name)
+end
+
 Given /^the Chef client "([^"]*)" exists$/ do |name|
   chef.client_name =  name
 end

data/lib/cuken/cucumber/chef/cookbook.rb

@@ -106,6 +106,10 @@ And /^these local Cookbooks exist:$/ do |table|
   check_cookbook_table_presence(table)
 end
 
+And /^these local Cookbooks do not exist:$/ do |table|
+  check_cookbook_table_presence(table, false)
+end
+
 And /^these local Site\-Cookbooks exist:$/ do |table|
   # table is a Cucumber::Ast::Table
   ckbk_path = 'site-cookbook'

data/lib/cuken/cucumber/chef/knife.rb

@@ -27,14 +27,6 @@ Given /^the Knife file "([^"]*)"$/ do |path|
   end
 end
 
-When /^I delete the Chef admin client "([^"]*)"$/ do |client_name|
-  delete_client(client_name)
-end
-
-When /^I create the Chef admin client "([^"]*)"$/ do |client_name|
-  create_client(client_name)
-end
-
 When /^I successfully run Knife's "([^"]*)"$/ do |cmd|
   run_knife_command(cmd, false)
 end

data/lib/cuken/cucumber/chef/role.rb

@@ -16,7 +16,7 @@
 #
 World(::Cuken::Api::Chef::Role)
 
-When /^I load the Cookbook Roles:$/ do |table|
+When /^I load the Roles:$/ do |table|
   load_role_table(table)
 end
 
@@ -35,10 +35,6 @@ end
 ###
 # When
 ###
-#When /^I load the Cookbook Roles:$/ do |table|
-#  # table is a Cucumber::Ast::Table
-#  pending # express the regexp above with the code you wish you had
-#end
 
 ###
 # Then
@@ -48,7 +44,3 @@ Then /^the Roles are:$/ do |partial_output|
   all_stdout.should include(partial_output)
 end
 
-#Then /^these Roles exist:$/ do |table|
-#  run_knife_command('role list')
-#  pending # express the regexp above with the code you wish you had
-#end

metadata

@@ -2,7 +2,7 @@
 name: cuken
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors: 
 - Hedgehog
@@ -231,13 +231,15 @@ files:
 - features/chef_examples/cookbooks_repo.feature
 - features/chef_examples/knife_admin_client.feature
 - features/chef_examples/knife_client_create.feature
-- features/chef_examples/zenoss/01_chef_server_setup.feature
-- features/chef_examples/zenoss/02_monitor_vm_setup.feature
-- features/chef_examples/zenoss/03_monitor_chef_setup.feature
+- features/chef_examples/zenoss_example/01_chef_server_setup.feature
+- features/chef_examples/zenoss_example/02_monitor_vm_setup.feature
+- features/chef_examples/zenoss_example/03_monitor_chef_setup.feature
 - features/chef_steps/common_steps.feature
 - features/chef_steps/cookbook_steps.feature
+- features/chef_steps/data_bag_steps.feature
 - features/chef_steps/knife_steps.feature
 - features/chef_steps/node_steps.feature
+- features/chef_steps/role_steps.feature
 - features/command_examples/commands.feature
 - features/command_steps/command_steps.feature
 - features/cuken.feature
@@ -564,13 +566,13 @@ files:
 - features/data/node-load-test.rb
 - features/data/node-simple.rb
 - features/data/repositories/chef-repo/.gitignore
-- features/data/repositories/chef-repo/README.md
+- features/data/repositories/chef-repo/README.md.relish
 - features/data/repositories/chef-repo/Rakefile
-- features/data/repositories/chef-repo/certificates/README.md
+- features/data/repositories/chef-repo/certificates/README.md.relish
 - features/data/repositories/chef-repo/config/rake.rb
-- features/data/repositories/chef-repo/cookbooks/README.md
-- features/data/repositories/chef-repo/data_bags/README.md
-- features/data/repositories/chef-repo/roles/README.md
+- features/data/repositories/chef-repo/cookbooks/README.md.relish
+- features/data/repositories/chef-repo/data_bags/README.md.relish
+- features/data/repositories/chef-repo/roles/README.md.relish
 - features/data/repositories/cookbooks/attribute_include/README.rdoc
 - features/data/repositories/cookbooks/attribute_include/attributes/a.rb
 - features/data/repositories/cookbooks/attribute_include/attributes/b.rb
@@ -670,7 +672,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 782328980720716796
+      hash: -4455492689956118476
       segments: 
       - 0
       version: "0"