cucumber-chef 3.0.7 → 3.0.8

data/.gitignore

@@ -14,6 +14,5 @@ tmtags
 \#*
 .\#*
 *.swp
-.rvmrc
 *gem
 .idea/

data/.ruby-gemset

@@ -0,0 +1 @@
+cucumber-chef

data/.ruby-version

@@ -0,0 +1 @@
+ruby-1.9.3

data/README.md

@@ -1,5 +1,7 @@
-[![Build Status](https://secure.travis-ci.org/zpatten/cucumber-chef.png)](http://travis-ci.org/zpatten/cucumber-chef)
+[![Gem Version](https://badge.fury.io/rb/cucumber-chef.png)](http://badge.fury.io/rb/cucumber-chef)
 [![Dependency Status](https://gemnasium.com/zpatten/cucumber-chef.png)](https://gemnasium.com/zpatten/cucumber-chef)
+[![Build Status](https://secure.travis-ci.org/zpatten/cucumber-chef.png)](http://travis-ci.org/zpatten/cucumber-chef)
+[![Code Climate](https://codeclimate.com/github/zpatten/cucumber-chef.png)](https://codeclimate.com/github/zpatten/cucumber-chef)
 
 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.
 

data/cucumber-chef.gemspec

@@ -1,7 +1,7 @@
 ################################################################################
 #
-#      Author: Stephen Nelson-Smith <stephen@atalanta-systems.com>
-#      Author: Zachary Patten <zachary@jovelabs.com>
+#      Author: Stephen Nelson-Smith <stephen@atalanta-systemspec.com>
+#      Author: Zachary Patten <zachary@jovelabspec.com>
 #   Copyright: Copyright (c) 2011-2013 Atalanta Systems Ltd
 #     License: Apache License, Version 2.0
 #
@@ -18,44 +18,41 @@
 #   limitations under the License.
 #
 ################################################################################
-
-require File.expand_path("../lib/cucumber/chef/version", __FILE__)
-
-Gem::Specification.new do |s|
-  s.name = "cucumber-chef"
-  s.version = Cucumber::Chef::VERSION
-  s.platform = Gem::Platform::RUBY
-  s.authors = ["Stephen Nelson-Smith", "Zachary Patten"]
-  s.email = ["stephen@atalanta-systems.com", "zachary@jovelabs.com"]
-  s.homepage = "http://www.cucumber-chef.org"
-  s.summary = "Test Driven Infrastructure"
-  s.description = "Framework for test-driven infrastructure development."
-  s.required_ruby_version = ">= 1.8.7"
-  s.required_rubygems_version = ">= 1.3.6"
-  s.licenses = ["Apache 2.0"]
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'cucumber/chef/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "cucumber-chef"
+  spec.version       = Cucumber::Chef::VERSION
+  spec.authors       = ["Stephen Nelson-Smith", "Zachary Patten"]
+  spec.email         = ["stephen@atalanta-systemspec.com", "zachary@jovelabspec.com"]
+  spec.description   = "Framework for test-driven infrastructure development."
+  spec.summary       = "Test Driven Infrastructure"
+  spec.homepage      = "http://www.cucumber-chef.org"
+  spec.license       = "Apache 2.0"
+
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
 
   # Providers
-  s.add_dependency("fog", ">= 1.3.1")
+  spec.add_dependency("fog", ">= 1.3.1")
 
   # TDD
-  s.add_dependency("cucumber", ">= 0")
-  s.add_dependency("rspec", ">= 0")
+  spec.add_dependency("cucumber")
+  spec.add_dependency("rspec")
 
   # Support
-  s.add_dependency("mixlib-config", ">= 1.1.2")
-  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.9")
-
-  s.add_development_dependency("simplecov", ">= 0.6.4")
-  s.add_development_dependency("pry", ">= 0")
-  s.add_development_dependency("yard", ">= 0")
-  s.add_development_dependency("redcarpet", ">= 0")
-
-  s.files        = `git ls-files`.split("\n")
-  s.test_files   = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables  = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-
-  s.require_path = 'lib'
+  spec.add_dependency("mixlib-config", ">= 1.1.2")
+  spec.add_dependency("rake", ">= 0.9.2")
+  spec.add_dependency("thor", ">= 0.15.2")
+  spec.add_dependency("ubuntu_ami", ">= 0.4.0")
+  spec.add_dependency("ztk", ">= 1.0.9")
+
+  spec.add_development_dependency("simplecov")
+  spec.add_development_dependency("pry")
+  spec.add_development_dependency("yard")
+  spec.add_development_dependency("redcarpet")
 end

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

@@ -25,12 +25,15 @@ module Cucumber
       class VagrantError < Error; end
 
       class Vagrant
-        # attr_accessor :env, :vm
 
-        INVALID_STATES = %w(not_created aborted unknown).map(&:to_sym)
-        RUNNING_STATES =  %w(running).map(&:to_sym)
-        SHUTDOWN_STATES = %w(paused saved poweroff).map(&:to_sym)
-        VALID_STATES = RUNNING_STATES+SHUTDOWN_STATES
+        INVALID_STATES      = %w(not_created aborted unknown).map(&:to_sym)
+        RUNNING_STATES      = %w(running).map(&:to_sym)
+        SHUTDOWN_STATES     = %w(paused saved poweroff).map(&:to_sym)
+        VALID_STATES        = (RUNNING_STATES + SHUTDOWN_STATES)
+
+        MSG_NO_RUNNING_LAB  = %(We could not find a running test lab.)
+        MSG_NO_STOPPED_LAB  = %(We could not find a powered off test lab.)
+        MSG_NO_LAB          = %(We could not find a test lab!)
 
 ################################################################################
 
@@ -44,29 +47,27 @@ module Cucumber
 
         def create
           ZTK::Benchmark.bench(:message => "Creating #{Cucumber::Chef::Config.provider.upcase} instance", :mark => "completed in %0.4f seconds.", :stdout => @stdout) do
+            context               = build_create_context
+            vagrantfile_template  = File.join(Cucumber::Chef.root_dir, "lib", "cucumber", "chef", "templates", "cucumber-chef", "Vagrantfile.erb")
+            vagrantfile           = File.join(Cucumber::Chef.chef_repo, "Vagrantfile")
 
-            context = {
-              :ip => Cucumber::Chef.lab_ip,
-              :cpus => Cucumber::Chef::Config.vagrant[:cpus],
-              :memory => Cucumber::Chef::Config.vagrant[:memory]
-            }
-
-            vagrantfile_template = File.join(Cucumber::Chef.root_dir, "lib", "cucumber", "chef", "templates", "cucumber-chef", "Vagrantfile.erb")
-
-            vagrantfile = File.join(Cucumber::Chef.chef_repo, "Vagrantfile")
-
-            !File.exists?(vagrantfile) and IO.write(vagrantfile, ::ZTK::Template.render(vagrantfile_template, context))
+            if !File.exists?(vagrantfile)
+              IO.write(vagrantfile, ::ZTK::Template.render(vagrantfile_template, context))
+            end
 
             self.vagrant_cli("up", id)
             ZTK::TCPSocketCheck.new(:host => self.ip, :port => self.port, :wait => 120).wait
           end
 
           self
+        end
 
-        rescue Exception => e
-          @ui.logger.fatal { e.message }
-          @ui.logger.fatal { e.backtrace.join("\n") }
-          raise VagrantError, e.message
+        def build_create_context
+          {
+            :ip => Cucumber::Chef.lab_ip,
+            :cpus => Cucumber::Chef::Config.vagrant[:cpus],
+            :memory => Cucumber::Chef::Config.vagrant[:memory]
+          }
         end
 
 ################################################################################
@@ -74,16 +75,11 @@ module Cucumber
 ################################################################################
 
         def destroy
-          if exists?
+          if self.exists?
             self.vagrant_cli("destroy", "--force", id)
           else
-            raise VagrantError, "We could not find a test lab!"
+            raise VagrantError, MSG_NO_LAB
           end
-
-        rescue Exception => e
-          @ui.logger.fatal { e.message }
-          @ui.logger.fatal { e.backtrace.join("\n") }
-          raise VagrantError, e.message
         end
 
 ################################################################################
@@ -91,17 +87,12 @@ module Cucumber
 ################################################################################
 
         def up
-          if (exists? && dead?)
+          if self.dead?
             self.vagrant_cli("up", id)
             ZTK::TCPSocketCheck.new(:host => self.ip, :port => self.port, :wait => 120).wait
           else
-            raise VagrantError, "We could not find a powered off test lab."
+            raise VagrantError, MSG_NO_STOPPED_LAB
           end
-
-        rescue Exception => e
-          @ui.logger.fatal { e.message }
-          @ui.logger.fatal { e.backtrace.join("\n") }
-          raise VagrantError, e.message
         end
 
 ################################################################################
@@ -109,16 +100,11 @@ module Cucumber
 ################################################################################
 
         def down
-          if (exists? && alive?)
+          if self.alive?
             self.vagrant_cli("halt", id)
           else
-            raise AWSError, "We could not find a running test lab."
+            raise VagrantError, MSG_NO_RUNNING_LAB
           end
-
-        rescue Exception => e
-          @ui.logger.fatal { e.message }
-          @ui.logger.fatal { e.backtrace.join("\n") }
-          raise VagrantError, e.message
         end
 
 ################################################################################
@@ -126,16 +112,11 @@ module Cucumber
 ################################################################################
 
         def reload
-          if (exists? && alive?)
+          if self.alive?
             self.vagrant_cli("reload", id)
           else
-            raise AWSError, "We could not find a running test lab."
+            raise VagrantError, MSG_NO_RUNNING_LAB
           end
-
-        rescue Exception => e
-          @ui.logger.fatal { e.message }
-          @ui.logger.fatal { e.backtrace.join("\n") }
-          raise VagrantError, e.message
         end
 
 ################################################################################
@@ -145,11 +126,11 @@ module Cucumber
         end
 
         def alive?
-          (RUNNING_STATES.include?(self.state) rescue false)
+          (self.exists? && (RUNNING_STATES.include?(self.state) rescue false))
         end
 
         def dead?
-          (SHUTDOWN_STATES.include?(self.state) rescue true)
+          (self.exists? && (SHUTDOWN_STATES.include?(self.state) rescue true))
         end
 
 ################################################################################

data/lib/cucumber/chef/provisioner.rb

@@ -87,65 +87,9 @@ 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
-          server_name = @test_lab.ip
-
-          chef_solo_attributes = case Cucumber::Chef.chef_pre_11
-          when true then
-            {
-              "chef-server" => {
-                "webui_enabled" => true
-              },
-              "run_list" => %w(recipe[chef-server::rubygems-install] recipe[chef-server::apache-proxy] role[test_lab])
-            }
-          when false then
-            {
-              "chef-server" => {
-                "api_fqdn" => server_name,
-                "nginx" => {
-                  "enable_non_ssl" => true,
-                  "server_name" => server_name,
-                  "url" => "https://#{server_name}"
-                },
-                "lb" => {
-                  "fqdn" => server_name
-                },
-                "bookshelf" => {
-                  "vip" => server_name
-                },
-                "chef_server_webui" => {
-                  "enable" => true
-                },
-                "version" => Cucumber::Chef::Config.chef[:version],
-                "prereleases" => Cucumber::Chef::Config.chef[:prereleases],
-                "nightlies" => Cucumber::Chef::Config.chef[:nightlies]
-              },
-              "run_list" => %w(recipe[chef-server::default] role[test_lab])
-            }
-          end
-
-          chef_solo_attributes.merge!(
-            "cucumber_chef" => {
-              "version" => Cucumber::Chef::VERSION,
-              "prerelease" => Cucumber::Chef::Config.prerelease,
-              "lab_user" => Cucumber::Chef.lab_user,
-              "lxc_user" => Cucumber::Chef.lxc_user
-            }
-          )
-
-          context = {
-            :server_name => server_name,
-            :lab_user => Cucumber::Chef.lab_user,
-            :chef_pre_11 => Cucumber::Chef.chef_pre_11,
-            :chef_solo_attributes => chef_solo_attributes,
-            :chef_version => Cucumber::Chef::Config.chef[:version],
-            :chef_validator => (Cucumber::Chef.chef_pre_11 ? '/etc/chef/validation.pem' : '/etc/chef-server/chef-validator.pem'),
-            :chef_webui => (Cucumber::Chef.chef_pre_11 ? '/etc/chef/webui.pem' : '/etc/chef-server/chef-webui.pem'),
-            :chef_admin => (Cucumber::Chef.chef_pre_11 ? '/etc/chef/admin.pem' : '/etc/chef-server/admin.pem'),
-            :default_password => Cucumber::Chef::Config.chef[:default_password],
-            :user => Cucumber::Chef::Config.user,
-            :hostname_short => Cucumber::Chef.lab_hostname_short,
-            :hostname_full => Cucumber::Chef.lab_hostname_full
-          }
+          server_name           = @test_lab.ip
+          chef_solo_attributes  = build_chef_solo_attributes(server_name)
+          context               = build_context(server_name, chef_solo_attributes)
 
           bootstrap_template = File.join(Cucumber::Chef.root_dir, "lib", "cucumber", "chef", "templates", "bootstrap", "ubuntu-precise-omnibus.erb")
 
@@ -165,6 +109,83 @@ module Cucumber
         end
       end
 
+      def build_chef_solo_10_attributes(server_name)
+        {
+          "chef-server" => {
+            "webui_enabled" => true
+          },
+          "run_list" => %w(recipe[chef-server::rubygems-install] recipe[chef-server::apache-proxy] role[test_lab])
+        }
+      end
+
+      def build_chef_solo_11_attributes(server_name)
+        {
+          "chef-server" => {
+            "api_fqdn" => server_name,
+            "nginx" => {
+              "enable_non_ssl" => true,
+              "server_name" => server_name,
+              "url" => "https://#{server_name}"
+            },
+            "lb" => {
+              "fqdn" => server_name
+            },
+            "bookshelf" => {
+              "vip" => server_name
+            },
+            "chef_server_webui" => {
+              "enable" => true
+            },
+            "version" => Cucumber::Chef::Config.chef[:version],
+            "prereleases" => Cucumber::Chef::Config.chef[:prereleases],
+            "nightlies" => Cucumber::Chef::Config.chef[:nightlies]
+          },
+          "run_list" => %w(recipe[chef-server::default] role[test_lab])
+        }
+      end
+
+      def build_cucumber_chef_attributes(server_name)
+        {
+          "cucumber_chef" => {
+            "version" => Cucumber::Chef::VERSION,
+            "prerelease" => Cucumber::Chef::Config.prerelease,
+            "lab_user" => Cucumber::Chef.lab_user,
+            "lxc_user" => Cucumber::Chef.lxc_user
+          }
+        }
+      end
+
+      def build_chef_solo_attributes(server_name)
+        # TODO: This really should switch on the version number.
+        chef_solo_attributes = case Cucumber::Chef.chef_pre_11
+        when true then
+          build_chef_solo_10_attributes(server_name)
+        when false then
+          build_chef_solo_11_attributes(server_name)
+        end
+
+        chef_solo_attributes.merge!(build_cucumber_chef_attributes(server_name))
+
+        chef_solo_attributes
+      end
+
+      def build_context(server_name, chef_solo_attributes)
+        {
+          :server_name => server_name,
+          :lab_user => Cucumber::Chef.lab_user,
+          :chef_pre_11 => Cucumber::Chef.chef_pre_11,
+          :chef_solo_attributes => chef_solo_attributes,
+          :chef_version => Cucumber::Chef::Config.chef[:version],
+          :chef_validator => (Cucumber::Chef.chef_pre_11 ? '/etc/chef/validation.pem' : '/etc/chef-server/chef-validator.pem'),
+          :chef_webui => (Cucumber::Chef.chef_pre_11 ? '/etc/chef/webui.pem' : '/etc/chef-server/chef-webui.pem'),
+          :chef_admin => (Cucumber::Chef.chef_pre_11 ? '/etc/chef/admin.pem' : '/etc/chef-server/admin.pem'),
+          :default_password => Cucumber::Chef::Config.chef[:default_password],
+          :user => Cucumber::Chef::Config.user,
+          :hostname_short => Cucumber::Chef.lab_hostname_short,
+          :hostname_full => Cucumber::Chef.lab_hostname_full
+        }
+      end
+
 ################################################################################
 
       def download_chef_credentials

data/lib/cucumber/chef/utility.rb

@@ -18,6 +18,13 @@
 #   limitations under the License.
 #
 ################################################################################
+require 'cucumber/chef/utility/bootstrap_helper'
+require 'cucumber/chef/utility/chef_helper'
+require 'cucumber/chef/utility/dir_helper'
+require 'cucumber/chef/utility/file_helper'
+require 'cucumber/chef/utility/lab_helper'
+require 'cucumber/chef/utility/log_helper'
+require 'cucumber/chef/utility/lxc_helper'
 
 module Cucumber
   module Chef
@@ -26,6 +33,14 @@ module Cucumber
 
     module Utility
 
+      include Cucumber::Chef::Utility::BootstrapHelper
+      include Cucumber::Chef::Utility::ChefHelper
+      include Cucumber::Chef::Utility::DirHelper
+      include Cucumber::Chef::Utility::FileHelper
+      include Cucumber::Chef::Utility::LabHelper
+      include Cucumber::Chef::Utility::LogHelper
+      include Cucumber::Chef::Utility::LXCHelper
+
 ################################################################################
 
       def is_rc?
@@ -86,179 +101,31 @@ module Cucumber
 
 ################################################################################
 
-      def chef_pre_11
-        return false if (Cucumber::Chef::Config.chef[:version].downcase == "latest")
-        (Cucumber::Chef::Config.chef[:version].to_f < 11.0)
-      end
-
-################################################################################
-# Path Helpers
-################################################################################
-
-      def chef_repo
-        (Cucumber::Chef.locate_parent(".chef") rescue nil)
-      end
-
-      def in_chef_repo?
-        ((chef_repo && File.exists?(chef_repo) && File.directory?(chef_repo)) ? true : false)
-      end
-
-################################################################################
-
-      def root_dir
-        File.expand_path(File.join(File.dirname(__FILE__), "..", "..", ".."), File.dirname(__FILE__))
+      def provider_config
+        Cucumber::Chef::Config[Cucumber::Chef::Config.provider]
       end
 
-################################################################################
-
-      def home_dir
-        home_dir = (ENV['CUCUMBER_CHEF_HOME'] || File.join(Cucumber::Chef.locate_parent(".chef"), ".cucumber-chef"))
-        FileUtils.mkdir_p(File.dirname(home_dir))
-        home_dir
-      end
-
-################################################################################
-
-      def artifacts_dir
-        artifacts_dir = File.join(Cucumber::Chef.home_dir, Cucumber::Chef::Config.provider.to_s, "artifacts")
-        FileUtils.mkdir_p(File.dirname(artifacts_dir))
-        artifacts_dir
+      def ensure_directory(dir)
+        FileUtils.mkdir_p(File.dirname(dir))
       end
 
-################################################################################
-
-      def log_file
-        log_file = File.join(Cucumber::Chef.home_dir, "cucumber-chef.log")
-        FileUtils.mkdir_p(File.dirname(log_file))
-        log_file
-      end
-
-################################################################################
-
-      def config_rb
-        config_rb = File.join(Cucumber::Chef.home_dir, "config.rb")
-        FileUtils.mkdir_p(File.dirname(config_rb))
-        config_rb
-      end
-
-################################################################################
-
-      def labfile
-        labfile = File.join(Cucumber::Chef.chef_repo, "Labfile")
-        FileUtils.mkdir_p(File.dirname(labfile))
-        labfile
-      end
-
-################################################################################
-
-      # def knife_rb
-      #   knife_rb = File.join(Cucumber::Chef.home_dir, Cucumber::Chef::Config.provider.to_s, "knife.rb")
-      #   FileUtils.mkdir_p(File.dirname(knife_rb))
-      #   knife_rb
-      # end
-
-################################################################################
-
-      def chef_user
-        Cucumber::Chef::Config.user
-      end
-
-      def chef_identity
-        chef_identity = File.join(Cucumber::Chef.home_dir, Cucumber::Chef::Config.provider.to_s, "#{chef_user}.pem")
-        FileUtils.mkdir_p(File.dirname(chef_identity))
-        chef_identity
-      end
-
-################################################################################
-# Bootstraping SSH Helpers
-################################################################################
-
-      def bootstrap_user
-        Cucumber::Chef::Config[Cucumber::Chef::Config.provider][:bootstrap_user]
-      end
-
-      def bootstrap_user_home_dir
-        user = Cucumber::Chef::Config[Cucumber::Chef::Config.provider][:bootstrap_user]
+      def build_home_dir(user)
         ((user == "root") ? "/root" : "/home/#{user}")
       end
 
-      def bootstrap_identity
-        bootstrap_identity = Cucumber::Chef::Config[Cucumber::Chef::Config.provider][:identity_file]
-        File.exists?(bootstrap_identity) && File.chmod(0400, bootstrap_identity)
-        bootstrap_identity
+      def ensure_identity_permissions(identity)
+        (File.exists?(identity) && File.chmod(0400, identity))
       end
 
-################################################################################
-# Test Lab SSH Helpers
-################################################################################
-
-      def lab_user
-        Cucumber::Chef::Config[Cucumber::Chef::Config.provider][:lab_user]
-      end
-
-      def lab_user_home_dir
-        user = Cucumber::Chef::Config[Cucumber::Chef::Config.provider][:lab_user]
-        ((user == "root") ? "/root" : "/home/#{user}")
-      end
-
-      def lab_identity
-        lab_identity = File.join(Cucumber::Chef.home_dir, Cucumber::Chef::Config.provider.to_s, "id_rsa-#{lab_user}")
-        File.exists?(lab_identity) && File.chmod(0400, lab_identity)
-        lab_identity
-      end
-
-      def lab_ip
-        Cucumber::Chef::Config[Cucumber::Chef::Config.provider][:ssh][:lab_ip]
-      end
-
-      def lab_ssh_port
-        Cucumber::Chef::Config[Cucumber::Chef::Config.provider][:ssh][:lab_port]
-      end
-
-      def lab_hostname_short
-        Cucumber::Chef::Config.test_lab[:hostname]
-      end
-
-      def lab_hostname_full
-        "#{lab_hostname_short}.#{Cucumber::Chef::Config.test_lab[:tld]}"
-      end
-
-################################################################################
-# Container SSH Helpers
-################################################################################
-
-      def lxc_user
-        Cucumber::Chef::Config[Cucumber::Chef::Config.provider][:lxc_user]
-      end
-
-      def lxc_user_home_dir
-        user = Cucumber::Chef::Config[Cucumber::Chef::Config.provider][:lxc_user]
-        ((user == "root") ? "/root" : "/home/#{user}")
-      end
-
-      def lxc_identity
-        lxc_identity = File.join(Cucumber::Chef.home_dir, Cucumber::Chef::Config.provider.to_s, "id_rsa-#{lxc_user}")
-        File.exists?(lxc_identity) && File.chmod(0400, lxc_identity)
-        lxc_identity
-      end
-
-################################################################################
-
       def tag(name=nil)
         [ name, "v#{Cucumber::Chef::VERSION}" ].compact.join(" ")
       end
 
-################################################################################
-
       def build_command(name, *args)
         executable = (Cucumber::Chef.locate(:file, "bin", name) rescue "/usr/bin/env #{name}")
         [executable, args].flatten.compact.join(" ")
       end
 
-################################################################################
-# BOOT
-################################################################################
-
       def boot(name=nil)
         if !in_chef_repo?
           message = "It does not look like you are inside a chef-repo!  Please relocate to one and execute your command again!"
@@ -273,51 +140,10 @@ module Cucumber
 
 ################################################################################
 
-      def logger
-        if (!defined?($logger) || $logger.nil?)
-          $logger = ZTK::Logger.new(Cucumber::Chef.log_file)
-          Cucumber::Chef.is_rc? and ($logger.level = ZTK::Logger::DEBUG)
-
-          dependencies = {
-            "cucumber_chef_version" => Cucumber::Chef::VERSION.inspect,
-            "fog_version" => ::Fog::VERSION.inspect,
-            "ruby_version" => RUBY_VERSION.inspect,
-            "ruby_patchlevel" => RUBY_PATCHLEVEL.inspect,
-            "ruby_platform" => RUBY_PLATFORM.inspect,
-            "ztk_version" => ::ZTK::VERSION.inspect
-          }
-          if RUBY_VERSION >= "1.9"
-            dependencies.merge!("ruby_engine" => RUBY_ENGINE.inspect)
-          end
-
-          details = {
-            "program" => $0.to_s.inspect,
-            "uname" => %x(uname -a).chomp.strip.inspect,
-            "chef_repo" => chef_repo.inspect,
-            "log_file" => log_file.inspect,
-            "config_rb" => config_rb.inspect,
-            "labfile" => labfile.inspect
-          }
-
-          max_key_length = [dependencies.keys.collect{ |key| key.to_s.length }.max, details.keys.collect{ |key| key.to_s.length }.max].max + 2
-
-          $logger.info { ("=" * 80) }
-          details.sort.each do |key, value|
-            $logger.info { " %s%s: %s" % [ key.upcase, '.' * (max_key_length - key.length), value.to_s ] }
-          end
-          $logger.info { ("-" * (max_key_length * 2)) }
-          dependencies.sort.each do |key, value|
-            $logger.info { " %s%s: %s" % [ key.upcase, '.' * (max_key_length - key.length), value.to_s ] }
-          end
-          $logger.info { ("-" * (max_key_length * 2)) }
-
-        end
-
-        $logger
-      end
-
     end
 
+################################################################################
+
   end
 end
 

data/lib/cucumber/chef/utility/bootstrap_helper.rb

@@ -0,0 +1,46 @@
+################################################################################
+#
+#      Author: Stephen Nelson-Smith <stephen@atalanta-systems.com>
+#      Author: Zachary Patten <zachary@jovelabs.com>
+#   Copyright: Copyright (c) 2011-2013 Atalanta Systems Ltd
+#     License: Apache License, Version 2.0
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+################################################################################
+
+module Cucumber
+  module Chef
+
+    module Utility
+      module BootstrapHelper
+
+        def bootstrap_user
+          provider_config[:bootstrap_user]
+        end
+
+        def bootstrap_user_home_dir
+          build_home_dir(provider_config[:bootstrap_user])
+        end
+
+        def bootstrap_identity
+          bootstrap_identity = provider_config[:identity_file]
+          ensure_identity_permissions(bootstrap_identity)
+          bootstrap_identity
+        end
+
+      end
+    end
+
+  end
+end

data/lib/cucumber/chef/utility/chef_helper.rb

@@ -0,0 +1,55 @@
+################################################################################
+#
+#      Author: Stephen Nelson-Smith <stephen@atalanta-systems.com>
+#      Author: Zachary Patten <zachary@jovelabs.com>
+#   Copyright: Copyright (c) 2011-2013 Atalanta Systems Ltd
+#     License: Apache License, Version 2.0
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+################################################################################
+
+module Cucumber
+  module Chef
+
+    module Utility
+      module ChefHelper
+
+        def chef_pre_11
+          return false if (Cucumber::Chef::Config.chef[:version].downcase == "latest")
+          (Cucumber::Chef::Config.chef[:version].to_f < 11.0)
+        end
+
+        def chef_repo
+          (Cucumber::Chef.locate_parent(".chef") rescue nil)
+        end
+
+        def in_chef_repo?
+          ((chef_repo && File.exists?(chef_repo) && File.directory?(chef_repo)) ? true : false)
+        end
+
+        def chef_user
+          Cucumber::Chef::Config.user
+        end
+
+        def chef_identity
+          result = File.join(provider_dir, "#{chef_user}.pem")
+          ensure_directory(result)
+          result
+        end
+
+      end
+    end
+
+  end
+end

data/lib/cucumber/chef/utility/dir_helper.rb

@@ -0,0 +1,54 @@
+################################################################################
+#
+#      Author: Stephen Nelson-Smith <stephen@atalanta-systems.com>
+#      Author: Zachary Patten <zachary@jovelabs.com>
+#   Copyright: Copyright (c) 2011-2013 Atalanta Systems Ltd
+#     License: Apache License, Version 2.0
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+################################################################################
+
+module Cucumber
+  module Chef
+
+    module Utility
+      module DirHelper
+
+        def root_dir
+          File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", ".."), File.dirname(__FILE__))
+        end
+
+        def home_dir
+          result = (ENV['CUCUMBER_CHEF_HOME'] || File.join(Cucumber::Chef.locate_parent(".chef"), ".cucumber-chef"))
+          ensure_directory(result)
+          result
+        end
+
+        def provider_dir
+          result = File.join(Cucumber::Chef.home_dir, Cucumber::Chef::Config.provider.to_s)
+          ensure_directory(result)
+          result
+        end
+
+        def artifacts_dir
+          result = File.join(provider_dir, "artifacts")
+          ensure_directory(result)
+          result
+        end
+
+      end
+    end
+
+  end
+end

data/lib/cucumber/chef/utility/file_helper.rb

@@ -0,0 +1,56 @@
+################################################################################
+#
+#      Author: Stephen Nelson-Smith <stephen@atalanta-systems.com>
+#      Author: Zachary Patten <zachary@jovelabs.com>
+#   Copyright: Copyright (c) 2011-2013 Atalanta Systems Ltd
+#     License: Apache License, Version 2.0
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+################################################################################
+
+module Cucumber
+  module Chef
+
+    module Utility
+      module FileHelper
+
+        def log_file
+          result = File.join(Cucumber::Chef.home_dir, "cucumber-chef.log")
+          ensure_directory(result)
+          result
+        end
+
+        def config_rb
+          result = File.join(Cucumber::Chef.home_dir, "config.rb")
+          ensure_directory(result)
+          result
+        end
+
+        def labfile
+          result = File.join(Cucumber::Chef.chef_repo, "Labfile")
+          ensure_directory(result)
+          result
+        end
+
+        # def knife_rb
+        #   knife_rb = File.join(provider_dir, "knife.rb")
+        #   FileUtils.mkdir_p(File.dirname(knife_rb))
+        #   knife_rb
+        # end
+
+      end
+    end
+
+  end
+end

data/lib/cucumber/chef/utility/lab_helper.rb

@@ -0,0 +1,62 @@
+################################################################################
+#
+#      Author: Stephen Nelson-Smith <stephen@atalanta-systems.com>
+#      Author: Zachary Patten <zachary@jovelabs.com>
+#   Copyright: Copyright (c) 2011-2013 Atalanta Systems Ltd
+#     License: Apache License, Version 2.0
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+################################################################################
+
+module Cucumber
+  module Chef
+
+    module Utility
+      module LabHelper
+
+        def lab_user
+          provider_config[:lab_user]
+        end
+
+        def lab_user_home_dir
+          build_home_dir(provider_config[:lab_user])
+        end
+
+        def lab_identity
+          lab_identity = File.join(provider_dir, "id_rsa-#{lab_user}")
+          ensure_identity_permissions(lab_identity)
+          lab_identity
+        end
+
+        def lab_ip
+          provider_config[:ssh][:lab_ip]
+        end
+
+        def lab_ssh_port
+          provider_config[:ssh][:lab_port]
+        end
+
+        def lab_hostname_short
+          Cucumber::Chef::Config.test_lab[:hostname]
+        end
+
+        def lab_hostname_full
+          "#{lab_hostname_short}.#{Cucumber::Chef::Config.test_lab[:tld]}"
+        end
+
+      end
+    end
+
+  end
+end

data/lib/cucumber/chef/utility/log_helper.rb

@@ -0,0 +1,100 @@
+################################################################################
+#
+#      Author: Stephen Nelson-Smith <stephen@atalanta-systems.com>
+#      Author: Zachary Patten <zachary@jovelabs.com>
+#   Copyright: Copyright (c) 2011-2013 Atalanta Systems Ltd
+#     License: Apache License, Version 2.0
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+################################################################################
+
+module Cucumber
+  module Chef
+
+    module Utility
+      module LogHelper
+
+        def log_key_value(key, value, max_key_length)
+          $logger.info { " %s%s: %s" % [ key.upcase, '.' * (max_key_length - key.length), value.to_s ] }
+        end
+
+        def log_page_break(max_key_length, char='-')
+          $logger.info { (char * (max_key_length * 2)) }
+        end
+
+        def log_dependencies
+          dependencies = {
+            "cucumber_chef_version" => Cucumber::Chef::VERSION.inspect,
+            "fog_version" => ::Fog::VERSION.inspect,
+            "ruby_version" => RUBY_VERSION.inspect,
+            "ruby_patchlevel" => RUBY_PATCHLEVEL.inspect,
+            "ruby_platform" => RUBY_PLATFORM.inspect,
+            "ztk_version" => ::ZTK::VERSION.inspect
+          }
+
+          if RUBY_VERSION >= "1.9"
+            dependencies.merge!("ruby_engine" => RUBY_ENGINE.inspect)
+          end
+
+          dependencies
+        end
+
+        def log_details
+          {
+            "program" => $0.to_s.inspect,
+            "uname" => %x(uname -a).chomp.strip.inspect,
+            "chef_repo" => chef_repo.inspect,
+            "log_file" => log_file.inspect,
+            "config_rb" => config_rb.inspect,
+            "labfile" => labfile.inspect
+          }
+        end
+
+        def logger
+          if (!defined?($logger) || $logger.nil?)
+            $logger = ZTK::Logger.new(Cucumber::Chef.log_file)
+
+            if Cucumber::Chef.is_rc?
+              $logger.level = ZTK::Logger::DEBUG
+            end
+
+            dependencies    = log_dependencies
+            details         = log_details
+
+            max_key_length  = [dependencies.keys.map(&:length).max, details.keys.map(&:length).max].max + 2
+
+            log_page_break(max_key_length, '=')
+
+            details.sort.each do |key, value|
+              log_key_value(key, value, max_key_length)
+            end
+
+            log_page_break(max_key_length)
+
+            dependencies.sort.each do |key, value|
+              log_key_value(key, value, max_key_length)
+            end
+
+            log_page_break(max_key_length)
+
+          end
+
+          $logger
+        end
+
+      end
+    end
+
+  end
+end

data/lib/cucumber/chef/utility/lxc_helper.rb

@@ -0,0 +1,62 @@
+################################################################################
+#
+#      Author: Stephen Nelson-Smith <stephen@atalanta-systems.com>
+#      Author: Zachary Patten <zachary@jovelabs.com>
+#   Copyright: Copyright (c) 2011-2013 Atalanta Systems Ltd
+#     License: Apache License, Version 2.0
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+################################################################################
+
+module Cucumber
+  module Chef
+
+    module Utility
+      module LXCHelper
+
+        def lxc_user
+          provider_config[:lxc_user]
+        end
+
+        def lxc_user_home_dir
+          build_home_dir(provider_config[:lxc_user])
+        end
+
+        def lxc_identity
+          lxc_identity = File.join(provider_dir, "id_rsa-#{lxc_user}")
+          ensure_identity_permissions(lxc_identity)
+          lxc_identity
+        end
+
+        def lxc_ip
+          provider_config[:ssh][:lxc_ip]
+        end
+
+        def lxc_ssh_port
+          provider_config[:ssh][:lxc_port]
+        end
+
+        def lxc_hostname_short
+          Cucumber::Chef::Config.test_lxc[:hostname]
+        end
+
+        def lxc_hostname_full
+          "#{lxc_hostname_short}.#{Cucumber::Chef::Config.test_lxc[:tld]}"
+        end
+
+      end
+    end
+
+  end
+end

data/lib/cucumber/chef/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: cucumber-chef
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.0.7
+  version: 3.0.8
 platform: ruby
 authors: 
 - Stephen Nelson-Smith
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-13 00:00:00 Z
+date: 2013-04-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fog
@@ -108,7 +108,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.4
+        version: "0"
   type: :development
   prerelease: false
   version_requirements: *id009
@@ -147,8 +147,8 @@ dependencies:
   version_requirements: *id012
 description: Framework for test-driven infrastructure development.
 email: 
-- stephen@atalanta-systems.com
-- zachary@jovelabs.com
+- stephen@atalanta-systemspec.com
+- zachary@jovelabspec.com
 executables: 
 - cc-console
 - cc-knife
@@ -160,7 +160,8 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - .rspec
-- .rvmrc.template
+- .ruby-gemset
+- .ruby-version
 - .travis.yml
 - Gemfile
 - LICENSE
@@ -235,6 +236,13 @@ files:
 - lib/cucumber/chef/templates/cucumber/readme.erb
 - lib/cucumber/chef/test_lab.rb
 - lib/cucumber/chef/utility.rb
+- lib/cucumber/chef/utility/bootstrap_helper.rb
+- lib/cucumber/chef/utility/chef_helper.rb
+- lib/cucumber/chef/utility/dir_helper.rb
+- lib/cucumber/chef/utility/file_helper.rb
+- lib/cucumber/chef/utility/lab_helper.rb
+- lib/cucumber/chef/utility/log_helper.rb
+- lib/cucumber/chef/utility/lxc_helper.rb
 - lib/cucumber/chef/version.rb
 - spec/cucumber/chef/config_spec.rb
 - spec/cucumber/chef/provisioner_spec.rb
@@ -253,13 +261,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.8.7
+      hash: -4003573981982952912
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.6
+      hash: -4003573981982952912
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 

data/.rvmrc.template

@@ -1,2 +0,0 @@
-rvm use ruby-1.9.3@cucumber-chef --create
-export USE_BUNDLER=force