testlab 1.16.0 → 1.16.1

data/bin/tl

@@ -97,7 +97,7 @@ flag [:c, :config]
 desc 'Path to Log file'
 default_value STDOUT
 arg_name 'path/to/log_file'
-flag [:L, :log_file]
+flag [:log]
 
 pre do |global,command,options,args|
   @testlab_start_time = Time.now.utc
@@ -105,7 +105,7 @@ pre do |global,command,options,args|
   (global[:verbose] == true) and (ENV['LOG_LEVEL'] = 'DEBUG')
 
   @ui = ZTK::UI.new(
-    :logger  => ZTK::Logger.new(global[:log_file]),
+    :logger  => ZTK::Logger.new(global[:log]),
     :verbose => global[:verbose],
     :quiet   => global[:quiet]
   )

data/lib/commands/testlab.rb

@@ -199,6 +199,7 @@ end
 desc 'Display the lab status'
 command :status do |status|
   status.action do |global_options,options,args|
+    @testlab.ui.logger.level = ZTK::Logger::WARN
     @testlab.ui.stdout.puts("\nNODES:".green.bold)
     commands[:node].commands[:status].execute({}, {}, [])
 

data/lib/testlab/container/io.rb

@@ -43,8 +43,9 @@ class TestLab
         when :get, :put then
           elapsed      = (Time.now - @start_time)
           current_size = (args[1] + args[2].length)
+          message      = ((action == :get) ? 'downloading from' : 'uploading to')
 
-          transfer_message(%(uploading to node:), args[0].local, current_size, @total_size, elapsed)
+          transfer_message(%(#{message} node:), args[0].local, current_size, @total_size, elapsed)
 
         when :finish
           @ui.stdout.puts
@@ -73,7 +74,8 @@ class TestLab
         # Ensure the container is stopped before we attempt to export it.
         self.down
 
-        self.lxc.attach(%(-- /bin/bash -c 'apt-get clean'))
+        self.lxc.execute(%(/bin/bash -c 'apt-get -y autoremove'))
+        self.lxc.execute(%(/bin/bash -c 'apt-get -y clean'))
 
         export_tempfile = Tempfile.new('export')
         remote_filename = File.basename(export_tempfile.path.dup)
@@ -85,13 +87,13 @@ class TestLab
         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.bootstrap(<<-EOF)
-du -sh #{self.lxc.container_root}
-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
+          self.node.bootstrap(<<-EOSCRIPT)
+            du -sh #{self.lxc.container_root}
+            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}
+          EOSCRIPT
         end
 
         File.exists?(local_file) and FileUtils.rm_f(local_file)
@@ -100,9 +102,9 @@ EOF
 
         self.node.download(remote_file, local_file, :on_progress => method(:progress_callback), :read_size => READ_SIZE, :use_scp => true)
 
-        self.node.bootstrap(<<-EOF)
-rm -fv #{remote_file}
-EOF
+        self.node.bootstrap(<<-EOSCRIPT)
+          rm -fv #{remote_file}
+        EOSCRIPT
 
         @ui.stdout.puts(format_message("Your shipping container is now exported and available at '#{local_file}'!".green.bold))
 

data/lib/testlab/providers/vagrant.rb

@@ -49,7 +49,10 @@ class TestLab
 
       # Destroy Vagrant-controlled VM
       def destroy
+        @state = nil
         self.alive? and self.down
+
+        @state = nil
         self.exists? and self.vagrant_cli("destroy", "--force", self.instance_id)
 
         true
@@ -59,6 +62,7 @@ class TestLab
 
       # Online Vagrant-controlled VM
       def up
+        @state = nil
         self.vagrant_cli("up", self.instance_id)
 
         ZTK::TCPSocketCheck.new(:host => self.ip, :port => self.port, :wait => 120, :ui => @ui).wait
@@ -68,8 +72,8 @@ class TestLab
 
       # Halt Vagrant-controlled VM
       def down(*args)
+        @state = nil
         arguments = (%W(halt #{self.instance_id}) + args).flatten.compact
-
         self.vagrant_cli(*arguments)
 
         true
@@ -151,15 +155,18 @@ class TestLab
 
       # Inquire the state of the Vagrant-controlled VM
       def state
-        output = self.vagrant_cli("status").output.split("\n").select{ |line| (line =~ /#{self.instance_id}/) }.first
-        result = UNKNOWN_STATE
-        ALL_STATES.map{ |s| s.to_s.gsub('_', ' ') }.each do |state|
-          if output =~ /#{state}/
-            result = state.to_s.gsub(' ', '_')
-            break
+        if @state.nil?
+          output = self.vagrant_cli("status").output.split("\n").select{ |line| (line =~ /#{self.instance_id}/) }.first
+          result = UNKNOWN_STATE
+          ALL_STATES.map{ |s| s.to_s.gsub('_', ' ') }.each do |state|
+            if output =~ /#{state}/
+              result = state.to_s.gsub(' ', '_')
+              break
+            end
           end
+          @state = result.to_sym
         end
-        result.to_sym
+        @state
       end
 
 ################################################################################

data/lib/testlab/provisioners/bind.rb

@@ -32,7 +32,6 @@ class TestLab
 
         true
       end
-      alias :on_node_up :on_node_provision
 
       # Bind: Container Provision
       #

data/lib/testlab/provisioners/resolv.rb

@@ -41,7 +41,6 @@ class TestLab
 
         true
       end
-      alias :on_node_up :on_node_provision
 
       # Resolv: Container Provision
       #

data/lib/testlab/provisioners/templates/apt/provision.erb

@@ -1,6 +1,3 @@
-set -x
-set -e
-
 export DEBIAN_FRONTEND="noninteractive"
 
 <% if !@apt[:multiarch].nil? && (@apt[:multiarch] == false) -%>

data/lib/testlab/provisioners/templates/apt_cacher_ng/provision.erb

@@ -1,6 +1,3 @@
-set -x
-set -e
-
 export DEBIAN_FRONTEND="noninteractive"
 
 if ! dpkg --status apt-cacher-ng &> /dev/null; then

data/lib/testlab/provisioners/templates/raring/provision.erb

@@ -1,6 +1,3 @@
-set -x
-set -e
-
 export DEBIAN_FRONTEND="noninteractive"
 
 # Update APT and ensure our required packages are installed

data/lib/testlab/provisioners/templates/resolv/provision.erb

@@ -1,6 +1,3 @@
-set -x
-set -e
-
 dpkg --status bind9 &> /dev/null || <%= (@resolv[:object] == :container).inspect %>
 
 cat <<EOF | tee /etc/resolv.conf

data/lib/testlab/version.rb

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

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.16.1
+  prerelease: 
 platform: ruby
 authors:
 - Zachary Patten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-11 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: lxc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ztk
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -125,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -132,6 +150,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -139,6 +158,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -146,6 +166,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -153,6 +174,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -160,6 +182,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -167,6 +190,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -174,6 +198,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -314,26 +339,27 @@ files:
 homepage: http://hackers.lookout.com/testlab/
 licenses:
 - Apache 2.0
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A toolkit for building virtual computer labs
 test_files:
 - features/step_definitions/container_steps.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NmQ5ZmI1ZmRjYTJhNjJjOGNkOWRiYjE1ODQ3ZDM4OGVjODAxNjRlNw==
-  data.tar.gz: !binary |-
-    NzU1NDg1NDc0MjM4MWZjZmQwZThhYjQyNWY2NjQ4YjNjMzRjODEwMw==
-SHA512:
-  metadata.gz: !binary |-
-    YjRmYTkzZWM3ZTEwOWI5MjMwY2U1NjY1MjI4YTdmYWVmYWY4OWYyOTNmNzUx
-    ZTY4NDkxODdiZWMwNzI2MjY1Mzc1MjQwZmI0ZjUyYmIzY2FhY2U2ZjhjYzM3
-    M2Y1MGIwMjcxOTk2YTU2NDkzZGIzYThlOThiNWQxNjQ4YmQ5YjQ=
-  data.tar.gz: !binary |-
-    NDkzMTBjZTI2ODUzZDI3OGQyZjc0OWI3YzMxMWVjMDNhZTRjYTA4MzE4Zjg0
-    MDQxZmRjMWVkZjFmYTk3MmZhOTA4MzdkOTMxMTgyOGFiYmQ5NjRmOWFjOTk2
-    MGJlZTFmMjQ3OTQxMjNlNDk1ZWNhMTNhZWMzMDk4M2MyMzc5ZGM=