cucumber-chef 2.1.0.rc.15 → 3.0.0.rc.0

data/lib/cucumber/chef/ecosystem.rb

@@ -0,0 +1,37 @@
+################################################################################
+#
+#      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
+
+    class EcosystemError < Error; end
+
+    class Ecosystem < ZTK::DSL::Base
+      belongs_to :labfile, :class_name => "Cucumber::Chef:Labfile"
+      has_many :containers, :class_name => "Cucumber::Chef::Container"
+
+      attribute :name
+    end
+
+  end
+end
+
+################################################################################

data/lib/cucumber/chef/labfile.rb

@@ -0,0 +1,34 @@
+################################################################################
+#
+#      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
+
+    class LabfileError < Error; end
+
+    class Labfile < ZTK::DSL::Base
+      has_many :ecosystems, :class_name => "Cucumber::Chef::Ecosystem"
+    end
+
+  end
+end
+
+################################################################################

data/lib/cucumber/chef/provisioner.rb

@@ -47,12 +47,9 @@ module Cucumber
         wait_for_chef_server
 
         download_chef_credentials
-        render_knife_rb
 
         upload_cookbook
         upload_role
-        tag_node
-        add_node_role
 
         chef_first_run
 
@@ -110,10 +107,10 @@ 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.join(Cucumber::Chef.home_dir, Cucumber::Chef::Config.provider.to_s)
+          local_path = File.dirname(Cucumber::Chef.chef_identity)
           remote_path = File.join(Cucumber::Chef.lab_user_home_dir, ".chef")
 
-          files = [ "#{Cucumber::Chef::Config[:user]}.pem", "validation.pem" ]
+          files = [ File.basename(Cucumber::Chef.chef_identity), "validation.pem" ]
           files.each do |file|
             @test_lab.bootstrap_ssh.download(File.join(remote_path, file), File.join(local_path, file))
           end
@@ -137,24 +134,6 @@ module Cucumber
         end
       end
 
-################################################################################
-
-      def render_knife_rb
-        ZTK::Benchmark.bench(:message => "Building 'cc-knife' configuration", :mark => "completed in %0.4f seconds.", :ui => @ui) do
-          template_file = File.join(Cucumber::Chef.root_dir, "lib", "cucumber", "chef", "templates", "cucumber-chef", "knife-rb.erb")
-
-          context = {
-            :chef_server => @test_lab.ip,
-            :librarian_chef => Cucumber::Chef::Config.librarian_chef,
-            :user => Cucumber::Chef::Config.user
-          }
-
-          File.open(Cucumber::Chef.knife_rb, 'w') do |f|
-            f.puts(ZTK::Template.render(template_file, context))
-          end
-        end
-      end
-
 ################################################################################
 
       def upload_cookbook
@@ -173,29 +152,13 @@ module Cucumber
         end
       end
 
