poise-service 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e78d99c983b8bbd140f02e127362f21d5016354b
-  data.tar.gz: 35322dfdbc04cbeac6b81f3e8c7b2a73c23cf045
+  metadata.gz: 620447ed47a3030f8b4450f2c0ff5fec761a2188
+  data.tar.gz: 675005000178c19f5b7d4422857d67372fe3d50a
 SHA512:
-  metadata.gz: 5e97a66effe71fc090420174f0bb3224866fc83ff6e42b49019db07bd7b82bcafd7605f592b1b023e7c2fbe9ad90232ad68a50ae73d743b70f5d2efe1a2a4774
-  data.tar.gz: 84331025327a5ecfe30874991f13e918c93a05af914637d4c3214c6583123b1b943d43561eb5aed868debbc394ead51e31789099506df61cb5a327738329216f
+  metadata.gz: 61d7319f04b307c041e763ff157993957a627703bb22b32845f5cf8aae3e8f34acfc10dc955239d5258a1775a49c7a79d41b1c590e242601d1cbafa388166553
+  data.tar.gz: b908f0d756102441e6921f57ec639282b65f0d4f76546824d2e22f4e0d069bd72a062572ac89c54a43bf5661529b41a5fd2e76c8591d8cb430fa6caa8fd6feb1

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Poise-Service Changelog
 
+## v1.3.1
+
+* [#25](https://github.com/poise/poise-service/pull/25) Cope with a service user
+  with an invalid home directory.
+* Use the correct default cookbook for `service_template` when used with additional plugins.
+
 ## v1.3.0
 
 * Allow setting `pid_file_external false` as a provider option for the `sysvinit`

data/lib/poise_service/resources/poise_service.rb

@@ -118,23 +118,26 @@ module PoiseService
         # @see #directory
         # @return [String]
         def default_directory
-          # For root we always want the system root path.
-          unless user == 'root'
-            # Force a reload in case any users were created earlier in the run.
-            Etc.endpwent
-            home = begin
-              Dir.home(user)
-            rescue ArgumentError
-              nil
-            end
-          end
-          # Better than nothing
-          home || case node['platform_family']
+          # Default fallback.
+          sysroot = case node['platform_family']
           when 'windows'
             ENV.fetch('SystemRoot', 'C:\\')
           else
             '/'
           end
+          # For root we always want the system root path.
+          return sysroot if user == 'root'
+          # Force a reload in case any users were created earlier in the run.
+          Etc.endpwent
+          # ArgumentError means we can't find the user, possibly nsswitch caching?
+          home = begin
+            Dir.home(user)
+          rescue ArgumentError
+            sysroot
+          end
+          # If the home doesn't exist or is empty, use sysroot.
+          home = sysroot if home.empty? || !::File.directory?(home)
+          home
         end
 
         # Clean up a signal string/integer. Ints are mapped to the signal name,

data/lib/poise_service/service_providers/base.rb

@@ -164,7 +164,7 @@ module PoiseService
             end
           else
             source default_source
-            cookbook 'poise-service'
+            cookbook self.poise_defined_in_cookbook
           end
           variables(
             command: options['command'] || new_resource.command,

data/lib/poise_service/version.rb

@@ -16,5 +16,5 @@
 
 
 module PoiseService
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

data/test/spec/resources/poise_service_spec.rb

@@ -161,6 +161,8 @@ describe PoiseService::Resources::PoiseService::Resource do
       let(:user) { 'poise' }
       before do
         expect(Dir).to receive(:home).with('poise').and_return('/home/poise')
+        allow(File).to receive(:directory?).and_call_original
+        allow(File).to receive(:directory?).with('/home/poise').and_return(true)
       end
 
       it { is_expected.to eq '/home/poise' }
@@ -174,6 +176,26 @@ describe PoiseService::Resources::PoiseService::Resource do
 
       it { is_expected.to eq '/' }
     end # /context with an invalid user
+
+    context 'with a non-existent directory' do
+      let(:user) { 'poise' }
+      before do
+        expect(Dir).to receive(:home).with('poise').and_return('/home/poise')
+        allow(File).to receive(:directory?).and_call_original
+        allow(File).to receive(:directory?).with('/home/poise').and_return(false)
+      end
+
+      it { is_expected.to eq '/' }
+    end # /context with a non-existent directory
+
+    context 'with a blank directory' do
+      let(:user) { 'poise' }
+      before do
+        expect(Dir).to receive(:home).with('poise').and_return('')
+      end
+
+      it { is_expected.to eq '/' }
+    end # /context with a blank directory
   end # /describe #default_directory
 
   describe '#restart_on_update' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poise-service
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: halite