testlab 1.18.1 → 1.19.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTBiNzQ4NzUwY2JlYWVjMTE0NzcwNmMwYzM0OTQ3ZTY2OTQwZDIzOQ==
+    NjQ3NDM1Njk2ZWQwMjJmMDU0MWMyODcxNTk1OWVlYTExODFlZmQ0Yw==
   data.tar.gz: !binary |-
-    M2RhODk4NGFjYjViYjE2NzEwMTE2Nzg2OGI0NTMyMGY0NGIzMWFhMA==
+    N2NlZjBhNTdkYTVmYjMxODg5NmQzZTJmNzFiZDAyNGQ1YjMxODBmMA==
 SHA512:
   metadata.gz: !binary |-
-    ZDBmN2Q5OGQ3OGY4MTgxNGM1MDFmNzY4MzU1MjMwNWFmMzFmYzM4NjM1NTdj
-    OTFlZTYyNTUxMmQ0YTA4ZTM3NWJjMDI2YmMyZWE1MzYxYzZhYjgyMzgwOGJk
-    MTVjOTUwNTgyOGJkOTM4ODk0NTgwYmQ4MDgyNDY1NDc5MGMyODI=
+    ZWEyOGQyNzM4NDQ1ZGU1MmVjYTBlMzUyZTU5ZTA4MzgyMzc2NTM4NDBmZmI2
+    YWZmZDM1YmE1Mjc1MjQyMWUxNmVhNzI2M2I0NTRlYTgwNTNjMTRjOGQ3MGI3
+    ODcyM2Y0NWI1NWQ0NjRiNzliMWIwY2Y4ZGJhMDkyNTY4MzAwMzM=
   data.tar.gz: !binary |-
-    OTRiNTBjN2UxMzQzMjAyZGJmNThjN2VkM2I1ZDEzYmZlOTUzMjRhNjdjMjNl
-    NzdkYzIxNTYxMmYzNzkxNTQ3MTcwMGI1MDlmNDI5ZWU5ZTJmMGEyZjFlNDk4
-    ZjIyZmNiM2Y0NThiYmU4M2UxMmUzZGI5ZTE4ZGY1MTQ2OTM0NTE=
+    M2UxMThlZTIwOGZkODE2YjNkNjMwYzEwNWRjMjdkNTNjMDZiZTNmODk2ZDdk
+    MDkxMmMzODRjNWMzOTUzZWY1MjQ4ZDM3ZjE5OTVlMmYzNmM2M2Q3YTdhZTcy
+    ZmUxODNhYzUzOGE1NTc5ZTM5MWM0ZmQwMTE4NWU3YWYyZWRkM2I=

data/bin/tl

@@ -74,11 +74,11 @@ require 'commands/container'
 
 # commands_from 'commands'
 
-desc 'Show verbose output'
+desc 'Verbose output (or set VERBOSE=1 in your environment)'
 default_value false
 switch [:v, :verbose]
 
-desc 'Quiet mode'
+desc 'Quiet output (or set QUIET=1 in your environment)'
 default_value false
 switch [:q, :quiet]
 
@@ -95,19 +95,27 @@ arg_name 'path/to/directory'
 flag [:c, :config]
 
 desc 'Path to Log file'
-default_value STDOUT
+default_value DEFAULT_LOG_FILE
 arg_name 'path/to/log_file'
 flag [:log]
 
 pre do |global,command,options,args|
   @testlab_start_time = Time.now.utc
+  @verbose = ((ENV['VERBOSE'] == '1') || (global[:verbose] == true))
+  @quiet   = ((ENV['QUIET'] == '1') || (global[:quiet] == true))
 
-  (global[:verbose] == true) and (ENV['LOG_LEVEL'] = 'DEBUG')
+  (@verbose == true) and (ENV['LOG_LEVEL'] = 'DEBUG')
+
+  File.exists?(global[:log]) and FileUtils.move(global[:log], DEFAULT_LOG_BACKUP)
+  logger = ZTK::Logger.new(global[:log])
+  if ((@verbose == true) || (@quiet == false))
+    logger.loggers << ::Logger.new(STDOUT)
+  end
 
   @ui = ZTK::UI.new(
-    :logger  => ZTK::Logger.new(global[:log]),
-    :verbose => global[:verbose],
-    :quiet   => global[:quiet]
+    :logger  => logger,
+    :verbose => @verbose,
+    :quiet   => @quiet
   )
 
   @ui.logger.debug { "global(#{global.inspect})" }
