specinfra 2.50.0 → 2.50.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a07e94a5d9bac7cb2bd1283ae10970a81274457c
-  data.tar.gz: 8c10e89b09094f9e38563e0043e532ee3f735f3a
+  metadata.gz: f6c880f24b6ae0c53598ddc4408f4370522aba84
+  data.tar.gz: 9420ee0b8f5dbf9a398611ac49df0488e99d30eb
 SHA512:
-  metadata.gz: 76196e2eb8ceda7e07e94f032cd245873551c833fd9d200e4aa2f67ba562baa027e44500991d8da30f047c47b29c8db4b141537750932f5620969b49cdceba1a
-  data.tar.gz: f40ed8e4201f5669e8dc8985c1c43079d23cadffe5a855c3dff260bcf8798f1a047ed378d8165659e31e946e9ba0f62d6c2dd956216df31a74d9f43dfa0156cc
+  metadata.gz: 6a086e4ae7c8b62a860ccd068bd8c51161b5a5fb9be6927999fa6a95290d5e473082c425bf34c10e533d1d550290f8537e712e8dfef04836e62bf83655241f6d
+  data.tar.gz: 49081faa4f25bade03217d3aa098f8660319f84b7678510f48dfabba53b89373e6dc5a2baf13609663c3f149d6ae11c05f44848e5497a834d50883386eafbda4

data/lib/specinfra/command/freebsd/base/service.rb

@@ -3,9 +3,8 @@ class Specinfra::Command::Freebsd::Base::Service < Specinfra::Command::Base::Ser
     def check_is_enabled(service, level=3)
       "service -e | grep -- #{escape(service)}"
     end
-
-    def check_is_running_under_daemontools(service)
-      "svstat /var/service/#{escape(service)} | grep -E 'up \\(pid [0-9]+\\)'"
+    def check_is_running_under_init(service)
+      "service #{escape(service)} status | grep -E 'as \\(pid [0-9]+\\)'"
     end
   end
 end

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

@@ -9,12 +9,50 @@ class Specinfra::Command::Freebsd::Base::User < Specinfra::Command::Base::User
     end
 
     def get_minimum_days_between_password_change(user)
-      "0"
+      "echo 0"
     end
 
     def get_maximum_days_between_password_change(user)
       "pw usershow -n #{escape(user)} | cut -d':' -f 6"
     end
 
+    def update_home_directory(user, directory)
+      "pw user mod #{escape(user)} -d #{escape(directory)}"
+    end
+
+    def update_login_shell(user, shell)
+      "pw user mod #{escape(user)} -s #{escape(shell)}"
+    end
+
+    def update_uid(user, uid)
+      "pw user mod #{escape(user)} -u #{escape(uid)}"
+    end
+
+    def update_gid(user, gid)
+      "pw user mod #{escape(user)} -g #{escape(gid)}"
+    end
+
+    def add(user, options)
+      if options[:password] then
+        command = ['echo',"\'#{escape(options[:password])}\'",'|','pw','user','add',escape(user),'-H','0']
+      else
+        command = ['pw','user','add',escape(user)]
+      end
+      command << '-g' << escape(options[:gid])            if options[:gid]
+      command << '-d' << escape(options[:home_directory]) if options[:home_directory]
+      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]
+      command.join(' ')
+    end
+
+    def update_encrypted_password(user, encrypted_password)
+        "echo \'#{escape(encrypted_password)}\' | sudo pw user mod #{escape(user)} -H 0"
+    end
+
+    def get_encrypted_password(user)
+      "getent passwd #{escape(user)} | awk -F: '{ print $2 }'"
+    end
   end
 end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.50.0"
+  VERSION = "2.50.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.50.0
+  version: 2.50.1
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp