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

data/WIKI.md

@@ -1,6 +1,5 @@
-[![Dependency Status](https://gemnasium.com/jovelabs/cucumber-chef.png)](https://gemnasium.com/jovelabs/cucumber-chef)
-
 [![Build Status](https://secure.travis-ci.org/jovelabs/cucumber-chef.png)](http://travis-ci.org/jovelabs/cucumber-chef)
+[![Dependency Status](https://gemnasium.com/jovelabs/cucumber-chef.png)](https://gemnasium.com/jovelabs/cucumber-chef)
 
 I was not particularly happy with the state of the 2.x documents and considering workflow changes, etc it made sense to me to start over with the documentation.  Since most things are the same the 2.x documentation will remain available in the repo as `WIKI.2.x.md`.  This is WIP.
 
@@ -8,6 +7,13 @@ I was not particularly happy with the state of the 2.x documents and considering
 
 Cucumber-chef is a library of tools to enable the emerging discipline of infrastructure as code to practice test driven development.  It provides a testing platform within which Cucumber tests can be run which provision virtual machines, configure them by applying the appropriate Chef roles to them, and then run acceptance and integration tests against the environment.
 
+# Example Chef-Repo
+
+I have prepared a chef-repo which I use to develop off of and made it available to the community to use as a baseline for playing with cucumber-chef and experimenting with cucumber-chef.
+
+* https://github.com/zpatten/cc-chef-repo
+
+
 # Prerequsites/Recommendations
 
 Your Chef-Repo should be setup in a manner as follows:

data/chef_repo/Cheffile

@@ -0,0 +1,4 @@
+site 'http://community.opscode.com/api/v1'
+
+cookbook "chef-server"
+cookbook "chef-client"

data/chef_repo/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "librarian-chef"

data/examples/README.md

@@ -1,7 +1,3 @@
-Examples
-========
+Examples:
 
-This directory contains various examples in the form of early feature tests for some of my cookbooks.  You can find out more about the cookbooks on GitHub:
-
-https://github.com/jovelabs
-https://github.com/zpatten
+* https://github.com/zpatten/cc-chef-repo

data/lib/cucumber/chef/provisioner.rb

@@ -43,16 +43,11 @@ module Cucumber
 ################################################################################
 
       def build
+        upload_chef_repo
         bootstrap
         wait_for_chef_server
 
         download_chef_credentials
-
-        upload_cookbook
-        upload_role
-
-        chef_first_run
-
         download_proxy_ssh_credentials
 
         reboot_test_lab
@@ -61,6 +56,35 @@ module Cucumber
 
 ################################################################################
     private
+################################################################################
+
+      def upload_chef_repo
+        ZTK::Benchmark.bench(:message => "Uploading embedded chef-repo", :mark => "completed in %0.4f seconds.", :ui => @ui) do
+          local_path = File.join(Cucumber::Chef.root_dir, "chef_repo")
+          @ui.logger.debug { "local_path == #{local_path.inspect}" }
+
+          remote_path = File.join("/tmp", "chef-solo")
+          @ui.logger.debug { "remote_path == #{remote_path.inspect}" }
+
+          glob_dir = File.join(local_path, "**")
+          @ui.logger.debug { "glob_dir == #{glob_dir.inspect}" }
+
+          @test_lab.bootstrap_ssh.exec(%(mkdir -p #{remote_path}))
+
+          Dir.glob(glob_dir).each do |file|
+            file = File.basename(file)
+            @ui.logger.debug { "file == #{file.inspect}" }
+
+            local_file = File.join(local_path, file)
+            remote_file = File.join(remote_path, file)
+
+            File.directory?(local_file) and @test_lab.bootstrap_ssh.exec(%(mkdir -p #{remote_file}))
+
+            @test_lab.bootstrap_ssh.upload(local_file, remote_file)
+          end
+        end
+      end
+
 ################################################################################
 
       def bootstrap
@@ -68,13 +92,20 @@ module Cucumber
 
         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" => "role[test_lab]",
+            "run_list" => %w(recipe[chef-server::rubygems-install] recipe[chef-server] recipe[chef-client] 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
+            "lxc_user" => Cucumber::Chef.lxc_user,
+            "chef_server" => {
+              "webui_enabled" => true
+            },
+            "chef_client" => {
+              "interval" => 900,
+              "splay" => 900
+            }
           }
 
           context = {
@@ -108,10 +139,15 @@ module Cucumber
       def download_chef_credentials
         ZTK::Benchmark.bench(:message => "Downloading chef-server credentials", :mark => "completed in %0.4f seconds.", :ui => @ui) do
           local_path = File.dirname(Cucumber::Chef.chef_identity)
+          @ui.logger.debug { "local_path == #{local_path.inspect}" }
+
           remote_path = File.join(Cucumber::Chef.lab_user_home_dir, ".chef")
+          @ui.logger.debug { "remote_path == #{remote_path.inspect}" }
 
           files = [ File.basename(Cucumber::Chef.chef_identity), "validation.pem" ]
           files.each do |file|
+            @ui.logger.debug { "file == #{file.inspect}" }
+
             @test_lab.bootstrap_ssh.download(File.join(remote_path, file), File.join(local_path, file))
           end
         end
@@ -134,36 +170,6 @@ module Cucumber
         end
       end
 
-################################################################################
-
-      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(%(cookbook upload cucumber-chef -o #{@cookbooks_path}), :silence => true)
-        end
-      end
-
-################################################################################
-
-      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(%(role from file #{File.join(@roles_path, "test_lab.rb")}), :silence => true)
-        end
-      end
-
-################################################################################
-
-      def chef_first_run
-        ZTK::Benchmark.bench(:message => "Performing chef-client run", :mark => "completed in %0.4f seconds.", :ui => @ui) do
-          log_level = (ENV['LOG_LEVEL'].downcase rescue (Cucumber::Chef.is_rc? ? "debug" : "info"))
-
-          command = "/usr/bin/chef-client -j /etc/chef/first-boot.json --log_level #{log_level} --once"
-          command = "sudo #{command}"
-          @test_lab.bootstrap_ssh.exec(command, :silence => true)
-        end
-      end
-
 ################################################################################
 
       def wait_for_chef_server

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

@@ -15,26 +15,33 @@ echo "127.0.0.1 <%= @hostname_full %> <%= @hostname_short %>" | tee -a /etc/host
 echo "<%= @hostname_full %>" | tee /etc/hostname
 hostname <%= @hostname_full %>
 
-echo "deb http://apt.opscode.com/ `lsb_release -cs`-0.10 main" | tee /etc/apt/sources.list.d/opscode.list
-mkdir -p /etc/apt/trusted.gpg.d
-gpg --fetch-key http://apt.opscode.com/packages@opscode.com.gpg.key
-gpg --export packages@opscode.com | tee /etc/apt/trusted.gpg.d/opscode-keyring.gpg > /dev/null
-apt-get -q -y --force-yes update
-apt-get -q -y --force-yes -o Dpkg::Options::="--force-confnew" install opscode-keyring
-apt-get -q -y --force-yes update
-chown -R ${SUDO_USER}:${SUDO_USER} ${HOME}/.gnupg
-apt-get -q -y upgrade
-
-cat <<EOF | debconf-set-selections
-chef chef/chef_server_url string http://<%= @hostname_short %>:4000
-chef-solr chef-solr/amqp_password password <%= @amqp_password %>
-chef-server-webui chef-server-webui/admin_password password <%= @admin_password %>
+apt-get -y --force-yes update
+apt-get -y --force-yes install build-essential
+
+wget http://www.opscode.com/chef/install.sh
+bash install.sh -v <%= @chef_version %>
+rpm -Uvh --nodeps /tmp/*rpm
+export PATH=/opt/chef/embedded/bin/:$PATH
+
+mkdir -p /etc/chef/
+mkdir -p /var/log/chef/
+
+cat <<EOF > /etc/chef/solo.rb
+file_cache_path "/tmp/chef-solo/"
+cookbook_path %w(/tmp/chef-solo/cookbooks/ /tmp/chef-solo/site-cookbooks/)
+role_path "/tmp/chef-solo/roles/"
+EOF
+
+cat <<EOF > /etc/chef/bootstrap.json
+<%= @chef_client_attributes.to_json %>
 EOF
 
-CHEF_VERSION=`apt-cache showpkg chef | tee | grep -m 1 "<%= @chef_version %>" | cut -c -<%= @chef_version.length + 3 %>`
-CHEF_SERVER_VERSION=`apt-cache showpkg chef-server | tee | grep -m 1 "<%= @chef_version %>" | cut -c -<%= @chef_version.length + 3 %>`
+cd /tmp/chef-solo/
+gem install bundler --no-ri --no-rdoc
+bundle install --standalone --path vendor/bundle --binstubs
+bin/librarian-chef install
 
-apt-get -q -y --force-yes install chef=$CHEF_VERSION chef-server=$CHEF_SERVER_VERSION
+chef-solo --config /etc/chef/solo.rb --json-attributes /etc/chef/bootstrap.json --logfile /var/log/chef/chef-solo.log --log_level debug
 
 echo -n "Waiting on validation.pem and webui.pem to appear..."
 until [ -f /etc/chef/validation.pem ] && [ -f /etc/chef/webui.pem ]; do
@@ -68,42 +75,6 @@ ${KNIFE_CONFIG_EXP_FILE}
 
 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
-
-if [ ! -f /etc/chef/client.pem ]; then
-  /etc/init.d/chef-client restart
-  echo -n "Waiting on client.pem to appear..."
-  i="0"
-  until [ -f /etc/chef/client.pem ]; do
-    i=$[$i+1]
-    sleep 1
-    echo -n "."
-    if [ $i -gt 60 ]; then
-      echo -n "restart-chef-client"
-      /etc/init.d/chef-client restart
-      i="0"
-    fi
-  done
-  echo "done."
-fi
-
-cat <<EOF > /etc/chef/first-boot.json
-<%= @chef_client_attributes.to_json %>
-EOF
+chown -Rv ${SUDO_USER}:${SUDO_USER} ${HOME}
 
 touch ${CUCUMBER_CHEF_BOOTSTRAP_DONE}

data/lib/cucumber/chef/version.rb

@@ -24,7 +24,7 @@ module Cucumber
 
 ################################################################################
 
-    VERSION = "3.0.0.rc.1" unless const_defined?(:VERSION)
+    VERSION = "3.0.0.rc.2" 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.1
+  version: 3.0.0.rc.2
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-31 00:00:00.000000000 Z
+date: 2013-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -230,27 +230,27 @@ files:
 - bin/cc-console
 - bin/cc-knife
 - bin/cucumber-chef
-- chef_repo/cookbooks/cucumber-chef/LICENSE
-- chef_repo/cookbooks/cucumber-chef/README.md
-- chef_repo/cookbooks/cucumber-chef/attributes/default.rb
-- chef_repo/cookbooks/cucumber-chef/metadata.rb
-- chef_repo/cookbooks/cucumber-chef/recipes/default.rb
-- chef_repo/cookbooks/cucumber-chef/recipes/lxc.rb
-- chef_repo/cookbooks/cucumber-chef/recipes/test_lab.rb
-- chef_repo/cookbooks/cucumber-chef/templates/default/db-168-192.erb
-- chef_repo/cookbooks/cucumber-chef/templates/default/db-test-lab.erb
-- chef_repo/cookbooks/cucumber-chef/templates/default/dhcpd-conf.erb
-- chef_repo/cookbooks/cucumber-chef/templates/default/lxc-initializer-config.erb
-- chef_repo/cookbooks/cucumber-chef/templates/default/lxc-install-chef.erb
-- chef_repo/cookbooks/cucumber-chef/templates/default/motd.erb
-- chef_repo/cookbooks/cucumber-chef/templates/default/named-conf-local.erb
-- chef_repo/cookbooks/cucumber-chef/templates/default/solrconfig.erb
-- chef_repo/cookbooks/cucumber-chef/templates/default/ssh-config.erb
+- chef_repo/Cheffile
+- chef_repo/Gemfile
 - chef_repo/roles/test_lab.rb
+- chef_repo/site-cookbooks/cucumber-chef/LICENSE
+- chef_repo/site-cookbooks/cucumber-chef/README.md
+- chef_repo/site-cookbooks/cucumber-chef/attributes/default.rb
+- chef_repo/site-cookbooks/cucumber-chef/metadata.rb
+- chef_repo/site-cookbooks/cucumber-chef/recipes/default.rb
+- chef_repo/site-cookbooks/cucumber-chef/recipes/lxc.rb
+- chef_repo/site-cookbooks/cucumber-chef/recipes/test_lab.rb
+- chef_repo/site-cookbooks/cucumber-chef/templates/default/db-168-192.erb
+- chef_repo/site-cookbooks/cucumber-chef/templates/default/db-test-lab.erb
+- chef_repo/site-cookbooks/cucumber-chef/templates/default/dhcpd-conf.erb
+- chef_repo/site-cookbooks/cucumber-chef/templates/default/lxc-initializer-config.erb
+- chef_repo/site-cookbooks/cucumber-chef/templates/default/lxc-install-chef.erb
+- chef_repo/site-cookbooks/cucumber-chef/templates/default/motd.erb
+- chef_repo/site-cookbooks/cucumber-chef/templates/default/named-conf-local.erb
+- chef_repo/site-cookbooks/cucumber-chef/templates/default/solrconfig.erb
+- chef_repo/site-cookbooks/cucumber-chef/templates/default/ssh-config.erb
 - cucumber-chef.gemspec
 - examples/README.md
-- examples/users_add.feature
-- examples/users_auto_remove.feature
 - features/installing.feature
 - features/steps/installing_steps.rb
 - features/steps/setup_steps.rb

data/examples/users_add.feature

@@ -1,51 +0,0 @@
-@users
-Feature: Perform test driven infrastructure with Cucumber-Chef
-  In order to learn how to develop test driven infrastructure
-  As an infrastructure developer
-  I want to better understand how to use Cucumber-Chef
-
-  Background:
-    * I have a server called "users"
-    * "users" is running "ubuntu" "lucid"
-    * "users" has been provisioned
-    * the following roles have been updated:
-      | role | role_path |
-      | users | ./support/roles/ |
-    * the "users" role has been added to the "users" run list
-    * the following databags have been updated:
-      | databag | databag_path |
-      | users | ./support/data_bags/users |
-    * the chef-client has been run on "users"
-    * I ssh to "users" with the following credentials:
-      | username | keyfile |
-      | root | ../.ssh/id_rsa |
-
-  Scenario: The user has been added
-    When I run "cat /etc/passwd | grep [b]dobbs"
-      Then I should see "bdobbs" in the output
-      And I should see "/home/bdobbs" in the output
-      And I should see "/bin/bash" in the output
-
-  Scenario: The user's groups have been added
-    When I run "cat /etc/group | grep [b]dobbs"
-      Then I should see "bdobbs" in the output
-      And I should see "sysop" in the output
-      And I should see "dba" in the output
-      And I should see "dev" in the output
-
-  Scenario: The user's ssh keys have been populated
-    When I run "cat /home/bdobbs/.ssh/authorized_keys"
-      Then I should see "ssh-rsa" in the output
-      And I should see "bob@dobbs" in the output
-
-  Scenario: The user's ssh config has been populated
-    When I run "cat /home/bdobbs/.ssh/config"
-      Then I should see "KeepAlive yes" in the output
-      And I should see "ServerAliveInterval 60" in the output
-
-  Scenario: The user can ssh in to the system with their key pair
-    * I ssh to "users" with the following credentials:
-      | username | keyfile |
-      | bdobbs | ./support/keys/bdobbs |
-    When I run "hostname"
-    Then I should see "users" in the output

data/examples/users_auto_remove.feature

@@ -1,50 +0,0 @@
-@users
-Feature: Perform test driven infrastructure with Cucumber-Chef
-  In order to learn how to develop test driven infrastructure
-  As an infrastructure developer
-  I want to better understand how to use Cucumber-Chef
-
-  Background:
-    * I have a server called "users"
-    * "users" is running "ubuntu" "lucid"
-    * "users" has been provisioned
-    * the following roles have been updated:
-      | role | role_path |
-      | users | ./support/roles/ |
-    * the "users" role has been added to the "users" run list
-    * the following databags have been updated:
-      | databag | databag_path |
-      | users | ./support/data_bags/users |
-    * the chef-client has been run on "users"
-    * I ssh to "users" with the following credentials:
-      | username | keyfile |
-      | root | ../.ssh/id_rsa |
-
-  Scenario: The user has been removed
-    * the following databags have been updated:
-      | databag | databag_path |
-      | users | ./support/data_bags/users-auto-remove |
-    * the chef-client has been run on "users"
-    When I run "cat /etc/passwd | grep [b]dobbs"
-      Then I should not see "bdobbs" in the output
-      And I should not see "/home/bdobbs" in the output
-      And I should not see "/bin/bash" in the output
-
-  Scenario: The user's group has been removed
-    * the following databags have been updated:
-      | databag | databag_path |
-      | users | ./support/data_bags/users-auto-remove |
-    * the chef-client has been run on "users"
-    When I run "cat /etc/group | grep [b]dobbs"
-      Then I should not see "bdobbs" in the output
-      And I should not see "sysop" in the output
-      And I should not see "dba" in the output
-      And I should not see "dev" in the output
-
-  Scenario: The user's directory has been preserved on remove
-    * the following databags have been updated:
-      | databag | databag_path |
-      | users | ./support/data_bags/users-auto-remove |
-    * the chef-client has been run on "users"
-    When I run "[[ -e /home/bdobbs ]] && echo OK"
-      Then I should see "OK" in the output