testlab 1.8.1 → 1.8.2

data/lib/testlab/container/io.rb

@@ -8,7 +8,7 @@ class TestLab
 
       PBZIP2_MEMORY    = 1024
       READ_SIZE        = ((64 * 1024) - 1)
-      TRANSFER_MESSAGE = "transferring '%s' at %0.2fMB/s -- %0.2fMB of %0.2fMB -- %d%%   \r"
+      TRANSFER_MESSAGE = "transferring '%s' at %0.2fMB/s -- %0.2fMB of %0.2fMB -- %d%% (%01d:%02dT-%01d:%02d)   \r"
 
       def progress_callback(action, args)
         @total_size ||= 0
@@ -22,15 +22,24 @@ class TestLab
           end
 
         when :get, :put then
+          elapsed  = (Time.now - @start_time)
+
           current_size = (args[1] + args[2].length)
           current_size_mb = (current_size.to_f / (1024 * 1024).to_f)
 
-          elapsed = (Time.now - @start_time)
-          speed_mb = (current_size.to_f / elapsed.to_f) / (1024 * 1024).to_f
+          speed    = (current_size.to_f / elapsed.to_f)
+          speed_mb = speed / (1024 * 1024).to_f
+
+          minutes = elapsed.div(60)
+          seconds = elapsed.modulo(60)
+
+          estimated = ((@total_size.to_f - current_size).to_f / speed)
+          est_minutes = estimated.div(60)
+          est_seconds = estimated.modulo(60)
 
           percentage_done = ((current_size * 100) / @total_size)
 
-          @ui.stdout.print(format_message(TRANSFER_MESSAGE.yellow % [File.basename(args[0].local), speed_mb, current_size_mb, @total_size_mb, percentage_done]))
+          @ui.stdout.print(format_message(TRANSFER_MESSAGE.yellow % [File.basename(args[0].local), speed_mb, current_size_mb, @total_size_mb, percentage_done, minutes, seconds, est_minutes, est_seconds]))
 
         when :finish
           @ui.stdout.puts
@@ -51,6 +60,9 @@ class TestLab
         # ephemeral state.
         self.lxc_clone.exists? and raise ContainerError, 'You can not export ephemeral containers!'
 
+        # Run our callbacks
+        do_provisioner_callbacks(self, :export, @ui)
+
         # Ensure the container is stopped before we attempt to export it.
         self.down
 
@@ -149,6 +161,11 @@ rm -fv #{remote_file}
 EOF
         end
 
+        self.up
+
+        # Run our callbacks
+        do_provisioner_callbacks(self, :import, @ui)
+
         @ui.stdout.puts(format_message("Your shipping container is now imported and available for use!".green.bold))
 
         true
@@ -234,9 +251,19 @@ EOF
 
               new_progress = (current_size * 100) / total_size
               unless new_progress == progress
-                elapsed = (Time.now - start_time)
-                speed_mb = (current_size.to_f / elapsed.to_f) / (1024 * 1024).to_f
-                @ui.stdout.print(format_message(TRANSFER_MESSAGE.yellow % [File.basename(local_file), speed_mb, current_size_mb, total_size_mb, new_progress]))
+                elapsed  = (Time.now - start_time)
+
+                speed    = (current_size.to_f / elapsed.to_f)
+                speed_mb = speed / (1024 * 1024).to_f
+
+                minutes = elapsed.div(60)
+                seconds = elapsed.modulo(60)
+
+                estimated = ((total_size.to_f - current_size).to_f / speed)
+                est_minutes = estimated.div(60)
+                est_seconds = estimated.modulo(60)
+
+                @ui.stdout.print(format_message(TRANSFER_MESSAGE.yellow % [File.basename(local_file), speed_mb, current_size_mb, total_size_mb, new_progress, minutes, seconds, est_minutes, est_seconds]))
               end
               progress = new_progress
             end

data/lib/testlab/provider.rb

@@ -9,9 +9,10 @@ class TestLab
   class Provider
     PROXY_METHODS = %w(instance_id state user identity ip port create destroy up down reload status alive? dead? exists?).map(&:to_sym)
 
-    autoload :AWS, 'testlab/providers/aws'
-    autoload :Local, 'testlab/providers/local'
-    autoload :Vagrant, 'testlab/providers/vagrant'
+    autoload :AWS,       'testlab/providers/aws'
+    autoload :Local,     'testlab/providers/local'
+    autoload :OpenStack, 'testlab/providers/open_stack'
+    autoload :Vagrant,   'testlab/providers/vagrant'
 
     class << self
 

data/lib/testlab/providers/open_stack.rb

@@ -0,0 +1,20 @@
+class TestLab
+
+  class Provider
+
+    # OpenStack Provider Error Class
+    class OpenStackError < ProviderError; end
+
+    # OpenStack Provider Class
+    #
+    # @author Zachary Patten <zachary AT jovelabs DOT com>
+    class OpenStack
+
+      def initialize(ui=ZTK::UI.new)
+        @ui = ui
+      end
+
+    end
+
+  end
+end

data/lib/testlab/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-16 00:00:00.000000000 Z
+date: 2013-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -275,6 +275,7 @@ files:
 - lib/testlab/provider.rb
 - lib/testlab/providers/aws.rb
 - lib/testlab/providers/local.rb
+- lib/testlab/providers/open_stack.rb
 - lib/testlab/providers/templates/vagrant/Vagrantfile.erb
 - lib/testlab/providers/vagrant.rb
 - lib/testlab/provisioner.rb
@@ -343,7 +344,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2144885167691104843
+      hash: -2021953625576057715
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -352,7 +353,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2144885167691104843
+      hash: -2021953625576057715
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25