rubocop cleanups, special case default recipe when pkgs are unavail

Author: wohali

.kitchen.yml

@@ -19,7 +19,7 @@ verifier:
 
 platforms:
   - name: centos-6.9
-  - name: centos-7.2
+  - name: centos-7.3
   - name: debian-7.11
   - name: debian-8.7
   - name: ubuntu-12.04
@@ -28,7 +28,11 @@ platforms:
 suites:
   - name: default
     run_list:
+      - recipe[apt::default]
       - recipe[couchdb]
+    verifier:
+      inspec_tests:
+        - test/smoke/inspec
   - name: source
     run_list:
       - recipe[apt::default]

CHANGELOG.md

@@ -4,42 +4,38 @@ This file is used to list changes made in each version of the CouchDB cookbook.
 
 v2.5.3
 ------
-Multiple fixes for CentOS, recent Debian/Ubuntu builds
-Prefer /usr/lib64/ over /usr/lib when present
-Store CouchDB UUID into host-specific local.ini file
+* Multiple fixes for CentOS, recent Debian/Ubuntu builds
+* Prefer /usr/lib64/ over /usr/lib when present
+* Store CouchDB UUID into host-specific local.ini file
 
 v2.5.2
 ------
-Add nohup to running couch to make it work with Test Kitchen
-adding case for libmozjs package for ubuntu 14.04
-Specify upstart service provider for ubuntu >=13.10
-
+* Add nohup to running couch to make it work with Test Kitchen
+* adding case for libmozjs package for ubuntu 14.04
+* Specify upstart service provider for ubuntu >=13.10
 
 v2.5.1
 ------
-New cookbook maintainer
-Update default version to CouchDB 1.5.0
-Update source download URL to new format
-Fix testkitchen support
-Fix stray "w" in 1.5.0
+* New cookbook maintainer
+* Update default version to CouchDB 1.5.0
+* Update source download URL to new format
+* Fix testkitchen support
+* Fix stray "w" in 1.5.0
 
 
 v2.5.0
 ------
-Porting to use cookbook yum ~> 3.0
-Fixing up style to pass rubocop
-Updating testing bits
-
+* Porting to use cookbook yum ~> 3.0
+* Fixing up style to pass rubocop
+* Updating testing bits
 
 v2.4.8
 ------
-fixing metadata version error. locking to 3.0"
-
+* fixing metadata version error. locking to 3.0
 
 v2.4.6
 ------
-Locking yum dependency to '< 3'
-
+* Locking yum dependency to '< 3'
 
 v2.4.4
 ------

README.md

@@ -16,16 +16,17 @@ Tested via Test Kitchen:
 * Debian 7, 8
 * Ubuntu 12.04, 14.04
 
-**NOTE** Ubuntu 16.04 (xenial) does not have an old enough version of Erlang available to support CouchDB 1.x! This cookbook will move to support CouchDB 2.x soon, resolving this issue.
+**NOTE** Ubuntu 16.04 (xenial) does not have an old enough version of Erlang
+available to support CouchDB 1.x! This cookbook will move to support CouchDB 2.x
+soon, resolving this issue.
 
 ## Cookbooks
 
 * erlang
 
-When using the `couchdb::source` recipe, the `build-essential` recipe
-is required. It is not a direct dependency of this cookbook as it is
-an optional installation method, and package installation is
-recommended.
+When using the `couchdb::source` recipe, the `build-essential` recipe is
+required. It is not a direct dependency of this cookbook as it is an optional
+installation method, and package installation is recommended.
 
 Attributes
 ==========
@@ -52,24 +53,23 @@ Will result in the following lines in the `local.ini` file:
     [httpd]
     bind_address = "0.0.0.0"
 
