poise-service 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19ac4e7234269bdbef35c490936ccf490ac35617
-  data.tar.gz: 142369bfa25095a9f383fb011608481fc861a6d8
+  metadata.gz: f3fc72bef39422fae1951da15292b19f8197a71b
+  data.tar.gz: 2aa9c8a1eb8d6808b0e591ff8a2aabfdc3360ad3
 SHA512:
-  metadata.gz: 6da85709d79589eb70e2e3483473cce141231f1b836ff8a6e45b172386360f79ec1c1eda1a60978a6938ddb99c7667d4127bcd8e5f9efd8048dcaeb125827070
-  data.tar.gz: e389aa918481ec598c1cbcac9bbbff271945b635809eb849fa869642c01c51fce643067555f7597ffe01b264c8f86541c896a08c6f95aacf665a3c15aff9cec9
+  metadata.gz: 84418165ab96792da66819398e11360890259d764e2f9ecfe93ac1ce85d9e0b176d44b66e3a20cb66da20f1a6f40535910e864f83e26eec76f60f037a1f7c510
+  data.tar.gz: e4aea2a2c486514982693e15d3d3e1d8e5d71bebce16366c45587e3fc9cbb374d95d13b8d61e26495cd34b3339de41a13f8dbaccc9ab15e1e9951577fd9a5345

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v1.0.2
+* Fix a potential infinite loop when starting a service with the dummy provider.
+* [#2](https://github.com/poise/poise-service/pull/2) Remove usage of root
+  default files so uploading with Berkshelf works (for now).
+
 ## v1.0.1
 
 * Don't use a shared, mutable default value for `#environment`.

data/README.md

@@ -125,7 +125,7 @@ that are passed down to the service provider and can be used to control how it
 creates and manages the service. These can be set in the `poise_service`
 resource using the `options` method, in node attributes or via the
 `poise_service_options` resource. The options from all sources are merged
-together into a single hash based.
+together in to a single hash.
 
 When setting options in the resource you can either set them for all providers:
 
@@ -167,7 +167,7 @@ poise_service_options 'myapp' do
 end
 ```
 
-Unlike resource attributes, service options can be different for each provide.
+Unlike resource attributes, service options can be different for each provider.
 Not all providers support the same options so make sure to the check the
 documentation for each provider to see what options the use.
 
@@ -190,9 +190,8 @@ end
 
 #### Attributes
 
-* `service_name` – Name of the service. *(name attribute)*
-* `for_provider` – Provider to set options for. If set, the resource must be
-  defined and reachable before the `poise_service_options` resource.
+* `resource` – Name of the service. *(name attribute)*
+* `for_provider` – Provider to set options for.
 
 All other attribute keys will be used as options data.
 

data/lib/poise_service/resources.rb

@@ -15,7 +15,6 @@
 #
 
 require 'poise_service/resources/poise_service'
-require 'poise_service/resources/poise_service_test'
 require 'poise_service/resources/poise_service_user'
 
 

data/lib/poise_service/resources/poise_service_user.rb

@@ -22,6 +22,7 @@ require 'poise'
 module PoiseService
   module Resources
     # (see PoiseServiceUser::Resource)
+    # @since 1.0.0
     module PoiseServiceUser
       # A `poise_service_user` resource to create service users/groups.
       #
@@ -67,6 +68,7 @@ module PoiseService
 
       # Provider for `poise_service_user`.
       #
+      # @since 1.0.0
       # @see Resource
       # @provides poise_service_user
       class Provider < Chef::Provider

data/lib/poise_service/service_providers/base.rb

@@ -180,7 +180,7 @@ module PoiseService
           # Don't trigger a restart if the template doesn't already exist, this
           # prevents restarting on the run that first creates the service.
           restart_on_update = options.fetch('restart_on_update', new_resource.restart_on_update)
-          if restart_on_update && ::File.exists?(path)
+          if restart_on_update && ::File.exist?(path)
             mode = restart_on_update.to_s == 'immediately' ? :immediately : :delayed
             notifies :restart, new_resource, mode
           end

data/lib/poise_service/service_providers/dummy.rb

@@ -24,25 +24,37 @@ module PoiseService
 
       def action_start
         return if pid
+        Chef::Log.debug("[#{new_resource}] Starting #{new_resource.command}")
+        # Clear the pid file if it exists.
+        ::File.unlink(pid_file) if ::File.exist?(pid_file)
         if Process.fork
           # Parent, wait for the final child to write the pid file.
-          until pid
+          until ::File.exist?(pid_file)
             sleep(1)
+            Chef::Log.debug("[#{new_resource}] Waiting for PID file")
           end
         else
           # :nocov:
+          Chef::Log.debug("[#{new_resource}] Forked")
           # First child, daemonize and go to town.
           Process.daemon(true)
+          Chef::Log.debug("[#{new_resource}] Daemonized")
           # Daemonized, set up process environment.
           Dir.chdir(new_resource.directory)
+          Chef::Log.debug("[#{new_resource}] Directory changed to #{new_resource.directory}")
           new_resource.environment.each do |key, val|
             ENV[key.to_s] = val.to_s
           end
           Process.uid = new_resource.user
+          Chef::Log.debug("[#{new_resource}] Process environment configured")
           IO.write(pid_file, Process.pid)
+          Chef::Log.debug("[#{new_resource}] PID written to #{pid_file}, execing #{new_resource.command}")
           Kernel.exec(new_resource.command)
+          # Just in case, bail out.
+          exit!
           # :nocov:
         end
+        Chef::Log.debug("[#{new_resource}] Started.")
       end
 
       def action_stop
@@ -61,7 +73,7 @@ module PoiseService
       end
 
       def pid
-        return nil unless ::File.exists?(pid_file)
+        return nil unless ::File.exist?(pid_file)
         pid = IO.read(pid_file).to_i
         begin
           # Check if the PID is running.

data/lib/poise_service/service_providers/sysvinit.rb

@@ -27,7 +27,7 @@ module PoiseService
       end
 
       def pid
-        IO.read(pid_file).to_i if ::File.exists?(pid_file)
+        IO.read(pid_file).to_i if ::File.exist?(pid_file)
       end
 
       private

data/lib/poise_service/version.rb

@@ -16,5 +16,5 @@
 
 
 module PoiseService
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/test/cookbooks/poise-service_test/recipes/default.rb

@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+require 'poise_service/resources/poise_service_test'
+
 # Create the various services.
 poise_service_test 'default' do
   base_port 5000

data/test/integration/default/serverspec/default_spec.rb

@@ -28,15 +28,15 @@ describe 'default provider' do
   end
 end
 
-describe 'sysvinit provider', unless: File.exists?('/no_sysvinit') do
+describe 'sysvinit provider', unless: File.exist?('/no_sysvinit') do
   it_should_behave_like 'a poise_service_test', 'sysvinit', 6000
 end
 
-describe 'upstart provider', unless: File.exists?('/no_upstart') do
+describe 'upstart provider', unless: File.exist?('/no_upstart') do
   it_should_behave_like 'a poise_service_test', 'upstart', 7000, !old_upstart
 end
 
-describe 'systemd provider', unless: File.exists?('/no_systemd') do
+describe 'systemd provider', unless: File.exist?('/no_systemd') do
   it_should_behave_like 'a poise_service_test', 'systemd', 8000
 end
 

data/test/spec/resources/poise_service_spec.rb

@@ -179,8 +179,8 @@ describe PoiseService::Resources::PoiseService::Resource do
     service_provider('sysvinit')
     step_into(:poise_service)
     before do
-      allow(File).to receive(:exists?).and_call_original
-      allow(File).to receive(:exists?).with('/etc/init.d/test').and_return(true)
+      allow(File).to receive(:exist?).and_call_original
+      allow(File).to receive(:exist?).with('/etc/init.d/test').and_return(true)
     end
     subject { chef_run.template('/etc/init.d/test') }
 

data/test/spec/service_mixin_spec.rb

@@ -49,7 +49,7 @@ describe PoiseService::ServiceMixin::Resource do
       include PoiseService::ServiceMixin::Resource
     end
 
-    its(:action) { is_expected.to eq :doit }
+    it { expect(Array(subject.action)).to eq %i{doit} }
     its(:allowed_actions) { is_expected.to eq %i{nothing doit enable disable start stop restart reload} }
     its(:service_name) { is_expected.to eq 'test' }
   end # /context with Poise already included
@@ -60,7 +60,7 @@ describe PoiseService::ServiceMixin::Resource do
       actions(:doit)
     end
 
-    its(:action) { is_expected.to eq :enable }
+    it { expect(Array(subject.action)).to eq %i{enable} }
     its(:allowed_actions) { is_expected.to eq %i{nothing enable disable start stop restart reload doit} }
     its(:service_name) { is_expected.to eq 'test' }
   end # /context without Poise already included

data/test/spec/service_providers/dummy_spec.rb

@@ -22,15 +22,15 @@ describe PoiseService::ServiceProviders::Dummy do
   before do
     allow(Process).to receive(:fork).and_return(0)
     allow(Process).to receive(:kill).with(0, 100)
-    allow(File).to receive(:exists?).and_call_original
-    allow(File).to receive(:exists?).with('/var/run/test.pid').and_return(true)
+    allow(File).to receive(:exist?).and_call_original
+    allow(File).to receive(:exist?).with('/var/run/test.pid').and_return(true)
     allow(IO).to receive(:read).and_call_original
     allow(IO).to receive(:read).with('/var/run/test.pid').and_return('100')
   end
 
   describe '#action_enable' do
     before do
-      allow(File).to receive(:exists?).with('/var/run/test.pid').and_return(false, false, true)
+      allow(File).to receive(:exist?).with('/var/run/test.pid').and_return(false, false, false, true)
       expect_any_instance_of(described_class).to receive(:sleep).with(1).once
     end
     recipe do

data/test/spec/service_providers/sysvinit_spec.rb

@@ -85,8 +85,8 @@ EOH
   describe '#pid' do
     subject { described_class.new(nil, nil) }
     before do
-      allow(File).to receive(:exists?).and_call_original
-      allow(File).to receive(:exists?).with('/pid').and_return(true)
+      allow(File).to receive(:exist?).and_call_original
+      allow(File).to receive(:exist?).with('/pid').and_return(true)
       allow(IO).to receive(:read).and_call_original
       allow(IO).to receive(:read).with('/pid').and_return('100')
       expect(subject).to receive(:pid_file).and_return('/pid').at_least(:once)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poise-service
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-23 00:00:00.000000000 Z
+date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: halite
@@ -85,9 +85,9 @@ files:
 - README.md
 - Rakefile
 - chef/attributes/default.rb
-- chef/templates/systemd.service.erb
-- chef/templates/sysvinit.sh.erb
-- chef/templates/upstart.conf.erb
+- chef/templates/default/systemd.service.erb
+- chef/templates/default/sysvinit.sh.erb
+- chef/templates/default/upstart.conf.erb
 - lib/poise_service.rb
 - lib/poise_service/cheftie.rb
 - lib/poise_service/error.rb
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A Chef cookbook for managing system services.