testlab 0.6.7 → 0.6.8

data/lib/commands/container.rb

@@ -259,13 +259,18 @@ EOF
     export.arg_name 'level'
     export.flag [:c, :compression]
 
+    export.desc 'Specify the shipping container file to export to.'
+    # export.default_value nil
+    export.arg_name 'filename'
+    export.flag [:output]
+
     export.action do |global_options, options, args|
       help_now!('a name is required') if options[:name].nil?
 
       container = @testlab.containers.select{ |n| n.id.to_sym == options[:name].to_sym }.first
       container.nil? and raise TestLab::TestLabError, "We could not find the container you supplied!"
 
-      container.export(options[:compression])
+      container.export(options[:compression], options[:output])
     end
   end
 
@@ -274,18 +279,18 @@ EOF
   c.desc 'Import a shipping container (file)'
   c.command :import do |import|
 
-    import.desc 'Specify the shipping container file to import.'
+    import.desc 'Specify the shipping container file to import from.'
     import.arg_name 'filename'
-    import.flag [:sc]
+    import.flag [:input]
 
     import.action do |global_options, options, args|
       help_now!('a name is required') if options[:name].nil?
-      help_now!('a filename is required') if options[:sc].nil?
+      help_now!('a filename is required') if options[:input].nil?
 
       container = @testlab.containers.select{ |n| n.id.to_sym == options[:name].to_sym }.first
       container.nil? and raise TestLab::TestLabError, "We could not find the container you supplied!"
 
-      container.import(options[:sc])
+      container.import(options[:input])
     end
   end
 

data/lib/testlab/container/io.rb

@@ -2,11 +2,12 @@ class TestLab
   class Container
 
     module IO
+      PBZIP2_MEMORY = 256
 
       # Export the container
       #
       # @return [Boolean] True if successful.
-      def export(compression=9)
+      def export(compression=9, local_file=nil)
         @ui.logger.debug { "Container Export: #{self.id} " }
 
         (self.lxc.state == :not_created) and return false
@@ -14,14 +15,17 @@ class TestLab
         self.down
 
         sc_file = File.join("/", "tmp", "#{self.id}.sc")
-        local_file = File.join(Dir.pwd, File.basename(sc_file))
+        local_file ||= File.join(Dir.pwd, File.basename(sc_file))
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Compress', :cyan)) do
           self.node.ssh.bootstrap(<<-EOF)
 set -x
 set -e
-find #{self.lxc.container_root} -print0 -depth | cpio -o0 | pbzip2 -#{compression} -vfcz > #{sc_file}
+
+du -sh #{self.lxc.container_root}
+find #{self.lxc.container_root} -print0 -depth | cpio -o0 | pbzip2 -#{compression} -vfczm#{PBZIP2_MEMORY} > #{sc_file}
 chown ${SUDO_USER}:${SUDO_USER} #{sc_file}
+ls -lah #{sc_file}
 EOF
         end
 
@@ -55,7 +59,10 @@ EOF
           self.node.ssh.bootstrap(<<-EOF)
 set -x
 set -e
-pbzip2 -vdc #{sc_file} | cpio -uid && rm -fv #{sc_file}
+
+ls -lah #{sc_file}
+pbzip2 -vdcm#{PBZIP2_MEMORY} #{sc_file} | cpio -uid && rm -fv #{sc_file}
+du -sh #{self.lxc.container_root}
 EOF
         end
 

data/lib/testlab/providers/vagrant.rb

@@ -91,7 +91,7 @@ class TestLab
 
       # Inquire the state of the Vagrant-controlled VM
       def state
-        output = self.vagrant_cli("status | grep '#{self.instance_id}'").output
+        output = self.vagrant_cli("status").output.grep(/#{self.instance_id}/).first
         result = UNKNOWN_STATE
         ALL_STATES.map{ |s| s.to_s.gsub('_', ' ') }.each do |state|
           if output =~ /#{state}/

data/lib/testlab/utility/logger.rb

@@ -20,14 +20,12 @@ class TestLab
       end
 
       def log_details(testlab)
-        @command = ZTK::Command.new(:silence => true, :ignore_exit_status => true)
         {
           "hostname" => Socket.gethostname.inspect,
           "program" => $0.to_s.inspect,
           "config_dir" => testlab.config_dir.inspect,
           "logdev" => testlab.ui.logger.logdev.inspect,
-          "vagrant_version" => @command.exec(%(/usr/bin/env vagrant --version)).output.strip.inspect,
-          "virtualbox_version" => @command.exec(%(/usr/bin/env vboxmanage --version)).output.strip.inspect
+          "version" => TestLab::VERSION
         }
       end
 
@@ -44,11 +42,15 @@ class TestLab
       end
 
       def log_dependencies
+        @command = ZTK::Command.new(:silence => true, :ignore_exit_status => true)
+
         {
           "gli_version" => ::GLI::VERSION.inspect,
           "lxc_version" => ::LXC::VERSION.inspect,
           "ztk_version" => ::ZTK::VERSION.inspect,
           "activesupport_version" => ::ActiveSupport::VERSION::STRING.inspect,
+          "vagrant_version" => @command.exec(%(/usr/bin/env vagrant --version)).output.strip.inspect,
+          "virtualbox_version" => @command.exec(%(/usr/bin/env vboxmanage --version)).output.strip.inspect
         }
       end
 

data/lib/testlab/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-16 00:00:00.000000000 Z
+date: 2013-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -300,7 +300,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1748419604064060777
+      hash: 1538648921136541642
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -309,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1748419604064060777
+      hash: 1538648921136541642
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25