cucumber-chef 2.0.7 → 2.1.0.rc.0

data/lib/cucumber/chef/templates/cucumber/readme-environments.erb

@@ -0,0 +1 @@
+Create supporting environment definitions here.

data/lib/cucumber/chef/templates/cucumber/readme-roles.erb

@@ -1 +1 @@
-Create supporting roles here.
+Create supporting role definitions here.

data/lib/cucumber/chef/templates/cucumber-chef/config-rb.erb

@@ -5,6 +5,11 @@
 provider                        :aws
 librarian_chef                  <%= @librarian_chef %>
 
+artifacts                       ({ "chef-client-log" => "/var/log/chef/client.log",
+                                   "chef-client-stacktrace" => "/var/chef/cache/chef-stacktrace.out" })
+
+lxc_user                        "root"
+lab_user                        "ubuntu"
 
 ################################################################################
 # Provider: AWS

data/lib/cucumber/chef/test_lab.rb

@@ -2,7 +2,7 @@
 #
 #      Author: Stephen Nelson-Smith <stephen@atalanta-systems.com>
 #      Author: Zachary Patten <zachary@jovelabs.com>
-#   Copyright: Copyright (c) 2011-2012 Atalanta Systems Ltd
+#   Copyright: Copyright (c) 2011-2013 Atalanta Systems Ltd
 #     License: Apache License, Version 2.0
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
@@ -48,6 +48,53 @@ module Cucumber
         ensure_security_group
       end
 
+################################################################################
+
+      def ssh
+        if (!defined?(@ssh) || @ssh.nil?)
+          ssh_private_key_file = Cucumber::Chef.locate(:file, ".cucumber-chef", "id_rsa-#{Cucumber::Chef::Config[:lab_user]}")
+          File.chmod(0400, ssh_private_key_file)
+          @ssh ||= ZTK::SSH.new
+
+          @ssh.config.host_name = self.labs_running.first.public_ip_address
+          @ssh.config.user = Cucumber::Chef::Config[:lab_user]
+          @ssh.config.keys = ssh_private_key_file
+        end
+        @ssh
+      end
+
+################################################################################
+
+      def proxy_ssh(container)
+        container = container.to_sym
+        @proxy_ssh ||= Hash.new
+        if (!defined?(@proxy_ssh[container]) || @proxy_ssh[container].nil?)
+          ssh_private_key_file = Cucumber::Chef.locate(:file, ".cucumber-chef", "id_rsa-#{Cucumber::Chef::Config[:lab_user]}")
+          File.chmod(0400, ssh_private_key_file)
+          @proxy_ssh[container] ||= ZTK::SSH.new
+
+          @proxy_ssh[container].config.proxy_host_name = self.labs_running.first.public_ip_address
+          @proxy_ssh[container].config.proxy_user = Cucumber::Chef::Config[:lab_user]
+          @proxy_ssh[container].config.proxy_keys = ssh_private_key_file
+
+          @proxy_ssh[container].config.host_name = container
+          @proxy_ssh[container].config.user = Cucumber::Chef::Config[:lxc_user]
+          @proxy_ssh[container].config.keys = ssh_private_key_file
+        end
+        @proxy_ssh[container]
+      end
+
+################################################################################
+
+      def drb
+        if (!defined?(@drb) || @drb.nil?)
+          @drb ||= DRbObject.new_with_uri("druby://#{self.labs_running.first.public_ip_address}:8787")
+          @drb and DRb.start_service
+          @drb.servers = Hash.new(nil)
+        end
+        @drb
+      end
+
 ################################################################################
 
       def create
@@ -85,7 +132,7 @@ module Cucumber
         if @server
           @stdout.print("Waiting for SSHD...")
           Cucumber::Chef.spinner do
-            ZTK::TCPSocketCheck.new(:host => @server.public_ip_address, :port => 22).wait
+            ZTK::TCPSocketCheck.new(:host => @server.public_ip_address, :port => 22, :wait => 120).wait
           end
           @stdout.puts("done.\n")
         end
@@ -93,8 +140,8 @@ module Cucumber
         @server
 
       rescue Exception => e
