specinfra 2.82.14 → 2.82.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 149c1e2722e441af453f1eca0da8bc9f6e639097
-  data.tar.gz: b7eb2635ebfaf3b7119e1103da9ed96861abd956
+  metadata.gz: e4bbeedbd93346478be080cccaa8c690a2dab1d4
+  data.tar.gz: 06860c7283922f58de2599abdfed56ded6006b0f
 SHA512:
-  metadata.gz: 30dc8b7ac56e049c1e29a71fe7f473ce14c58e4387a61b0b8c5c9206862c09a2a30838ee8d5131c0c8865f37ec955c987d8687a54710c41410736a48c1b0d1fc
-  data.tar.gz: 3e28985de56c4995daa461278ffaea599c80e6e443f410039971e61410029eaa7c4679d0dbb84cfb82b64a2d95a58999f02423d1804bca885aa290026abe9ff0
+  metadata.gz: 23d0eb2edb19432f9ffe8dfb8e352a0d60fc6da010e74cfa2b2601554737996444763914c292f854a7b41a492c940400d0fca56cff40a4a62d25eb2f0991c652
+  data.tar.gz: 415baa53796260ae23d3a69414d51b0c7bad7def0483cfdf4afbc96d08a265dc3997e0735c918c579bd7f19d0b2c843c78baf39deaf85b689d68ade76688fabc

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

@@ -1,17 +1,15 @@
 class Specinfra::Command::Base::User < Specinfra::Command::Base
   class << self
     def check_exists(user)
-      "getent passwd #{escape(user)}"
+      "id #{escape(user)}"
     end
 
     def check_belongs_to_group(user, group)
-      "groups #{escape(user)} | grep -- #{escape(group)}"
+      "id #{escape(user)} | sed 's/ context=.*//g' | cut -f 4 -d '=' | grep -- #{escape(group)}"
     end
 
     def check_belongs_to_primary_group(user, group)
-      pgid = "getent passwd #{escape(user)} | cut -f 4 -d ':'"
-      ggid = "getent group #{escape(group)} | cut -f 3 -d ':'"
-      %Q|test "#{escape(pgid)}" -eq "#{escape(ggid)}"|
+      "id -gn #{escape(user)}| grep ^#{escape(group)}$"
     end
 
     def check_is_system_user(user)
@@ -23,8 +21,8 @@ class Specinfra::Command::Base::User < Specinfra::Command::Base
     end
 
     def check_has_uid(user, uid)
-      auid = "getent passwd #{escape(user)} | cut -f 3 -d ':'"
-      %Q| test "#{escape(uid)}" -eq "#{escape(auid)}"|
+      regexp = "^uid=#{uid}("
+      "id #{escape(user)} | grep -- #{escape(regexp)}"
     end
 
     def check_has_home_directory(user, path_to_home)
@@ -49,11 +47,11 @@ class Specinfra::Command::Base::User < Specinfra::Command::Base
     end
 
     def get_uid(user)
-      "getent passwd #{escape(user)} | cut -f 3 -d ':'"
+      "id -u #{escape(user)}"
     end
 
     def get_gid(user)
-      "getent passwd #{escape(user)} | cut -f 4 -d ':'"
+      "id -g #{escape(user)}"
     end
 
     def get_home_directory(user)

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.82.14"
+  VERSION = "2.82.15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.82.14
+  version: 2.82.15
 platform: ruby
 authors:
 - Gosuke Miyashita