cucumber-chef 3.0.0.rc.0 → 3.0.0.rc.1

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

@@ -24,12 +24,12 @@ module Cucumber::Chef::Helpers::Chef
 ################################################################################
 
   def create_data_bag(data_bag, data_bag_path)
-    $test_lab.knife_cli(%Q{data bag create "#{data_bag}"}, :silence => true)
-    $test_lab.knife_cli(%Q{data bag from file "#{data_bag}" "#{data_bag_path}"}, :silence => true)
+    $cc_client.test_lab.knife_cli(%(data bag create "#{data_bag}"), :silence => true)
+    $cc_client.test_lab.knife_cli(%(data bag from file "#{data_bag}" "#{data_bag_path}"), :silence => true)
   end
 
   def delete_data_bag(data_bag)
-    $test_lab.knife_cli(%Q{data bag delete "#{data_bag}" --yes}, :silence => true)
+    $cc_client.test_lab.knife_cli(%(data bag delete "#{data_bag}" --yes), :silence => true)
   end
 
 ################################################################################
@@ -37,10 +37,10 @@ module Cucumber::Chef::Helpers::Chef
   def role_from_file(role, role_path)
     if File.extname(role).empty?
       Dir.glob(File.join(role_path, "#{role}.*")).each do |role_file|
-        $test_lab.knife_cli(%Q{role from file #{role_file}}, :silence => true)
+        $cc_client.test_lab.knife_cli(%(role from file #{role_file}), :silence => true)
       end
     else
-      $test_lab.knife_cli(%Q{role from file #{File.join(role_path, role)}}, :silence => true)
+      $cc_client.test_lab.knife_cli(%(role from file #{File.join(role_path, role)}), :silence => true)
     end
   end
 

data/lib/cucumber/chef/provider.rb

@@ -27,7 +27,7 @@ module Cucumber
     class ProviderError < Error; end
 
     class Provider
-      PROXY_METHODS = %w(create destroy up halt reload status id state username ip port chef_server_api chef_server_webui alive? dead? exists?)
+      PROXY_METHODS = %w(create destroy up down reload status id state username ip port chef_server_api chef_server_webui alive? dead? exists?)
 
 ################################################################################
 

data/lib/cucumber/chef/providers/aws.rb

@@ -126,7 +126,7 @@ module Cucumber
 # HALT
 ################################################################################
 
-        def halt
+        def down
           if (exists? && alive?)
             if !@server.stop
               raise AWSError, "Failed to halt the test lab!"

data/lib/cucumber/chef/providers/vagrant.rb

@@ -98,7 +98,7 @@ module Cucumber
 # HALT
 ################################################################################
 
-        def halt
+        def down
           if (exists? && alive?)
             self.vagrant_cli("halt")
           else

data/lib/cucumber/chef/provisioner.rb

@@ -139,7 +139,7 @@ module Cucumber
       def upload_cookbook
         @ui.logger.debug { "Uploading cucumber-chef cookbooks..." }
         ZTK::Benchmark.bench(:message => "Uploading 'cucumber-chef' cookbooks", :mark => "completed in %0.4f seconds.", :ui => @ui) do
-          @test_lab.knife_cli(%Q{cookbook upload cucumber-chef -o #{@cookbooks_path}}, :silence => true)
+          @test_lab.knife_cli(%(cookbook upload cucumber-chef -o #{@cookbooks_path}), :silence => true)
         end
       end
 
@@ -148,7 +148,7 @@ module Cucumber
       def upload_role
         @ui.logger.debug { "Uploading cucumber-chef test lab role..." }
         ZTK::Benchmark.bench(:message => "Uploading 'cucumber-chef' roles", :mark => "completed in %0.4f seconds.", :ui => @ui) do
-          @test_lab.knife_cli(%Q{role from file #{File.join(@roles_path, "test_lab.rb")}}, :silence => true)
+          @test_lab.knife_cli(%(role from file #{File.join(@roles_path, "test_lab.rb")}), :silence => true)
         end
       end
 
@@ -182,6 +182,7 @@ module Cucumber
         ZTK::Benchmark.bench(:message => "Rebooting the test lab", :mark => "completed in %0.4f seconds.", :ui => @ui) do
           command = "sudo reboot"
           @test_lab.bootstrap_ssh.exec(command, :silence => true)
+          sleep(10)
           ZTK::TCPSocketCheck.new(:host => @test_lab.ip, :port => @test_lab.port, :wait => 120).wait
         end
 

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

@@ -50,12 +50,12 @@ And /^the following (cookbook|cookbooks) (has|have) been (updated|uploaded):$/ d
   end
 
   cookbooks.each do |cookbook_path, cookbooks|
-    $test_lab.knife_cli(%Q{cookbook upload #{cookbooks.join(" ")} -o #{cookbook_path}}, :silence => true)
+    $cc_client.test_lab.knife_cli(%(cookbook upload #{cookbooks.join(" ")} -o #{cookbook_path}), :silence => true)
   end
 end
 
 And /^all of the cookbooks in "([^\"]*)" (has|have) been (updated|uploaded)$/ do |cookbook_path, ignore0, ignore1|
-  $test_lab.knife_cli(%Q{cookbook upload -a -o #{cookbook_path}}, :silence => true)
+  $cc_client.test_lab.knife_cli(%(cookbook upload -a -o #{cookbook_path}), :silence => true)
 end
 
 ################################################################################
@@ -67,10 +67,10 @@ And /^the following (environment|environments) (has|have) been (updated|uploaded
 
     if File.extname(environment).empty?
       Dir.glob(File.join(environment_path, "#{environment}.*")).each do |environment_file|
-        $test_lab.knife_cli(%Q{environment from file #{environment_file}}, :silence => true)
+        $cc_client.test_lab.knife_cli(%(environment from file #{environment_file}), :silence => true)
       end
     else
-      $test_lab.knife_cli(%Q{environment from file #{File.join(environment_path, environment)}}, :silence => true)
+      $cc_client.test_lab.knife_cli(%(environment from file #{File.join(environment_path, environment)}), :silence => true)
     end
   end
 end

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

@@ -20,10 +20,10 @@
 ################################################################################
 
 When /^I enable the running of MiniTest suites for "(.*?)"$/ do |name|
-  $test_lab.drb.enable_minitest(name)
+  $cc_client.test_lab.drb.enable_minitest(name)
 end
 
 Then /^the tests should run and pass on "(.*?)"$/ do |name|
-  results = $test_lab.drb.run_minitests(name)
+  results = $cc_client.test_lab.drb.run_minitests(name)
   results.last.scan(/assertions.*(\d).*failures.*(\d).*errors.*(\d).*skips/).flatten.map { |v| v.to_i }.should == [0,0,0]
 end

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

@@ -11,7 +11,7 @@ When /^I have the following SSH sessions:$/ do |table|
       @ssh_sessions[id] and !@ssh_sessions[id].closed? and @ssh_sessions[id].close
       @ssh_sessions[id] = ZTK::SSH.new
 
-      @ssh_sessions[id].config.proxy_host_name = $test_lab.ip
+      @ssh_sessions[id].config.proxy_host_name = $cc_client.test_lab.ip
       @ssh_sessions[id].config.proxy_user = Cucumber::Chef.lab_user
       @ssh_sessions[id].config.proxy_keys = Cucumber::Chef.lab_identity
 
@@ -32,8 +32,8 @@ When /^I ssh to "([^\"]*)" with the following credentials:$/ do |hostname, table
     @connection and @connection.ssh.shutdown!
     @connection = ZTK::SSH.new(:timeout => 120, :ignore_exit_status => true)
 
-    @connection.config.proxy_host_name = $test_lab.ip
-    @connection.config.proxy_port = $test_lab.port
+    @connection.config.proxy_host_name = $cc_client.test_lab.ip
+    @connection.config.proxy_port = $cc_client.test_lab.port
     @connection.config.proxy_user = Cucumber::Chef.lab_user
     @connection.config.proxy_keys = Cucumber::Chef.lab_identity
 

data/lib/cucumber/chef/templates/bootstrap/ubuntu-precise-test-lab.erb

@@ -70,20 +70,20 @@ knife client create <%= @user %> -d -a -f ${HOME}/.chef/<%= @user %>.pem
 
 chown -R ${SUDO_USER}:${SUDO_USER} ${HOME}
 
-nc -w 1 127.0.0.1 4040
-if [ $? -ne 0 ]; then
-  /etc/init.d/chef-server-webui stop && sleep 3
-  /usr/sbin/chef-server-webui -e production &
-  while true; do
-    nc -w 1 127.0.0.1 4040
-    if [ $? -eq 0 ]; then
-      break
-    fi
-    sleep 1
-  done
-  kill `jobs -p` && sleep 3
-  /etc/init.d/chef-server-webui start && sleep 3
-fi
+# nc -w 1 127.0.0.1 4040
+# if [ $? -ne 0 ]; then
+#   /etc/init.d/chef-server-webui stop && sleep 3
+#   /usr/sbin/chef-server-webui -e production &
+#   while true; do
+#     nc -w 1 127.0.0.1 4040
+#     if [ $? -eq 0 ]; then
+#       break
+#     fi
+#     sleep 1
+#   done
+#   kill `jobs -p` && sleep 3
+#   /etc/init.d/chef-server-webui start && sleep 3
+# fi
 
 if [ ! -f /etc/chef/client.pem ]; then
   /etc/init.d/chef-client restart

data/lib/cucumber/chef/templates/cucumber/cc-hooks.rb

@@ -18,79 +18,26 @@
 #
 ################################################################################
 
-tag = Cucumber::Chef.tag("cucumber-chef")
-puts(">>> #{tag}")
-Cucumber::Chef.boot(tag)
-
-$ui = ZTK::UI.new(:logger => Cucumber::Chef.logger)
-if !(($test_lab = Cucumber::Chef::TestLab.new($ui)) && $test_lab.alive?)
-  message = "No running cucumber-chef test labs to connect to!"
-  $ui.logger.fatal { message }
-  raise message
-end
-
-if ENV['PURGE'] == 'YES'
-  $ui.logger.warn { "PURGING CONTAINERS!  Container attributes will be reset!" }
-  $test_lab.containers.list.each do |name|
-    ZTK::Benchmark.bench(:message => ">>> Destroying container '#{name}'", :mark => "completed in %0.4f seconds.") do
-      $test_lab.containers.destroy(name)
-    end
-  end
-else
-  $ui.logger.info { "Allowing existing containers to persist." }
-end
-
-$test_lab.containers.chef_set_client_config(:chef_server_url => "http://192.168.255.254:4000",
-                                            :validation_client_name => "chef-validator")
-
-if ENV['SETUP'] == 'YES'
-  # Upload all of the chef-repo environments
-  ZTK::Benchmark.bench(:message => ">>> Pushing chef-repo environments to the test lab", :mark => "completed in %0.4f seconds.") do
-    $test_lab.knife_cli(%Q{environment from file ./environments/*.rb}, :silence => true)
-  end
-
-  # Upload all of the chef-repo cookbooks
-  ZTK::Benchmark.bench(:message => ">>> Pushing chef-repo cookbooks to the test lab", :mark => "completed in %0.4f seconds.") do
-    cookbook_paths = ["./cookbooks"]
-    cookbook_paths << "./site-cookbooks" if Cucumber::Chef::Config.librarian_chef
-    $test_lab.knife_cli(%Q{cookbook upload --all --cookbook-path #{cookbook_paths.join(':')} --force}, :silence => true)
-  end
-
-  # Upload all of the chef-repo roles
-  ZTK::Benchmark.bench(:message => ">>> Pushing chef-repo roles to the test lab", :mark => "completed in %0.4f seconds.") do
-    $test_lab.knife_cli(%Q{role from file ./roles/*.rb}, :silence => true)
-  end
-
-  # Upload all of our chef-repo data bags
-  Dir.glob("./data_bags/*").each do |data_bag_path|
-    next if !File.directory?(data_bag_path)
-    ZTK::Benchmark.bench(:message => ">>> Pushing chef-repo data bag '#{File.basename(data_bag_path)}' to the test lab", :mark => "completed in %0.4f seconds.") do
-      data_bag = File.basename(data_bag_path)
-      $test_lab.knife_cli(%Q{data bag create "#{data_bag}"}, :silence => true)
-      $test_lab.knife_cli(%Q{data bag from file "#{data_bag}" "#{data_bag_path}"}, :silence => true)
-    end
-  end
-
-  Cucumber::Chef::Container.all.each do |container|
-    ZTK::Benchmark.bench(:message => ">>> Creating container '#{container.name}'", :mark => "completed in %0.4f seconds.") do
-      $test_lab.containers.create(container)
-    end
-    ZTK::Benchmark.bench(:message => ">>> Provisioning container '#{container.name}'", :mark => "completed in %0.4f seconds.") do
-      $test_lab.containers.chef_run_client(container)
-    end
-  end
-end
-
+$cc_client = Cucumber::Chef::Client.new
+$cc_client.up
 
 ################################################################################
 # HOOKS
 ################################################################################
 
 Before do |scenario|
+  $cc_client.before(scenario)
 end
 
 After do |scenario|
   @connection and @connection.ssh.shutdown!
+  $cc_client.after(scenario)
+end
+
+################################################################################
+
+Kernel.at_exit do
+  $cc_client.at_exit
 end
 
 ################################################################################

data/lib/cucumber/chef/version.rb

@@ -24,7 +24,7 @@ module Cucumber
 
 ################################################################################
 
-    VERSION = "3.0.0.rc.0" unless const_defined?(:VERSION)
+    VERSION = "3.0.0.rc.1" unless const_defined?(:VERSION)
 
 ################################################################################
 

data/lib/cucumber-chef/rake/task.rb

@@ -12,9 +12,9 @@ namespace :cc do
       puts("feature_dir(#{dir.inspect})")
       puts("=" * 80)
 
-      system(%Q{echo "<li /><p>#{File.basename(dir)}<ul>" | tee -a #{@index_html}})
+      system(%(echo "<li /><p>#{File.basename(dir)}<ul>" | tee -a #{@index_html}))
       block.call
-      system(%Q{echo "</p></ul>" | tee -a #{@index_html}})
+      system(%(echo "</p></ul>" | tee -a #{@index_html}))
     end
 
     def run_feature(feature_file)
@@ -25,9 +25,9 @@ namespace :cc do
       filename = feature_file.gsub(/(\w*).feature/, '\1.html')
       puts("#{feature_file} -> public/#{filename}")
 
-      system(%Q{mkdir -pv #{File.dirname("public/#{filename}")}})
+      system(%(mkdir -pv #{File.dirname("public/#{filename}")}))
 
-      push = (@pushed ? nil : %Q{SETUP="YES"})
+      push = (@pushed ? nil : %(PUSH="YES"))
       output_file = File.join(@output_dir, filename)
       command = [push, "bundle exec cucumber", "features/support", feature_file, ENV['EXTRA_CUCUMBER_ARGS'], "--format html", "--out", output_file].flatten.compact.join(" ")
       @pushed = true if !@pushed
@@ -39,7 +39,7 @@ namespace :cc do
       failed = "<font style='font-weight: bold; color: red;'>FAILED</font>"
       status = ((@exit_codes[-1] == 0) ? passed : failed)
 
-      system(%Q{echo "<li /><a href='#{filename}'>#{File.basename(filename.gsub('.html', ''))}</a> (#{status})" | tee -a #{@index_html}})
+      system(%(echo "<li /><a href='#{filename}'>#{File.basename(filename.gsub('.html', ''))}</a> (#{status})" | tee -a #{@index_html}))
     end
 
     @output_dir = File.join(Dir.pwd, "public")
@@ -48,14 +48,14 @@ namespace :cc do
     @exit_codes = Array.new
 
     puts("Cleaning up...")
-    system(%Q{rm -rfv .cucumber-chef/aws/artifacts})
-    system(%Q{rm -rfv public})
-    system(%Q{mkdir -v public})
+    system(%(rm -rfv .cucumber-chef/aws/artifacts))
+    system(%(rm -rfv public))
+    system(%(mkdir -v public))
 
     puts("Generating Cucumber-Chef html reports...")
 
-    system(%Q{echo "<html><head><title>Cucumber-Chef Report</title></head><body>" | tee public/index.html})
-    system(%Q{echo "<h2>Cucumber-Chef Report</h2><ul>" | tee -a public/index.html})
+    system(%(echo "<html><head><title>Cucumber-Chef Report</title></head><body>" | tee public/index.html))
+    system(%(echo "<h2>Cucumber-Chef Report</h2><ul>" | tee -a public/index.html))
     Dir.glob("features/*").each do |fdir|
       if File.directory?(fdir)
         if (ffiles = Dir.glob("#{fdir}/*.feature")).count > 0
@@ -69,7 +69,7 @@ namespace :cc do
         run_feature(fdir)
       end
     end
-    system(%Q{echo "</ul></body></html>" | tee -a public/index.html})
+    system(%(echo "</ul></body></html>" | tee -a public/index.html))
 
     # If we had a failure be sure to surface it
     exit_code = (@exit_codes.any?{ |ec| ec != 0 } ? 1 : 0)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-chef
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc.0
+  version: 3.0.0.rc.1
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-13 00:00:00.000000000 Z
+date: 2013-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -131,7 +131,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -139,7 +139,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.8
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -225,6 +225,7 @@ files:
 - README.md
 - Rakefile
 - TODO.md
+- WIKI.2.x.md
 - WIKI.md
 - bin/cc-console
 - bin/cc-knife