testlab 1.4.3 → 1.4.4

data/lib/testlab/container/actions.rb

@@ -12,11 +12,8 @@ class TestLab
       def create
         @ui.logger.debug { "Container Create: #{self.id}" }
 
-        (self.node.state != :running) and return false
-        (self.lxc.state != :not_created) and return false
-
-        # If we are in ephemeral mode do not attempt to create the container.
-        self.lxc_clone.exists? and return false
+        (self.node.state == :running) or return false
+        (self.state == :not_created) or return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Create', :green)) do
           configure
@@ -37,14 +34,12 @@ class TestLab
       def destroy
         @ui.logger.debug { "Container Destroy: #{self.id}" }
 
-        (self.node.state != :running) and return false
-        (self.lxc.state == :not_created) and return false
-
-        # If we are in ephemeral mode do not attempt to destroy the container.
-        self.lxc_clone.exists? and return false
+        (self.node.state == :running) or return false
+        (self.state != :not_created) or return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Destroy', :red)) do
           self.lxc.destroy(%(-f))
+          self.lxc_clone.destroy(%(-f))
 
           do_provisioner_callbacks(self, :destroy, @ui)
         end
@@ -60,8 +55,8 @@ class TestLab
       def up
         @ui.logger.debug { "Container Up: #{self.id}" }
 
-        (self.node.state != :running) and return false
-        (self.lxc.state == :running) and return false
+        (self.node.state == :running) or return false
+        (self.state != :running) or return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Up', :green)) do
           configure
@@ -106,8 +101,8 @@ class TestLab
       def down
         @ui.logger.debug { "Container Down: #{self.id}" }
 
-        (self.node.state != :running) and return false
-        (self.lxc.state != :running) and return false
+        (self.node.state == :running) or return false
+        (self.state == :running) or return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Down', :red)) do
 

data/lib/testlab/container/status.rb

@@ -70,7 +70,11 @@ class TestLab
       #
       # @return [Symbol] A symbol indicating the state of the container.
       def state
-        self.lxc.state
+        if self.lxc_clone.exists?
+          self.lxc_clone.state
+        else
+          self.lxc.state
+        end
       end
 
       # Container Mode

data/lib/testlab/network/actions.rb

@@ -7,8 +7,8 @@ class TestLab
       def create
         @ui.logger.debug { "Network Create: #{self.id} " }
 
-        (self.node.state != :running) and return false
-        (self.state != :not_created) and return false
+        (self.node.state == :running) or return false
+        (self.state == :not_created) or return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Create', :green)) do
           self.node.bootstrap(<<-EOF, :ignore_exit_status => true)
@@ -16,7 +16,7 @@ set -x
 grep '#{def_tag}' /etc/network/interfaces && exit 0
 cat <<EOI | tee -a /etc/network/interfaces
 #{def_tag}
-auto br0
+auto #{self.bridge}
 iface #{self.bridge} inet static
       bridge_ports none
       bridge_stp off
@@ -41,8 +41,8 @@ brctl setfd #{self.bridge} 0
       def destroy
         @ui.logger.debug { "Network Destroy: #{self.id} " }
 
-        (self.node.state != :running) and return false
-        (self.state == :not_created) and return false
+        (self.node.state == :running) or return false
+        (self.state != :not_created) or return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Destroy', :red)) do
           self.node.bootstrap(<<-EOF, :ignore_exit_status => true)
@@ -61,8 +61,8 @@ brctl delbr #{self.bridge}
       def up
         @ui.logger.debug { "Network Up: #{self.id} " }
 
-        (self.node.state != :running) and return false
-        # (self.state == :running) and return false
+        (self.node.state == :running) or return false
+        # (self.state != :running) or return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Up', :green)) do
           self.node.bootstrap(<<-EOF, :ignore_exit_status => true)
@@ -80,8 +80,8 @@ ifconfig #{self.bridge} #{self.ip} netmask #{self.netmask} broadcast #{self.broa
       def down
         @ui.logger.debug { "Network Down: #{self.id} " }
 
-        (self.node.state != :running) and return false
-        # (self.state != :running) and return false
+        (self.node.state == :running) or return false
+        # (self.state == :running) or return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Down', :red)) do
           self.node.bootstrap(<<-EOF, :ignore_exit_status => true)

data/lib/testlab/node/actions.rb

