cucumber-chef 2.0.5 → 2.0.6

data/bin/cc-server

@@ -1,15 +1,16 @@
 #!/usr/bin/env ruby
-
-if RUBY_VERSION < "1.9"
-  exit if fork
-  Process.setsid
-  exit if fork
-  Dir.chdir "/"
-  STDIN.reopen "/dev/null"
-  STDOUT.reopen "/dev/null", "a"
-  STDERR.reopen "/dev/null", "a"
-else
-  Process.daemon
+if !ENV['BACKGROUND'].nil?
+  if RUBY_VERSION < "1.9"
+    exit if fork
+    Process.setsid
+    exit if fork
+    Dir.chdir "/"
+    STDIN.reopen "/dev/null"
+    STDOUT.reopen "/dev/null", "a"
+    STDERR.reopen "/dev/null", "a"
+  else
+    Process.daemon
+  end
 end
 
 Dir.chdir(File.join("/home", "ubuntu"))
@@ -28,6 +29,11 @@ class FrontObject
   def initialize
     knife_rb = Cucumber::Chef.locate(:file, ".chef", "knife.rb")
     Chef::Config.from_file(knife_rb)
+
+    $logger = ZTK::Logger.new(Cucumber::Chef.log_file)
+    Cucumber::Chef.is_rc? and ($logger.level = ZTK::Logger::DEBUG)
+
+    puts("cc-server v#{Cucumber::Chef::VERSION}")
   end
 
   def shutdown

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

@@ -42,7 +42,7 @@ module Cucumber::Chef::Helpers::Container
         when "fedora" then
           %x( yum --nogpgcheck --installroot=#{cache_rootfs} -y install wget openssh-server )
         end
-        %x( chroot #{cache_rootfs} /bin/bash -c 'wget http://opscode.com/chef/install.sh -O - | bash' 2>&1 )
+        %x( chroot #{cache_rootfs} /bin/bash -c 'wget http://www.opscode.com/chef/install.sh -O - | bash' 2>&1 )
         if distro.downcase == "fedora"
           %x( chroot #{cache_rootfs} /bin/bash -c 'rpm -Uvh --nodeps /tmp/*rpm' 2>&1 )
         end

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

@@ -30,9 +30,9 @@ end
 
 Then /^I should( not)? see the "([^\"]*)" of "([^\"]*)" in the output$/ do |boolean, key, name|
   if (!boolean)
-    @output.should =~ /#{$servers[name][key.downcase.to_sym]}/i
+    @output.should =~ /#{$drb_test_lab.servers[name][key.downcase.to_sym]}/i
   else
-    @output.should_not =~ /#{$servers[name][key.downcase.to_sym]}/i
+    @output.should_not =~ /#{$drb_test_lab.servers[name][key.downcase.to_sym]}/i
   end
 end
 

data/lib/cucumber/chef/templates/cucumber/env.rb

@@ -29,7 +29,8 @@ if ($test_lab = Cucumber::Chef::TestLab.new) && ($test_lab.labs_running.count >
   ssh.config.host_name = $test_lab.labs_running.first.public_ip_address
   ssh.config.user = "ubuntu"
   ssh.config.keys = Cucumber::Chef.locate(:file, ".cucumber-chef", "id_rsa-#{ssh.config.user}")
-  ssh.exec("nohup sudo cc-server #{Cucumber::Chef.external_ip}")
+  ssh.exec("nohup sudo pkill -9 -f cc-server")
+  ssh.exec("nohup sudo BACKGROUND=yes cc-server #{Cucumber::Chef.external_ip}")
   Cucumber::Chef.spinner do
     ZTK::TCPSocketCheck.new(:host => $test_lab.labs_running.first.public_ip_address, :port => 8787, :data => "\n\n").wait
   end

data/lib/cucumber/chef/templates/cucumber/example_feature.erb

@@ -6,7 +6,7 @@ Feature: Perform test driven infrastructure with Cucumber-Chef
 
   Background:
     * I have a server called "<%= @project %>"
-    * "<%= @project %>" is running "ubuntu" "lucid"
+    * "<%= @project %>" is running "ubuntu" "precise"
     * "<%= @project %>" has been provisioned
     * the "chef-client::service" recipe has been added to the "<%= @project %>" run list
     * the chef-client has been run on "<%= @project %>"

data/lib/cucumber/chef/version.rb

@@ -24,7 +24,7 @@ module Cucumber
 
 ################################################################################
 
-    VERSION = "2.0.5" unless const_defined?(:VERSION)
+    VERSION = "2.0.6" unless const_defined?(:VERSION)
 
 ################################################################################
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-chef
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
   prerelease: 
 platform: ruby
 authors: