Merge pull request jhoblitt#41 from jhoblitt/feature/v2.4.0

Feature/v2.4.0

.fixtures.yml

@@ -1,8 +1,8 @@
 fixtures:
   repositories:
-    "stdlib":
-      repo: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
-      ref: "3.0.0"
-    "shell_config": "http://tig.csail.mit.edu/git-public/shell_config.git/"
+    stdlib:
+      repo: 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
+      ref:  '4.2.0'
+    shell_config: 'http://tig.csail.mit.edu/git-public/shell_config.git/'
   symlinks:
-    "smartd": "#{source_dir}"
+    smartd: "#{source_dir}"

.travis.yml

@@ -1,22 +1,27 @@
+sudo: false
 language: ruby
 rvm:
   - 1.8.7
   - 1.9.3
-  - 2.0.0
-  - 2.1.4
+  - 2.0
+  - 2.1
+  - 2.2
 env:
   - PUPPET_GEM_VERSION="~> 2.7"
   - PUPPET_GEM_VERSION="~> 3.3"
   - PUPPET_GEM_VERSION="~> 3.7" FUTURE_PARSER="yes"
 matrix:
   allow_failures:
+    - rvm: 2.2
     - rvm: ruby-head
   exclude:
     - rvm: 1.9.3
       env: PUPPET_GEM_VERSION="~> 2.7"
-    - rvm: 2.0.0
+    - rvm: 2.0
       env: PUPPET_GEM_VERSION="~> 2.7"
-    - rvm: 2.1.4
+    - rvm: 2.1
+      env: PUPPET_GEM_VERSION="~> 2.7"
+    - rvm: 2.2
       env: PUPPET_GEM_VERSION="~> 2.7"
   fast_finish: true
 notifications:

CHANGELOG.md

@@ -1,5 +1,50 @@
 
 #### [Current]
