itamae 1.2.12 → 1.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47fe6f419701b8d6ea5e8e83de69f6ec2a613b84
-  data.tar.gz: 4575a36969617f23fa01d53f058b2061bef21b2f
+  metadata.gz: b1f6dd38921987f3da2602ed39ac6442380a2fa9
+  data.tar.gz: 096bcdc139c46100637114b230f1fd210b30330c
 SHA512:
-  metadata.gz: 4903252764a33d19b67966d9b8b3243ae886b1b1e0e8dc61610afd35b93aa77f3cf62d8f72a270ec327344564bdf56b489efc3708d8975701ca50e8355057423
-  data.tar.gz: a4977c7fd756974df71c798a7d4034f76026239f1a9baf5291c3d70ff2df0859b6be4133236ba8d0029dfb5088ad83d8827bec5c1ae36af126be9644f2f352e1
+  metadata.gz: a344becac6dd490ab6dd5ef564a5c0de644ec3e9ce8427560ec4e4e0f9a5a16dc20e6cd6c8705d98b1ad65fe301e5837b44f9e300bfb66462335b3857e593413
+  data.tar.gz: 91e48dc9ef2169ed3f97a6f3b3e37800d555037f4c03638433aec1f3163e921113ec9c56ca9733cc68e499e490980c37c930de37f755275ddc324acb3f19c3ca

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v1.2.13
+
+Features
+
+- [Add "shell" attribute to user resource (by @toritori0318)](https://github.com/itamae-kitchen/itamae/pull/120)
+
 ## v1.2.12
 
 Bugfixes

data/itamae.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "thor"
-  spec.add_runtime_dependency "specinfra", [">= 2.26.1", "< 3.0.0"]
+  spec.add_runtime_dependency "specinfra", [">= 2.29.0", "< 3.0.0"]
   spec.add_runtime_dependency "hashie"
   spec.add_runtime_dependency "ansi"
   spec.add_runtime_dependency "schash", "~> 0.1.0"

data/lib/itamae/resource/user.rb

@@ -10,6 +10,7 @@ module Itamae
       define_attribute :password, type: String
       define_attribute :system_user, type: [TrueClass, FalseClass]
       define_attribute :uid, type: Integer
+      define_attribute :shell, type: String
 
       def pre_action
         case @current_action
@@ -25,6 +26,7 @@ module Itamae
           current.uid = run_specinfra(:get_user_uid, attributes.username).stdout.strip.to_i
           current.gid = run_specinfra(:get_user_gid, attributes.username).stdout.strip.to_i
           current.home = run_specinfra(:get_user_home_directory, attributes.username).stdout.strip
+          current.shell = run_specinfra(:get_user_login_shell, attributes.username).stdout.strip
           current.password = current_password
         end
       end
@@ -50,6 +52,11 @@ module Itamae
             run_specinfra(:update_user_home_directory, attributes.username, attributes.home)
             updated!
           end
+
+          if attributes.shell && attributes.shell != current.shell
+            run_specinfra(:update_user_login_shell, attributes.username, attributes.shell)
+            updated!
+          end
         else
           options = {
             gid:            attributes.gid,
@@ -57,6 +64,7 @@ module Itamae
             password:       attributes.password,
             system_user:    attributes.system_user,
             uid:            attributes.uid,
+            shell:          attributes.shell,
           }
 
           run_specinfra(:add_user, attributes.username, options)

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.2.12
+1.2.13

data/spec/integration/default_spec.rb

@@ -4,6 +4,7 @@ describe user("itamae") do
   it { should exist }
   it { should have_uid 1234 }
   it { should have_home_directory '/home/itamae' }
+  it { should have_login_shell '/bin/dash' }
 end
 
 describe file('/tmp/included_recipe') do

data/spec/integration/recipes/default.rb

@@ -12,6 +12,7 @@ user "create itamae user" do
   username "itamae"
   password "$1$ltOY8bZv$iZ57f1KAp8jwKViNm3pze."
   home '/home/foo'
+  shell '/bin/sh'
 end
 
 user "update itamae user" do
@@ -19,6 +20,7 @@ user "update itamae user" do
   username "itamae"
   password "$1$TQz9gPMl$nHYrsA5W2ZdZ0Yn021BQH1"
   home '/home/itamae'
+  shell '/bin/dash'
 end
 
 ######

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.2.12
+  version: 1.2.13
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-11 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -30,7 +30,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.26.1
+        version: 2.29.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -40,7 +40,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.26.1
+        version: 2.29.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -262,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Simple Configuration Management Tool