.travis.yml

@@ -1,9 +1,9 @@
 ---
 language: ruby
 cache: bundler
-bundler_args: --without development
+bundler_args: --without system_tests
 script:
-    - "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
+    - "bundle exec rake validate lint parallel_spec SPEC_OPTS='--format documentation'"
 rvm:
   - 1.9.3
   - 2.0.0

CHANGELOG.md

@@ -2,7 +2,15 @@ Changelog
 =========
 
 ## Unreleased
-[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.6.0...HEAD)
+[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.6.2...HEAD)
+
+## [v0.6.2](https://github.com/pcfens/puppet-filebeat/tree/v0.6.2)
+[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.6.1...v0.6.2)
+
+**Fixed Bugs**
+- Fix the other certificate_key typo in Ruby 1.8 template
+[\#23](https://github.com/pcfens/puppet-filebeat/issues/23)
+
 
 ## [v0.6.1](https://github.com/pcfens/puppet-filebeat/tree/v0.6.1)
 [Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.6.0...v0.6.1)

Gemfile

@@ -1,24 +1,33 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
-# def location_for(place, fake_version = nil)
-#   if place =~ /^(git:[^#]*)#(.*)/
-#     [fake_version, { :git => $1, :branch => $2, :require => false }].compact
-#   elsif place =~ /^file:\/\/(.*)/
-#     ['>= 0', { :path => File.expand_path($1), :require => false }]
-#   else
-#     [place, { :require => false }]
-#   end
-# end
+def location_for(place, version = nil)
+  if place =~ /^(git[:@][^#]*)#(.*)/
+    [version, { :git => $1, :branch => $2, :require => false}].compact
+  elsif place =~ /^file:\/\/(.*)/
+    ['>= 0', { :path => File.expand_path($1), :require => false}]
+  else
+    [place, version, { :require => false}].compact
+  end
+end
 
 group :development, :unit_tests do
-  gem 'rspec-core', '3.1.7',     :require => false
-  gem 'puppetlabs_spec_helper',  :require => false
-  gem 'simplecov',               :require => false
-  gem 'puppet_facts',            :require => false
-  gem 'json',                    :require => false
-  gem 'metadata-json-lint',      :require => false
-  gem 'beaker-rspec',            :require => false
-  gem 'pry',                     :require => false
+gem 'json',                      :require => false
+  gem 'metadata-json-lint',        :require => false
+  gem 'puppet_facts',              :require => false
+  gem 'puppet-blacksmith',         :require => false
+  gem 'puppetlabs_spec_helper',    :require => false
+  gem 'rspec-puppet', '>= 2.3.2',  :require => false
+  gem 'simplecov',                 :require => false
+  gem 'parallel_tests',            :require => false
+end
+
+group :system_tests do
+  gem 'beaker-rspec',                  *location_for(ENV['BEAKER_RSPEC_VERSION'] || '>= 3.4')
+  gem 'beaker',                        *location_for(ENV['BEAKER_VERSION'])
+  gem 'serverspec',                    :require => false
+  gem 'beaker-puppet_install_helper',  :require => false
+  gem 'master_manipulator',            :require => false
+  gem 'beaker-hostgenerator',          *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
 end
 
 if facterversion = ENV['FACTER_GEM_VERSION']

Rakefile

@@ -1,9 +1,19 @@
-require 'puppetlabs_spec_helper/rake_tasks'
+require 'puppet_blacksmith/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
+require 'puppetlabs_spec_helper/rake_tasks'
+require 'parallel_tests'
+require 'parallel_tests/cli'
 
 PuppetLint.configuration.fail_on_warnings = true
 PuppetLint.configuration.send('relative')
 PuppetLint.configuration.send('disable_80chars')
 PuppetLint.configuration.send('disable_class_inherits_from_params_class')
 PuppetLint.configuration.send('disable_documentation')
 PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
+
+desc "Parallel spec tests"
+task :parallel_spec do
+  Rake::Task[:spec_prep].invoke
+  ParallelTests::CLI.new.run('--type test -t rspec spec/classes spec/defines'.split)
+  Rake::Task[:spec_clean].invoke
+end

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "pcfens-filebeat",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "author": "pcfens",
   "license": "Apache-2.0",
   "summary": "A module to install and manage the filebeat log shipper",

templates/filebeat.yml.ruby18.erb

@@ -134,7 +134,7 @@
         <%- if @filebeat_config['output']['logstash']['tls']['certificate'] != nil -%>
         certificate: "<%= @filebeat_config['output']['logstash']['tls']['certificate'] %>"
         <%- end -%>
-        <%- if @filebeat_config['output']['logstash']['tls']['certifcate_key'] != nil -%>
+        <%- if @filebeat_config['output']['logstash']['tls']['certificate_key'] != nil -%>
         certificate_key: "<%= @filebeat_config['output']['logstash']['tls']['certificate_key'] %>"
         <%- end -%>
         <%- if @filebeat_config['output']['logstash']['tls']['insecure'] != nil -%>