-The attributes file contains default values for platform-independent
-parameters. All parameter values that expect a path argument are
-not set by default. The default values that are currently set have
-been taken from the CouchDB configuration
-[wiki page](http://wiki.apache.org/couchdb/Configurationfile_couch.ini).
+The attributes file contains default values for platform-independent parameters.
+All parameter values that expect a path argument are not set by default. The
+default values that are currently set have been taken from the CouchDB
+configuration [wiki
+page](http://wiki.apache.org/couchdb/Configurationfile_couch.ini).
 
 The resulting configuration file is now dynamically rendered from the
-attributes. Each subkey below the `config` key is a specific section
-of the `local.ini` file. Then each subkey in a section is a parameter
-associated with a value.
+attributes. Each subkey below the `config` key is a specific section of the
+`local.ini` file. Then each subkey in a section is a parameter associated with a
+value.
 
-You should consult the CouchDB documentation for specific
-configuration details.
+You should consult the CouchDB documentation for specific configuration details.
 
-For values that are "on" or "off", they should be specified as literal
-`true` or `false`. Any configuration option set to the literal `nil` will
-be skipped entirely. All other values (e.g., string, numeric literals) will
-be used as is. So for example:
+For values that are "on" or "off", they should be specified as literal `true` or
+`false`. Any configuration option set to the literal `nil` will be skipped
+entirely. All other values (e.g., string, numeric literals) will be used as is.
+So for example:
 
     node.default['couch_db']['config']['couchdb']['os_process_timeout'] = 5000
     node.default['couch_db']['config']['couchdb']['delayed_commits'] = true
@@ -91,8 +91,8 @@ Will result in the following config lines:
 
 ### Defaults
 
-Here the list of attributes that are already provided by the recipe
-and their associated default value.
+Here the list of attributes that are already provided by the recipe and their
+associated default value.
 
 #### Section [couchdb]
 
@@ -153,17 +153,16 @@ Can be used to create a database on a CouchDB install.
 License and Author
 ==================
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License.  You may obtain a copy of the
+License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+Unless required by applicable law or agreed to in writing, software distributed
+under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations under the License.
 
 * Author: Joshua Timberman (<joshua@opscode.com>)
 * Author: Matthieu Vachon (<matthieu.o.vachon@gmail.com>)

Rakefile

@@ -14,14 +14,14 @@ desc 'Run all tasks'
 task all: [:doc, :rubocop, :foodcritic, :spec, 'kitchen:all']
 
 desc 'Build documentation'
-#task doc: [:knifecookbookdoc, :yard]
+# task doc: [:knifecookbookdoc, :yard]
 task doc: [:yard]
 
 desc 'Run kitchen integration tests'
 task test: ['kitchen:all']
 
-#desc 'Generate README.md from _README.md.erb'
-#KnifeCookbookDoc::RakeTask.new(:knifecookbookdoc)
+# desc 'Generate README.md from _README.md.erb'
+# KnifeCookbookDoc::RakeTask.new(:knifecookbookdoc)
 
 FoodCritic::Rake::LintTask.new do |t|
   t.options = { fail_tags: ['all'] }

attributes/default.rb

@@ -22,7 +22,7 @@
 default['couch_db']['src_mirror']     = "https://archive.apache.org/dist/couchdb/source/#{node['couch_db']['src_version']}/apache-couchdb-#{node['couch_db']['src_version']}.tar.gz"
 default['couch_db']['install_erlang'] = true
 # CouchDB 1.x doesn't support Erlang newer than 17.x!
-node.set['erlang']['esl']['version'] = '17.5.3'
+node.default['erlang']['esl']['version'] = '17.5.3'
 
 # Attributes below are used to configure your couchdb instance.
 # These defaults were extracted from this url:

files/default/couchdb-ubuntu-12.04.init

@@ -0,0 +1,159 @@
+#!/bin/sh -e
+
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+### BEGIN INIT INFO
+# Provides:          couchdb
+# Required-Start:    $local_fs $remote_fs
+# Required-Stop:     $local_fs $remote_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Apache CouchDB init script
+# Description:       Apache CouchDB init script for the database server.
+### END INIT INFO
+
+SCRIPT_OK=0
+SCRIPT_ERROR=1
+
+DESCRIPTION="database server"
+NAME=couchdb
+SCRIPT_NAME=`basename $0`
+COUCHDB=/usr/bin/couchdb
+CONFIGURATION_FILE=/etc/default/couchdb
+RUN_DIR=/var/run/couchdb
+LSB_LIBRARY=/lib/lsb/init-functions
+
+if test ! -x $COUCHDB; then
+    exit $SCRIPT_ERROR
+fi
+
+if test -r $CONFIGURATION_FILE; then
+    . $CONFIGURATION_FILE
+fi
+
+log_daemon_msg () {
+    # Dummy function to be replaced by LSB library.
+
+    echo $@
+}
+
+log_end_msg () {
+    # Dummy function to be replaced by LSB library.
+
+    if test "$1" != "0"; then
+      echo "Error with $DESCRIPTION: $NAME"
+    fi
+    return $1
+}
+
+if test -r $LSB_LIBRARY; then
+    . $LSB_LIBRARY
+fi
+
+start_couchdb () {
+    # Start Apache CouchDB as a background process.
+
+    command="$COUCHDB -b"
+    if test -n "$COUCHDB_STDOUT_FILE"; then
+        command="$command -o $COUCHDB_STDOUT_FILE"
+    fi
+    if test -n "$COUCHDB_STDERR_FILE"; then
+        command="$command -e $COUCHDB_STDERR_FILE"
+    fi
+    if test -n "$COUCHDB_RESPAWN_TIMEOUT"; then
+        command="$command -r $COUCHDB_RESPAWN_TIMEOUT"
+    fi
+    if test -n "$COUCHDB_OPTIONS"; then
+        command="$command $COUCHDB_OPTIONS"
+    fi
+    mkdir -p "$RUN_DIR"
+    if test -n "$COUCHDB_USER"; then
+        chown $COUCHDB_USER "$RUN_DIR"
+        if nohup su $COUCHDB_USER -c "$command" > /dev/null; then
+            return $SCRIPT_OK
+        else
+            return $SCRIPT_ERROR
+        fi
+    else
+        if $command > /dev/null; then
+            return $SCRIPT_OK
+        else
+            return $SCRIPT_ERROR
+        fi
+    fi
+}
+
+stop_couchdb () {
+    # Stop the running Apache CouchDB process.
+    retval=0
+    if ! $COUCHDB -s >/dev/null 2>&1; then
+        log_daemon_msg "already stopped"
+    else
+        pkill -u $COUCHDB_USER beam\*
+        retval=$?
+        [ $retval -eq 0 ] && return $SCRIPT_OK || return $SCRIPT_ERROR
+    fi
+    return $retval
+}
+
+display_status () {
+    # Display the status of the running Apache CouchDB process.
+
+    $COUCHDB -s
+}
+
+parse_script_option_list () {
+    # Parse arguments passed to the script and take appropriate action.
+
+    case "$1" in
+        start)
+            log_daemon_msg "Starting $DESCRIPTION" $NAME
+            if start_couchdb; then
+                log_end_msg $SCRIPT_OK
+            else
+                log_end_msg $SCRIPT_ERROR
+            fi
+            ;;
+        stop)
+            log_daemon_msg "Stopping $DESCRIPTION" $NAME
+            if stop_couchdb; then
+                log_end_msg $SCRIPT_OK
+            else
+                log_end_msg $SCRIPT_ERROR
+            fi
+            ;;
+        restart|force-reload)
+            log_daemon_msg "Restarting $DESCRIPTION" $NAME
+            if stop_couchdb; then
+                if start_couchdb; then
+                    log_end_msg $SCRIPT_OK
+                else
+                    log_end_msg $SCRIPT_ERROR
+                fi
+            else
+                log_end_msg $SCRIPT_ERROR
+            fi
+            ;;
+        status)
+            display_status
+            ;;
+        *)
+            cat << EOF >&2
+Usage: $SCRIPT_NAME {start|stop|restart|force-reload|status}
+EOF
+            exit $SCRIPT_ERROR
+            ;;
+    esac
+}
+
+parse_script_option_list $@