@@ -7,7 +7,7 @@ class TestLab
       def create
         @ui.logger.debug { "Node Create: #{self.id} " }
 
-        (self.state != :not_created) and return false
+        (self.state == :not_created) or return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Create', :green)) do
           @provider.create
@@ -22,7 +22,7 @@ class TestLab
       def destroy
         @ui.logger.debug { "Node Destroy: #{self.id} " }
 
-        (self.state == :not_created) and return false
+        (self.state != :not_created) or return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Destroy', :red)) do
           @provider.destroy
@@ -37,7 +37,7 @@ class TestLab
       def up
         @ui.logger.debug { "Node Up: #{self.id} " }
 
-        (self.state == :running) and return false
+        (self.state != :running) or return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Up', :green)) do
           @provider.up
@@ -52,7 +52,7 @@ class TestLab
       def down
         @ui.logger.debug { "Node Down: #{self.id} " }
 
-        (self.state != :running) and return false
+        (self.state == :running) or return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Down', :red)) do
           @provider.down

data/lib/testlab/providers/vagrant.rb

@@ -63,16 +63,19 @@ class TestLab
       # Online Vagrant-controlled VM
       def up
         self.vagrant_cli("up", self.instance_id)
+
         ZTK::TCPSocketCheck.new(:host => self.ip, :port => self.port, :wait => 120, :ui => @ui).wait
 
         true
       end
 
       # Halt Vagrant-controlled VM
-      def down
+      def down(*args)
         !self.exists? and raise VagrantError, MSG_NO_LAB
 
-        self.vagrant_cli("halt", self.instance_id)
+        arguments = (%W(halt #{self.instance_id}) + args).flatten.compact
+
+        self.vagrant_cli(*arguments)
 
         true
       end

data/lib/testlab/provisioners/templates/resolv/provision.erb

@@ -1,9 +1,9 @@
 set -x
+set -e
 
 dpkg --status bind9 &> /dev/null || <%= (@resolv[:object] == :container).inspect %>
 
-if [ $? -eq 0 ]; then
-  cat << EOF | tee /etc/resolv.conf
+cat <<EOF | tee /etc/resolv.conf
 <%= ZTK::Template.do_not_edit_notice(:message => "TestLab Resolv Provisioner") %>
 <% if !@resolv[:domain].nil? -%>
 domain <%= @resolv[:domain] %>
@@ -17,4 +17,3 @@ nameserver <%= server %>
 <% end -%>
 <% end -%>
 EOF
-fi

data/lib/testlab/version.rb

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

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
+  prerelease: 
 platform: ruby
 authors:
 - Zachary Patten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-08 00:00:00.000000000 Z
+date: 2013-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: lxc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ztk
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -125,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -132,6 +150,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -139,6 +158,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -146,6 +166,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -153,6 +174,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -160,6 +182,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -167,6 +190,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -174,6 +198,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -303,26 +328,27 @@ files:
 homepage: http://hackers.lookout.com/testlab/
 licenses:
 - Apache 2.0
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A toolkit for building virtual computer labs
 test_files:
 - features/step_definitions/container_steps.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NzQyNWVlODk4ZmQwZGRlYzM1YTRiM2VhOGE0MTllZTZiOWVmODUyMg==
-  data.tar.gz: !binary |-
-    YzhhMTgyMGRmYzIxODRkYzgyYzRkM2E3NjRjYmQ4YzRlMGE3NzFmYQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MWY3NmU2NGQ1OTUzYzM3NTQxODk1MmMyYWIzNDRhYzQyNzE0MGJjNDA4MWZj
-    NGJiZTdhNDgxOWFjMTFmZDVlNzAyYTg3N2RkNjM4YTMxZmIyMDlmMDQ3Nzk2
-    MDNkN2ZlZGFkMjE0ZDhkNzM2ZjhjNjdmYzUxNGM0OTAzOTljYWY=
-  data.tar.gz: !binary |-
-    Y2MyMTY5ZjQ5NzE4OTQ3ODJlYzEwNjExYzBiZGU4YjM1OWJkZWE1MTc5MmFi
-    ODM2YTdjY2I2Mjc0ZGI5ODdjZDA0YThjNzZhNjBlYjgzNjE0ZTU4YTM3OTIz
-    MmY5MmJiZGMzNTU3MWE5NTgzMGNhZTgwNDQyNTU0YzgyMTU5NDA=