-        $logger.fatal { e.message }
-        $logger.fatal { "Backtrace:\n#{e.backtrace.join("\n")}" }
+        Cucumber::Chef.logger.fatal { e.message }
+        Cucumber::Chef.logger.fatal { "Backtrace:\n#{e.backtrace.join("\n")}" }
         raise TestLabError, e.message
       end
 
@@ -112,8 +159,8 @@ module Cucumber
         end
 
       rescue Exception => e
-        $logger.fatal { e.message }
-        $logger.fatal { e.backtrace.join("\n") }
+        Cucumber::Chef.logger.fatal { e.message }
+        Cucumber::Chef.logger.fatal { e.backtrace.join("\n") }
         raise TestLabError, e.message
       end
 
@@ -131,7 +178,7 @@ module Cucumber
 
             @stdout.print("Waiting for SSHD...")
             Cucumber::Chef.spinner do
-              ZTK::TCPSocketCheck.new(:host => @server.public_ip_address, :port => 22).wait
+              ZTK::TCPSocketCheck.new(:host => @server.public_ip_address, :port => 22, :wait => 120).wait
             end
             @stdout.puts("done.\n")
 
@@ -146,8 +193,8 @@ module Cucumber
         end
 
       rescue Exception => e
-        $logger.fatal { e.message }
-        $logger.fatal { e.backtrace.join("\n") }
+        Cucumber::Chef.logger.fatal { e.message }
+        Cucumber::Chef.logger.fatal { e.backtrace.join("\n") }
         raise TestLabError, e.message
       end
 
@@ -164,8 +211,8 @@ module Cucumber
         end
 
       rescue Exception => e
-        $logger.fatal { e.message }
-        $logger.fatal { e.backtrace.join("\n") }
+        Cucumber::Chef.logger.fatal { e.message }
+        Cucumber::Chef.logger.fatal { e.backtrace.join("\n") }
         raise TestLabError, e.message
       end
 
@@ -222,8 +269,8 @@ module Cucumber
         end
 
       rescue Exception => e
-        $logger.fatal { e.message }
-        $logger.fatal { e.backtrace.join("\n") }
+        Cucumber::Chef.logger.fatal { e.message }
+        Cucumber::Chef.logger.fatal { e.backtrace.join("\n") }
         raise TestLabError, e.message
       end
 
@@ -237,13 +284,13 @@ module Cucumber
 
       def labs
         results = @connection.servers.select do |server|
-          $logger.debug("candidate") { "ID=#{server.id}, state='#{server.state}'" }
+          Cucumber::Chef.logger.debug("candidate") { "ID=#{server.id}, state='#{server.state}'" }
           ( server.tags['cucumber-chef-mode'] == Cucumber::Chef::Config[:mode].to_s &&
             server.tags['cucumber-chef-user'] == Cucumber::Chef::Config[:user].to_s &&
             VALID_STATES.any?{ |state| state == server.state } )
         end
         results.each do |server|
-          $logger.debug("results") { "ID=#{server.id}, state='#{server.state}'" }
+          Cucumber::Chef.logger.debug("results") { "ID=#{server.id}, state='#{server.state}'" }
         end
         results
       end
@@ -252,13 +299,13 @@ module Cucumber
 
       def labs_running
         results = @connection.servers.select do |server|
-          $logger.debug("candidate") { "ID=#{server.id}, state='#{server.state}'" }
+          Cucumber::Chef.logger.debug("candidate") { "ID=#{server.id}, state='#{server.state}'" }
           ( server.tags['cucumber-chef-mode'] == Cucumber::Chef::Config[:mode].to_s &&
             server.tags['cucumber-chef-user'] == Cucumber::Chef::Config[:user].to_s &&
             RUNNING_STATES.any?{ |state| state == server.state } )
         end
         results.each do |server|
-          $logger.debug("results") { "ID=#{server.id}, state='#{server.state}'" }
+          Cucumber::Chef.logger.debug("results") { "ID=#{server.id}, state='#{server.state}'" }
         end
         results
       end
@@ -267,13 +314,13 @@ module Cucumber
 
       def labs_shutdown
         results = @connection.servers.select do |server|
-          $logger.debug("candidate") { "ID=#{server.id}, state='#{server.state}'" }
+          Cucumber::Chef.logger.debug("candidate") { "ID=#{server.id}, state='#{server.state}'" }
           ( server.tags['cucumber-chef-mode'] == Cucumber::Chef::Config[:mode].to_s &&
             server.tags['cucumber-chef-user'] == Cucumber::Chef::Config[:user].to_s &&
             SHUTDOWN_STATES.any?{ |state| state == server.state } )
         end
         results.each do |server|
