testlab 0.6.16 → 0.6.17

data/lib/testlab/provisioners/chef/omni_bus.rb

@@ -84,7 +84,7 @@ class TestLab
 
         def chef_client_rb(container)
           <<-EOF
-#{ZTK::Template.do_not_edit_notice(:message => "Lookout TestLab Chef-Client Configuration")}
+#{ZTK::Template.do_not_edit_notice(:message => "OmniBus TestLab Chef-Client Configuration")}
 log_level               #{@config[:chef][:client][:log_level].inspect}
 log_location            STDOUT
 chef_server_url         #{@config[:chef][:client][:server_url].inspect}

data/lib/testlab/provisioners/shell.rb

@@ -12,8 +12,8 @@ class TestLab
       require 'tempfile'
 
       def initialize(config={}, ui=nil)
+        @ui     = (ui     || TestLab.ui)
         @config = (config || Hash.new)
-        @ui     = (ui || TestLab.ui)
       end
 
       # Shell Provisioner Container Setup
@@ -25,9 +25,9 @@ class TestLab
       #   provision.
       # @return [Boolean] True if successful.
       def on_container_setup(container)
-        if !@config[:script].nil?
-          container.bootstrap(@config[:script])
-        end
+        @config[:script].nil? and raise ShellError, "You must supply a script to bootstrap!"
+
+        container.bootstrap(@config[:script])
 
         true
       end

data/lib/testlab/version.rb

@@ -1,6 +1,6 @@
 class TestLab
   unless const_defined?(:VERSION)
     # TestLab Gem Version
-    VERSION = "0.6.16"
+    VERSION = "0.6.17"
   end
 end

data/spec/provisioners/shell_spec.rb

@@ -42,7 +42,7 @@ describe TestLab::Provisioner::Shell do
         it "should provision the container" do
           subject.node.ssh.stub(:file).and_yield(StringIO.new)
           subject.stub(:fs_root) { "/var/lib/lxc/#{subject.id}/rootfs" }
-          subject.lxc.stub(:attach) { "" }
+          subject.lxc.stub(:bootstrap) { "" }
 
           p = TestLab::Provisioner::Shell.new(subject.config, @ui)
           p.on_container_setup(subject)
@@ -53,12 +53,10 @@ describe TestLab::Provisioner::Shell do
         it "should raise an exception" do
           subject.node.ssh.stub(:file).and_yield(StringIO.new)
           subject.stub(:fs_root) { "/var/lib/lxc/#{subject.id}/rootfs" }
-          subject.lxc.stub(:attach) do |arg0, arg1, arg2|
-            "#{arg2}: No such file or directory"
-          end
+          subject.lxc.stub(:bootstrap) { "" }
 
-          p = TestLab::Provisioner::Shell.new(subject.config, @ui)
-          lambda{ p.on_container_setup(subject) }.should raise_error TestLab::ContainerError
+          p = TestLab::Provisioner::Shell.new(Hash.new, @ui)
+          lambda{ p.on_container_setup(subject) }.should raise_error TestLab::Provisioner::ShellError
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 0.6.16
+  version: 0.6.17
   prerelease: 
 platform: ruby
 authors:
@@ -303,7 +303,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1123955355283621213
+      hash: -2300226116598449906
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -312,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1123955355283621213
+      hash: -2300226116598449906
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25