cucumber-chef 2.1.0.rc.11 → 2.1.0.rc.12

data/bin/cucumber-chef

@@ -3,6 +3,7 @@
 require 'thor'
 require 'cucumber-chef'
 
+
 # $logger = Cucumber::Chef.logger
 
 class CucumberChef < Thor
@@ -55,7 +56,7 @@ class CucumberChef < Thor
 
     def boot
       tag = Cucumber::Chef.tag("cucumber-chef")
-      puts(set_color(tag, :green, true))
+      puts(tag)
       Cucumber::Chef.boot(tag)
       $logger = Cucumber::Chef.logger
 
@@ -204,23 +205,14 @@ class CucumberChef < Thor
           puts("BOOM!")
           puts
 
-          ZTK::Benchmark.bench(:message => "Start cc-server", :mark => "completed in %0.4f seconds.") do
-            test_lab.cc_client.up(:silence => true)
-          end
-
           args.each do |container|
             ZTK::Benchmark.bench(:message => "Destroy container '#{container}'", :mark => "completed in %0.4f seconds.") do
-              test_lab.drb.load_containers
-              test_lab.drb.server_destroy(container)
-              test_lab.drb.server_delete(container)
-              test_lab.drb.save_containers
+              test_lab.containers.load
+              test_lab.containers.destroy(container)
+              test_lab.containers.save
             end
           end
 
-          ZTK::Benchmark.bench(:message => "Stop cc-server", :mark => "completed in %0.4f seconds.") do
-            test_lab.cc_client.down
-          end
-
         else
           puts
           puts(set_color("Whew! That was close!", :green, true))
@@ -318,19 +310,16 @@ class CucumberChef < Thor
     if (test_lab = Cucumber::Chef::TestLab.new)
       if @options.containers?
         if test_lab.alive?
-          ZTK::Benchmark.bench(:message => "Start cc-server", :mark => "completed in %0.4f seconds.") do
-            test_lab.cc_client.up(:silence => true)
-          end
 
-          test_lab.drb.load_containers
+          test_lab.containers.load
 
-          if test_lab.drb.containers.count > 0
+          if test_lab.containers.count > 0
             headers = [:name, :alive, :arch, :distro, :ip, :mac, :"chef version", :persist]
-            results = ZTK::Report.new.spreadsheet(test_lab.drb.containers, headers) do |name, detail|
+            results = ZTK::Report.new.spreadsheet(test_lab.containers.to_a, headers) do |name, detail|
               chef_version = "N/A"