-          $logger.debug("results") { "ID=#{server.id}, state='#{server.state}'" }
+          Cucumber::Chef.logger.debug("results") { "ID=#{server.id}, state='#{server.state}'" }
         end
         results
       end
@@ -281,17 +328,17 @@ module Cucumber
 ################################################################################
 
       def nodes
-        Cucumber::Chef.load_knife_config
+        Cucumber::Chef.load_knife
         query = "tags:#{Cucumber::Chef::Config[:mode]} AND tags:#{Cucumber::Chef::Config[:user]}"
-        $logger.debug { "query(#{query})" }
+        Cucumber::Chef.logger.debug { "query(#{query})" }
         nodes, offset, total = ::Chef::Search::Query.new.search("node", URI.escape(query))
         nodes.compact
       end
 
       def clients
-        Cucumber::Chef.load_knife_config
+        Cucumber::Chef.load_knife
         query = "tags:#{Cucumber::Chef::Config[:mode]} AND tags:#{Cucumber::Chef::Config[:user]}"
-        $logger.debug { "query(#{query})" }
+        Cucumber::Chef.logger.debug { "query(#{query})" }
         clients, offset, total = ::Chef::Search::Query.new.search("client", URI.escape(query))
         clients.compact
       end

data/lib/cucumber/chef/utility.rb

@@ -2,7 +2,7 @@
 #
 #      Author: Stephen Nelson-Smith <stephen@atalanta-systems.com>
 #      Author: Zachary Patten <zachary@jovelabs.com>
-#   Copyright: Copyright (c) 2011-2012 Atalanta Systems Ltd
+#   Copyright: Copyright (c) 2011-2013 Atalanta Systems Ltd
 #     License: Apache License, Version 2.0
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,55 +32,29 @@ module Cucumber
         ((Cucumber::Chef::VERSION =~ /rc/) || (Cucumber::Chef::VERSION =~ /pre/))
       end
 
-################################################################################
-
-      def root
-        File.expand_path(File.join(File.dirname(__FILE__), "..", "..", ".."), File.dirname(__FILE__))
-      end
-
-################################################################################
-
-      def load_knife_config
-        $logger.debug { "attempting to load cucumber-chef test lab 'knife.rb'" }
-
-        knife_rb = Cucumber::Chef.locate(:file, ".cucumber-chef", "knife.rb")
-        ::Chef::Config.from_file(knife_rb)
-
-        $logger.debug { "load_knife_config(#{knife_rb})" }
-      end
-
 ################################################################################
 
       def locate(type, *args)
         pwd = Dir.pwd.split(File::SEPARATOR)
-        $logger.debug { "pwd='#{Dir.pwd}'" } if $logger
         (pwd.length - 1).downto(0) do |i|
           candidate = File.join(pwd[0..i], args)
-          $logger.debug { "candidate='#{candidate}'" } if $logger
           case type
           when :file
             if (File.exists?(candidate) && !File.directory?(candidate))
-              result = File.expand_path(candidate)
-              $logger.debug { "result='#{result}'" } if $logger
-              return result
+              return File.expand_path(candidate)
             end
           when :directory
             if (File.exists?(candidate) && File.directory?(candidate))
-              result = File.expand_path(candidate)
-              $logger.debug { "result='#{result}'" } if $logger
-              return result
+              return File.expand_path(candidate)
             end
           when :any
             if File.exists?(candidate)
-              result = File.expand_path(candidate)
-              $logger.debug { "result='#{result}'" } if $logger
-              return result
+              return File.expand_path(candidate)
             end
           end
         end
 
         message = "Could not locate #{type} '#{File.join(args)}'."
-        $logger.fatal { message } if $logger
         raise UtilityError, message
       end
 
@@ -115,7 +89,7 @@ module Cucumber
 ################################################################################
 
       def generate_do_not_edit_warning(message=nil)
-        warning = []
+        warning = Array.new
         warning << "#"
         warning << "# WARNING: Automatically generated file; DO NOT EDIT!"
         warning << [ "# Cucumber-Chef v#{Cucumber::Chef::VERSION}", message ].compact.join(" ")
