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

data/lib/cucumber/chef/utility.rb

@@ -101,94 +101,160 @@ module Cucumber
 ################################################################################
 
       def external_ip
-        %x( wget -q -O - checkip.dyndns.org|sed -e 's/.*Current IP Address: //' -e 's/<.*$//' ).chomp
+        %x(wget -q -O - checkip.dyndns.org|sed -e 's/.*Current IP Address: //' -e 's/<.*$//').chomp.strip
+      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
+      def root_dir
         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)
-        File.join(config_path, "cucumber-chef.log")
+      def home_dir
+        home_dir = File.join(Cucumber::Chef.locate_parent(".chef"), ".cucumber-chef")
+        FileUtils.mkdir_p(File.dirname(home_dir))
+        home_dir
       end
 
 ################################################################################
 
-      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")
+      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_path = File.join(Cucumber::Chef.locate_parent(".chef"), ".cucumber-chef")
-        FileUtils.mkdir_p(config_path)
-        File.join(config_path, "config.rb")
+        config_rb = File.join(Cucumber::Chef.home_dir, "config.rb")
+        FileUtils.mkdir_p(File.dirname(config_rb))
+        config_rb
+      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 servers_bin
-        config_path = File.join(Cucumber::Chef.locate_parent(".chef"), ".cucumber-chef")
-        FileUtils.mkdir_p(config_path)
-        File.join(config_path, "servers.bin")
+        servers_bin = File.join(Cucumber::Chef.home_dir, Cucumber::Chef::Config[:provider].to_s, "servers.bin")
+        FileUtils.mkdir_p(File.dirname(servers_bin))
+        servers_bin
       end
 
+################################################################################
+# Bootstraping SSH Helpers
 ################################################################################
 
-      def chef_repo
-        (Cucumber::Chef.locate_parent(".chef") rescue nil)
+      def bootstrap_user
+        Cucumber::Chef::Config[Cucumber::Chef::Config[:provider]][:lab_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
+      end
+
+################################################################################
+# Test Lab SSH Helpers
 ################################################################################
 
-      def in_chef_repo?
-        ((chef_repo && File.exists?(chef_repo) && File.directory?(chef_repo)) ? true : false)
+      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
+
+################################################################################
+# 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-#{lab_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
 
+################################################################################
+# BOOT
 ################################################################################
 
-      def load_config(name=nil)
+      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!"
           logger.fatal { message }
           raise message
         end
         name and logger.info { "loading #{name}" }
-        logger.info { "load_config(#{Cucumber::Chef.config_rb})" }
+        logger.info { "boot(#{Cucumber::Chef.config_rb})" }
         Cucumber::Chef::Config.load
-        load_knife
+        load_chef_config
       end
 
+################################################################################
+# Load Chef::Config
 ################################################################################
 
-      def load_knife
+      def load_chef_config
         test_lab = (Cucumber::Chef::TestLab.new rescue nil)
-        if (test_lab && (test_lab.labs_running.count > 0))
+        if (test_lab && ((test_lab.labs_running.count rescue 0) > 0))
           if File.exists?(Cucumber::Chef.knife_rb)
-            logger.info { "load_knife(#{Cucumber::Chef.knife_rb})" }
+            logger.info { "load_chef_config(#{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"
+            chef_server_url = "http://#{test_lab.ip}: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})" }
+          logger.info { "load_chef_config(#{Cucumber::Chef.knife_rb})" }
           ::Chef::Config.from_file(Cucumber::Chef.knife_rb)
         end
       end
@@ -201,21 +267,23 @@ module Cucumber
           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
+            "program" => $0.to_s.inspect,
+            "cucumber_chef_version" => Cucumber::Chef::VERSION.inspect,
+            "uname" => %x(uname -a).chomp.strip.inspect,
+            "chef_repo" => chef_repo.inspect,
+            "chef_version" => ::Chef::VERSION.inspect,
+            "vagrant_version" => ::Vagrant::VERSION.inspect,
+            "fog_version" => ::Fog::VERSION.inspect,
+            "log_file" => log_file.inspect,
+            # "config_rb" => config_rb,
+            # "knife_rb" => knife_rb,
+            "servers_bin" => servers_bin.inspect,
+            "ruby_version" => RUBY_VERSION.inspect,
+            "ruby_patchlevel" => RUBY_PATCHLEVEL.inspect,
+            "ruby_platform" => RUBY_PLATFORM.inspect
           }
           if RUBY_VERSION >= "1.9"
-            headers.merge!("ruby_engine" => RUBY_ENGINE)
+            headers.merge!("ruby_engine" => RUBY_ENGINE.inspect)
           end
           max_key_length = headers.keys.collect{ |key| key.to_s.length }.max
 

data/lib/cucumber/chef/version.rb

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

data/lib/cucumber/chef.rb

@@ -28,7 +28,10 @@ require 'stringio'
 
 require 'chef'
 require 'chef/cookbook_uploader'
+
 require 'fog'
+require 'vagrant'
+
 require 'json'
 require 'mixlib/config'
 require 'ubuntu_ami'
@@ -45,7 +48,9 @@ module Cucumber
 
     autoload :Bootstrap, 'cucumber/chef/bootstrap'
     autoload :Config, 'cucumber/chef/config'
+    autoload :Provider, 'cucumber/chef/provider'
     autoload :Provisioner, 'cucumber/chef/provisioner'
+    autoload :Server, 'cucumber/chef/server'
     autoload :TestLab, 'cucumber/chef/test_lab'
 
     require 'cucumber/chef/utility'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-chef
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc.1
+  version: 2.1.0.rc.2
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-21 00:00:00.000000000 Z
+date: 2013-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.10.10
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,15 +27,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.10.10
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
-  name: cucumber
+  name: fog
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,15 +43,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: vagrant
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,15 +59,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
-  name: mixlib-config
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,7 +75,23 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.10.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -93,13 +109,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.15.2
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -107,15 +123,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
-  name: ubuntu_ami
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -123,15 +139,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: ubuntu_ami
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -139,7 +155,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: ztk
   requirement: !ruby/object:Gem::Requirement
@@ -292,7 +308,11 @@ files:
 - lib/cucumber/chef/helpers/server.rb
 - lib/cucumber/chef/helpers/test_lab.rb
 - lib/cucumber/chef/helpers/utility.rb
+- lib/cucumber/chef/provider.rb
+- lib/cucumber/chef/providers/aws.rb
+- lib/cucumber/chef/providers/vagrant.rb
 - lib/cucumber/chef/provisioner.rb
+- lib/cucumber/chef/server.rb
 - lib/cucumber/chef/steps.rb
 - lib/cucumber/chef/steps/chef_steps.rb
 - lib/cucumber/chef/steps/minitest_steps.rb