-              alive = (test_lab.drb.command_run_local(%Q{ping -n -c 1 -W 1 #{detail[:ip]}}, :ignore_exit_status => true).exit_code == 0)
+              alive = (test_lab.bootstrap_ssh(:ignore_exit_status => true).exec(%Q{ping -n -c 1 -W 1 #{detail[:ip]}}, :silence => true).exit_code == 0)
               if alive
-                chef_version = test_lab.drb.command_run_chroot(name, %Q{/usr/bin/env chef-client -v}, :ignore_exit_status => true).output.chomp
+                chef_version = test_lab.proxy_ssh(name, :ignore_exit_status => true).exec(%Q{/usr/bin/env chef-client -v}, :silence => true).output.chomp
               end
 
               OpenStruct.new(
@@ -359,9 +348,6 @@ class CucumberChef < Thor
             raise Cucumber::Chef::Error, "We could not find any containers!"
           end
 
-          ZTK::Benchmark.bench(:message => "Stop cc-server", :mark => "completed in %0.4f seconds.") do
-            test_lab.cc_client.down
-          end
         else
           raise Cucumber::Chef::Error, "We could not find a running test lab."
         end

data/chef_repo/cookbooks/cucumber-chef/recipes/lxc.rb

@@ -19,7 +19,7 @@
 ################################################################################
 
 
-%w( lxc bridge-utils debootstrap yum isc-dhcp-server bind9 ntpdate ntp ).each do |p|
+%w(lxc bridge-utils debootstrap yum isc-dhcp-server bind9 ntpdate ntp).each do |p|
   package p
 end
 
@@ -220,25 +220,6 @@ end
 service "lxc-net"
 service "lxc"
 
-#directory "create cgroup mount point" do
-#  path "/cgroup"
-#
-#  not_if { File.exists?("/cgroup") && File.directory?("/cgroup") }
-#end
-
-#mount "mount cgroup device" do
-#  mount_point "/cgroup"
-#  device "cgroup"
-#  fstype "cgroup"
-#  pass 0
-#  action [:mount, :enable]
-
-#  not_if do
-#    %x( mount | grep "cgroup" )
-#    ($? == 0)
-#  end
-#end
-
 execute "set LXC_AUTO to false" do
   command "sed -i \"s/LXC_AUTO=\\\"true\\\"/LXC_AUTO=\\\"false\\\"/\" /etc/default/lxc"
 
@@ -266,48 +247,3 @@ directory "create lxc configuration directory" do
 
   not_if { File.exists?("/etc/lxc") && File.directory?("/etc/lxc") }
 end
-
-# # load the chef client into our distro lxc cache
-# install_chef_sh = "/tmp/install-chef.sh"
-# distros = { "ubuntu" => [ "lucid", "maverick", "natty", "oneiric", "precise" ] }
-# arch = (%x( arch ).include?("i686") ? "i386" : "amd64")
-
-# template "create lxc initializer container configuration" do
-#   path "/etc/lxc/initializer"
-#   source "lxc-initializer-config.erb"
-
-#   not_if { File.exists?("/etc/lxc/initializer") }
-# end
-
-# distros.each do |distro, releases|
-#   releases.each do |release|
-#     cache_rootfs = File.join("/", "var", "cache", "lxc", release, "rootfs-#{arch}")
-#     initializer_rootfs = File.join("/", "var", "lib", "lxc", "initializer", "rootfs")
-
-#     execute "create the lxc initializer container for #{distro}/#{release}" do
-#       command "lxc-create -n initializer -f /etc/lxc/initializer -t #{distro} -- -r #{release}"
-
-#       not_if { File.exists?(cache_rootfs) && File.directory?(cache_rootfs) }
-#     end
-
-#     execute "destroy the lxc initializer container for #{distro}/#{release}" do
-#       command "lxc-destroy -n initializer"
-
-#       only_if { File.exists?(initializer_rootfs) && File.directory?(initializer_rootfs) }
-#     end
-
-#     template "create opscode omnibus installer in lxc container cache for #{distro}/#{release}" do
-#       path "#{cache_rootfs}#{install_chef_sh}"
-#       source "lxc-install-chef.erb"
-#       mode "0755"
-
-#       not_if { File.exists?(File.join(cache_rootfs, install_chef_sh)) }
-#     end
-
-#     execute "install chef-client using omnibus in lxc container cache for #{distro}/#{release}" do
-#       command "chroot #{cache_rootfs} /bin/bash -c '#{install_chef_sh}'"
-
-#       not_if { File.exists?(File.join(cache_rootfs, "opt", "opscode", "bin", "chef-client")) }
-#     end
-#   end
-# end

data/chef_repo/cookbooks/cucumber-chef/recipes/test_lab.rb

@@ -23,7 +23,7 @@
 # SYSTEM TWEAKS
 ################################################################################
 
-%w( build-essential wget chkconfig ruby-full ruby-dev libxml2-dev libxslt1-dev ).each do |p|
+%w(build-essential wget chkconfig).each do |p|
   package p
 end
 
@@ -49,16 +49,6 @@ end
     not_if { File.exists?(File.join(home_dir, ".ssh", "config")) }
   end
 
-  template "create .gemrc for #{user}" do
-    path "#{home_dir}/.gemrc"
-    source "gemrc.erb"
-    owner user
-    group user
-    mode "0644"
-
-    not_if { File.exists?(File.join(home_dir, ".gemrc")) }
-  end
-
   execute "generate ssh keypair for #{user}" do
     command "ssh-keygen -q -N '' -f #{home_dir}/.ssh/id_rsa"
 
@@ -106,36 +96,6 @@ template "install cucumber-chef motd" do
 end
 
 
-################################################################################
-# RUBY
-################################################################################
-bash "install rubygems" do
-  code <<-EOH
-cd /tmp
-wget http://production.cf.rubygems.org/rubygems/rubygems-1.8.19.tgz
-tar zxf rubygems-1.8.19.tgz
-cd rubygems-1.8.19
-ruby setup.rb --no-format-executable
-  EOH
-end
-
-gem_package "cucumber-chef" do
-  gem_binary("/usr/bin/gem")
-
-  version(node['cucumber_chef']['version'])
-
-  if node['cucumber_chef']['prerelease']
-    options("--prerelease")
-  end
-end
-
-%w( rspec ).each do |g|
-  gem_package g do
-    gem_binary("/usr/bin/gem")
-  end
-end
-
-
 ################################################################################
 # CHEF-CLIENT
 ################################################################################

data/cucumber-chef.gemspec

@@ -39,7 +39,6 @@ Gem::Specification.new do |s|
 
   # Providers
   s.add_dependency("fog", ">= 1.3.1")
-  # s.add_dependency("vagrant", ">= 1.0.5")
 
   # TDD
   s.add_dependency("cucumber", ">= 1.2.0")
@@ -50,7 +49,7 @@ Gem::Specification.new do |s|
   s.add_dependency("rake", ">= 0.9.2")
   s.add_dependency("thor", ">= 0.15.2")
   s.add_dependency("ubuntu_ami", ">= 0.4.0")
-  s.add_dependency("ztk", ">= 1.0.0")
+  s.add_dependency("ztk", ">= 1.0.1")
 
   s.add_development_dependency("simplecov", ">= 0.6.4")
   s.add_development_dependency("pry", ">= 0")

data/lib/cucumber/chef/client.rb

@@ -36,44 +36,44 @@ module Cucumber
 ################################################################################
 
       def up(options={})
-        user = Cucumber::Chef.lab_user
-        home_dir = Cucumber::Chef.lab_user_home_dir
-        provider = Cucumber::Chef::Config.provider.to_s
-        @test_lab.ssh.exec("sudo mkdir -p #{File.join(home_dir, ".cucumber-chef", provider)}")
-        @test_lab.ssh.exec("sudo cp -f #{File.join(home_dir, ".chef", "knife.rb")} #{File.join(home_dir, ".cucumber-chef", provider, "knife.rb")}")
-        @test_lab.ssh.exec("sudo chown -R #{user}:#{user} #{File.join(home_dir, ".cucumber-chef")}")
-
-        local_file = Cucumber::Chef.config_rb
-        remote_file = File.join(home_dir, ".cucumber-chef", "config.rb")
-        @test_lab.ssh.upload(local_file, remote_file)
-
-        begin
-          self.ping
-        rescue
-          @background = ZTK::Background.new
-          @background.process do
-            self.down
-
-            environment = Array.new
-            %w(PURGE VERBOSE LOG_LEVEL).each do |env_var|
-              environment << "#{env_var}=#{ENV[env_var].inspect}" if (!ENV[env_var].nil? && !ENV[env_var].empty?)
-            end
-            environment = environment.join(" ")
-            external_ip = Cucumber::Chef.external_ip
-
-            command = %Q{nohup sudo #{environment} /usr/bin/env cc-server #{external_ip} &}
-
-            @test_lab.ssh.exec(command, options)
-          end
-
-          Kernel.at_exit do
-            self.at_exit
-          end
-        end
-
-        ZTK::RescueRetry.try(:tries => 30) do
-          self.drb.ping
-        end
+        # user = Cucumber::Chef.lab_user
+        # home_dir = Cucumber::Chef.lab_user_home_dir
+        # provider = Cucumber::Chef::Config.provider.to_s
+        # @test_lab.ssh.exec("sudo mkdir -p #{File.join(home_dir, ".cucumber-chef", provider)}")
+        # @test_lab.ssh.exec("sudo cp -f #{File.join(home_dir, ".chef", "knife.rb")} #{File.join(home_dir, ".cucumber-chef", provider, "knife.rb")}")
+        # @test_lab.ssh.exec("sudo chown -R #{user}:#{user} #{File.join(home_dir, ".cucumber-chef")}")
+
+        # local_file = Cucumber::Chef.config_rb
+        # remote_file = File.join(home_dir, ".cucumber-chef", "config.rb")
+        # @test_lab.ssh.upload(local_file, remote_file)
+
+        # begin
+        #   self.ping
+        # rescue
+        #   @background = ZTK::Background.new
+        #   @background.process do
+        #     self.down
+
+        #     environment = Array.new
+        #     %w(PURGE VERBOSE LOG_LEVEL).each do |env_var|
+        #       environment << "#{env_var}=#{ENV[env_var].inspect}" if (!ENV[env_var].nil? && !ENV[env_var].empty?)
+        #     end
+        #     environment = environment.join(" ")
+        #     external_ip = Cucumber::Chef.external_ip
+
+        #     command = %Q{nohup sudo #{environment} /usr/bin/env cc-server #{external_ip} &}
+
+        #     @test_lab.ssh.exec(command, options)
+        #   end
+
+        #   Kernel.at_exit do
+        #     self.at_exit
+        #   end
+        # end
+
+        # ZTK::RescueRetry.try(:tries => 30) do
+        #   self.drb.ping
+        # end
 
         true
       end
@@ -81,17 +81,17 @@ module Cucumber
 ################################################################################
 
       def down
-        (@test_lab.drb.shutdown rescue nil)
+        # (@test_lab.drb.shutdown rescue nil)
       end
 
 ################################################################################
 
-      def drb
-        @drb and DRb.stop_service
-        @drb = DRbObject.new_with_uri("druby://#{@test_lab.ip}:8787")
-        @drb and DRb.start_service
-        @drb
-      end
+      # def drb
+      #   @drb and DRb.stop_service
+      #   @drb = DRbObject.new_with_uri("druby://#{@test_lab.ip}:8787")
+      #   @drb and DRb.start_service
+      #   @drb
+      # end
 
 ################################################################################
 
@@ -100,30 +100,20 @@ module Cucumber
         # we use various aspects of the scenario to name our artifacts
         $scenario = scenario
 
-        @test_lab.drb.load_containers
-
-        @test_lab.drb.chef_set_client_config(:chef_server_url => "http://192.168.255.254:4000",
-                                             :validation_client_name => "chef-validator")
       end
 
 ################################################################################
 
       def after(scenario)
-        @test_lab.drb.save_containers
-
-        # cleanup non-persistent lxc containers after tests
-        @test_lab.drb.containers.select{ |name, attributes| !attributes[:persist] }.each do |name, attributes|
-          @test_lab.drb.server_destroy(name)
-        end
       end
 
 ################################################################################
 
-      def at_exit
-        @ui.logger.fatal { "Waiting for cc-server to shutdown." }
-        self.down
-        @background.wait
-      end
+      # def at_exit
+      #   @ui.logger.fatal { "Waiting for cc-server to shutdown." }
+      #   self.down
+      #   @background.wait
+      # end
 
 ################################################################################