testlab 0.8.2 → 0.8.3

data/features/support/Labfile.local

@@ -27,7 +27,8 @@ node 'vagrant' do
       TestLab::Provisioner::Apt
     ]
 
-    user 'deployer' do
+    user do
+      username         'deployer'
       password         'deployer'
       identity         File.join(ENV['HOME'], '.ssh', 'id_rsa')
       public_identity  File.join(ENV['HOME'], '.ssh', 'id_rsa.pub')

data/features/support/Labfile.vagrant

@@ -39,7 +39,8 @@ node 'vagrant' do
       TestLab::Provisioner::Apt
     ]
 
-    user 'deployer' do
+    user do
+      username         'deployer'
       password         'deployer'
       identity         File.join(ENV['HOME'], '.ssh', 'id_rsa')
       public_identity  File.join(ENV['HOME'], '.ssh', 'id_rsa.pub')

data/lib/testlab/container/user.rb

@@ -15,10 +15,12 @@ class TestLab
         if self.users.count == 0
           case self.distro.downcase
           when 'ubuntu' then
-            u = TestLab::User.new "ubuntu" do
+            u = TestLab::User.new do
+              username 'ubuntu'
               password 'ubuntu'
             end
             u.container = self
+            u
           end
         elsif self.users.any?{ |u| u.primary == true }
           self.users.find{ |u| u.primary == true }

data/lib/testlab/node/ssh.rb

@@ -31,7 +31,7 @@ class TestLab
 
             c.host_name       = container.ip
 
-            c.user            = (options[:user]   || container.primary_user.id)
+            c.user            = (options[:user]   || container.primary_user.username)
             c.password        = (options[:passwd] || container.primary_user.password)
             c.keys            = (options[:keys]   || [container.primary_user.identity, @provider.identity].flatten.compact)
           end

data/lib/testlab/provisioners/chef/omni_bus.rb

@@ -43,7 +43,7 @@ class TestLab
             :chef_client_cli => chef_client_cli(container),
             :chef_client_rb => chef_client_rb(container),
             :validation_pem => validation_pem,
-            :sudo_user => container.primary_user.id,
+            :sudo_user => container.primary_user.username,
             :sudo_uid => container.primary_user.uid,
             :sudo_gid => container.primary_user.gid,
             :home_dir => container.primary_user.home_dir

data/lib/testlab/provisioners/chef/omni_truck.rb

@@ -44,7 +44,7 @@ class TestLab
             :chef_admin => '/etc/chef-server/admin.pem',
             :local_user => ENV['USER'],
             :default_password => "p@ssw01d",
-            :sudo_user => container.primary_user.id,
+            :sudo_user => container.primary_user.username,
             :sudo_uid => container.primary_user.uid,
             :sudo_gid => container.primary_user.gid,
             :home_dir => container.primary_user.home_dir

data/lib/testlab/provisioners/chef/ruby_gem_client.rb

@@ -44,7 +44,7 @@ class TestLab
             :chef_client_cli => chef_client_cli(container),
             :chef_client_rb => chef_client_rb(container),
             :validation_pem => validation_pem,
-            :sudo_user => container.primary_user.id,
+            :sudo_user => container.primary_user.username,
             :sudo_uid => container.primary_user.uid,
             :sudo_gid => container.primary_user.gid,
             :home_dir => container.primary_user.home_dir

data/lib/testlab/provisioners/chef/ruby_gem_server.rb

@@ -42,7 +42,7 @@ class TestLab
             :chef_admin => '/etc/chef/admin.pem',
             :default_password => "p@ssw01d",
             :local_user => ENV['USER'],
-            :sudo_user => container.primary_user.id,
+            :sudo_user => container.primary_user.username,
             :sudo_uid => container.primary_user.uid,
             :sudo_gid => container.primary_user.gid,
             :home_dir => container.primary_user.home_dir,

data/lib/testlab/user.rb

@@ -16,6 +16,7 @@ class TestLab
     # Associations and Attributes
     belongs_to  :container,  :class_name => 'TestLab::Container'
 
+    attribute   :username
     attribute   :password
 
     attribute   :identity

data/lib/testlab/user/lifecycle.rb

@@ -7,28 +7,28 @@ class TestLab
       #
       # @return [Boolean] True if successful.
       def setup
