testlab 1.12.0 → 1.13.0

data/bin/tl

@@ -128,8 +128,8 @@ pre do |global,command,options,args|
 
   if !@ui.quiet?
     message = format_message("TestLab v#{TestLab::VERSION} Loaded".black.bold)
-    @testlab.ui.stdout.puts(message)
-    @testlab.ui.logger.info { message }
+    @ui.stdout.puts(message)
+    @ui.logger.info { message }
   end
 
   true
@@ -140,8 +140,8 @@ post do |global,command,options,args|
 
   if !@ui.quiet?
     message = format_message("TestLab v#{TestLab::VERSION} Finished (%0.4f seconds)".black.bold % testlab_run_time)
-    @testlab.ui.stdout.puts(message)
-    @testlab.ui.logger.info { message }
+    @ui.stdout.puts(message)
+    @ui.logger.info { message }
   end
 
   true
@@ -168,8 +168,8 @@ on_error do |exception|
     end
 
     message = format_message("TestLab v#{TestLab::VERSION} Aborted (%0.4f seconds)".black.bold % testlab_run_time)
-    @testlab.ui.stderr.puts(message)
-    @testlab.ui.logger.info { message }
+    @ui.stderr.puts(message)
+    @ui.logger.info { message }
 
     false
   end

data/lib/testlab/container/io.rb

@@ -85,15 +85,10 @@ class TestLab
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Compress', :cyan)) do
           self.node.bootstrap(<<-EOF)
-set -x
-set -e
-
 du -sh #{self.lxc.container_root}
-
 cd #{self.lxc.container_root}
 find #{root_fs_path} -depth -print0 | cpio -o0 | pbzip2 -#{compression} -vfczm#{PBZIP2_MEMORY} > #{remote_file}
 chown ${SUDO_USER}:${SUDO_USER} #{remote_file}
-
 ls -lah #{remote_file}
 EOF
         end
@@ -105,9 +100,6 @@ EOF
         self.node.download(remote_file, local_file, :on_progress => method(:progress_callback), :read_size => READ_SIZE)
 
         self.node.bootstrap(<<-EOF)
-set -x
-set -e
-
 rm -fv #{remote_file}
 EOF
 
@@ -157,17 +149,11 @@ EOF
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Expand', :cyan)) do
           self.node.bootstrap(<<-EOF)
-set -x
-set -e
-
 ls -lah #{remote_file}
-
 rm -rf #{self.lxc.fs_root}
 cd #{self.lxc.container_root}
 pbzip2 -vdcm#{PBZIP2_MEMORY} #{remote_file} | cpio -uid && rm -fv #{remote_file}
-
 du -sh #{self.lxc.container_root}
-
 rm -fv #{remote_file}
 EOF
         end

data/lib/testlab/node/status.rb

@@ -22,10 +22,16 @@ class TestLab
       end
 
       def ok?
-        self.alive? or return false
+        self.dead? and return false
 
         result = true
 
+        if !self.lxc.installed?
+          # @ui.stderr.puts(format_message("ERROR: "))
+          raise NodeError, "LXC does not appear to be installed on your TestLab node!  (Did you forget to provision or build the node?)"
+          # result = false
+        end
+
         # make sure the node has some free space
         free_space_percent = (self.exec(%(df -P /), :ignore_exit_status => true).output.split("\n")[1].split[-2].to_i rescue nil)
         if free_space_percent.nil?
@@ -36,8 +42,13 @@ class TestLab
           result = false
         end
 
+        # get the names of all of the defined containers
         my_container_names = self.containers.map(&:id)
-        node_container_names = self.lxc.containers.map(&:name)
+
+        # ephemeral containers parent containers have a "-master" suffix; we need to remove these from the results or we will complain about them
+        node_container_names = self.lxc.containers.map(&:name).delete_if do |node_container_name|
+          my_container_names.any?{ |my_container_name| "#{my_container_name}-master" == node_container_name }
+        end
 
         unknown_container_names = (node_container_names - my_container_names)
         unknown_running_container_names = self.lxc.containers.select{ |c| (unknown_container_names.include?(c.name) && (c.state == :running)) }.map(&:name)

data/lib/testlab/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2013-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -350,7 +350,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -750207504025020924
+      hash: -3460081152239272666
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -359,7 +359,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -750207504025020924
+      hash: -3460081152239272666
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25