Merge pull request #103 from hw-cookbooks/develop

Runit 1.6.0

.kitchen.yml

@@ -5,11 +5,12 @@ provisioner:
   name: chef_zero
 
 platforms:
-  - name: centos-5.10
-  - name: centos-6.5
-  - name: fedora-19
+  - name: centos-5.11
+  - name: centos-6.6
+  - name: fedora-21
   - name: ubuntu-10.04
   - name: ubuntu-12.04
+  - name: ubuntu-14.04
 
 suites:
 - name: default

CHANGELOG.md

@@ -2,6 +2,15 @@ runit Cookbook CHANGELOG
 ========================
 This file is used to list changes made in each version of the runit cookbook.
 
+v1.6.0 (2015-04-06)
+--------------------
+* Fedora 21 support
+* Kitchen platform updates
+* use imeyer’s packagecloud repo for RHEL
+* fix converge_by usage
+* do_action helper to set updated_by_last_action
+* style fixes to provider
+
 v1.5.18 (2015-03-13)
 --------------------
 * Add helper methods to detect installation presence

Cheffile

@@ -2,8 +2,6 @@
 
 site 'https://supermarket.chef.io/api/v1'
 
-cookbook 'apt'
-cookbook 'yum'
 cookbook 'runit', path: '.'
 cookbook 'runit_test', path: './test/cookbooks/runit_test'
 cookbook 'runit-other_test', path: './test/cookbooks/runit-other_test'

Cheffile.lock

@@ -1,26 +1,16 @@
 SITE
   remote: https://supermarket.chef.io/api/v1
   specs:
-    apt (2.6.0)
     chef_handler (1.1.6)
     minitest-handler (1.3.2)
       chef_handler (>= 0.0.0)
-    yum (3.5.1)
-
-SITE
-  remote: https://supermarket.chef.io/api/v1
-  specs:
-    build-essential (2.1.3)
-    yum-epel (0.5.3)
-      yum (~> 3.0)
+    packagecloud (0.0.17)
 
 PATH
   remote: .
   specs:
-    runit (1.5.11)
-      build-essential (>= 0.0.0)
-      yum (~> 3.0)
-      yum-epel (>= 0.0.0)
+    runit (1.5.18)
+      packagecloud (>= 0.0.0)
 
 PATH
   remote: ./test/cookbooks/runit-other_test
@@ -33,10 +23,8 @@ PATH
     runit_test (1.0.0)
 
 DEPENDENCIES
-  apt (>= 0)
   minitest-handler (>= 0)
   runit (>= 0)
   runit-other_test (>= 0)
   runit_test (>= 0)
-  yum (>= 0)
 

README.md

@@ -16,6 +16,8 @@ Requirements
 - Gentoo
 - RHEL
 
+### Cookbooks
+- packagecloud (for RHEL)
 
 Attributes
 ----------
@@ -32,23 +34,19 @@ See `attributes/default.rb` for defaults generated per platform.
 
 ### Optional Attributes for RHEL systems
 
-- `node['runit']['use_package_from_yum']` - If `true`, attempts to install
-  runit without building an RPM first. This is for users who already have
-  the package in their own Yum repository.
-
+- `node['runit']['prefer_local_yum']` - If `true`, assumes that a `runit` package is available on an already configured local yum repository. By default, the recipe installs the `runit` package from a Package Cloud repository (see below). This is set to the value of `node['runit']['use_package_from_yum']` for backwards compatibility, but otherwise defaults to `false`.
 
 Recipes
 -------
 ### default
 The default recipe installs runit and starts `runsvdir` to supervise the services in runit's service directory (e.g., `/etc/service`).
 
-On RHEL family systems, it will build the runit RPM using [Ian Meyer's runit RPM SPEC](https://github.com/imeyer/runit-rpm) unless the attribute `node['runit']['use_package_from_yum']` is set to `true`. In which case it will try and install runit through the normal package installation mechanism.
+On RHEL-family systems, it will install the runit RPM using [Ian Meyer's Package Cloud repository](https://packagecloud.io/imeyer/runit) for runit. This replaces the previous functionality where the RPM was build using his [runit RPM SPEC](https://github.com/imeyer/runit-rpm). However, if the attribute `node['runit']['prefer_local_yum']` is set to `true`, the packagecloud repository creation will be skipped and it is assumed that a `runit` package is available on an otherwise configured (outside this cookbook) local repository.
 
 On Debian family systems, the runit packages are maintained by the runit author, Gerrit Pape, and the recipe will use that for installation.
 
 On Gentoo, the runit ebuild package is installed.
 
-
 Resource/Provider
 -----------------
 This cookbook has a resource, `runit_service`, for managing services under runit. This service subclasses the Chef `service` resource.

attributes/default.rb

@@ -36,14 +36,14 @@
     default['runit']['reload'] = 'reload runsvdir'
   end
 
-when 'rhel'
+when 'rhel', 'fedora'
   default['runit']['sv_bin'] = '/sbin/sv'
   default['runit']['chpst_bin'] = '/sbin/chpst'
   default['runit']['service_dir'] = '/etc/service'
   default['runit']['sv_dir'] = '/etc/sv'
   default['runit']['lsb_init_dir'] = '/etc/init.d'
   default['runit']['executable'] = '/sbin/runit'
-  default['runit']['use_package_from_yum'] = false
+  default['runit']['prefer_local_yum'] = node['runit']['use_package_from_yum'] || false
   default['runit']['start'] = '/etc/init.d/runit-start start'
   default['runit']['stop'] = '/etc/init.d/runit-start stop'
   default['runit']['reload'] = '/etc/init.d/runit-start reload'