-################################################################################
-
-      def tag_node
-        @ui.logger.debug { "Tagging cucumber-chef test lab node..." }
-        ZTK::Benchmark.bench(:message => "Tagging 'cucumber-chef' node", :mark => "completed in %0.4f seconds.", :ui => @ui) do
-          @test_lab.knife_cli(%Q{tag create #{Cucumber::Chef.lab_hostname_full} #{Cucumber::Chef::Config.mode}}, :silence => true)
-        end
-      end
-
-################################################################################
-
-      def add_node_role
-        @ui.logger.debug { "Setting up cucumber-chef test lab run list..." }
-        ZTK::Benchmark.bench(:message => "Setting 'cucumber-chef' run list", :mark => "completed in %0.4f seconds.", :ui => @ui) do
-          @test_lab.knife_cli(%Q{node run_list add #{Cucumber::Chef.lab_hostname_full} "role[test_lab]"}, :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
-          command = "/usr/bin/chef-client -j /etc/chef/first-boot.json -l debug"
+          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

data/lib/cucumber/chef/steps.rb

@@ -21,7 +21,6 @@
 
 require 'cucumber/chef/steps/chef_steps'
 require 'cucumber/chef/steps/minitest_steps'
-require 'cucumber/chef/steps/provision_steps'
 require 'cucumber/chef/steps/ssh_steps'
 
 ################################################################################

data/lib/cucumber/chef/steps/ssh_steps.rb

@@ -75,9 +75,9 @@ end
 
 Then /^I should( not)? see the "([^\"]*)" of "([^\"]*)" in the output$/ do |boolean, key, name|
   if (!boolean)
-    @output.should =~ /#{$test_lab.containers.to_a[name][key.downcase.to_sym]}/i
+    @output.should =~ /#{Cucumber::Chef::Containers.all.select{|c| c.name == name}.first.send(key.downcase.to_sym)}/i
   else
-    @output.should_not =~ /#{$test_lab.containers.to_a[name][key.downcase.to_sym]}/i
+    @output.should_not =~ /#{Cucumber::Chef::Containers.all.select{|c| c.name == name}.first.send(key.downcase.to_sym)}/i
   end
 end
 

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

@@ -31,7 +31,10 @@ chef-solr chef-solr/amqp_password password <%= @amqp_password %>
 chef-server-webui chef-server-webui/admin_password password <%= @admin_password %>
 EOF
 
-apt-get -q -y --force-yes install chef chef-server
+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 %>`
+
+apt-get -q -y --force-yes install chef=$CHEF_VERSION chef-server=$CHEF_SERVER_VERSION
 
 echo -n "Waiting on validation.pem and webui.pem to appear..."
 until [ -f /etc/chef/validation.pem ] && [ -f /etc/chef/webui.pem ]; do

data/lib/cucumber/chef/templates/cucumber-chef/cucumber-yml.erb

@@ -1,2 +1,2 @@
 ---
-default: -c -v
+default: --color --verbose --backtrace --exclude support/cookbooks --exclude support/data_bags --exclude support/environments --exclude support/keys --exclude support/roles --format pretty

data/lib/cucumber/chef/templates/cucumber/cc-hooks.rb

@@ -19,7 +19,7 @@
 ################################################################################
 
 tag = Cucumber::Chef.tag("cucumber-chef")
-puts("  * #{tag}")
+puts(">>> #{tag}")
 Cucumber::Chef.boot(tag)
 
 $ui = ZTK::UI.new(:logger => Cucumber::Chef.logger)
@@ -31,40 +31,53 @@ end
 
 if ENV['PURGE'] == 'YES'
   $ui.logger.warn { "PURGING CONTAINERS!  Container attributes will be reset!" }
-  $test_lab.containers.load
-
-  $test_lab.containers.to_a.each do |name, value|
-    $test_lab.containers.destroy(name)
+  $test_lab.containers.list.each do |name|
+    ZTK::Benchmark.bench(:message => ">>> Destroying container '#{name}'", :mark => "completed in %0.4f seconds.") do
+      $test_lab.containers.destroy(name)
+    end
   end
-
-  File.exists?(Cucumber::Chef.containers_bin) && File.delete(Cucumber::Chef.containers_bin)
-  $test_lab.containers.load
 else
   $ui.logger.info { "Allowing existing containers to persist." }
 end
 
-if ENV['PUSH'] == 'YES'
+$test_lab.containers.chef_set_client_config(:chef_server_url => "http://192.168.255.254:4000",
+                                            :validation_client_name => "chef-validator")
+
+if ENV['SETUP'] == 'YES'
   # Upload all of the chef-repo environments
-  puts("  * Pushing chef-repo environments to test lab...")
-  $test_lab.knife_cli(%Q{environment from file ./environments/*.rb --yes}, :silence => true)
+  ZTK::Benchmark.bench(:message => ">>> Pushing chef-repo environments to the test lab", :mark => "completed in %0.4f seconds.") do
+    $test_lab.knife_cli(%Q{environment from file ./environments/*.rb}, :silence => true)
+  end
 
   # Upload all of the chef-repo cookbooks
-  puts("  * Pushing chef-repo cookbooks to test lab...")
-  cookbook_paths = ["./cookbooks"]
-  cookbook_paths << "./site-cookbooks" if Cucumber::Chef::Config.librarian_chef
-  $test_lab.knife_cli(%Q{cookbook upload --all --cookbook-path #{cookbook_paths.join(':')} --force --yes}, :silence => true)
+  ZTK::Benchmark.bench(:message => ">>> Pushing chef-repo cookbooks to the test lab", :mark => "completed in %0.4f seconds.") do
+    cookbook_paths = ["./cookbooks"]
+    cookbook_paths << "./site-cookbooks" if Cucumber::Chef::Config.librarian_chef
+    $test_lab.knife_cli(%Q{cookbook upload --all --cookbook-path #{cookbook_paths.join(':')} --force}, :silence => true)
+  end
 
   # Upload all of the chef-repo roles
-  puts("  * Pushing chef-repo roles to test lab...")
-  $test_lab.knife_cli(%Q{role from file ./roles/*.rb --yes}, :silence => true)
+  ZTK::Benchmark.bench(:message => ">>> Pushing chef-repo roles to the test lab", :mark => "completed in %0.4f seconds.") do
+    $test_lab.knife_cli(%Q{role from file ./roles/*.rb}, :silence => true)
+  end
 
   # Upload all of our chef-repo data bags
   Dir.glob("./data_bags/*").each do |data_bag_path|
     next if !File.directory?(data_bag_path)
-    puts("  * Pushing chef-repo data bag '#{File.basename(data_bag_path)}' to test lab...")
-    data_bag = File.basename(data_bag_path)
-    $test_lab.knife_cli(%Q{data bag create "#{data_bag}" --yes}, :silence => true)
-    $test_lab.knife_cli(%Q{data bag from file "#{data_bag}" "#{data_bag_path}" --yes}, :silence => true)
+    ZTK::Benchmark.bench(:message => ">>> Pushing chef-repo data bag '#{File.basename(data_bag_path)}' to the test lab", :mark => "completed in %0.4f seconds.") do
+      data_bag = File.basename(data_bag_path)
+      $test_lab.knife_cli(%Q{data bag create "#{data_bag}"}, :silence => true)
+      $test_lab.knife_cli(%Q{data bag from file "#{data_bag}" "#{data_bag_path}"}, :silence => true)
+    end
+  end
+
+  Cucumber::Chef::Container.all.each do |container|
+    ZTK::Benchmark.bench(:message => ">>> Creating container '#{container.name}'", :mark => "completed in %0.4f seconds.") do
+      $test_lab.containers.create(container)
+    end
+    ZTK::Benchmark.bench(:message => ">>> Provisioning container '#{container.name}'", :mark => "completed in %0.4f seconds.") do
+      $test_lab.containers.chef_run_client(container)
+    end
   end
 end
 
@@ -74,21 +87,9 @@ end
 ################################################################################
 
 Before do |scenario|
-  $scenario = scenario
-
-  $test_lab.containers.load
-
-  $test_lab.containers.chef_set_client_config(:chef_server_url => "http://192.168.255.254:4000",
-                                              :validation_client_name => "chef-validator")
 end
 
 After do |scenario|
-  $test_lab.containers.save
-
-  $test_lab.containers.to_a.select{ |name, attributes| !attributes[:persist] }.each do |name, attributes|
-    server_destroy(name)
-  end
-
   @connection and @connection.ssh.shutdown!
 end
 

data/lib/cucumber/chef/test_lab.rb

@@ -91,8 +91,11 @@ module Cucumber
 
         arguments = Array.new
         arguments << "--user #{Cucumber::Chef::Config.user}"
+        arguments << "--key #{Cucumber::Chef.chef_identity}"
         arguments << "--server-url #{self.chef_server_api}"
-        arguments << "--config #{Cucumber::Chef.knife_rb}" if File.exists?(Cucumber::Chef.knife_rb)
+        arguments << "--disable-editing"
+        arguments << "--yes"
+        arguments << "-VV" if Cucumber::Chef.is_rc?
 
         command = Cucumber::Chef.build_command("knife", args, arguments)
         ZTK::Command.new.exec(command, options)

data/lib/cucumber/chef/utility.rb

@@ -136,18 +136,30 @@ module Cucumber
 
 ################################################################################
 
-      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
+      def labfile
+        labfile = File.join(Cucumber::Chef.chef_repo, "Labfile")
+        FileUtils.mkdir_p(File.dirname(labfile))
+        labfile
       end
 
 ################################################################################
 
-      def containers_bin
-        containers_bin = File.join(Cucumber::Chef.home_dir, "containers.bin")
-        FileUtils.mkdir_p(File.dirname(containers_bin))
-        containers_bin
+      # 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
 
 ################################################################################
@@ -236,26 +248,7 @@ module Cucumber
         name and logger.info { "loading #{name}" }
         logger.info { "boot(#{Cucumber::Chef.config_rb})" }
         Cucumber::Chef::Config.load
-        load_chef_config
-      end
-
-################################################################################
-# Load Chef::Config
-################################################################################
-
-      def load_chef_config
-        if File.exists?(Cucumber::Chef.knife_rb)
-          logger.info { "load_chef_config(#{Cucumber::Chef.knife_rb})" }
-          ::Chef::Config.from_file(Cucumber::Chef.knife_rb)
-
-          if (test_lab = (Cucumber::Chef::TestLab.new rescue nil)) && test_lab.alive?
-            chef_server_url = "http://#{test_lab.ip}:4000"
-            logger.info { "chef_server_url(#{chef_server_url})" }
-            ::Chef::Config[:chef_server_url] = chef_server_url
-          end
-        else
-          logger.warn { "knife config '#{Cucumber::Chef.knife_rb}' was missing!" }
-        end
+        Cucumber::Chef::Labfile.load(Cucumber::Chef.labfile)
       end
 
 ################################################################################
@@ -267,13 +260,11 @@ module Cucumber
 
           dependencies = {
             "cucumber_chef_version" => Cucumber::Chef::VERSION.inspect,
-            "chef_version" => ::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
-            # "cucumber_version" => ::Cucumber::VERSION.inspect
           }
           if RUBY_VERSION >= "1.9"
             dependencies.merge!("ruby_engine" => RUBY_ENGINE.inspect)
@@ -285,8 +276,7 @@ module Cucumber
             "chef_repo" => chef_repo.inspect,
             "log_file" => log_file.inspect,
             "config_rb" => config_rb.inspect,
-            "knife_rb" => knife_rb.inspect,
-            "containers_bin" => containers_bin.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

data/lib/cucumber/chef/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-chef
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc.15
+  version: 3.0.0.rc.0
   prerelease: 6
 platform: ruby
 authors:
@@ -10,24 +10,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-11 00:00:00.000000000 Z
+date: 2013-02-13 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: chef
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
@@ -147,7 +131,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -155,7 +139,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -280,9 +264,12 @@ files:
 - lib/cucumber/chef.rb
 - lib/cucumber/chef/client.rb
 - lib/cucumber/chef/config.rb
+- lib/cucumber/chef/container.rb
 - lib/cucumber/chef/containers.rb
+- lib/cucumber/chef/ecosystem.rb
 - lib/cucumber/chef/helpers.rb
 - lib/cucumber/chef/helpers/chef.rb
+- lib/cucumber/chef/labfile.rb
 - lib/cucumber/chef/provider.rb
 - lib/cucumber/chef/providers/aws.rb
 - lib/cucumber/chef/providers/vagrant.rb
@@ -290,12 +277,10 @@ files:
 - lib/cucumber/chef/steps.rb
 - lib/cucumber/chef/steps/chef_steps.rb
 - lib/cucumber/chef/steps/minitest_steps.rb
-- lib/cucumber/chef/steps/provision_steps.rb
 - lib/cucumber/chef/steps/ssh_steps.rb
 - lib/cucumber/chef/templates/bootstrap/ubuntu-precise-test-lab.erb
 - lib/cucumber/chef/templates/cucumber-chef/config-rb.erb
 - lib/cucumber/chef/templates/cucumber-chef/cucumber-yml.erb
-- lib/cucumber/chef/templates/cucumber-chef/knife-rb.erb
 - lib/cucumber/chef/templates/cucumber/cc-hooks.rb
 - lib/cucumber/chef/templates/cucumber/env.rb
 - lib/cucumber/chef/templates/cucumber/example_feature.erb