specinfra 2.10.1 → 2.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 752878a5e1f9c4c66e0e694a35828a41c053bb3b
-  data.tar.gz: f6810917014d94fd00fda3eb729588b170cef32f
+  metadata.gz: 4c8087fc1817c4d6e1a1dc711e5f05f694b2fab5
+  data.tar.gz: f4768d95e77d0931029d1f744d6eefc53dc12eea
 SHA512:
-  metadata.gz: efc924c21e4b6f7a0a890637b7b8024a01916a283e5a50125f5c66a13fcfa16b5bdc7dffd4bb293db6e056c6a647501528a420991a423b0856d2cd49f6a72f25
-  data.tar.gz: 680480acdbb6bc4b9de4f38770cffecad7839efc3559dbf49b5199daf90f701e4624ee1a60453fcc1c0cc84bb78add357b3e75a90dd5ab28c3338b085494c203
+  metadata.gz: dacb29480b50fc0bb3a6b93026f57bd20ec4b8cd2c7850fcc8e64e4f29655fafef050a50a6f36bfd7194ade4d5a6e709108e7fd224d4d5f28f9bd7d1a10ad2c0
+  data.tar.gz: 30a25b04745a2597e456f2afa72d2030f35e727d0370b3c35d9556ea8e2057c00039a1abe2a2e06b40771e67a116fd774cb1d7bbcf7d0a34bc067ee3771aac93

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

@@ -26,12 +26,20 @@ class Specinfra::Command::Base::File < Specinfra::Command::Base
 
     def check_is_grouped(file, group)
       regexp = "^#{group}$"
-      "stat -c %G #{escape(file)} | grep -- #{escape(regexp)}"
+      if group.is_a?(Numeric) || (group =~ /\A\d+\z/ ? true : false)
+        "stat -c %g #{escape(file)} | grep -- #{escape(regexp)}"
+      else
+        "stat -c %G #{escape(file)} | grep -- #{escape(regexp)}"
+      end
     end
 
     def check_is_owned_by(file, owner)
       regexp = "^#{owner}$"
-      "stat -c %U #{escape(file)} | grep -- #{escape(regexp)}"
+      if owner.is_a?(Numeric) || (owner =~ /\A\d+\z/ ? true : false)
+        "stat -c %u #{escape(file)} | grep -- #{escape(regexp)}"
+      else
+        "stat -c %U #{escape(file)} | grep -- #{escape(regexp)}"
+      end
     end
 
     def check_has_mode(file, mode)

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

@@ -52,12 +52,12 @@ class Specinfra::Command::Base::User < Specinfra::Command::Base
 
     def add(user, options)
       command = ['useradd']
-      command << '-g' << options[:gid]            if options[:gid]
-      command << '-d' << options[:home_directory] if options[:home_directory]
-      command << '-p' << options[:password]       if options[:password]
+      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 << '-r' if options[:system_user]
-      command << '-u' << options[:uid]            if options[:uid]
-      command << user
+      command << '-u' << escape(options[:uid])            if options[:uid]
+      command << escape(user)
       command.join(' ')
     end
 

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.10.1"
+  VERSION = "2.10.2"
 end

data/spec/command/base/user_spec.rb

@@ -22,8 +22,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') do
-  it { should eq 'useradd -d /home/foo foo' }
+describe get_command(:add_user, 'foo', :home_directory => '/home/foo', :password => '$6$foo/bar') do
+  it { should eq 'useradd -d /home/foo -p \$6\$foo/bar foo' }
 end
 
 describe get_command(:update_user_encrypted_password, 'foo', 'xxxxxxxx') do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.10.1
+  version: 2.10.2
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh