cucumber-chef 3.0.3 → 3.0.4

data/WIKI.md

@@ -1,5 +1,5 @@
-[![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)
+[![Build Status](https://secure.travis-ci.org/zpatten/cucumber-chef.png)](http://travis-ci.org/zpatten/cucumber-chef)
+[![Dependency Status](https://gemnasium.com/zpatten/cucumber-chef.png)](https://gemnasium.com/zpatten/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.
 
@@ -20,10 +20,15 @@ Your Chef-Repo should be setup in a manner as follows:
 
 * Use something like RVM for your ruby with your chef-repo
 * Use something like bundler for your rubygems with your chef-repo
-* Use something like berkshelf for your chef cookbooks with your chef-repo
+* Use something like librarian-chef or berkshelf for your chef cookbooks with your chef-repo
 
 If you do not use these patterns you will have an unplesant time in general.
 
+You also need the latest versions of:
+
+* VirtualBox (https://www.virtualbox.org/)
+* Vagrant (http://www.vagrantup.com/)
+
 When using Cucumber-Chef, especially at first, I highly recommend you tail the log.  Open another terminal, naviagate to your Chef-Repo root directory and run `tail -f .cucumber-chef/cucumber-chef.log`.  You'll have a much better idea what's going on in the background this way, especially during bootstrapping and provisioning.  And root causes of issues that are not so obvious on the console will hopefully be very obvious in the log.
 
 # Workflow
@@ -33,6 +38,26 @@ When using Cucumber-Chef, especially at first, I highly recommend you tail the l
 3. `cucumber-chef` runs the chef-client across the ecosystem using attributes from the `Labfile` (optionally executed)
 4. `cucumber`/`rspec` resumes execution
 
+# First-Time Execution
+
+1. Ensure you have the latest vagrant and virtualbox installed.
+2. `cucumber-chef init` to initalize a disabled config template.
+3. `cucumber-chef create test` to create a blank test feature.
+4. `cucumber-chef setup` is executed to ensure your test lab is provisioned.
+5. `cucumber` to execute features located in your `chef-repo`.
+
+# Other Execution Examples
+
+For example when I am testing, I often use this command sequence (I use binstubs, so everything will be prefixed with bin/):
+
+    echo "yes" | bin/cucumber-chef destroy && bin/cucumber-chef setup && bin/cucumber
+
+This will destroy the current test lab (if one exists), setup a new test (since we destroyed any existing labs), then execute the cucumber features.
+
+To force destruction of the containers when running cucumber place `PURGE=1` before your cucumber command like so:
+
+    PURGE=1 bin/cucumber
+
 # Configuration
 
 Cucumber-Chef creates a home directory for itself named `.cucumber-chef` off the root of your Chef-Repo.  Here you can find the configuration files as well as logs and artifacts from test runs.  There are two main configuration files for Cucumber-Chef.  The `Labfile` in the Chef-Repo directory and `config.rb` in the Cucumber-Chef home directory.
@@ -41,6 +66,8 @@ Cucumber-Chef creates a home directory for itself named `.cucumber-chef` off the
 
 When doing integration testing it makes sense that one generally wants to test across an entire ecosystem of servers.  You typically acquire a set of virtual or bare metal servers, provision those servers acordingly, put them into play then rinse and repeat.  I introduce the `Labfile`, the concept is simple if you haven't already guessed it.  You define a set of servers, i.e. an ecosystem, also dictating the settings and configuration.  Part of this change is because a) it makes alot of sense to me and b) it greatly decreases runtimes.  Also in cucumber-chef 2.x, we had insane background sections which bothered me tremendously and this change cleans up all of that mess as well.  The ultimate goal is to support configuration of multiple ecosystems, but we've got other ground to cover first so that feature will have to wait for a bit.  The `Labfile` should reside in the root of your Chef-Repo.
 
+https://github.com/zpatten/cc-chef-repo/blob/master/Labfile
+
 Here is a sample of what a `Labfile` might look like:
 
     #!/usr/bin/env ruby
@@ -108,6 +135,122 @@ Here is a sample of what a `Labfile` might look like:
 
 ## `config.rb`
 
+https://github.com/zpatten/cc-chef-repo/blob/master/.cucumber-chef/config.rb
+
+You can customize your configuration by editing your `<chef-repo>/.cucumber-chef/config.rb` file.  Here's an example of the current one I'm using for testing:
+
+    provider        :vagrant
+
+    vagrant.merge!( :identity_file => "#{ENV['HOME']}/.vagrant.d/insecure_private_key",
+                    :ssh => {
+                        :lab_ip => "192.168.33.10",
+                        :lab_port => 22,
+                        :lxc_port => 22
+                    },
+                    :cpus => 4,
+                    :memory => 4096 )
+
+    aws.merge!(     :identity_file => ENV['AWS_IDENTITY'],
+                    :ssh => {
+                        :lab_port => 22,
+                        :lxc_port => 22
+                    },
+                    :aws_access_key_id => ENV['AWS_ACCESS_KEY_ID'],
+                    :aws_secret_access_key => ENV['AWS_SECRET_ACCESS_KEY'],
+                    :aws_ssh_key_id => ENV['AWS_SSH_KEY_ID'],
+                    :region => "us-west-2",
+                    :availability_zone => "us-west-2a",
+                    :aws_instance_arch => "i386",
+                    :aws_instance_type => "c1.medium" )
+
+    artifacts       ({ "chef-client-log" => "/var/log/chef/client.log",
+                       "chef-client-stacktrace" => "/var/chef/cache/chef-stacktrace.out" })
+
+    chef.merge!(    :version => "10.24.0",
+                    :container_version => "10.18.2",
+                    :cookbook_paths => %w(cookbooks site-cookbooks))
+
+    # chef.merge!(    :version => "10.24.0")
+    # chef.merge!(    :version => "11.4.0")
+    # chef.merge!(    :version => "latest")
+
+If you want to see how your cucumber-chef installation is configured run `cucumber-chef displayconfig`:
+
+    $ cucumber-chef displayconfig
+    cucumber-chef v3.0.3
+    --------------------------------------------------------------------------------
+    ---
+    :mode: :user
+    :prerelease: false
+    :user: zpatten
+    :artifacts:
+      chef-client-log: /var/log/chef/client.log
+      chef-client-stacktrace: /var/chef/cache/chef-stacktrace.out
+    :chef:
+      :version: 10.24.0
+      :container_version: 10.18.2
+      :default_password: p@ssw0rd1
+      :render_client_rb: true
+      :cookbook_paths:
+      - cookbooks
+      - site-cookbooks
+    :test_lab:
+      :hostname: cucumber-chef
+      :tld: test-lab
+    :command_timeout: 1800
+    :provider: :vagrant
+    :aws:
+      :bootstrap_user: ubuntu
+      :lab_user: cucumber-chef
+      :lxc_user: root
+      :ssh:
+        :lab_port: 22
+        :lxc_port: 22
+      :ubuntu_release: precise
+      :aws_instance_arch: i386
+      :aws_instance_disk_store: ebs
+      :aws_instance_type: c1.medium
+      :aws_security_group: cucumber-chef
+      :identity_file:
+      :aws_access_key_id:
+      :aws_secret_access_key:
+      :aws_ssh_key_id:
+      :region: us-west-2
+      :availability_zone: us-west-2a
+    :vagrant:
+      :bootstrap_user: vagrant
+      :lab_user: cucumber-chef
+      :lxc_user: root
+      :ssh:
+        :lab_ip: 192.168.33.10
+        :lab_port: 22
+        :lxc_port: 22
+      :cpus: 4
+      :memory: 4096
+      :identity_file: /home/zpatten/.vagrant.d/insecure_private_key
+
+    --------------------------------------------------------------------------------
+                   root_dir = "/home/zpatten/code/cc-chef-repo/vendor/checkouts/cucumber-chef"
+                   home_dir = "/home/zpatten/code/cc-chef-repo/.cucumber-chef"
+                   log_file = "/home/zpatten/code/cc-chef-repo/.cucumber-chef/cucumber-chef.log"
+              artifacts_dir = "/home/zpatten/code/cc-chef-repo/.cucumber-chef/vagrant/artifacts"
+                  config_rb = "/home/zpatten/code/cc-chef-repo/.cucumber-chef/config.rb"
+                    labfile = "/home/zpatten/code/cc-chef-repo/Labfile"
+                  chef_repo = "/home/zpatten/code/cc-chef-repo"
+                  chef_user = "zpatten"
+              chef_identity = "/home/zpatten/code/cc-chef-repo/.cucumber-chef/vagrant/zpatten.pem"
+             bootstrap_user = "vagrant"
+    bootstrap_user_home_dir = "/home/vagrant"
+         bootstrap_identity = "/home/zpatten/.vagrant.d/insecure_private_key"
+                   lab_user = "cucumber-chef"
+          lab_user_home_dir = "/home/cucumber-chef"
+               lab_identity = "/home/zpatten/code/cc-chef-repo/.cucumber-chef/vagrant/id_rsa-cucumber-chef"
+                   lxc_user = "root"
+          lxc_user_home_dir = "/root"
+               lxc_identity = "/home/zpatten/code/cc-chef-repo/.cucumber-chef/vagrant/id_rsa-root"
+                chef_pre_11 = true
+    --------------------------------------------------------------------------------
+
 # Cucumber-Chef Tasks
 
 All tasks should function in a similar manner across all providers.

data/lib/cucumber/chef/config.rb

@@ -175,11 +175,15 @@ module Cucumber
       artifacts         ({"chef-client-log" => "/var/log/chef/client.log",
                           "chef-client-stacktrace" => "/var/chef/cache/chef-stacktrace.out"})
 
-      chef              ({:version => "latest",
+      chef              ({
+                          :version => "latest",
                           :container_version => "latest",
                           :default_password => "p@ssw0rd1",
                           :render_client_rb => true,
-                          :cookbook_paths => %w(cookbooks)})
+                          :cookbook_paths => %w(cookbooks),
+                          :prereleases => false,
+                          :nightlies => false
+                        })
 
       test_lab          ({:hostname => "cucumber-chef",
                           :tld => "test-lab"})

data/lib/cucumber/chef/provisioner.rb

@@ -87,6 +87,7 @@ 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
@@ -99,14 +100,24 @@ module Cucumber
           when false then
             {
               "chef-server" => {
+                "api_fqdn" => server_name,
                 "nginx" => {
                   "enable_non_ssl" => true,
-                  "server_name" => "localhost",
-                  "url" => "http://localhost"
+                  "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])
             }
@@ -122,6 +133,7 @@ module Cucumber
           )
 
           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,

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

@@ -63,6 +63,23 @@ bin/berks install --path ${CHEF_SOLO_ROOT}/cookbooks/
 <% end -%>
 
 chef-solo --config /etc/chef/solo.rb --json-attributes ${CHEF_SOLO_ROOT}/attributes.json --logfile /var/log/chef/chef-solo.log --log_level debug
+<% if (@chef_pre_11 == false) -%>
+
+cat << EOF | tee /etc/chef-server/chef-server.rb
+#
+# Auto-generated by Cucumber-Chef v#{Cucumber::Chef::VERSION} -- DO NOT EDIT!
+#
+server_name = "<%= @server_name %>"
+#
+topology                "standalone"
+api_fqdn                server_name
+nginx['url']          = "https://#{server_name}"
+nginx['server_name']  = server_name
+lb['fqdn']            = server_name
+bookshelf['vip']      = server_name
+EOF
+sudo chef-server-ctl reconfigure
+<% end -%>
 
 echo -n "Waiting on <%= File.basename(@chef_validator) %> and <%= File.basename(@chef_webui) %> to appear..."
 until [ -f <%= @chef_validator %> ] && [ -f <%= @chef_webui %> ]; do
@@ -72,8 +89,8 @@ done
 echo "done."
 
 cp -v <%= @chef_validator %> <%= @chef_webui %> ~/.chef
-
 <% if (@chef_pre_11 == false) -%>
+
 ln -sv <%= @chef_validator %> /etc/chef/validation.pem
 ln -sv <%= @chef_admin %> /etc/chef/admin.pem
 <% end -%>

data/lib/cucumber/chef/version.rb

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

metadata

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