cucumber-chef 3.0.0.rc.4 → 3.0.0.rc.5

data/bin/cucumber-chef

@@ -521,7 +521,8 @@ class CucumberChef < Thor
       "lab_identity" => Cucumber::Chef.lab_identity,
       "lxc_user" => Cucumber::Chef.lxc_user,
       "lxc_user_home_dir" => Cucumber::Chef.lxc_user_home_dir,
-      "lxc_identity" => Cucumber::Chef.lxc_identity
+      "lxc_identity" => Cucumber::Chef.lxc_identity,
+      "chef_pre_11" => Cucumber::Chef.chef_pre_11
     }
     max_key_length = details.collect{ |k,v| k.to_s.length }.max
 

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

@@ -27,7 +27,7 @@
   package p
 end
 
-[ node.lab_user, node.lxc_user ].flatten.each do |user|
+[ node.cucumber_chef.lab_user, node.cucumber_chef.lxc_user ].flatten.each do |user|
   home_dir = (user == "root" ? "/#{user}" : "/home/#{user}")
 
   directory "create .ssh directory for #{user}" do

data/lib/cucumber/chef/provisioner.rb

@@ -37,10 +37,6 @@ module Cucumber
 
         @cookbooks_path = File.join(Cucumber::Chef.root_dir, "chef_repo", "cookbooks")
         @roles_path = File.join(Cucumber::Chef.root_dir, "chef_repo", "roles")
-
-        @chef_pre_11 = Cucumber::Chef::Config.chef_pre_11
-        bootstrap_template_file = (@chef_pre_11 ? 'ubuntu-precise-apt.erb' : 'ubuntu-precise-omnibus.erb')
-        @bootstrap_template = File.join(Cucumber::Chef.root_dir, "lib", "cucumber", "chef", "templates", "bootstrap", bootstrap_template_file)
       end
 
 ################################################################################
@@ -69,15 +65,19 @@ module Cucumber
           remote_path = File.join("/tmp", "chef-solo")
           @ui.logger.debug { "remote_path == #{remote_path.inspect}" }
 
