Merge remote-tracking branch 'upstream/master'

* upstream/master: (286 commits)
  Added subdue attribute to sensu_check type
  Adding option to manage the mutators dir
  add ttl to check provider
  Add functionality to configure mutators sensu#230
  update supported puppet versions
  Adding spec tests for manage_handlers param
  Adding option to manage the handlers dir
  set $pkg_requires to undef for the redhat osfamily as with it not set the run fails on centos/redhat when strict_variables is enabled
  version bump: 2.0.0
  set sysconfig parameters when defined
  allow setting of path
  Add require on apt::update for puppetlabs-apt 2.x
  Correcting issue sensu#318 - Changing the default value of sensu_plugin_version from absent to installed
  allow handle and handlers together
  Make the sensu enterprise dashboard not show up unbidden
  Move file_ensure out of conditional
  Add tests for sensu-plugins provider
  update apt module dep
  fix db type
  Fix Sensu Enterprise services when not using enterprise
  ...

.fixtures.yml

@@ -2,6 +2,7 @@ fixtures:
   repositories:
     apt: git://github.com/puppetlabs/puppetlabs-apt.git
     stdlib: git://github.com/puppetlabs/puppetlabs-stdlib.git
+    wget: git://github.com/maestrodev/puppet-wget.git
   symlinks:
     sensu: "#{source_dir}"
 

.gitignore

@@ -1,3 +1,12 @@
-sensu.komodoproject
 pkg/*
+sensu.komodoproject
 spec/fixtures
+Gemfile.lock
+.vagrant/*
+.yardoc
+doc/**
+.bundle
+*.swp
+coverage/
+junit/
+log/

.pmignore

@@ -0,0 +1,7 @@
+pkg/*
+sensu.komodoproject
+spec/fixtures
+Gemfile.lock
+.vagrant/*
+.yardoc
+doc

.travis.yml

@@ -1,24 +1,30 @@
+---
 language: ruby
-rvm:
-  - 1.8.7
-  - 1.9.3
-  - ruby-head
-script:
-  - "rake lint"
-  - "rake spec SPEC_OPTS='--format documentation'"
-env:
-  - PUPPET_VERSION="~> 2.7.0"
-  - PUPPET_VERSION="~> 3.0.0"
-  - PUPPET_VERSION="~> 3.1.0"
+bundler_args: --without system_tests development
+script: "bundle install && bundle exec rake validate && bundle exec rake test SPEC_OPTS='--format documentation'"
+cache: bundler
+sudo: false
 matrix:
-  allow_failures:
-    - rvm: ruby-head
-  exclude:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-    - rvm: ruby-head
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-gemfile: .gemfile
+  fast_finish: true
+  include:
+  - rvm: 1.8.7
+    env: PUPPET_GEM_VERSION="~> 3.3.0"
+  - rvm: 1.8.7
+    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+  - rvm: 1.9.3
+    env: PUPPET_GEM_VERSION="~> 3.3.0"
+  - rvm: 1.9.3
+    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+  - rvm: 2.0.0
+    env: PUPPET_GEM_VERSION="~> 3.3.0"
+  - rvm: 2.0.0
+    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+  - rvm: 2.1.0
+    env: PUPPET_GEM_VERSION="~> 3" FUTURE_PARSER="yes"
+  - rvm: 2.1.6
+    env: PUPPET_GEM_VERSION="~> 4.0"
+  - rvm: 2.1.6
+    env: PUPPET_GEM_VERSION="~> 4"
 notifications:
   email:
     - [email protected]

Gemfile

@@ -0,0 +1,52 @@
+source ENV['GEM_SOURCE'] || "https://rubygems.org"
+
+if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '1.9'
+  gem 'rspec', '~> 2.0'
+end
+
+group :development, :unit_tests do
+  gem 'rake',                                             :require => false
+  gem 'rspec-puppet',                                     :require => false
+  gem 'puppetlabs_spec_helper',                           :require => false
+  gem 'puppet-lint', "1.0.1",                             :require => false
+  gem 'json',                                             :require => false
+  gem 'puppet-syntax',                                    :require => false
+  gem 'metadata-json-lint',                               :require => false
+  gem 'puppet-blacksmith',                                :require => false
+  gem 'rest-client', "1.6.8",                             :require => false
+  gem 'puppet-lint-absolute_classname-check',             :require => false
+  gem 'puppet-lint-appends-check',                        :require => false
+  gem 'puppet-lint-empty_string-check',                   :require => false
+  gem 'puppet-lint-file_ensure-check',                    :require => false
+  gem 'puppet-lint-leading_zero-check',                   :require => false
+  gem 'puppet-lint-spaceship_operator_without_tag-check', :require => false
+  gem 'puppet-lint-trailing_comma-check',                 :require => false
+  gem 'puppet-lint-undef_in_function-check',              :require => false
+  gem 'puppet-lint-unquoted_string-check',                :require => false
+  gem 'puppet-lint-version_comparison-check',             :require => false
+end
+
+group :system_tests do
+  gem 'beaker-rspec',    :require => false
+  gem 'serverspec',      :require => false
+  gem 'vagrant-wrapper', :require => false
+end
+
+group :development do
+  gem 'simplecov',   :require => false
+  gem 'guard-rake',  :require => false
+end
+
+if facterversion = ENV['FACTER_GEM_VERSION']
+  gem 'facter', facterversion, :require => false
+else
+  gem 'facter', :require => false
+end
+
+if puppetversion = ENV['PUPPET_GEM_VERSION']
+  gem 'puppet', puppetversion, :require => false
+else
+  gem 'puppet', '>= 3.3.0', '< 4.0.0', :require => false
+end
+
+# vim:ft=ruby