poise-service-runit 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bd16e05cea18fcda87a6943861f5648326131de
-  data.tar.gz: 9ae59b4819183a0671d9407536ed8a045a75202a
+  metadata.gz: 7c209d895aa803d66524df70aa508a6b8fc9f007
+  data.tar.gz: 1fe211e400f1bd3bee1ec3119c5451deda1c64ba
 SHA512:
-  metadata.gz: ffdab15e11cea62cf36c10cee2b006b45494e75eeaeec6fa79b9aff79d7c2780f86b9ff04d6664891542ffa541563175c04b38af76229f4d882eab2922fd8627
-  data.tar.gz: 266ccae3d7d5e999523db0e076a887b241951414f47c1e79d096a6ad746ecc1f3556d4188533bbd607c78d03c5523e0e9cfe35152332e41ad77256da98ab2c89
+  metadata.gz: 5f0fd4f678f97595ab5338c629c2d9850e57ff0950aedb208443a7fd9645bbb664fcd459eb507a88a08a598e457e64de8ff273575fd17ff0531c6d73317def2a
+  data.tar.gz: cdf3134fc2645d899cb2252e476ab180e01c2b1f489856e07de1a38345c4d2a38418d6167440ee1984225c04aadc648885a2049b503b8dbf3a450d78e3c9d64a

data/.gitignore

@@ -1,5 +1,11 @@
+Gemfile.lock
+Berksfile.lock
+test/gemfiles/*.lock
 .kitchen/
 .kitchen.local.yml
-.vagrant/
 test/docker/
-Gemfile.lock
+coverage/
+pkg/
+.yardoc/
+doc/
+

data/Berksfile

@@ -26,3 +26,8 @@ group :test do
   cookbook 'poise-service-runit_test', path: 'test/cookbooks/poise-service-runit_test'
   cookbook 'apt'
 end
+
+# For the master build, pull in the runit cookbook from git.
+if ENV['POISE_MASTER_BUILD']
+  cookbook 'runit', github: 'hw-cookbooks/runit', branch: 'develop'
+end

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+# Poise-Service-Runit Changlog
+
+## v1.1.0
+
+* Support for runit cookbook 1.7.
+
+## v1.0.0
+
+* Initial release.

data/Gemfile

@@ -18,10 +18,12 @@ source 'https://rubygems.org/'
 
 gemspec path: File.expand_path('..', __FILE__)
 
-def dev_gem(name, path: File.join('..', name))
+def dev_gem(name, path: File.join('..', name), github: nil)
   path = File.expand_path(File.join('..', path), __FILE__)
   if File.exist?(path)
     gem name, path: path
+  elsif github
+    gem name, github: github
   end
 end
 

data/chef/templates/sv-template-log-run.erb

@@ -1,2 +1,2 @@
 #!/bin/sh
-exec svlogd -tt /var/log/<%= @options[:new_resource].service_name %>
+exec svlogd -tt /var/log/<%= @options['new_resource'].service_name %>

data/chef/templates/sv-template-run.erb

@@ -1,8 +1,8 @@
 #!/bin/sh
 exec 2>&1
-cd <%= @options[:new_resource].directory %>
+cd <%= @options['new_resource'].directory %>
 if [ -d "<%= File.join(@options['sv_dir'], @options['new_resource'].service_name, 'env') %>" ]; then
-  exec chpst -u "<%= @options[:new_resource].user %>" -U "<%= @options[:new_resource].user %>" -e "<%= File.join(@options['sv_dir'], @options['new_resource'].service_name, 'env') %>" <%= @options[:new_resource].command %>
+  exec chpst -u "<%= @options['new_resource'].user %>" -U "<%= @options['new_resource'].user %>" -e "<%= File.join(@options['sv_dir'], @options['new_resource'].service_name, 'env') %>" <%= @options['new_resource'].command %>
 else
-  exec chpst -u "<%= @options[:new_resource].user %>" -U "<%= @options[:new_resource].user %>" <%= @options[:new_resource].command %>
+  exec chpst -u "<%= @options['new_resource'].user %>" -U "<%= @options['new_resource'].user %>" <%= @options['new_resource'].command %>
 fi

data/lib/poise_service/runit/provider.rb

@@ -16,6 +16,7 @@
 
 require 'chef/mash'
 
+require 'poise_service/error'
 require 'poise_service/service_providers/base'
 
 
@@ -71,7 +72,14 @@ module PoiseService
 
       # Recipes to include for Runit.
       def recipes
-        'runit'
+        ['runit', proc {
+          begin
+            if node['virtualization'] && %w{docker lxc}.include?(node['virtualization']['system'])
+              resources('service[runsvdir-start]').action(:nothing)
+            end
+          rescue Chef::Exceptions::ResourceNotFound
+          end
+        }]
       end
 
       # Set up secondary service files for Runit.
@@ -86,6 +94,20 @@ module PoiseService
         end
       end
 
+      # Hack the enable action for the runit provider. This forces it to wait
+      # until runsv recognizes the new service. This is tracked upstream in
+      # https://github.com/hw-cookbooks/runit/issues/136
+      #
+      # @api private
+      # @todo Remove once the upstream bug is fixed.
+      def enable_service
+        super
+        sleep 1 until ::FileTest.pipe?("#{service_resource.service_dir}/#{service_resource.service_name}/supervise/ok")
+        if service_resource.log
+          sleep 1 until ::FileTest.pipe?("#{service_resource.service_dir}/#{service_resource.service_name}/log/supervise/ok")
+        end
+      end
+
       # Tear down secondary service files for Runit.
       def destroy_service
         # Disable automatically destroys the service with Runit.
@@ -99,9 +121,17 @@ module PoiseService
       #
       # @return [Class]
       def service_provider
-        Class.new(Chef::Provider::Service::Runit) do
+        base_class = if defined?(Chef::Provider::RunitService)
+          Chef::Provider::RunitService
+        elsif defined?(Chef::Provider::Service::Runit)
+          Chef::Provider::Service::Runit
+        else
+          raise PoiseService::Error.new('Unable to find runit_service provider class.')
+        end
+        Class.new(base_class) do
+          # Lie about the name.
           def self.name
-            'Chef::Provider::Service::Runit'
+            superclass.name
           end
 
           def inside_docker?

data/lib/poise_service/runit/version.rb

@@ -17,6 +17,6 @@
 
 module PoiseService
   class Runit
-    VERSION = '1.0.0'
+    VERSION = '1.1.0'
   end
 end

data/poise-service-runit.gemspec

@@ -39,5 +39,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'poise-boiler', '~> 1.0'
 
-  spec.metadata['halite_dependencies'] = 'runit ~> 1.5'
+  spec.metadata['halite_dependencies'] = 'runit ~> 1.7'
 end

data/test/cookbooks/poise-service-runit_test/recipes/default.rb

@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+require 'poise_service/resources/poise_service_test'
+
 poise_service_test 'runit' do
   service_provider :runit
   base_port 8000

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poise-service-runit
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2016-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: halite
@@ -78,6 +78,7 @@ files:
 - ".kitchen.yml"
 - ".travis.yml"
 - Berksfile
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -116,7 +117,7 @@ homepage: https://github.com/poise/poise-service-runit
 licenses:
 - Apache 2.0
 metadata:
-  halite_dependencies: runit ~> 1.5
+  halite_dependencies: runit ~> 1.7
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -133,7 +134,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: An extension for poise-service to support runit.