+ * [b469715](../../commit/b469715) - __(Joshua Hoblitt)__ update Rakefile boilerplate
+ * [9b3c52c](../../commit/9b3c52c) - __(Joshua Hoblitt)__ replace Modulefile vs metadata.json
+ * [9311cbe](../../commit/9311cbe) - __(Joshua Hoblitt)__ update fixtures stdlib to 4.2.0
+ * [6b29744](../../commit/6b29744) - __(Joshua Hoblitt)__ update travis matrix
+ * [951d6a5](../../commit/951d6a5) - __(Joshua Hoblitt)__ suppress linter 80chars warnings
+
+In params.pp where it's not easy to avoid slightly > 80char lines
+
+ * [6100a71](../../commit/6100a71) - __(Joshua Hoblitt)__ update rspec-puppet to v2.0.0
+ * [5a8d71c](../../commit/5a8d71c) - __(Joshua Hoblitt)__ Merge pull request [#40](../../issues/40) from negz/master
+
+Expose PD sizes, and support older MegaCli binaries.
+ * [18589cc](../../commit/18589cc) - __(Nic Cope)__ Support ancient versions of MegaCli
+
+At around version 8.02.16 some arguments to MegaCli changed. This change
+attempts to determine whether MegaCli is modern (8.02.16 or newer) or
+legacy (everything else). Facts affected by the changed arguments are
+gated using a confine statement.
+
+This change also handles cases where the MegaCli binary is lowercase (megacli).
+
+ * [b3cf2b8](../../commit/b3cf2b8) - __(Nic Cope)__ Add a fact exposing the sizes of physical disks
+ * [8e003d1](../../commit/8e003d1) - __(Joshua Hoblitt)__ Merge pull request [#39](../../issues/39) from jhoblitt/feature/future_parser
+
+Feature/future parser
+ * [e80c3aa](../../commit/e80c3aa) - __(Joshua Hoblitt)__ make #verify_contents usage compatible with rspec-puppet > 1.0.1
+
+The verify_contents method invocations have been updated to work with
+rspec-puppet 1.0.1+ but are now incompatible with <= 1.0.1
+https://github.com/rodjek/rspec-puppet/issues/235
+
+ * [d5daf1e](../../commit/d5daf1e) - __(Joshua Hoblitt)__ add future parser to travis matrix
+ * [5c219ce](../../commit/5c219ce) - __(Joshua Hoblitt)__ fix megaraid_virtual_drives fact return value
+
+Resolves this test failure:
+  1) megaraid_virtual_drives on linux no adapters should be nil
+     Failure/Error: Facter.fact(:megaraid_virtual_drives).value.should be_nil
+       expected: nil
+            got: ""
+
+#### v2.3.0
+ * [adddbf5](../../commit/adddbf5) - __(Joshua Hoblitt)__ Merge pull request [#38](../../issues/38) from jhoblitt/feature/v2.3.0
+
+Feature/v2.3.0
+ * [925effc](../../commit/925effc) - __(Joshua Hoblitt)__ bump version to v2.3.0
  * [65306af](../../commit/65306af) - __(Joshua Hoblitt)__ mv all rspec-puppet tests under ./spec/unit/
  * [155eca5](../../commit/155eca5) - __(Joshua Hoblitt)__ remove rspec-system support
  * [7306e3a](../../commit/7306e3a) - __(Joshua Hoblitt)__ Merge pull request [#37](../../issues/37) from razorsedge/fedora_config_location

Gemfile

@@ -6,18 +6,15 @@ else
   gem 'puppet', :require => false
 end
 
-gem 'rake',                   :require => false
-gem 'puppetlabs_spec_helper', :require => false
-gem 'puppet-lint',            :require => false
-gem 'puppet-syntax',          :require => false
-# The verify_contents method invocations have been updated to work with
-# rspec-puppet 1.0.1+ but are now incompatible with <= 1.0.1
-# https://github.com/rodjek/rspec-puppet/issues/235
-gem 'rspec-puppet',
-  :git => 'https://github.com/rodjek/rspec-puppet.git',
-  :ref => '6ac97993fa972a15851a73d55fe3d1c0a85172b5',
-  :require => false
-# rspec 3 spews warnings with rspec-puppet 1.0.1
-gem 'rspec-core', '~> 2.0',   :require => false
+group :development, :test do
+  gem 'rake',                    :require => false
+  gem 'puppetlabs_spec_helper',  :require => false
+  gem 'puppet-lint', '>= 1.1.0', :require => false
+  gem 'puppet-syntax',           :require => false
+  gem 'rspec-puppet',
+    :git     => 'https://github.com/rodjek/rspec-puppet.git',
+    :ref     => 'v2.0.0',
+    :require => false
+end
 
 # vim:ft=ruby

Rakefile

@@ -2,12 +2,12 @@ require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-syntax/tasks/puppet-syntax'
 require 'puppet-lint/tasks/puppet-lint'
 
-PuppetLint.configuration.send("disable_class_inherits_from_params_class")
-PuppetLint.configuration.ignore_paths = [
-  'pkg/**/*.pp',
-  'spec/**/*.pp',
-  'tests/**/*.pp',
-]
+PuppetSyntax.exclude_paths = ['spec/fixtures/**/*']
+
+PuppetLint::RakeTask.new :lint do |config|
+  config.pattern          = 'manifests/**/*.pp'
+  config.fail_on_warnings = true
+end
 
 task :default => [
   :syntax,

manifests/params.pp

@@ -36,6 +36,7 @@
     }
     'RedHat': {
       $config_file = $::operatingsystem ? {
+        # lint:ignore:80chars
         'Fedora'                                       => $::operatingsystemrelease ? {
           # No, I am not going to support versions 1-9.
           /10|11|12|13|14|15|16|17|18/ => '/etc/smartd.conf',
@@ -46,6 +47,7 @@
           default => '/etc/smartmontools/smartd.conf',
         },
         default                                        => '/etc/smartd.conf',
+        # lint:endignore
       }
       $service_name = 'smartd'
     }

metadata.json

@@ -0,0 +1,25 @@
+{
+  "name": "jhoblitt-smartd",
+  "version": "2.4.0",
+  "author": "Joshua Hoblitt <[email protected]>",
+  "summary": "Manages the smartmontools package including the smartd daemon",
+  "license": "MIT",
+  "source": "https://github.com/jhoblitt/puppet-smartd.git",
+  "project_page": "https://github.com/jhoblitt/puppet-smartd",
+  "issues_url": "https://github.com/jhoblitt/puppet-smartd/issues",
+  "operatingsystem_support": [
+    { "operatingsystem": "RedHat", "operatingsystemrelease": [ "5", "6" ] },
+    { "operatingsystem": "CentOS", "operatingsystemrelease": [ "5", "6" ] },
+    { "operatingsystem": "OracleLinux", "operatingsystemrelease": [ "5", "6" ] },
+    { "operatingsystem": "Scientific", "operatingsystemrelease": [ "5", "6" ] },
+    { "operatingsystem": "Fedora" },
+    { "operatingsystem": "SLES" },
+    { "operatingsystem": "Debian" },
+    { "operatingsystem": "Ubuntu" },
+    { "operatingsystem": "FreeBSD" }
+  ],
+  "dependencies": [
+    { "name": "puppetlabs/stdlib", "version_requirement": ">= 4.2.0 < 5.0.0" },
+    { "name": "csail/shell_config", "version_requirement": ">= 0.0.1" }
+  ]
+}