cucumber-chef 2.1.0.rc.10 → 2.1.0.rc.11

data/bin/cc-server

@@ -35,7 +35,7 @@ class FrontObject
   def initialize
     logger.info { "DRB=#{DRb.config.inspect}" }
 
-    if ENV['PURGE']
+    if ENV['PURGE'] == 'YES'
       Cucumber::Chef.logger.warn { "PURGING CONTAINERS!  Container attributes will be reset!" }
       load_containers
       containers.each do |name, value|

data/lib/cucumber/chef/client.rb

@@ -75,8 +75,6 @@ module Cucumber
           self.drb.ping
         end
 
-        File.exists?(Cucumber::Chef.artifacts_dir) && FileUtils.rm_rf(Cucumber::Chef.artifacts_dir)
-
         true
       end
 

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

@@ -34,29 +34,28 @@ module Cucumber::Chef::Helpers::Utility
                168..168,
                0..254,
                1..254 ]
-    ip = ""
+    ip = Array.new
     for x in 1..4 do
-      ip += octets[x-1].to_a[rand(octets[x-1].count)].to_s
-      ip += "." if x != 4
+      ip << octets[x-1].to_a[rand(octets[x-1].count)].to_s
     end
-    ip
+    ip.join(".")
   end
 
 ################################################################################
 
   def generate_mac
-    digits = [ %w( 0 ),
-               %w( 0 ),
-               %w( 0 ),
-               %w( 0 ),
-               %w( 5 ),
-               %w( e ),
-               %w( 0 1 2 3 4 5 6 7 8 9 a b c d e f ),
-               %w( 0 1 2 3 4 5 6 7 8 9 a b c d e f ),
-               %w( 5 6 7 8 9 a b c d e f ),
-               %w( 3 4 5 6 7 8 9 a b c d e f ),
-               %w( 0 1 2 3 4 5 6 7 8 9 a b c d e f ),
-               %w( 0 1 2 3 4 5 6 7 8 9 a b c d e f ) ]
+    digits = [ %w(0),
+               %w(0),
+               %w(0),
+               %w(0),
+               %w(5),
+               %w(e),
+               %w(0 1 2 3 4 5 6 7 8 9 a b c d e f),
+               %w(0 1 2 3 4 5 6 7 8 9 a b c d e f),
+               %w(5 6 7 8 9 a b c d e f),
+               %w(3 4 5 6 7 8 9 a b c d e f),
+               %w(0 1 2 3 4 5 6 7 8 9 a b c d e f),
+               %w(0 1 2 3 4 5 6 7 8 9 a b c d e f) ]
     mac = ""
     for x in 1..12 do
       mac += digits[x-1][rand(digits[x-1].count)]

data/lib/cucumber/chef/utility.rb

@@ -105,7 +105,7 @@ module Cucumber
 ################################################################################
 
       def home_dir
-        home_dir = File.join(Cucumber::Chef.locate_parent(".chef"), ".cucumber-chef")
+        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
@@ -244,20 +244,17 @@ module Cucumber
 ################################################################################
 
       def load_chef_config
-        if (test_lab = (Cucumber::Chef::TestLab.new rescue nil)) && test_lab.alive?
-          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 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
-          else
-            logger.warn { "We found the test lab; but the knife config '#{Cucumber::Chef.knife_rb}' was missing!" }
           end
         else
-          logger.info { "load_chef_config(#{Cucumber::Chef.knife_rb})" }
-          ::Chef::Config.from_file(Cucumber::Chef.knife_rb)
+          logger.warn { "knife config '#{Cucumber::Chef.knife_rb}' was missing!" }
         end
       end
 

data/lib/cucumber/chef/version.rb

@@ -24,7 +24,7 @@ module Cucumber
 
 ################################################################################
 
-    VERSION = "2.1.0.rc.10" unless const_defined?(:VERSION)
+    VERSION = "2.1.0.rc.11" 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.10
+  version: 2.1.0.rc.11
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-07 00:00:00.000000000 Z
+date: 2013-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef