specinfra 2.82.8 → 2.82.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 919413029a0bf8f822b8b4613b8fcf969e8ab8e1
-  data.tar.gz: 5edeb32cf48c944b0dddc080f7dfd68c444d161a
+  metadata.gz: 12be641da0b979fbb7e114c6a6b40987d41a0e30
+  data.tar.gz: 23542c373ee045664d8612268396ed21c7278a1d
 SHA512:
-  metadata.gz: 026344c6e79af03b377ebdb5522c5e47edf4b8490d619ae4d2f47d0aa53913a105f7febe9729e0e3ff0c04610d8425db0208f6c9c8ff21bcf36b6c75ba73fad2
-  data.tar.gz: 03ab9944c6c7b56f9b243670a88f7c5a162785296be6f2de263b1d9e50797fbccedcba8e0ede60c27d311ecf76c0f2c995895c1fdfc0e25840fe1d556cf5a153
+  metadata.gz: f7ba4a22c7825dbfd0c17734f2d69edf8e422903ec61e2d2318e6fe0a2dfcdcb81d8580aa4ed48535886888b2840897c5eae1ace0dc3e75b43b0569f492abeb6
+  data.tar.gz: e6599750de210765cc448f39fd36c3ebe7287a44625c375fc61fac01b95d01aa3180697855638cadb3eebdc4b2be752ad942128bb1d3a5306019de7981c64289

data/lib/specinfra/command.rb

@@ -174,6 +174,7 @@ require 'specinfra/command/darwin/base/package'
 require 'specinfra/command/darwin/base/port'
 require 'specinfra/command/darwin/base/process'
 require 'specinfra/command/darwin/base/user'
+require 'specinfra/command/darwin/base/group'
 
 # Debian (inherit Linux)
 require 'specinfra/command/debian'

data/lib/specinfra/command/darwin/base/group.rb

@@ -0,0 +1,22 @@
+class Specinfra::Command::Darwin::Base::Group < Specinfra::Command::Base::Group
+  class << self
+
+    def get_gid(group)
+      "dscl . -read /Groups/#{escape(group)} PrimaryGroupID | awk '{ print $2 }'" 
+    end
+
+    def update_gid(group, gid)
+      "dscl . -create /Groups/#{escape(group)} PrimaryGroupID #{escape(gid)}"
+    end
+    def add(group, options)
+      group_name = escape(group)
+                      
+      record_path = "/Groups/#{group_name}"
+      dscl_create = "dscl . -create #{record_path}"
+      command = [dscl_create]
+      command << "#{dscl_create} PrimaryGroupID #{escape(options[:gid])}"    if options[:gid]
+      command << "#{dscl_create} RecordName #{escape(options[:groupname])}"  if options[:groupname]
+      command.join(' && ')
+    end
+  end
+end

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

@@ -11,5 +11,43 @@ class Specinfra::Command::Darwin::Base::User < Specinfra::Command::Base::User
     def get_home_directory(user)
       "finger #{escape(user)} | grep -E '^Directory' | awk '{ print $2 }'"
     end
+
+    def update_home_directory(user, directory)
+      "dscl . -create /Users/#{escape(user)} NFSHomeDirectory #{escape(directory)}"
+    end
+
+    def update_login_shell(user, shell)
+      "dscl . -create /Users/#{escape(user)} UserShell #{escape(shell)}"
+    end
+
+    def update_encrypted_password(user, password)
+      "dscl . passwd /Users/#{escape(user)} #{escape(password)}"
+    end
+
+    def update_gid(user, gid)
+      "dscl . -create /Users/#{escape(user)} PrimaryGroupID #{escape(gid)}"
+    end
+
+    def add(user, options)
+      user_name = escape(user)
+      record_path = "/Users/#{user_name}"
+      dscl_create = "dscl . -create #{record_path}"
+
+      command = [dscl_create]
+      command << "#{dscl_create} UserShell #{escape(options[:shell])}"      if options[:shell]
+      command << "#{dscl_create} UniqueID #{escape(options[:uid])}"         if options[:uid]
+      command << "#{dscl_create} PrimaryGroupID #{escape(options[:gid])}"   if options[:gid]
+
+      home_dir = if options[:home_directory]
+                   escape(options[:home_directory])
+                 else
+                   record_path
+                 end
+      command << "#{dscl_create} NFSHomeDirectory #{home_dir}"
+
+      command << "dscl . passwd #{record_path} #{escape(options[:password])}"  if options[:password]
+      command << "createhomedir -b -u #{user_name}"                            if options[:create_home]
+      command.join(' && ')
+    end
   end
 end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.82.8"
+  VERSION = "2.82.9"
 end

data/spec/command/darwin/group_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+set :os, { :family => 'darwin' }
+
+describe get_command(:get_group_gid, 'foo') do
+  it { should eq "dscl . -read /Groups/foo PrimaryGroupID | awk '{ print $2 }'" }
+end
+
+describe get_command(:update_group_gid, 'foo', 1234) do
+  it { should eq "dscl . -create /Groups/foo PrimaryGroupID 1234" }
+end
+
+describe get_command(:add_group, 'foo', :gid => 1234, :groupname => 'bar') do
+  it { should eq 'dscl . -create /Groups/foo && dscl . -create /Groups/foo PrimaryGroupID 1234 && dscl . -create /Groups/foo RecordName bar' }
+end

data/spec/command/darwin/user_spec.rb

@@ -13,3 +13,23 @@ end
 describe get_command(:get_user_home_directory, 'foo') do
   it { should eq "finger foo | grep -E '^Directory' | awk '{ print $2 }'" }
 end
+
+describe get_command(:update_user_home_directory, 'user', 'dir') do
+  it { should eq "dscl . -create /Users/user NFSHomeDirectory dir" }
+end
+
+describe get_command(:update_user_login_shell, 'user', '/bin/bash') do
+  it { should eq "dscl . -create /Users/user UserShell /bin/bash" }
+end
+
+describe get_command(:update_user_encrypted_password, 'user', 'pass') do
+  it { should eq "dscl . passwd /Users/user pass" }
+end
+
+describe get_command(:update_user_gid, 'user', '100') do
+  it { should eq "dscl . -create /Users/user PrimaryGroupID 100" }
+end
+
+describe get_command(:add_user, 'foo', :home_directory => '/Users/foo', :password => '$6$foo/bar', :shell => '/bin/zsh', :create_home => true) do
+  it { should eq 'dscl . -create /Users/foo && dscl . -create /Users/foo UserShell /bin/zsh && dscl . -create /Users/foo NFSHomeDirectory /Users/foo && dscl . passwd /Users/foo \$6\$foo/bar && createhomedir -b -u foo' }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.82.8
+  version: 2.82.9
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-22 00:00:00.000000000 Z
+date: 2020-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -217,6 +217,7 @@ files:
 - lib/specinfra/command/darwin.rb
 - lib/specinfra/command/darwin/base.rb
 - lib/specinfra/command/darwin/base/file.rb
+- lib/specinfra/command/darwin/base/group.rb
 - lib/specinfra/command/darwin/base/host.rb
 - lib/specinfra/command/darwin/base/interface.rb
 - lib/specinfra/command/darwin/base/inventory.rb
@@ -521,6 +522,7 @@ files:
 - spec/command/cumulus/ppa_cumuluslinux_spec.rb
 - spec/command/cumulus/ppa_cumulusnetworks_spec.rb
 - spec/command/darwin/file_spec.rb
+- spec/command/darwin/group_spec.rb
 - spec/command/darwin/host_spec.rb
 - spec/command/darwin/interface_spec.rb
 - spec/command/darwin/port_spec.rb
@@ -658,6 +660,7 @@ test_files:
 - spec/command/cumulus/ppa_cumuluslinux_spec.rb
 - spec/command/cumulus/ppa_cumulusnetworks_spec.rb
 - spec/command/darwin/file_spec.rb
+- spec/command/darwin/group_spec.rb
 - spec/command/darwin/host_spec.rb
 - spec/command/darwin/interface_spec.rb
 - spec/command/darwin/port_spec.rb