testlab 0.4.10 → 0.4.11

data/README.md

@@ -25,10 +25,9 @@ For more information see the TestLab Documentation, `testlab-repo`, command-line
 
 * Latest VirtualBox Package
 * Latest Vagrant Package (non-gem version)
-* Ubuntu 13.04 Recommended; 12.10 Minimum
+* Ubuntu 13.04 Base Box Recommended
 
 * Ubuntu 13.04 Server 64-bit (Raring) Base Box - https://github.com/zpatten/raring64
-* Ubuntu 12.10 Server 64-bit (Quantal) Base Box - https://github.com/zpatten/quantal64
 
 # EXAMPLE USE
 

data/lib/testlab/container/actions.rb

@@ -54,7 +54,8 @@ class TestLab
         @ui.logger.debug { "Container Destroy: #{self.id} " }
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Destroy', :red)) do
-          self.lxc.destroy
+          self.lxc.destroy(%(-f))
+          self.lxc_clone.destroy(%(-f))
         end
 
         true
@@ -115,14 +116,13 @@ class TestLab
       def clone
         @ui.logger.debug { "Container Clone: #{self.id}" }
 
-        self.down
-
         please_wait(:ui => @ui, :message => format_object_action(self, 'Clone', :yellow)) do
 
           # ensure our container is in "ephemeral" mode
           self.to_ephemeral
 
-          self.lxc_clone.start_ephemeral(%(-o #{self.id}-master), %(-n #{self.id}), %(-d))
+          self.node.ssh.exec(%(sudo arp --verbose --delete #{self.ip}), :ignore_exit_status => true)
+          self.lxc_clone.start_ephemeral(%W(-o #{self.lxc_clone.name} -n #{self.lxc.name} -d))
         end
 
         true

data/lib/testlab/container/lxc.rb

@@ -60,10 +60,13 @@ class TestLab
       def to_static
         if self.lxc_clone.exists?
           self.lxc.stop
+          self.lxc.destroy(%(-f))
+
           self.lxc_clone.stop
-          self.lxc_clone.clone(%(-o #{self.lxc_clone.name}), %(-n #{self.lxc.name}))
-          build_lxc_config(self.lxc.config)
+          self.lxc_clone.clone(%W(-o #{self.lxc_clone.name} -n #{self.lxc.name}))
           self.lxc_clone.destroy(%(-f))
+
+          build_lxc_config(self.lxc.config)
         end
 
         true
@@ -71,16 +74,22 @@ class TestLab
 
       # Convert to Ephemeral Container
       #
-      # If the current container is operating as a static ocntainer, this will
+      # If the current container is operating as a static container, this will
       # convert it to a ephemeral container, otherwise no changes will occur.
       #
       # @return [Boolean] Returns true if successful.
       def to_ephemeral
         if (self.lxc.exists? && !self.lxc_clone.exists?)
+          self.lxc_clone.stop
+          self.lxc_clone.destroy(%(-f))
+
           self.lxc.stop
-          self.lxc.clone(%(-o #{self.lxc.name}), %(-n #{self.lxc_clone.name}))
-          build_lxc_config(self.lxc_clone.config)
+          self.lxc.clone(%W(-o #{self.lxc.name} -n #{self.lxc_clone.name}))
           self.lxc.destroy(%(-f))
+
+          build_lxc_config(self.lxc_clone.config)
+        else
+          self.lxc.stop
         end
 
         true

data/lib/testlab/version.rb

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

data/spec/container_spec.rb

@@ -156,6 +156,7 @@ describe TestLab::Container do
     describe "#destroy" do
       it "should destroy the container" do
         subject.lxc.stub(:destroy) { true }
+        subject.lxc_clone.stub(:destroy) { true }
         subject.destroy
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
   prerelease: 
 platform: ruby
 authors:
@@ -281,7 +281,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -561292551195131094
+      hash: -4607919379801357092
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -290,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -561292551195131094
+      hash: -4607919379801357092
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25