@@ -141,6 +149,8 @@ post do |global,command,options,args|
     @ui.logger.info { message }
   end
 
+  File.exists?(DEFAULT_DUMP_FILE) and File.delete(DEFAULT_DUMP_FILE)
+
   true
 end
 
@@ -159,12 +169,22 @@ on_error do |exception|
   else
     testlab_run_time = (Time.now.utc - @testlab_start_time)
 
+    dump_file = File.open(DEFAULT_DUMP_FILE, 'w')
+
+    if !@testlab.nil?
+      TestLab::Utility.log_header(@testlab).each { |line| dump_file.puts(line) }
+    end
+
+    dump_file.puts(exception.inspect)
     @ui.logger.fatal { exception.inspect }
+
     exception.backtrace.each do |line|
-      @ui.logger.logdev.write("#{line}\n")
+      dump_file.puts(line)
+      @ui.logger << "#{line}\n"
     end
 
     message = format_message("TestLab v#{TestLab::VERSION} Aborted (%0.4f seconds)".black.bold % testlab_run_time)
+    dump_file.puts(ZTK::ANSI.uncolor(message))
     @ui.stderr.puts(message)
     @ui.logger.info { message }
 

data/lib/commands/support.rb

@@ -46,17 +46,26 @@ def build_lab_commands(component, klass, &block)
     c.arg_name %(#{component}[,#{component},...])
     c.flag [:n, :name]
 
+    c.desc %(Force the actions verbatium, do not attempt to infer shortcuts; this has no effect for most operations)
+    c.switch [:f, :force]
+
     LAB_ACTION_ORDER.each do |lab_action|
       action_desc = LAB_ACTIONS[lab_action]
       c.desc(action_desc.first % "#{component}s")
       c.long_desc(ZTK::Template.string(action_desc.last, {:component => "#{component}s"}))
 
       c.command lab_action do |la|
+
         la.action do |global_options, options, args|
           iterate_objects_by_name(options[:name], klass) do |object|
-            object.send(lab_action)
+            if %w( build recycle ).map(&:to_sym).include?(lab_action)
+              object.send(lab_action, options[:force])
+            else
+              object.send(lab_action)
+            end
           end
         end
+
       end
     end
 

data/lib/commands/testlab.rb

@@ -33,7 +33,7 @@ TestLab will then attempt to build the components, executing the following tasks
 Create -> Up -> Provision
 EOF
 command :build do |build|
-  build.action do |global_options,options,args|
+  build.action do |global_options, options, args|
     @testlab.build
   end
 end
@@ -53,7 +53,7 @@ TestLab will then attempt to demolish the components, executing the following ta
 Deprovision -> Down -> Destroy
 EOF
 command :demolish do |demolish|
-  demolish.action do |global_options,options,args|
+  demolish.action do |global_options, options, args|
     @testlab.demolish
   end
 end
@@ -73,7 +73,7 @@ Then components are onlined in the following order:
 Nodes -> Networks -> Containers
 EOF
 command :bounce do |bounce|
-  bounce.action do |global_options,options,args|
+  bounce.action do |global_options, options, args|
     @testlab.bounce
   end
 end
@@ -93,7 +93,7 @@ Then components are built in the following order:
 Nodes -> Networks -> Containers
 EOF
 command :recycle do |recycle|
-  recycle.action do |global_options,options,args|
+  recycle.action do |global_options, options, args|
     @testlab.recycle
   end
 end
@@ -109,7 +109,7 @@ The components are created in the following order:
 Nodes -> Networks -> Containers
 EOF
 command :create do |create|
-  create.action do |global_options,options,args|
+  create.action do |global_options, options, args|
     @testlab.create
   end
 end
@@ -125,7 +125,7 @@ The components are destroyed in the following order:
 Nodes -> Networks -> Containers
 EOF
 command :destroy do |destroy|
-  destroy.action do |global_options,options,args|
+  destroy.action do |global_options, options, args|
     @testlab.destroy
   end
 end
@@ -141,7 +141,7 @@ The components are onlined in the following order:
 Nodes -> Networks -> Containers
 EOF
 command :up do |up|
-  up.action do |global_options,options,args|
+  up.action do |global_options, options, rgs|
     @testlab.up
   end
 end
@@ -157,7 +157,7 @@ The components are offlined in the following order:
 Containers -> Networks -> Nodes
 EOF
 command :down do |down|
-  down.action do |global_options,options,args|
+  down.action do |global_options, options, args|
     @testlab.down
   end
 end
@@ -173,7 +173,7 @@ The components are provisioned in the following order:
 Nodes -> Networks -> Containers
 EOF
 command :provision do |provision|
-  provision.action do |global_options,options,args|
+  provision.action do |global_options, options, args|
     @testlab.provision
   end
 end
@@ -189,7 +189,7 @@ The components are torndown in the following order:
 Containers -> Networks -> Nodes
 EOF
 command :deprovision do |deprovision|
-  deprovision.action do |global_options,options,args|
+  deprovision.action do |global_options, options, args|
     @testlab.deprovision
   end
 end
@@ -198,7 +198,7 @@ end
 #############
 desc 'Display the lab status'
 command :status do |status|
-  status.action do |global_options,options,args|
+  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({}, {}, [])
@@ -211,6 +211,25 @@ command :status do |status|
   end
 end
 
+# LAB BUG REPORT
+#################
+desc 'Generate a lab bug report'
+command :bugreport do |bugreport|
+  bugreport.action do |global_options, options, args|
+    @testlab.ui.logger.level = ZTK::Logger::FATAL
+
+    report_file = File.join("", "tmp", "testlab-bug-report.#{Time.now.utc.to_i}")
+
+    content = Array.new
+    content << (IO.read(DEFAULT_DUMP_FILE) rescue nil)
+    content << ("#{'=' * 30} TestLab Log #{'=' * 30}")
+    content << IO.read(DEFAULT_LOG_BACKUP)
+
+    IO.write(report_file, content.flatten.compact.join("\n"))
+
+    @testlab.ui.stdout.puts("The bug report for your most recent execution of TestLab is located at #{report_file.inspect}.")
+  end
+end
 
 # LAB DOCTOR
 #############

data/lib/testlab.rb

@@ -7,6 +7,7 @@ require 'lxc'
 require 'active_support/inflector'
 
 require 'testlab/version'
+require 'testlab/const'
 require 'testlab/monkeys'
 
 # TestLab - A framework for building lightweight virtual infrastructure using LXC
@@ -153,9 +154,6 @@ class TestLab
 
     @config_dir    = (options[:config_dir] || File.join(@repo_dir, ".testlab-#{TestLab.hostname}"))
     File.exists?(@config_dir) or FileUtils.mkdir_p(@config_dir)
-
-    # @log_file      = (options[:log_file] || File.join(@repo_dir, "testlab-#{TestLab.hostname}.log") || STDOUT)
-    # self.ui.logger = ZTK::Logger.new(@log_file)
   end
 
   # Boot TestLab

data/lib/testlab/const.rb

@@ -0,0 +1,11 @@
+unless defined?(DEFAULT_DUMP_FILE)
+  DEFAULT_DUMP_FILE = File.join('', 'tmp', 'testlab.dump')
+end
+
+unless defined?(DEFAULT_LOG_FILE)
+  DEFAULT_LOG_FILE = File.join('', 'tmp', 'testlab.log')
+end
+
+unless defined?(DEFAULT_LOG_BACKUP)
+  DEFAULT_LOG_BACKUP = File.join('', 'tmp', 'testlab.log.bak')
+end

data/lib/testlab/container/io.rb

@@ -114,7 +114,7 @@ class TestLab
       # Import the container
       #
       # @return [Boolean] True if successful.
-      def import(local_file)
+      def import(local_file=nil)
         @ui.logger.debug { "Container Import: #{self.id}" }
 
         self.node.alive? or return false
@@ -141,8 +141,8 @@ class TestLab
         # Ensure we are not in ephemeral mode.
         self.persistent
 
-        self.down
-        self.destroy
+        (self.state == :running) and self.down
+        self.exists? and self.destroy
 
         self.create
 

data/lib/testlab/support/lifecycle.rb

@@ -4,10 +4,14 @@ class TestLab
     module Lifecycle
 
       # Build the object
-      def build
-        create
-        up
-        provision
+      def build(force=false)
+        if (force == false) and self.respond_to?(:importable?) and self.respond_to?(:import) and (self.importable? == true)
+          import
+        else
+          create
+          up
+          provision
+        end
 
         true
       end
@@ -22,9 +26,9 @@ class TestLab
       end
 
       # Recycle the object
-      def recycle
+      def recycle(force=false)
         demolish
-        build
+        build(force)
 
         true
       end

data/lib/testlab/utility/logger.rb

@@ -25,7 +25,7 @@ class TestLab
           "config_dir" => testlab.config_dir.inspect,
           "repo_dir" => testlab.repo_dir.inspect,
           "labfile_path" => testlab.labfile_path.inspect,
-          "logdev" => testlab.ui.logger.logdev.inspect,
+          "logdev" => testlab.ui.logger.instance_variable_get(:@logdev).inspect,
           "version" => TestLab::VERSION.inspect,
         }
       end

