testlab 1.0.1 → 1.1.0

data/lib/testlab/support.rb

@@ -0,0 +1,17 @@
+class TestLab
+
+  # Support Error Class
+  class SupportError < TestLabError; end
+
+  # Support Module
+  #
+  # This module defines our object support namespace.  This namespace should
+  # provide modules we can mixin to our various objects (containers, networks,
+  # nodes).
+  #
+  # @author Zachary Patten <zachary AT jovelabs DOT com>
+  module Support
+    autoload :Execution, 'testlab/support/execution'
+  end
+
+end

data/lib/testlab/user/lifecycle.rb

@@ -14,11 +14,11 @@ class TestLab
 
         # ensure the container user exists
         container_passwd_file = File.join(self.container.fs_root, "etc", "passwd")
-        if self.container.node.ssh.exec(%(sudo grep "#{self.username}" #{container_passwd_file}), :ignore_exit_status => true).exit_code != 0
+        if self.container.node.exec(%(sudo grep "#{self.username}" #{container_passwd_file}), :ignore_exit_status => true).exit_code != 0
 
           if !self.gid.nil?
             groupadd_command = %(groupadd --gid #{self.gid} #{self.username})
-            self.container.node.ssh.exec(%(sudo chroot #{self.container.fs_root} /bin/bash -c '#{groupadd_command}'))
+            self.container.node.exec(%(sudo chroot #{self.container.fs_root} /bin/bash -c '#{groupadd_command}'))
           end
 
           useradd_command = %W(useradd --create-home --shell /bin/bash --groups sudo)
@@ -50,15 +50,15 @@ class TestLab
 
         authkeys.each do |destination, source|
           @ui.logger.info { "SOURCE: #{source} >>> #{destination}" }
-          self.container.node.ssh.exec(%(sudo mkdir -pv #{File.dirname(destination)}))
+          self.container.node.exec(%(sudo mkdir -pv #{File.dirname(destination)}))
 
-          self.container.node.ssh.exec(%(sudo grep "$(cat #{source})" #{destination} || sudo cat #{source} | sudo tee -a #{destination}))
+          self.container.node.exec(%(sudo grep "$(cat #{source})" #{destination} || sudo cat #{source} | sudo tee -a #{destination}))
 
           public_identities.each do |pi|
-            self.container.node.ssh.exec(%(sudo grep "#{pi}" #{destination} || sudo echo "#{pi}" | sudo tee -a #{destination}))
+            self.container.node.exec(%(sudo grep "#{pi}" #{destination} || sudo echo "#{pi}" | sudo tee -a #{destination}))
           end
 
-          self.container.node.ssh.exec(%(sudo chmod -v 644 #{destination}))
+          self.container.node.exec(%(sudo chmod -v 644 #{destination}))
         end
 
         # ensure the container user home directory is owned by them

data/lib/testlab/utility/gli.rb

@@ -7,11 +7,11 @@ class TestLab
     module GLI
       require 'ztk'
 
-      LAB_ACTION_ORDER = %W(create destroy up down provision deprovision build demolish).map(&:to_sym)
+      LAB_ACTION_ORDER = %W(build demolish create destroy up down provision deprovision).map(&:to_sym)
 
       LAB_ACTIONS = {
-        :create      => ["Construct %s",    "Attempts to create the <%= @component %>."],
-        :destroy     => ["Destruct %s",     "Attempts to destroy the <%= @component %>."],
+        :create      => ["Initialize %s",   "Attempts to create the <%= @component %>."],
+        :destroy     => ["Terminate %s",    "Attempts to destroy the <%= @component %>."],
         :up          => ["On-line %s",      "Attempts to online the <%= @component %>."],
         :down        => ["Off-line %s",     "Attempts to offline the <%= @component %>."],
         :provision   => ["Provision %s",    "Attempts to provision the <%= @component %>."],

data/lib/testlab/utility/misc.rb

@@ -55,6 +55,14 @@ class TestLab
         end
       end
 
+      def sudo
+        %(sudo -p '#{sudo_prompt}')
+      end
+
+      def sudo_prompt
+        %(sudo password for %u@%h: )
+      end
+
     end
 
   end

data/lib/testlab/version.rb

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

data/lib/testlab.rb

@@ -127,6 +127,7 @@ class TestLab
   autoload :Node,        'testlab/node'
   autoload :Provider,    'testlab/provider'
   autoload :Provisioner, 'testlab/provisioner'
+  autoload :Support,     'testlab/support'
   autoload :User,        'testlab/user'
   autoload :Utility,     'testlab/utility'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2013-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -240,14 +240,18 @@ files:
 - lib/testlab/container.rb
 - lib/testlab/container/actions.rb
 - lib/testlab/container/class_methods.rb
+- lib/testlab/container/clone.rb
+- lib/testlab/container/configuration.rb
 - lib/testlab/container/generators.rb
 - lib/testlab/container/interface.rb
 - lib/testlab/container/io.rb
 - lib/testlab/container/lifecycle.rb
 - lib/testlab/container/lxc.rb
 - lib/testlab/container/method_missing.rb
+- lib/testlab/container/provision.rb
 - lib/testlab/container/ssh.rb
 - lib/testlab/container/status.rb
+- lib/testlab/container/support.rb
 - lib/testlab/container/user.rb
 - lib/testlab/interface.rb
 - lib/testlab/labfile.rb
@@ -257,6 +261,7 @@ files:
 - lib/testlab/network/bind.rb
 - lib/testlab/network/class_methods.rb
 - lib/testlab/network/lifecycle.rb
+- lib/testlab/network/provision.rb
 - lib/testlab/network/status.rb
 - lib/testlab/node.rb
 - lib/testlab/node/actions.rb
@@ -264,6 +269,7 @@ files:
 - lib/testlab/node/lifecycle.rb
 - lib/testlab/node/lxc.rb
 - lib/testlab/node/method_missing.rb
+- lib/testlab/node/provision.rb
 - lib/testlab/node/ssh.rb
 - lib/testlab/node/status.rb
 - lib/testlab/provider.rb
@@ -298,6 +304,8 @@ files:
 - lib/testlab/provisioners/templates/chef/ruby_gem_server.erb
 - lib/testlab/provisioners/templates/raring/provision.erb
 - lib/testlab/provisioners/templates/resolv/resolv.conf.erb
+- lib/testlab/support.rb
+- lib/testlab/support/execution.rb
 - lib/testlab/user.rb
 - lib/testlab/user/lifecycle.rb
 - lib/testlab/utility.rb
@@ -331,18 +339,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2056415191929520166
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2056415191929520166
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25