poise-service 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc314f2835262cc4716868dbe28806a24fb5d6f5
-  data.tar.gz: 3283117be88a4eb5e43986d8482db391c51d0131
+  metadata.gz: c69f8bdc50849e5cfe6498cb3e248f0708e55a49
+  data.tar.gz: 8e60520adfb87a6a16e20b22f1a2869daa59c9cc
 SHA512:
-  metadata.gz: 2c7888157443d3ce72a2b79283c443f6d9a59df86c031440edae4f1422a6f35c2e741b0c201964f8d0dc451d3cde9bf07aabf272255d1b6ca8cd8436051079a8
-  data.tar.gz: 57e51c07b358673293c019684a101666d881def1b1fe9052fa0c5c8cb0feee82a4ab8ec07c4395e40dd13e5ec5371d36ad10dda8b620bbf7fb9faa49b8e1539a
+  metadata.gz: 07d5fe9c86e84cc4aaef0bab394969217e220ca8c922ebe75b51301f1bd73b396269b29ada43cee6e711bc4d4ac6c3223ee359c4366eb6aafc6b9d994e365744
+  data.tar.gz: d53e5e479b1bcfaac6cd860ec0b772f79506db7294c705c6dfebe3a3123f20a147ca5e24d81ce2e47494d600d6d5f284213647fd75d64691a79f3eb8ad090f19

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Poise-Service Changelog
 
+## v1.4.1
+
+* Fix `poise_service_user` on Solaris and make it closer to being usable on Windows.
+
 ## v1.4.0
 
 * [#31](https://github.com/poise/poise-service/pull/31) Add `shell` property to

data/lib/poise_service/resources/poise_service_user.rb

@@ -49,10 +49,11 @@ module PoiseService
         #   @return [String]
         attribute(:user, kind_of: String, name_attribute: true)
         # @!attribute group
-        #   Name of the group to create. Defaults to the name of the resource.
-        #   Set to false to disable group creation.
+        #   Name of the group to create. Defaults to the name of the user,
+        #   except on Windows where it defaults to false. Set to false to
+        #   disable group creation.
         #   @return [String, false]
-        attribute(:group, kind_of: [String, FalseClass], name_attribute: true)
+        attribute(:group, kind_of: [String, FalseClass], default: lazy { default_group })
         # @!attribute uid
         #   UID of the user to create. Optional, if not set the UID will be
         #   allocated automatically.
@@ -79,10 +80,24 @@ module PoiseService
         # Find a default shell for service users. Tries to use nologin, but fall
         # back on false.
         #
+        # @api private
         # @return [String]
         def default_shell
           DEFAULT_SHELLS.find {|s| ::File.exist?(s) } || DEFAULT_SHELLS.last
         end
+
+        # Find the default group name. Returns false on Windows because service
+        # groups aren't needed there. Otherwise use the name of the service user.
+        #
+        # @api private
+        # @return [String, false]
+        def default_group
+          if node.platform_family?('windows')
+            false
+          else
+            user
+          end
+        end
       end
 
       # Provider for `poise_service_user`.
@@ -119,26 +134,37 @@ module PoiseService
         private
 
         # Create the system group.
+        #
+        # @api private
+        # @return [void]
         def create_group
           group new_resource.group do
             gid new_resource.gid
-            system true
+            # Solaris doesn't support the idea of system groups.
+            system true unless node.platform_family?('solaris2')
           end
         end
 
         # Create the system user.
+        #
+        # @api private
+        # @return [void]
         def create_user
           user new_resource.user do
             comment "Service user for #{new_resource.name}"
             gid new_resource.group if new_resource.group
             home new_resource.home
             shell new_resource.shell
-            system true
+            # Solaris doesn't support the idea of system users.
+            system true unless node.platform_family?('solaris2')
             uid new_resource.uid
           end
         end
 
         # Remove the system group.
+        #
+        # @api private
+        # @return [void]
         def remove_group
           create_group.tap do |r|
             r.action(:remove)
@@ -146,6 +172,9 @@ module PoiseService
         end
 
         # Remove the system user.
+        #
+        # @api private
+        # @return [void]
         def remove_user
           create_user.tap do |r|
             r.action(:remove)

data/lib/poise_service/version.rb

@@ -16,5 +16,5 @@
 
 
 module PoiseService
-  VERSION = '1.4.0'
+  VERSION = '1.4.1'
 end

data/test/spec/resources/poise_service_user_spec.rb

@@ -18,6 +18,9 @@ require 'spec_helper'
 
 describe PoiseService::Resources::PoiseServiceUser do
   step_into(:poise_service_user)
+  # We need a platform because Chef no longer maps the user resource for chefspec.
+  # https://github.com/chef/chef/issues/5242
+  let(:chefspec_options) { {platform: 'ubuntu', version: '14.04'} }
   let(:shells) { [] }
   before do
     allow(File).to receive(:exist?) {|s| shells.include?(s) }
@@ -140,4 +143,19 @@ describe PoiseService::Resources::PoiseServiceUser do
       it { is_expected.to remove_user('poise') }
     end # /context with no group
   end # context with action :remove
+
+  context 'on Solaris' do
+    let(:chefspec_options) { {platform: 'solaris2', version: '5.11'} }
+
+    it { is_expected.to create_group('poise').with(gid: nil, system: nil) }
+    it { is_expected.to create_user('poise').with(gid: 'poise', home: nil, system: false, uid: nil, shell: '/bin/false') }
+  end # /context on Solaris
+
+  context 'on Windows' do
+    let(:chefspec_options) { {platform: 'windows', version: '2012R2'} }
+
+    it { is_expected.to_not create_group('poise') }
+    it { is_expected.to create_user('poise').with(gid: nil, home: nil, system: true, uid: nil, shell: '/bin/false') }
+  end # /context on Windows
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poise-service
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-21 00:00:00.000000000 Z
+date: 2016-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: halite