@@ -130,6 +104,14 @@ module Cucumber
         %x( wget -q -O - checkip.dyndns.org|sed -e 's/.*Current IP Address: //' -e 's/<.*$//' ).chomp
       end
 
+################################################################################
+
+      def root
+        File.expand_path(File.join(File.dirname(__FILE__), "..", "..", ".."), File.dirname(__FILE__))
+      end
+
+################################################################################
+
       def log_file
         config_path = File.join(Cucumber::Chef.locate_parent(".chef"), ".cucumber-chef")
         FileUtils.mkdir_p(config_path)
@@ -138,6 +120,114 @@ module Cucumber
 
 ################################################################################
 
+      def knife_rb
+        config_path = File.join(Cucumber::Chef.locate_parent(".chef"), ".cucumber-chef")
+        FileUtils.mkdir_p(config_path)
+        File.join(config_path, "knife.rb")
+      end
+
+################################################################################
+
+      def config_rb
+        config_path = File.join(Cucumber::Chef.locate_parent(".chef"), ".cucumber-chef")
+        FileUtils.mkdir_p(config_path)
+        File.join(config_path, "config.rb")
+      end
+
+################################################################################
+
+      def servers_bin
+        config_path = File.join(Cucumber::Chef.locate_parent(".chef"), ".cucumber-chef")
+        FileUtils.mkdir_p(config_path)
+        File.join(config_path, "servers.bin")
+      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 tag(name=nil)
+        [ name, "v#{Cucumber::Chef::VERSION}" ].compact.join(" ")
+      end
+
+################################################################################
+
+      def load_config(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!"
+          logger.fatal { message }
+          raise message
+        end
+        name and logger.info { "loading #{name}" }
+        logger.info { "load_config(#{Cucumber::Chef.config_rb})" }
+        Cucumber::Chef::Config.load
+        load_knife
+      end
+
+################################################################################
+
+      def load_knife
+        test_lab = (Cucumber::Chef::TestLab.new rescue nil)
+        if (test_lab && (test_lab.labs_running.count > 0))
+          if File.exists?(Cucumber::Chef.knife_rb)
+            logger.info { "load_knife(#{Cucumber::Chef.knife_rb})" }
+            ::Chef::Config.from_file(Cucumber::Chef.knife_rb)
+
+            chef_server_url = "http://#{test_lab.labs_running.first.public_ip_address}:4000"
+            logger.info { "chef_server_url(#{chef_server_url})" }
+            ::Chef::Config[:chef_server_url] = chef_server_url
+          else
+            logger.warn { "We found the test lab; but the knife config '#{Cucumber::Chef.knife_rb}' was missing!" }
+          end
+        else
+          logger.info { "load_knife(#{Cucumber::Chef.knife_rb})" }
+          ::Chef::Config.from_file(Cucumber::Chef.knife_rb)
+        end
+      end
+
+################################################################################
+
+      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)
+
+          headers = {
+            "program" => $0.to_s,
+            "version" => Cucumber::Chef::VERSION,
+            "uname" => %x(uname -a).chomp.strip,
+            "chef_repo" => chef_repo,
+            "chef_version" => ::Chef::VERSION,
+            "log_file" => log_file,
+            "knife_rb" => knife_rb,
+            "config_rb" => config_rb,
+            "servers_bin" => servers_bin,
+            "ruby_version" => RUBY_VERSION,
+            "ruby_patchlevel" => RUBY_PATCHLEVEL,
+            "ruby_platform" => RUBY_PLATFORM
+          }
+          if RUBY_VERSION >= "1.9"
+            headers.merge!("ruby_engine" => RUBY_ENGINE)
+          end
+          max_key_length = headers.keys.collect{ |key| key.to_s.length }.max
+
+          $logger.info { ("=" * 80) }
+          headers.sort.each do |key, value|
+            $logger.info { "%#{max_key_length}s: %s" % [ key.upcase, value.to_s ] }
+          end
+        end
+
+        $logger
+      end
+
     end
 
   end

data/lib/cucumber/chef/version.rb

@@ -2,7 +2,7 @@
 #
 #      Author: Stephen Nelson-Smith <stephen@atalanta-systems.com>
 #      Author: Zachary Patten <zachary@jovelabs.com>
