testlab 1.7.1 → 1.8.0

data/lib/commands/container.rb

@@ -173,12 +173,11 @@ EOF
     import.flag [:input]
 
     import.action do |global_options, options, args|
-      if (options[:name].nil? || options[:input].nil?)
+      if options[:name].nil?
         help_now!('a name is required') if options[:name].nil?
-        help_now!('a filename is required') if options[:input].nil?
       else
         iterate_objects_by_name(options[:name], TestLab::Container) do |container|
-          container.import(options[:input])
+          container.import(options[:input] || "")
         end
       end
     end

data/lib/testlab/container.rb

@@ -11,14 +11,14 @@ class TestLab
   #   container "server-west-1" do
   #     domain        "west.zone"
   #
-  #     distro        "ubuntu"
-  #     release       "precise"
+  #     distro  "ubuntu"
+  #     release "precise"
   #
   #     user do
   #       username "deployer"
   #       password "deployer"
-  #       uid 2600
-  #       gid 2600
+  #       uid      2600
+  #       gid      2600
   #     end
   #
   #     interface do
@@ -31,14 +31,14 @@ class TestLab
   #
   # @example Multiple interfaces can be defined as well:
   #   container "dual-nic" do
-  #     distro        "ubuntu"
-  #     release       "precise"
+  #     distro  "ubuntu"
+  #     release "precise"
   #
   #     user do
   #       username "deployer"
   #       password "deployer"
-  #       uid 2600
-  #       gid 2600
+  #       uid      2600
+  #       gid      2600
   #     end
   #
   #     interface do
@@ -127,6 +127,8 @@ class TestLab
 
     attribute   :mounts,        :default => Array.new
 
+    attribute   :sc_url
+
     attribute   :aa_profile
     attribute   :cap_drop
 

data/lib/testlab/container/io.rb

@@ -2,8 +2,42 @@ class TestLab
   class Container
 
     module IO
+      require 'net/http'
+      require 'net/https' if RUBY_VERSION < '1.9'
       require 'tempfile'
-      PBZIP2_MEMORY = 256
+
+      PBZIP2_MEMORY    = 1024
+      READ_SIZE        = ((64 * 1024) - 1)
+      TRANSFER_MESSAGE = "transferring '%s' at %0.2fMB/s -- %0.2fMB of %0.2fMB -- %d%%   \r"
+
+      def progress_callback(action, args)
+        @total_size ||= 0
+
+        case action
+        when :open then
+          @start_time = Time.now
+          if (@total_size == 0)
+            @total_size = args[0].size
+            @total_size_mb = (@total_size.to_f / (1024 * 1024).to_f)
+          end
+
+        when :get, :put then
+          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
+
+          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]))
+
+        when :finish
+          @ui.stdout.puts
+          @total_size = 0
+
+        end
+      end
 
       # Export the container
       #
@@ -44,10 +78,19 @@ ls -lah #{remote_file}
 EOF
         end
 
-        please_wait(:ui => @ui, :message => format_object_action(self, 'Export', :cyan)) do
-          File.exists?(local_file) and FileUtils.rm_f(local_file)
-          self.node.download(remote_file, local_file)
-        end
+        File.exists?(local_file) and FileUtils.rm_f(local_file)
+
+        @total_size = self.node.ssh.sftp.stat!(remote_file).size
+        @total_size_mb = (@total_size.to_f / (1024 * 1024).to_f)
+
+        self.node.download(remote_file, local_file, :on_progress => method(:progress_callback), :read_size => READ_SIZE)
+
+        self.node.bootstrap(<<-EOF)
+set -x
+set -e
+
+rm -fv #{remote_file}
+EOF
 
         @ui.stdout.puts(format_message("Your shipping container is now exported and available at '#{local_file}'!".green.bold))
 
@@ -60,11 +103,21 @@ EOF
       def import(local_file)
         @ui.logger.debug { "Container Import: #{self.id} " }
 
+        if !File.exists?(local_file)
+          self.sc_url.nil? and raise ContainerError, "You failed to supply a filename or URL to import from!"
+
+          @ui.stdout.puts(format_message("Downloading shipping container for #{self.id}...".green.bold))
+
+          local_file = File.expand_path("#{self.id}.sc")
+          sc_download(local_file, self.sc_url, 16)
+        end
+
         # Ensure we are not in ephemeral mode.
         self.persistent
 
         self.down
         self.destroy
+
         self.create
 
         import_tempfile = Tempfile.new('import')
@@ -75,10 +128,8 @@ EOF
         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.exec(%(sudo rm -fv #{remote_file}), :silence => true, :ignore_exit_status => true)
-          self.node.upload(local_file, remote_file)
-        end
+        self.node.exec(%(sudo rm -fv #{remote_file}), :silence => true, :ignore_exit_status => true)
+        self.node.upload(local_file, remote_file, :on_progress => method(:progress_callback), :read_size => READ_SIZE)
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Expand', :cyan)) do
           self.node.bootstrap(<<-EOF)
@@ -92,6 +143,8 @@ cd #{self.lxc.container_root}
 pbzip2 -vdcm#{PBZIP2_MEMORY} #{remote_file} | cpio -uid && rm -fv #{remote_file}
 
 du -sh #{self.lxc.container_root}
+
+rm -fv #{remote_file}
 EOF
         end
 
@@ -135,6 +188,73 @@ EOF
         true
       end
 
+      # Downloads a given shipping container image
+      #
+      # @return [Boolean] True if successful.
+      def sc_download(local_file, url, count)
+        (count <= 0) and raise ContainerError, "Too many redirects, aborting!"
+
+        uri        = URI(url)
+        http       = Net::HTTP.new(uri.host, uri.port)
+
+        if (uri.scheme.downcase == 'https')
+          http.use_ssl = true
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE  # lets be really permissive for now
+        end
+
+        http.request_get(uri.path) do |response|
+          case response
+          when Net::HTTPNotFound then
+            raise ContainerError, "The supplied sc_url for this container was 404 Not Found!"
+
+          when Net::HTTPClientError then
+            raise ContainerError, "Client Error: #{response.inspect}"
+
+          when Net::HTTPRedirection then
+            location = response['location']
+            @ui.stdout.puts(format_message("REDIRECTED  #{url} --> #{location}".black))
+            return sc_download(local_file, location, (count - 1))
+
+          when Net::HTTPOK then
+            tempfile = Tempfile.new(%(download-#{self.id}))
+            tempfile.binmode
+
+            current_size = 0
+            progress = 0
+            total_size = response['content-length'].to_i
+            total_size_mb = total_size.to_f / (1024 * 1024).to_f
+
+            start_time = Time.now
+            response.read_body do |chunk|
+              tempfile << chunk
+
+              current_size += chunk.size
+              current_size_mb = current_size.to_f / (1024 * 1024).to_f
+
+              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]))
+              end
+              progress = new_progress
+            end
+            @ui.stdout.puts
+
+            tempfile.close
+
+            FileUtils.mkdir_p(File.dirname(local_file))
+            File.exists?(local_file) and File.unlink(local_file)
+            FileUtils.mv(tempfile.path, local_file, :force => true)
+
+            true
+          else
+            raise ContainerError, "Unknown HTTP response when attempt to download your shipping container!"
+          end
+        end
+
+      end
+
     end
 
   end

data/lib/testlab/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-09 00:00:00.000000000 Z
+date: 2013-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -343,7 +343,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1929450895573458590
+      hash: -2347575770462916440
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -352,7 +352,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1929450895573458590
+      hash: -2347575770462916440
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25