data/lib/testlab/utility/misc.rb

@@ -26,27 +26,29 @@ class TestLab
       end
 
       def please_wait(options={}, &block)
-        ui      = options[:ui]
-        message = options[:message]
-        mark    = (options[:mark] || "Completed in %0.4f seconds!")
+        ui       = options[:ui]
+        message  = options[:message]
+        mark     = (options[:mark] || "Completed in %0.4f seconds!")
 
         !block_given? and raise MiscError, "You must supply a block!"
         ui.nil? and raise MiscError, "You must supply a ZTK::UI object!"
         message.nil? and raise MiscError, "You must supply a message!"
 
-        if (ui.logger.logdev == STDOUT)
-          mark = format_message("#{message} / #{mark.black.bold}")
-          message = format_message(message)
-        else
-          message = format_message(message)
-          length = message.uncolor.length
-          max = (length >= 60 ? (length+1) : (60 - length))
-          mark = ((' ' * max) + "# #{mark}".black.bold)
+        use_spinner = true
+        msg         = format_message("#{message} ")
+        length      = msg.uncolor.length
+        max         = (length >= 60 ? (length+1) : (60 - length))
+        mrk         = ((' ' * max) + "# #{mark}\n".bold)
+
+        if (ui.logger.respond_to?(:loggers) && ui.logger.loggers.is_a?(Array))
+          if ui.logger.loggers.count > 1
+            use_spinner = false
+            mrk = format_message("#{message} / #{mark.bold}\n")
+            msg = format_message("#{message}\n")
+          end
         end
-        use_spinner = ((ui.logger.logdev == STDOUT) ? false : true)
 
-        ZTK::Benchmark.bench(:ui => ui, :message => message, :mark => mark, :use_spinner => use_spinner) do
-          (ui.logger.logdev == STDOUT) and STDOUT.puts
+        ZTK::Benchmark.bench(:ui => ui, :message => msg, :mark => mrk, :use_spinner => use_spinner) do
           yield
         end
       end

data/lib/testlab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 1.18.1
+  version: 1.19.0
 platform: ruby
 authors:
 - Zachary Patten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-01 00:00:00.000000000 Z
+date: 2014-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -271,6 +271,7 @@ files:
 - lib/commands/support.rb
 - lib/commands/testlab.rb
 - lib/testlab.rb
+- lib/testlab/const.rb
 - lib/testlab/container.rb
 - lib/testlab/container/actions.rb
 - lib/testlab/container/class_methods.rb
@@ -388,7 +389,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: A toolkit for building virtual computer labs