testlab 0.6.15 → 0.6.16

data/bin/tl

@@ -46,8 +46,13 @@ desc 'Quiet mode'
 default_value false
 switch [:q, :quiet]
 
+desc 'Path to Labfile'
+arg_name 'path/to/file'
+default_value File.join(Dir.pwd, 'Labfile')
+flag [:l, :labfile]
+
 pre do |global,command,options,args|
-  (global[:v] == true) and ENV['LOG_LEVEL'] = 'DEBUG'
+  (global[:verbose] == true) and ENV['LOG_LEVEL'] = 'DEBUG'
 
   log_file = File.join(Dir.pwd, "testlab-#{HOSTNAME}.log")
   @logger = ZTK::Logger.new(log_file)
@@ -57,11 +62,11 @@ pre do |global,command,options,args|
   @logger.debug { "args(#{args.inspect})" }
 
   @ui = ZTK::UI.new(:logger => @logger)
-  @testlab = TestLab.new(:ui => @ui)
+  @testlab = TestLab.new(:ui => @ui, :labfile => global[:labfile])
 
   TestLab::Utility.log_header(@testlab).each { |line| @logger.info { line } }
 
-  if (global[:q] == false)
+  if (global[:quiet] == false)
     message = format_message("TestLab v#{TestLab::VERSION} Loaded".black.bold)
     @testlab.ui.stdout.puts(message)
   end

data/lib/commands/container.rb

@@ -179,9 +179,7 @@ EOF
         if containers.count == 0
           @testlab.ui.stderr.puts("You either have no containers defined or dead nodes!".yellow)
         else
-          # ZTK::Report.new(:ui => @testlab.ui).spreadsheet(containers, TestLab::Container::STATUS_KEYS.reject{|k| k == :fqdn}) do |container|
           ZTK::Report.new(:ui => @testlab.ui).list(containers, TestLab::Container::STATUS_KEYS) do |container|
-            # OpenStruct.new(container.status.reject{|k,v| k == :fqdn})
             OpenStruct.new(container.status)
           end
         end

data/lib/testlab/container/lxc.rb

@@ -18,24 +18,7 @@ class TestLab
       #   execute.  This is generally a bash script of some sort for example.
       # @return [String] The output of *lxc-attach*.
       def bootstrap(content)
-        output = nil
-
-        ZTK::RescueRetry.try(:tries => 5, :on => ContainerError) do
-          tempfile = Tempfile.new("bootstrap")
-          remote_tempfile = File.join("/", "tmp", File.basename(tempfile.path))
-          target_tempfile = File.join(self.fs_root, remote_tempfile)
-
-          self.node.ssh.file(:target => target_tempfile, :chmod => '0777', :chown => 'root:root') do |file|
-            file.puts(content)
-          end
-
-          output = self.lxc.attach(%(--), %(/bin/bash), remote_tempfile)
-          if !(output =~ /#{remote_tempfile}: No such file or directory/).nil?
-            raise ContainerError, "We could not find the bootstrap file!"
-          end
-        end
-
-        output
+        self.lxc.bootstrap(content)
       end
 
       # LXC::Container object

data/lib/testlab/container.rb

@@ -121,9 +121,9 @@ class TestLab
 
 
     def initialize(*args)
-      super(*args)
-
       @ui          = TestLab.ui
+
+      super(*args)
     end
 
   end

data/lib/testlab/interface.rb

@@ -19,9 +19,9 @@ class TestLab
     attribute   :primary,    :default => false
 
     def initialize(*args)
-      super(*args)
-
       @ui = TestLab.ui
+
+      super(*args)
     end
 
     def ip

data/lib/testlab/network.rb

@@ -37,9 +37,9 @@ class TestLab
 
 
     def initialize(*args)
-      super(*args)
-
       @ui     = TestLab.ui
+
+      super(*args)
     end
 
   end

data/lib/testlab/node/lxc.rb

@@ -11,9 +11,8 @@ class TestLab
       # @return [LXC] An instance of LXC configured for this node.
       def lxc(options={})
         if (!defined?(@lxc) || @lxc.nil?)
-          @lxc ||= ::LXC.new
-          @lxc.use_sudo = true
-          @lxc.use_ssh = self.ssh
+          @lxc_runner ||= ::LXC::Runner::SSH.new(:ui => @ui, :ssh => self.ssh)
+          @lxc        ||= ::LXC.new(:ui => @ui, :runner => @lxc_runner)
         end
         @lxc
       end

data/lib/testlab/node.rb

@@ -41,12 +41,13 @@ class TestLab
 
 
     def initialize(*args)
-      super(*args)
+      @ui       = TestLab.ui
 
-      raise NodeError, "You must specify a provider class!" if self.provider.nil?
+      super(*args)
 
-      @ui       = TestLab.ui
       @provider = self.provider.new(self.config, @ui)
+
+      raise NodeError, "You must specify a provider class!" if self.provider.nil?
     end
 
   end

data/lib/testlab/user.rb

@@ -27,9 +27,9 @@ class TestLab
     attribute   :primary,    :default => false
 
     def initialize(*args)
-      super(*args)
-
       @ui = TestLab.ui
+
+      super(*args)
     end
 
   end

data/lib/testlab/version.rb

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

data/lib/testlab.rb

@@ -307,7 +307,7 @@ class TestLab
   # class.
   module DualMethods
 
-    @@ui = nil
+    @@ui ||= nil
 
     # Get Test Lab User Interface
     #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 0.6.15
+  version: 0.6.16
   prerelease: 
 platform: ruby
 authors:
@@ -303,7 +303,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -738732606304836077
+      hash: -1123955355283621213
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -312,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -738732606304836077
+      hash: -1123955355283621213
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25