testlab 0.6.14 → 0.6.15

data/Gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
 gem "json" if (RUBY_VERSION == "1.8.7")
+gem "activesupport", "< 4.0.0" if (RUBY_VERSION < "1.9.3")
 
 gemspec

data/lib/testlab/user/lifecycle.rb

@@ -21,17 +21,18 @@ class TestLab
             self.container.node.ssh.exec(%(sudo chroot #{self.container.fs_root} /bin/bash -c '#{groupadd_command}'))
           end
 
-          useradd_command = %W(useradd --create-home --shell /bin/bash --groups sudo --password #{self.password})
+          useradd_command = %W(useradd --create-home --shell /bin/bash --groups sudo)
           useradd_command << "--uid #{self.uid}" if !self.uid.nil?
           useradd_command << "--gid #{self.gid}" if !self.gid.nil?
           useradd_command << self.id
           useradd_command = useradd_command.flatten.compact.join(' ')
 
-          self.container.node.ssh.exec(%(sudo chroot #{self.container.fs_root} /bin/bash -c '#{useradd_command}'))
+          self.container.lxc.attach(%(-- /bin/bash -c '#{useradd_command}'))
+          self.container.lxc.attach(%(-- /bin/bash -c 'echo "#{self.id}:#{self.password}" | chpasswd'))
         end
 
         # ensure the user user gets our node user key
-        user_home_dir = File.join(self.container.fs_root, ((self.id == "root") ? %(/root) : %(/home/#{self.id})))
+        user_home_dir = File.join(self.container.fs_root, self.home_dir)
         user_authkeys = File.join(user_home_dir, ".ssh", "authorized_keys")
         user_authkeys2 = File.join(user_home_dir, ".ssh", "authorized_keys2")
 
@@ -40,10 +41,23 @@ class TestLab
           user_authkeys2 => node_authkeys
         }
 
+        public_identities = Array.new
+        !self.public_identity.nil? and [self.public_identity].flatten.compact.each do |pi|
+          if File.exists?(pi)
+            public_identities << ::IO.read(pi).strip
+          end
+        end
+
         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 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}))
+          end
+
           self.container.node.ssh.exec(%(sudo chmod -v 644 #{destination}))
         end
 

data/lib/testlab/user.rb

@@ -19,6 +19,7 @@ class TestLab
     attribute   :password
 
     attribute   :identity
+    attribute   :public_identity
 
     attribute   :uid
     attribute   :gid

data/lib/testlab/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 0.6.14
+  version: 0.6.15
   prerelease: 
 platform: ruby
 authors:
@@ -301,12 +301,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -738732606304836077
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -738732606304836077
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25