-          @test_lab.bootstrap_ssh.exec(%(rm -rf #{remote_path} ; mkdir -p #{remote_path}))
-          @test_lab.bootstrap_ssh.upload(local_path, remote_path)
-
-          # %w(Gemfile Gemfile.lock).each do |file|
-          #   local_file = File.join(Cucumber::Chef.chef_repo, file)
-          #   remote_file = File.join(remote_path, file)
-
-          #   @test_lab.bootstrap_ssh.upload(local_file, remote_file)
-          # end
+          # FIXME!
+          # there seems to be a major difference between net-sftp v2.0.5 and
+          # v2.1.1; under v2.0.5 the remote_path is expected to exist already so
+          # if it is not in place mkdir fails with Net::SFTP::StatusException on
+          # the Net::SFTP mkdir internal call triggered by a Net::SFTP upload
+          # call
+          @test_lab.bootstrap_ssh.exec(%(rm -rf #{remote_path}))
+          begin
+            @test_lab.bootstrap_ssh.upload(local_path, remote_path)
+          rescue Net::SFTP::StatusException => e
+            @test_lab.bootstrap_ssh.exec(%(mkdir -p #{remote_path}))
+            retry
+          end
         end
       end
 
@@ -87,15 +87,30 @@ module Cucumber
         raise ProvisionerError, "You must have the environment variable 'USER' set." if !Cucumber::Chef::Config.user
 
         ZTK::Benchmark.bench(:message => "Bootstrapping #{Cucumber::Chef::Config.provider.upcase} instance", :mark => "completed in %0.4f seconds.", :ui => @ui) do
-          chef_client_attributes = {
-            "run_list" => %w(role[test_lab]),
-            "cucumber_chef" => {
-              "version" => Cucumber::Chef::VERSION,
-              "prerelease" => Cucumber::Chef::Config.prerelease
-            },
-            "lab_user" => Cucumber::Chef.lab_user,
-            "lxc_user" => Cucumber::Chef.lxc_user
-          }
+          chef_client_attributes = if Cucumber::Chef.chef_pre_11
+            {
+              "run_list" => %w(role[test_lab] recipe[chef-server::default] recipe[chef-server::apache-proxy] recipe[chef-client]),
+              "cucumber_chef" => {
+                "version" => Cucumber::Chef::VERSION,
+                "prerelease" => Cucumber::Chef::Config.prerelease,
+                "lab_user" => Cucumber::Chef.lab_user,
+                "lxc_user" => Cucumber::Chef.lxc_user
+              },
+              "chef-server" => {
+                "webui_enabled" => true
+              }
+            }
+          else
+            {
+              "run_list" => %w(role[test_lab]),
+              "cucumber_chef" => {
+                "version" => Cucumber::Chef::VERSION,
+                "prerelease" => Cucumber::Chef::Config.prerelease,
+                "lab_user" => Cucumber::Chef.lab_user,
+                "lxc_user" => Cucumber::Chef.lxc_user
+              }
+            }
+          end
 
           context = {
             :chef_client_attributes => chef_client_attributes,
@@ -108,12 +123,15 @@ module Cucumber
             :chef_client_version => Cucumber::Chef::Config.chef[:client_version]
           }
 
+          bootstrap_template_file = (Cucumber::Chef.chef_pre_11 ? 'ubuntu-precise-apt.erb' : 'ubuntu-precise-omnibus.erb')
+          bootstrap_template = File.join(Cucumber::Chef.root_dir, "lib", "cucumber", "chef", "templates", "bootstrap", bootstrap_template_file)
+
           local_bootstrap_file = Tempfile.new("bootstrap")
           local_bootstrap_filename = local_bootstrap_file.path
-          local_bootstrap_file.write(::ZTK::Template.render(@bootstrap_template, context))
+          local_bootstrap_file.write(::ZTK::Template.render(bootstrap_template, context))
           local_bootstrap_file.close
 
-          remote_bootstrap_filename = File.join(Cucumber::Chef.lab_user_home_dir, "cucumber-chef-bootstrap.sh")
+          remote_bootstrap_filename = File.join('/tmp', 'cucumber-chef-bootstrap.sh')
 
           @test_lab.bootstrap_ssh.upload(local_bootstrap_filename, remote_bootstrap_filename)
 
@@ -135,7 +153,7 @@ module Cucumber
           @ui.logger.debug { "remote_path == #{remote_path.inspect}" }
 
           files = [ File.basename(Cucumber::Chef.chef_identity) ]
-          if (@chef_pre_11 == true)
+          if (Cucumber::Chef.chef_pre_11 == true)
             files << "validation.pem"
           else
             files << "chef-validator.pem"
@@ -180,7 +198,7 @@ module Cucumber
 ################################################################################
 
       def wait_for_chef_server
-        if (@chef_pre_11 == true)
+        if (Cucumber::Chef.chef_pre_11 == true)
           ZTK::Benchmark.bench(:message => "Waiting for the chef-server", :mark => "completed in %0.4f seconds.", :ui => @ui) do
             ZTK::TCPSocketCheck.new(:host => @test_lab.ip, :port => 4000, :data => "GET", :wait => 120).wait
           end
@@ -190,7 +208,7 @@ module Cucumber
           end
         else
           ZTK::Benchmark.bench(:message => "Waiting for the chef-server nginx daemon", :mark => "completed in %0.4f seconds.", :ui => @ui) do
-            ZTK::TCPSocketCheck.new(:host => @test_lab.ip, :port => 8080, :data => "GET", :wait => 120).wait
+            ZTK::TCPSocketCheck.new(:host => @test_lab.ip, :port => 80, :data => "GET", :wait => 120).wait
           end
         end
       end

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

@@ -10,6 +10,7 @@ CUCUMBER_CHEF_BOOTSTRAP_DONE="/.cucumber-chef-bootstrap-finished"
 # [ -f ${CUCUMBER_CHEF_BOOTSTRAP_DONE} ] && echo "Already bootstrapped!" && exit
 
 export DEBIAN_FRONTEND=noninteractive
+cd /tmp
 
 echo "127.0.0.1 <%= @hostname_full %> <%= @hostname_short %>" | tee -a /etc/hosts
 echo "<%= @hostname_full %>" | tee /etc/hostname
@@ -65,7 +66,26 @@ if [ ! -f /etc/chef/client.pem ]; then
   echo "done."
 fi
 
-knife cookbook upload --all --cookbook-path /tmp/chef-solo/cookbooks --force --yes -VV
+cat <<EOF > /tmp/chef-solo/Gemfile
+source 'https://rubygems.org'
+gem 'chef', '<%= @chef_client_version %>'
+gem 'librarian-chef'
+EOF
+
+cat <<EOF > /tmp/chef-solo/Cheffile
+site 'http://community.opscode.com/api/v1'
+cookbook 'chef-server'
+cookbook 'chef-client'
+EOF
+
+cd /tmp/chef-solo
+mv cookbooks site-cookbooks
+gem install bundler --no-ri --no-rdoc
+bundle install
+librarian-chef install
+cd /tmp
+
+knife cookbook upload --all --cookbook-path /tmp/chef-solo/cookbooks:/tmp/chef-solo/site-cookbooks --force --yes -VV
 knife role from file /tmp/chef-solo/roles/*.rb --yes -VV
 
 cat <<EOF > /etc/chef/bootstrap-chef-client.json

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

@@ -10,6 +10,7 @@ CUCUMBER_CHEF_BOOTSTRAP_DONE="/.cucumber-chef-bootstrap-finished"
 # [ -f ${CUCUMBER_CHEF_BOOTSTRAP_DONE} ] && echo "Already bootstrapped!" && exit
 
 export DEBIAN_FRONTEND=noninteractive
+cd /tmp
 
 echo "127.0.0.1 <%= @hostname_full %> <%= @hostname_short %>" | tee -a /etc/hosts
 echo "<%= @hostname_full %>" | tee /etc/hostname

data/lib/cucumber/chef/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-chef
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc.4
+  version: 3.0.0.rc.5
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+date: 2013-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -318,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Test Driven Infrastructure