testlab 0.6.3 → 0.6.4

data/bin/tl

@@ -187,6 +187,44 @@ EOF
     end
   end
 
+  # NODE CREATE
+  ##############
+  c.desc 'Create a node'
+  c.long_desc <<-EOF
+Create a node.  The node is created.
+EOF
+  c.command :create do |create|
+    create.action do |global_options, options, args|
+      if options[:id].nil?
+        help_now!('id is required') if options[:id].nil?
+      else
+        node = @testlab.nodes.select{ |c| c.id.to_sym == options[:id].to_sym }.first
+        node.nil? and raise TestLab::TestLabError, "We could not find the node you screateplied!"
+
+        node.create
+      end
+    end
+  end
+
+  # NODE DESTROY
+  ############
+  c.desc 'Destroy a node'
+  c.long_desc <<-EOF
+Destroy a node.  The node is stopped and destroyed.
+EOF
+  c.command :destroy do |destroy|
+    destroy.action do |global_options, options, args|
+      if options[:id].nil?
+        help_now!('id is required') if options[:id].nil?
+      else
+        node = @testlab.nodes.select{ |c| c.id.to_sym == options[:id].to_sym }.first
+        node.nil? and raise TestLab::TestLabError, "We could not find the node you supplied!"
+
+        node.destroy
+      end
+    end
+  end
+
   # NODE SETUP
   #############
   c.desc 'Setup a node'
@@ -533,6 +571,44 @@ EOF
     end
   end
 
+  # CONTAINER CREATE
+  ###################
+  c.desc 'Create a container'
+  c.long_desc <<-EOF
+Create a container.  The container is created.
+EOF
+  c.command :create do |create|
+    create.action do |global_options, options, args|
+      if options[:id].nil?
+        help_now!('id is required') if options[:id].nil?
+      else
+        container = @testlab.containers.select{ |c| c.id.to_sym == options[:id].to_sym }.first
+        container.nil? and raise TestLab::TestLabError, "We could not find the container you screateplied!"
+
+        container.create
+      end
+    end
+  end
+
+  # CONTAINER DESTROY
+  ####################
+  c.desc 'Destroy a container'
+  c.long_desc <<-EOF
+Destroy a container.  The container is stopped and destroyed.
+EOF
+  c.command :destroy do |destroy|
+    destroy.action do |global_options, options, args|
+      if options[:id].nil?
+        help_now!('id is required') if options[:id].nil?
+      else
+        container = @testlab.containers.select{ |c| c.id.to_sym == options[:id].to_sym }.first
+        container.nil? and raise TestLab::TestLabError, "We could not find the container you supplied!"
+
+        container.destroy
+      end
+    end
+  end
+
   # CONTAINER SETUP
   ####################
   c.desc 'Setup a container'

data/lib/testlab/container/actions.rb

@@ -60,6 +60,10 @@ class TestLab
 
           (self.lxc.state != :running) and raise ContainerError, "The container failed to online!"
 
+          self.users.each do |user|
+            user.setup
+          end
+
         end
 
         true

data/lib/testlab/container/lifecycle.rb

@@ -18,10 +18,6 @@ class TestLab
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Setup', :green)) do
 
-          self.users.each do |user|
-            user.setup
-          end
-
           self.provisioners.each do |provisioner|
             @ui.logger.info { ">>>>> SETUP CONTAINER PROVISIONER: #{provisioner} <<<<<" }
             p = provisioner.new(self.config, @ui)

data/lib/testlab/user/lifecycle.rb

@@ -36,13 +36,14 @@ class TestLab
         user_authkeys2 = File.join(user_home_dir, ".ssh", "authorized_keys2")
 
         authkeys = {
-          node_authkeys => user_authkeys,
-          node_authkeys => user_authkeys2
+          user_authkeys  => node_authkeys,
+          user_authkeys2 => node_authkeys
         }
 
-        authkeys.each do |source, destination|
+        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.ssh.exec(%(sudo cp -v #{source} #{destination}))
+          self.container.node.ssh.exec(%(sudo grep "$(cat #{source})" #{destination} || sudo cat #{source} | sudo tee -a #{destination}))
           self.container.node.ssh.exec(%(sudo chmod -v 644 #{destination}))
         end
 

data/lib/testlab/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
   prerelease: 
 platform: ruby
 authors:
@@ -293,7 +293,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -429496536353905042
+      hash: -2213038808322166943
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -302,7 +302,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -429496536353905042
+      hash: -2213038808322166943
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25