testlab 0.8.6 → 0.9.0

data/Gemfile

@@ -1,6 +1,10 @@
 source 'https://rubygems.org'
 
 gem "json" if (RUBY_VERSION == "1.8.7")
-gem "activesupport", "< 4.0.0" if (RUBY_VERSION < "1.9.3")
+
+if (RUBY_VERSION < "1.9.3")
+  gem "activesupport", "< 4.0.0"
+  gem "redcarpet", "< 3.0.0"
+end
 
 gemspec

data/bin/tl-console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'bundler/setup'
+require 'pry'
+require 'testlab'
+
+ENV['LOG_LEVEL'] = 'DEBUG'
+logger = ZTK::Logger.new(STDOUT)
+
+ui = ZTK::UI.new(:logger => logger)
+l  = TestLab.new(:ui => ui, :repo_dir => Dir.pwd)
+l.boot
+
+binding.pry

data/lib/testlab/container/actions.rb

@@ -61,7 +61,6 @@ class TestLab
           self.to_static
 
           self.lxc.start(%(--daemon))
-          self.lxc.wait(:running)
 
           (self.lxc.state != :running) and raise ContainerError, "The container failed to online!"
 

data/lib/testlab/container/io.rb

@@ -19,9 +19,10 @@ class TestLab
         remote_filename = File.basename(export_tempfile.path.dup)
         export_tempfile.close!
 
-        remote_file = File.join("", "tmp", remote_filename)
+        remote_file  = File.join("", "tmp", remote_filename)
         local_file ||= File.join(Dir.pwd, File.basename(remote_file))
         local_file   = File.expand_path(local_file)
+        root_fs_path = self.lxc.fs_root.split(File::SEPARATOR).last
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Compress', :cyan)) do
           self.node.ssh.bootstrap(<<-EOF)
@@ -29,7 +30,8 @@ set -x
 set -e
 
 du -sh #{self.lxc.container_root}
-find #{self.lxc.container_root} -print0 -depth | cpio -o0 | pbzip2 -#{compression} -vfczm#{PBZIP2_MEMORY} > #{remote_file}
+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
@@ -53,13 +55,15 @@ EOF
 
         self.down
         self.destroy
+        self.create
 
         import_tempfile = Tempfile.new('import')
         remote_filename = File.basename(import_tempfile.path.dup)
         import_tempfile.close!
 
-        remote_file = File.join("", "tmp", remote_filename)
-        local_file  = File.expand_path(local_file)
+        remote_file  = File.join("", "tmp", remote_filename)
+        local_file   = File.expand_path(local_file)
+        root_fs_path = self.lxc.fs_root.split(File::SEPARATOR).last
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Import', :cyan)) do
           self.node.ssh.exec(%(sudo rm -fv #{remote_file}), :silence => true, :ignore_exit_status => true)
@@ -72,6 +76,8 @@ set -x
 set -e
 
 ls -lah #{remote_file}
+cd #{self.lxc.container_root}
+rm -rf #{root_fs_path}
 pbzip2 -vdcm#{PBZIP2_MEMORY} #{remote_file} | cpio -uid && rm -fv #{remote_file}
 du -sh #{self.lxc.container_root}
 EOF

data/lib/testlab/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-04 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -208,6 +208,7 @@ email:
 - zachary AT jovelabs DOT com
 executables:
 - tl
+- tl-console
 extensions: []
 extra_rdoc_files: []
 files:
@@ -222,6 +223,7 @@ files:
 - README.md
 - Rakefile
 - bin/tl
+- bin/tl-console
 - features/step_definitions/container_steps.rb
 - features/step_definitions/network_steps.rb
 - features/step_definitions/node_steps.rb
@@ -329,7 +331,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1442946295549762745
+      hash: 2591373511513958371
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -338,7 +340,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1442946295549762745
+      hash: 2591373511513958371
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25