testlab 1.6.5 → 1.6.6

data/lib/testlab/container/clone.rb

@@ -11,9 +11,7 @@ class TestLab
       def ephemeral
         @ui.logger.debug { "Container Ephemeral: #{self.id}" }
 
-        please_wait(:ui => @ui, :message => format_object_action(self, 'Ephemeral', :yellow)) do
-          is_persistent? and self.to_ephemeral
-        end
+        is_persistent? and self.to_ephemeral
 
         true
       end
@@ -26,9 +24,7 @@ class TestLab
       def persistent
         @ui.logger.debug { "Container Persistent: #{self.id}" }
 
-        please_wait(:ui => @ui, :message => format_object_action(self, 'Persistent', :yellow)) do
-          is_ephemeral? and self.to_persistent
-        end
+        is_ephemeral? and self.to_persistent
 
         true
       end
@@ -92,14 +88,16 @@ class TestLab
         if self.is_ephemeral?
           self_state = self.state
 
-          configure
+          please_wait(:ui => @ui, :message => format_object_action(self, 'Persistent', :yellow)) do
+            configure
 
-          self.lxc.stop
-          self.lxc.destroy(%(-f))
+            self.lxc.stop
+            self.lxc.destroy(%(-f))
 
-          self.lxc_clone.stop
-          self.lxc_clone.clone(%W(-o #{self.lxc_clone.name} -n #{self.lxc.name}))
-          self.lxc_clone.destroy(%(-f))
+            self.lxc_clone.stop
+            self.lxc_clone.clone(%W(-o #{self.lxc_clone.name} -n #{self.lxc.name}))
+            self.lxc_clone.destroy(%(-f))
+          end
 
           # bring our container back online if it was running before the operation
           (self_state == :running) and self.up
@@ -118,14 +116,16 @@ class TestLab
         if self.is_persistent?
           self_state = self.state
 
-          configure
+          please_wait(:ui => @ui, :message => format_object_action(self, 'Ephemeral', :yellow)) do
+            configure
 
-          self.lxc_clone.stop
-          self.lxc_clone.destroy(%(-f))
+            self.lxc_clone.stop
+            self.lxc_clone.destroy(%(-f))
 
-          self.lxc.stop
-          self.lxc.clone(%W(-o #{self.lxc.name} -n #{self.lxc_clone.name}))
-          self.lxc.destroy(%(-f))
+            self.lxc.stop
+            self.lxc.clone(%W(-o #{self.lxc.name} -n #{self.lxc_clone.name}))
+            self.lxc.destroy(%(-f))
+          end
 
           # bring our container back online if it was running before the operation
           (self_state == :running) and self.up

data/lib/testlab/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.6.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-03 00:00:00.000000000 Z
+date: 2013-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -342,7 +342,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1958778561098121213
+      hash: -673687854564395917
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -351,7 +351,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1958778561098121213
+      hash: -673687854564395917
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25