-#   Copyright: Copyright (c) 2011-2012 Atalanta Systems Ltd
+#   Copyright: Copyright (c) 2011-2013 Atalanta Systems Ltd
 #     License: Apache License, Version 2.0
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,7 +24,7 @@ module Cucumber
 
 ################################################################################
 
-    VERSION = "2.0.7" unless const_defined?(:VERSION)
+    VERSION = "2.1.0.rc.0" unless const_defined?(:VERSION)
 
 ################################################################################
 

data/lib/cucumber/chef.rb

@@ -2,7 +2,7 @@
 #
 #      Author: Stephen Nelson-Smith <stephen@atalanta-systems.com>
 #      Author: Zachary Patten <zachary@jovelabs.com>
-#   Copyright: Copyright (c) 2011-2012 Atalanta Systems Ltd
+#   Copyright: Copyright (c) 2011-2013 Atalanta Systems Ltd
 #     License: Apache License, Version 2.0
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");

data/lib/cucumber-chef.rb

@@ -2,7 +2,7 @@
 #
 #      Author: Stephen Nelson-Smith <stephen@atalanta-systems.com>
 #      Author: Zachary Patten <zachary@jovelabs.com>
-#   Copyright: Copyright (c) 2011-2012 Atalanta Systems Ltd
+#   Copyright: Copyright (c) 2011-2013 Atalanta Systems Ltd
 #     License: Apache License, Version 2.0
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");

data/spec/cucumber/chef/config_spec.rb

@@ -2,7 +2,7 @@
 #
 #      Author: Stephen Nelson-Smith <stephen@atalanta-systems.com>
 #      Author: Zachary Patten <zachary@jovelabs.com>
-#   Copyright: Copyright (c) 2011-2012 Atalanta Systems Ltd
+#   Copyright: Copyright (c) 2011-2013 Atalanta Systems Ltd
 #     License: Apache License, Version 2.0
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");

data/spec/cucumber/chef/provisioner_spec.rb

@@ -2,7 +2,7 @@
 #
 #      Author: Stephen Nelson-Smith <stephen@atalanta-systems.com>
 #      Author: Zachary Patten <zachary@jovelabs.com>
-#   Copyright: Copyright (c) 2011-2012 Atalanta Systems Ltd
+#   Copyright: Copyright (c) 2011-2013 Atalanta Systems Ltd
 #     License: Apache License, Version 2.0
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");

data/spec/cucumber/chef/test_lab_spec.rb

@@ -2,7 +2,7 @@
 #
 #      Author: Stephen Nelson-Smith <stephen@atalanta-systems.com>
 #      Author: Zachary Patten <zachary@jovelabs.com>
-#   Copyright: Copyright (c) 2011-2012 Atalanta Systems Ltd
+#   Copyright: Copyright (c) 2011-2013 Atalanta Systems Ltd
 #     License: Apache License, Version 2.0
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@
 #
 #      Author: Stephen Nelson-Smith <stephen@atalanta-systems.com>
 #      Author: Zachary Patten <zachary@jovelabs.com>
-#   Copyright: Copyright (c) 2011-2012 Atalanta Systems Ltd
+#   Copyright: Copyright (c) 2011-2013 Atalanta Systems Ltd
 #     License: Apache License, Version 2.0
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-chef
 version: !ruby/object:Gem::Version
-  version: 2.0.7
-  prerelease: 
+  version: 2.1.0.rc.0
+  prerelease: 6
 platform: ruby
 authors:
 - Stephen Nelson-Smith
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-15 00:00:00.000000000 Z
+date: 2013-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -147,7 +147,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -155,7 +155,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.15
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -263,6 +263,7 @@ files:
 - 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/roles/test_lab.rb
 - cucumber-chef.gemspec
@@ -301,10 +302,12 @@ files:
 - 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
 - lib/cucumber/chef/templates/cucumber/example_steps.erb
 - lib/cucumber/chef/templates/cucumber/readme-data_bags.erb
+- lib/cucumber/chef/templates/cucumber/readme-environments.erb
 - lib/cucumber/chef/templates/cucumber/readme-keys.erb
 - lib/cucumber/chef/templates/cucumber/readme-roles.erb
 - lib/cucumber/chef/templates/cucumber/readme.erb