specinfra 2.28.4 → 2.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c99ff54bdf0c869ed893ccc5b971f51ae6bf95c0
-  data.tar.gz: edd1f04b11eaa1c0d4876ef38cf28344266a7234
+  metadata.gz: 89db6e31e081e6722c466847d897042eadfe5871
+  data.tar.gz: fd0586975df1af3bf980a66dc10df9882fb4d84e
 SHA512:
-  metadata.gz: 6dbd5c4dcb234fba2b256f4563506c76822bd41e3bbecec8c1b40d038dca5a4e24beb0c830184a8b8da5839df6877be90054a5c120c80f4fbf27c8bb85e63f76
-  data.tar.gz: aff947585ef5c6d2b767b6b97d55c781232a3bd59a0a44d1224ecbc593acc3f846d9b36c95321ecbb8d1ddc6aa1775afd9512cdb4d68383fa44ee94a876ac5da
+  metadata.gz: ea495a7d4fedb865c5fb1b5b18e512d30276dc3a2c207ad1e38f5f58030cc5c54e0e9b187d0dda147a42fa1adab44f9f7c0d8c60c8652afb711ef90ebb2c59fb
+  data.tar.gz: a603f678b1e2d19e4b052fbe6fe3bdffadca5d44d7d448d7a196c7c6651728489c883668007a53ee64e0bc33238814ab4609a6f87bd05faee33b8da8447ead6c

data/lib/specinfra/command/base/user.rb

@@ -42,10 +42,18 @@ class Specinfra::Command::Base::User < Specinfra::Command::Base
       "getent passwd #{escape(user)} | awk -F: '{ print $6 }'"
     end
 
+    def get_login_shell(user)
+      "getent passwd #{escape(user)} | cut -f 7 -d ':'"
+    end
+
     def update_home_directory(user, directory)
       "usermod -d #{escape(directory)} #{escape(user)}"
     end
 
+    def update_login_shell(user, shell)
+      "usermod -s #{escape(shell)} #{escape(user)}"
+    end
+
     def update_uid(user, uid)
       "usermod -u #{escape(uid)} #{escape(user)}"
     end
@@ -59,6 +67,7 @@ class Specinfra::Command::Base::User < Specinfra::Command::Base
       command << '-g' << escape(options[:gid])            if options[:gid]
       command << '-d' << escape(options[:home_directory]) if options[:home_directory]
       command << '-p' << escape(options[:password])       if options[:password]
+      command << '-s' << escape(options[:shell])          if options[:shell]
       command << '-m' if options[:create_home]
       command << '-r' if options[:system_user]
       command << '-u' << escape(options[:uid])            if options[:uid]

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.28.4"
+  VERSION = "2.29.0"
 end

data/spec/command/base/user_spec.rb

@@ -26,8 +26,8 @@ describe get_command(:update_user_gid, 'foo', 100) do
   it { should eq 'usermod -g 100 foo' }
 end
 
-describe get_command(:add_user, 'foo', :home_directory => '/home/foo', :password => '$6$foo/bar', :create_home => true) do
-  it { should eq 'useradd -d /home/foo -p \$6\$foo/bar -m foo' }
+describe get_command(:add_user, 'foo', :home_directory => '/home/foo', :password => '$6$foo/bar', :shell => '/bin/tcsh', :create_home => true) do
+  it { should eq 'useradd -d /home/foo -p \$6\$foo/bar -s /bin/tcsh -m foo' }
 end
 
 describe get_command(:update_user_encrypted_password, 'foo', 'xxxxxxxx') do
@@ -38,3 +38,14 @@ describe get_command(:get_user_encrypted_password, 'foo') do
   it { should eq "getent shadow foo | awk -F: '{ print $2 }'" }
 end
 
+describe get_command(:check_user_has_login_shell, 'foo', '/bin/sh') do
+  it { should eq "getent passwd foo | cut -f 7 -d ':' | grep -w -- /bin/sh" }
+end
+
+describe get_command(:get_user_login_shell, 'foo') do
+  it { should eq "getent passwd foo | cut -f 7 -d ':'" }
+end
+
+describe get_command(:update_user_login_shell, 'foo', '/bin/bash') do
+  it { should eq 'usermod -s /bin/bash foo' }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.28.4
+  version: 2.29.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2015-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh