cucumber-chef 2.0.2.pre → 2.0.3.pre

data/lib/cucumber/chef/helpers/chef_server.rb

@@ -35,6 +35,19 @@ module Cucumber::Chef::Helpers::ChefServer
     log("chef-server", "destroyed client '#{name}'")
   end
 
+################################################################################
+
+  def load_cookbook(cookbook, cookbook_path)
+    if !File.exists?(cookbook_path)
+      raise "Cookbook path does not exist!"
+    end
+    cookbook_repo = ::Chef::CookbookLoader.new(cookbook_path)
+    cookbook_repo.each do |name, cbook|
+      ::Chef::CookbookUploader.new(cbook, cookbook_path, :force => true).upload_cookbook
+      log("chef-server", "uploaded cookbook '#{cookbook}' from path '#{cookbook_path}'")
+    end
+  end
+
 ################################################################################
 
   def load_role(role, role_path)

data/lib/cucumber/chef/steps/chef_steps.rb

@@ -30,3 +30,9 @@ And /^the following roles have been updated:$/ do |table|
     load_role(entry['role'], entry['role_path'])
   end
 end
+
+And /^the following cookbooks have been uploaded:$/ do |table|
+  table.hashes.each do |entry|
+    load_cookbook(entry['cookbook'], entry['cookbook_path'])
+  end
+end

data/lib/cucumber/chef/steps/provision_steps.rb

@@ -31,7 +31,7 @@ And /^"([^\"]*)" has "([^\"]*)" architecture$/ do |name, arch|
   @servers[name].merge!( :arch => arch )
 end
 
-And /^"([^\"]*)" should( not)? be persistant$/ do |name, boolean|
+And /^"([^\"]*)" should( not)? be persist[ae]nt$/ do |name, boolean|
   @servers[name].merge!( :persist => (!boolean ? true : false) )
 end
 

data/lib/cucumber/chef/steps/ssh_steps.rb

@@ -93,3 +93,46 @@ Then /^I should( not)? see the "([^\"]*)" of "([^\"]*)" in the output$/ do |bool
     @output.should_not =~ /#{$servers[name][key.downcase.to_sym]}/i
   end
 end
+
+Then /^path "([^\"]*)" should exist$/ do |dir|
+  parent = File.dirname dir
+  child = File.basename dir
+  command = "ls %s" % [
+    parent
+  ]
+  @output = @connection.exec!(command)
+  @output.should =~ /#{child}/
+end
+
+Then /^path "([^\"]*)" should be owned by "([^\"]*)"$/ do |path, owner|
+  command = "stat -c %%U:%%G %s" % [
+    path
+  ]
+  @output = @connection.exec!(command)
+  @output.should =~ /#{owner}/
+end
+
+Then /^file "([^\"]*)" should( not)? contain "([^\"]*)"$/ do |path, boolean, content|
+  command = "cat %s" % [
+    path
+  ]
+  @output = @connection.exec!(command)
+  if (!boolean)
+    @output.should =~ /#{content}/
+  else
+    @output.should_not =~ /#{content}/
+  end
+end
+
+Then /^package "([^\"]*)" should be installed$/ do |package|
+  command = ""
+  if (dpkg = @connection.exec!("which dpkg 2> /dev/null")).length > 0
+    command = "#{dpkg.chomp} --get-selections"
+  elsif (yum = @connection.exec!("which yum 2> /dev/null")).length > 0
+    command = "#{yum.chomp} -q list installed"
+# could easily add more cases here, if I knew what they were :)
+  end
+
+  @output = @connection.exec!(command)
+  @output.should =~ /#{package}/
+end

data/lib/cucumber/chef/test_runner.rb

@@ -51,9 +51,9 @@ module Cucumber
 
         @stdout.puts("Executing Cucumber-Chef Test Runner")
         remote_path = File.join("/", "home", "ubuntu", "features")
-        cucumber_options = args.flatten.compact.uniq.join(" ")
+        cucumber_options = args.flatten.compact.join(" ")
         env = ( destroy ? "DESTROY=1" : nil )
-        command = [ "cd #{remote_path}", "&&", "sudo", env, "cucumber", cucumber_options, "--exclude support/roles", "--exclude support/data_bags", "--exclude support/keys", "." ].flatten.compact.join(" ")
+        command = [ "cd #{remote_path}", "&&", "sudo", env, "cucumber", cucumber_options, "--exclude support/cookbooks", "--exclude support/roles", "--exclude support/data_bags", "--exclude support/keys", "." ].flatten.compact.join(" ")
 
         @ssh.exec(command)
       end

data/lib/cucumber/chef/version.rb

@@ -24,7 +24,7 @@ module Cucumber
 
 ################################################################################
 
-    VERSION = "2.0.2.pre" unless const_defined?(:VERSION)
+    VERSION = "2.0.3.pre" unless const_defined?(:VERSION)
 
 ################################################################################
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-chef
 version: !ruby/object:Gem::Version
-  version: 2.0.2.pre
+  version: 2.0.3.pre
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-27 00:00:00.000000000 Z
+date: 2012-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef