specinfra 2.82.13 → 2.82.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4091da838326377ef94b07ae9b26011de7769fb9
-  data.tar.gz: 4157f26e7591567eece6b67067e1aa1fb3da32f7
+  metadata.gz: 149c1e2722e441af453f1eca0da8bc9f6e639097
+  data.tar.gz: b7eb2635ebfaf3b7119e1103da9ed96861abd956
 SHA512:
-  metadata.gz: 21aa8c43ffd5c01fe64a4c380b4729d6c93511277196925db37e9c836d8c1a3354c588c10affbbb34693d51761e4a5ca6d2f89a16d261f2cfbcdb9b41a08cd48
-  data.tar.gz: db8d758cd7964e6af9a70792d78ccaec01d63f395e371ccb3a7c8e888c00bfb56e321411760b174e66c458b48d55b775f9d7ec1739563b8047428a060362bc41
+  metadata.gz: 30dc8b7ac56e049c1e29a71fe7f473ce14c58e4387a61b0b8c5c9206862c09a2a30838ee8d5131c0c8865f37ec955c987d8687a54710c41410736a48c1b0d1fc
+  data.tar.gz: 3e28985de56c4995daa461278ffaea599c80e6e443f410039971e61410029eaa7c4679d0dbb84cfb82b64a2d95a58999f02423d1804bca885aa290026abe9ff0

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

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

data/lib/specinfra/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.82.13
+  version: 2.82.14
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-01 00:00:00.000000000 Z
+date: 2020-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp