Chef 12 support

This commit adds Chef 12 support and changes some of the properties of 
the resources. Configuration is more automatic.

See README for notes on resource changes.

Author: RulerOf

.rubocop.yml

@@ -0,0 +1,6 @@
+Metrics/LineLength:
+  Max: 150
+
+Metrics/BlockLength:
+  Exclude:
+    - 'resources/config.rb'

CHANGELOG.md

@@ -2,10 +2,20 @@
 
 This file is used to list changes made in each version of the gamegos-supervisor cookbook.
 
+# 1.0.0
+
+Update
+
+- Add Chef 12 support
+- Add tests
+  - Testing Ubuntu and CentOS
+- Update documentation
+- Fixes some bugs
+
+
 # 0.1.0
 
 Initial release.
 
 - change 0
 - change 1
-

README.md

@@ -12,7 +12,7 @@ This cookbook installs and configures [Supervisor](https://github.com/Supervisor
 
 ## Chef
 
-- Chef 13+
+- Chef 12+
 
 ## Cookbooks
 
@@ -82,6 +82,7 @@ Define configurations of supervisord.
 - `unix_http_server_chown` - (is: String)
 - `unix_http_server_username` - (is: String)
 - `unix_http_server_password` - (is: String)
+- `supervisord_config_directory` - (is: String)
 - `supervisord_log_directory` - (is: String)
 - `supervisord_logfile` - (is: String)
 - `supervisord_logfile_maxbytes` - (is: String)
@@ -105,7 +106,9 @@ Define configurations of supervisord.
 #### Examples
 
 ```ruby
-supervisor_config '/etc/supervisor' do
+# Create a custom config
+supervisor_config 'supervisor' do
+  supervisord_config_directory '/etc/supervisor'
   socket_file '/run/supervisor.sock'
   inet_port '0.0.0.0:9010'
   inet_username 'randy'
@@ -117,9 +120,14 @@ end
 ```
 
 ```ruby
-supervisor_config '/home/rudy/supervisor'
+# Create a default config
+supervisor_config 'supervisor'
 ```
 
+#### Notes
+
+The name property of the resource should always just be `supervisor`.
+
 ### supervisor_process
 
 Creates a process for supervisor. The process may be a 'program', 'eventlistener' or 'fcgi-program'.
@@ -221,5 +229,9 @@ Creates Supervisor service for your systems.
 #### Examples
 
 ```ruby
-supervisor_service 'not_important'
+supervisor_service 'supervisor'
 ```
+
+#### Note
+
+The name property of the resource should always just be `supervisor`.

attributes/default.rb

@@ -0,0 +1,5 @@
+default['supervisor']['supervisord_default_path'] = if platform_family?('rhel')
+                                                      '/usr/bin'
+                                                    else
+                                                      '/usr/local/bin'
+                                                    end

metadata.rb

@@ -4,8 +4,11 @@
 license 'GPL-3.0'
 description 'Installs/Configures supervisor'
 long_description 'Installs/Configures supervisor'
-version '0.1.0'
-chef_version '>= 13.0'
+chef_version '>= 12.0'
+%w[amazon centos debian redhat ubuntu].each do |os|
+  supports os
+end
+version '1.0.0'
 
 # The `issues_url` points to the location where issues for this cookbook are
 # tracked.  A `View Issues` link will be displayed on this cookbook's page when

recipes/default.rb

@@ -5,8 +5,6 @@
 # Copyright:: 2018, The Authors, All Rights Reserved.
 supervisor_install '3.3'
 
-supervisor_config '/etc/supervisor' do
-  action :create
-end
+supervisor_config 'supervisor'
 
 supervisor_service 'supervisor'

resources/config.rb

@@ -1,7 +1,8 @@
 # To learn more about Custom Resources, see https://docs.chef.io/custom_resources.html
 resource_name :supervisor_config
 
-property :supervisor_directory, String, name_property: true
+property :name, String, name_property: true
+property :supervisord_config_directory, String, default: '/etc/supervisor'
 property :socket_file, String, default: '/var/run/supervisor.sock'
 
 property :unix_http_server_chmod, String, default: '700'
@@ -32,13 +33,13 @@
 property :inet_password, [String, NilClass], default: nil
 
 property :include_files, [String, Array], default: lazy {
-  "#{supervisor_directory}/*.conf"
+  "#{supervisord_config_directory}/*.conf"
 }
 
 property :template, String, default: 'gamegos-supervisor'
 
 action :create do
-  supervisor_config_directory = new_resource.supervisor_directory
+  supervisor_config_directory = new_resource.supervisord_config_directory
   supervisor_config_file = "#{supervisor_config_directory}/supervisord.conf"
   with_run_context :root do
     node.run_state['supervisor'] ||= {}
@@ -63,14 +64,14 @@
     recursive true
   end
 
-  template 'supervisord_config_file' do
+  declare_resource(:template, 'supervisord_config_file') do
     cookbook new_resource.template
     path supervisor_config_file
     source 'supervisord.conf.erb'
     owner 'root'
     group 'root'
     mode '644'
     variables config: new_resource
-    notifies :reload, 'supervisor_service[supervisor]', :delayed
+    notifies :reload, find_resource(:supervisor_service, 'supervisor'), :delayed
   end
 end

resources/group.rb

@@ -7,22 +7,22 @@
 property :template, String, default: 'gamegos-supervisor'
 
 action :create do
-  template "supervisor_group_#{new_resource.name}" do
+  declare_resource(:template, "supervisor_group_#{new_resource.name}") do
     cookbook new_resource.template
     path lazy { "#{node.run_state['supervisor']['directory']}/group_#{new_resource.name}.conf" }
     source 'group.conf.erb'
     owner 'root'
     group 'root'
     mode '644'
     variables group: new_resource
-    notifies :reload, 'supervisor_service[supervisor]', :delayed
+    notifies :reload, find_resource(:supervisor_service, 'supervisor'), :delayed
   end
 end
 
 action :delete do
   file 'delete specific group configuration file' do
     path lazy { "#{node.run_state['supervisor']['directory']}/group_#{new_resource.name}.conf" }
     action :delete
-    notifies :reload, 'supervisor_service[supervisor]', :delayed
+    notifies :reload, find_resource(:supervisor_service, 'supervisor'), :delayed
   end
 end

resources/install.rb

@@ -4,9 +4,11 @@
 property :version, String, name_property: true
 
 action :create do
-  node.override['poise-python']['options']['pip_version'] = '18.0'
-
-  python_runtime '2'
+  python_runtime 'supervisor' do
+    provider :system
+    version '2'
+    pip_version '18.0'
+  end
 
   python_package 'supervisor' do
     version new_resource.version

resources/process.rb

@@ -50,7 +50,7 @@
 action :create do
   clean_name = new_resource.name.downcase.tr(' ', '_')
   unique_name_for_process = "#{new_resource.type}_#{clean_name}"
-  template "supervisor_#{unique_name_for_process}" do
+  declare_resource(:template, "supervisor_#{unique_name_for_process}") do
     cookbook new_resource.template
     path lazy { "#{node.run_state['supervisor']['directory']}/#{unique_name_for_process}.conf" }
     source 'process.conf.erb'
@@ -61,7 +61,7 @@
       name: clean_name,
       service: new_resource
     )
-    notifies :reload, 'supervisor_service[supervisor]', :delayed
+    notifies :reload, find_resource(:supervisor_service, 'supervisor'), :delayed
   end
 end
 
@@ -71,6 +71,6 @@
   file 'delete specific program configuration file' do
     path lazy { "#{node.run_state['supervisor']['directory']}/#{unique_name_for_process}.conf" }
     action :delete
-    notifies :reload, 'supervisor_service[supervisor]', :delayed
+    notifies :reload, find_resource(:supervisor_service, 'supervisor'), :delayed
   end
 end

resources/service.rb

@@ -1,16 +1,18 @@
 # To learn more about Custom Resources, see https://docs.chef.io/custom_resources.html
 resource_name :supervisor_service
-property :supervisord_executable_path, String, default: '/usr/local/bin/supervisord'
+property :supervisord_executable_path, String, default: lazy { node['supervisor']['supervisord_default_path'] }
+property :name, String, name_property: true
 
 action :create do
   poise_service 'supervisor' do
-    command lazy { "#{new_resource.supervisord_executable_path} -n -c #{node.run_state['supervisor']['config_file']}" }
+    command lazy { "#{new_resource.supervisord_executable_path}/supervisord -n -c #{node.run_state['supervisor']['config_file']}" }
   end
 end
 
 action :reload do
-  with_run_context :root do
-    find_resource(:poise_service, 'supervisor') do
-    end.run_action(:reload)
+  execute 'supervisorctl reread' do
+    command lazy { "#{new_resource.supervisord_executable_path}/supervisorctl -c #{node.run_state['supervisor']['config_file']} reread" }
+    action :run
+    only_if "#{new_resource.supervisord_executable_path}/supervisorctl -c #{node.run_state['supervisor']['config_file']} avail"
   end
 end