-        @ui.logger.debug { "User Create: #{self.id} " }
+        @ui.logger.debug { "User Create: #{self.username} " }
 
         node_home_dir = ((self.container.node.user == "root") ? %(/root) : %(/home/#{self.container.node.user}))
         node_authkeys = File.join(node_home_dir, ".ssh", "authorized_keys")
 
         # 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.id}" #{container_passwd_file}), :ignore_exit_status => true).exit_code != 0
+        if self.container.node.ssh.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.id})
+            groupadd_command = %(groupadd --gid #{self.gid} #{self.username})
             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)
           useradd_command << "--uid #{self.uid}" if !self.uid.nil?
           useradd_command << "--gid #{self.gid}" if !self.gid.nil?
-          useradd_command << self.id
+          useradd_command << self.username
           useradd_command = useradd_command.flatten.compact.join(' ')
 
           self.container.lxc.attach(%(-- /bin/bash -c '#{useradd_command}'))
-          self.container.lxc.attach(%(-- /bin/bash -c 'echo "#{self.id}:#{self.password}" | chpasswd'))
+          self.container.lxc.attach(%(-- /bin/bash -c 'echo "#{self.username}:#{self.password}" | chpasswd'))
         end
 
         # ensure the user user gets our node user key
@@ -62,8 +62,8 @@ class TestLab
         end
 
         # ensure the container user home directory is owned by them
-        home_dir = self.container.lxc.attach(%(-- /bin/bash -c 'grep #{self.id} /etc/passwd | cut -d ":" -f6')).strip
-        self.container.lxc.attach(%(-- /bin/bash -c 'sudo chown -Rv $(id -u #{self.id}):$(id -g #{self.id}) #{home_dir}'))
+        home_dir = self.container.lxc.attach(%(-- /bin/bash -c 'grep #{self.username} /etc/passwd | cut -d ":" -f6')).strip
+        self.container.lxc.attach(%(-- /bin/bash -c 'sudo chown -Rv $(id -u #{self.username}):$(id -g #{self.username}) #{home_dir}'))
 
         # ensure the sudo user group can do passwordless sudo
         self.container.lxc.attach(%(-- /bin/bash -c 'grep "sudo\tALL=\(ALL:ALL\) ALL" /etc/sudoers && sed -i "s/sudo\tALL=\(ALL:ALL\) ALL/sudo\tALL=\(ALL:ALL\) NOPASSWD: ALL/" /etc/sudoers'))
@@ -77,7 +77,7 @@ class TestLab
       #
       # @return [String] The users home directory.
       def home_dir(name=nil)
-        username = (name || self.id)
+        username = (name || self.username)
         if (username == "root")
           "/root"
         else

data/lib/testlab/utility/logger.rb

@@ -46,9 +46,9 @@ class TestLab
           "ruby_platform" => RUBY_PLATFORM.inspect
         }
 
-        defined?(RUBY_ENGINE)       and dependencies.merge!("ruby_engine" => RUBY_ENGINE)
-        defined?(RUBY_DESCRIPTION)  and dependencies.merge!("ruby_description" => RUBY_DESCRIPTION)
-        defined?(RUBY_RELEASE_DATE) and dependencies.merge!("ruby_release_date" => RUBY_RELEASE_DATE)
+        defined?(RUBY_ENGINE)       and dependencies.merge!("ruby_engine" => RUBY_ENGINE.inspect)
+        defined?(RUBY_DESCRIPTION)  and dependencies.merge!("ruby_description" => RUBY_DESCRIPTION.inspect)
+        defined?(RUBY_RELEASE_DATE) and dependencies.merge!("ruby_release_date" => RUBY_RELEASE_DATE.inspect)
 
         dependencies
       end

data/lib/testlab/version.rb

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

data/spec/testlab_spec.rb

@@ -25,6 +25,7 @@ describe TestLab do
     @ui = ZTK::UI.new(:stdout => StringIO.new, :stderr => StringIO.new)
     @testlab = TestLab.new(:labfile_path => LABFILE, :ui => @ui)
     @testlab.boot
+    @testlab
   }
 
   describe "class" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -329,7 +329,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3757036604992318209
+      hash: 1734275304878040822
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -338,7 +338,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3757036604992318209
+      hash: 1734275304878040822
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25