RuboCop fixes

Author: jskarpe

.rubocop.yml

@@ -1,36 +1,71 @@
 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
+
 group :test do
-  gem "ci_reporter_rspec"
-  gem "metadata-json-lint"
-  gem "puppet", ENV['PUPPET_GEM_VERSION'] || '~> 4.7.0'
-  gem "puppet-lint-absolute_classname-check"
-  gem "puppet-lint-classes_and_types_beginning_with_digits-check"
-  gem "puppet-lint-leading_zero-check"
-  gem "puppet-lint-resource_reference_syntax"
-  gem "puppet-lint-trailing_comma-check"
-  gem "puppet-lint-unquoted_string-check"
-  gem "puppet-lint-version_comparison-check"
-  gem "puppetlabs_spec_helper"
-  gem "rake"
-  gem "rspec"
-  gem "rspec-puppet"
-  gem "rspec-puppet-facts"
-  gem "rubocop"
-  gem "simplecov"
-  gem "simplecov-console"
-  gem "webmock"
+  gem 'puppetlabs_spec_helper', '~> 1.2.2',                         :require => false
+  gem 'rspec-puppet', '~> 2.5',                                     :require => false
+  gem 'rspec-puppet-facts',                                         :require => false
+  gem 'rspec-puppet-utils',                                         :require => false
+  gem 'puppet-lint-absolute_classname-check',                       :require => false
+  gem 'puppet-lint-leading_zero-check',                             :require => false
+  gem 'puppet-lint-trailing_comma-check',                           :require => false
+  gem 'puppet-lint-version_comparison-check',                       :require => false
+  gem 'puppet-lint-classes_and_types_beginning_with_digits-check',  :require => false
+  gem 'puppet-lint-unquoted_string-check',                          :require => false
+  gem 'puppet-lint-variable_contains_upcase',                       :require => false
+  gem 'metadata-json-lint',                                         :require => false
+  gem 'puppet-blacksmith',                                          :require => false
+  gem 'voxpupuli-release',                                          :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem.git'
+  gem 'puppet-strings', '~> 1.0.0',                                 :require => false
+  gem 'redcarpet',                                                  :require => false
+  gem 'rubocop', '~> 0.47.0',                                       :require => false if RUBY_VERSION >= '2.3.0'
+  gem 'rubocop-rspec', '~> 1.10.0',                                 :require => false if RUBY_VERSION >= '2.3.0'
+  gem 'mocha', '>= 1.2.1',                                          :require => false
+  gem 'coveralls',                                                  :require => false
+  gem 'simplecov-console',                                          :require => false
+  gem 'github_changelog_generator', '~> 1.13.0',                    :require => false if RUBY_VERSION < '2.2.2'
+  gem 'rack', '~> 1.0',                                             :require => false if RUBY_VERSION < '2.2.2'
+  gem 'github_changelog_generator',                                 :require => false if RUBY_VERSION >= '2.2.2'
+  gem 'webmock',                                                    :require => false
 end
 
 group :development do
-  gem "puppet-blacksmith"
-  gem "travis"
-  gem "travis-lint"
-  gem "vagrant-wrapper"
+  gem 'travis',       :require => false
+  gem 'travis-lint',  :require => false
+  gem 'guard-rake',   :require => false
 end
 
 group :system_tests do
-  gem "beaker", '~> 2'
-  gem "beaker-puppet_install_helper"
-  gem "beaker-rspec"
+  if beaker_version = ENV['BEAKER_VERSION']
+    gem 'beaker', *location_for(beaker_version)
+  end
+  if beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
+    gem 'beaker-rspec', *location_for(beaker_rspec_version)
+  else
+    gem 'beaker-rspec',  :require => false
+  end
+  gem 'serverspec',                    :require => false
+  gem 'beaker-puppet_install_helper',  :require => false
+end
+
+
+
+if facterversion = ENV['FACTER_GEM_VERSION']
+  gem 'facter', facterversion.to_s, :require => false, :groups => [:test]
+else
+  gem 'facter', :require => false, :groups => [:test]
 end
+
+ENV['PUPPET_VERSION'].nil? ? puppetversion = '~> 4.0' : puppetversion = ENV['PUPPET_VERSION'].to_s
+gem 'puppet', puppetversion, :require => false, :groups => [:test]
+
+# vim: syntax=ruby

Gemfile

@@ -1,56 +1,44 @@
-require 'rubygems'
-require 'bundler/setup'
-
 require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet/version'
-require 'puppet/vendor/semantic/lib/semantic' unless Puppet.version.to_f < 3.6
-require 'puppet-lint/tasks/puppet-lint'
-require 'puppet-syntax/tasks/puppet-syntax'
-require 'metadata-json-lint/rake_task'
-require 'ci/reporter/rake/rspec'
-
-# These gems aren't always present, for instance
-# on Travis with --without development
-begin
-  require 'puppet_blacksmith/rake_tasks'
-rescue LoadError # rubocop:disable Lint/HandleExceptions
-end
+require 'puppet_blacksmith/rake_tasks'
+require 'voxpupuli/release/rake_tasks'
+require 'puppet-strings/tasks'
 
-exclude_paths = [
-  "bundle/**/*",
-  "pkg/**/*",
-  "vendor/**/*",
-  "spec/**/*",
-]
-
-Rake::Task[:lint].clear
-
-PuppetLint.configuration.relative = true
-PuppetLint.configuration.disable_80chars
-PuppetLint.configuration.disable_class_inherits_from_params_class
-PuppetLint.configuration.disable_class_parameter_defaults
+PuppetLint.configuration.log_format = '%{path}:%{line}:%{check}:%{KIND}:%{message}'
 PuppetLint.configuration.fail_on_warnings = true
-
-PuppetLint::RakeTask.new :lint do |config|
-  config.ignore_paths = exclude_paths
-end
-
+PuppetLint.configuration.send('relative')
+PuppetLint.configuration.send('disable_140chars')
+PuppetLint.configuration.send('disable_class_inherits_from_params_class')
+PuppetLint.configuration.send('disable_documentation')
+PuppetLint.configuration.send('disable_single_quote_string_with_variables')
+
+exclude_paths = %w(
+  pkg/**/*
+  vendor/**/*
+  .vendor/**/*
+  spec/**/*
+)
+PuppetLint.configuration.ignore_paths = exclude_paths
 PuppetSyntax.exclude_paths = exclude_paths
 
-desc "Populate CONTRIBUTORS file"
-task :contributors do
-  system("git log --format='%aN' | sort -u > CONTRIBUTORS")
-end
-
 desc 'Run acceptance tests'
 RSpec::Core::RakeTask.new(:acceptance) do |t|
   t.pattern = 'spec/acceptance'
 end
 
-desc "Run syntax, lint, and spec tests."
-task :test => [
+desc 'Run tests metadata_lint, release_checks'
+task test: [
   :metadata_lint,
-  :syntax,
-  :lint,
-  :spec,
+  :release_checks,
 ]
+
+begin
+  require 'github_changelog_generator/task'
+  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+    version = (Blacksmith::Modulefile.new).version
+    config.future_release = "#{version}"
+    config.header = "# Change log\n\nAll notable changes to this project will be documented in this file.\nEach new release typically also includes the latest modulesync defaults.\nThese should not impact the functionality of the module."
+    config.exclude_labels = %w{duplicate question invalid wontfix modulesync}
+  end
+rescue LoadError
+end
+# vim: syntax=ruby

Rakefile

@@ -21,33 +21,36 @@ def fetch(uri_str, limit = 10)
 Facter.add(:apache_present) do
   setcode do
     present = Facter::Util::Resolution.which('apachectl')
-    if not present
-      present = Facter::Util::Resolution.which('apache2ctl')
-    end
+    present = Facter::Util::Resolution.which('apache2ctl') unless present
     !!present
   end
 end
 
 Facter.add(:apache_running) do
-  confine :apache_present => true
+  confine apache_present: true
   setcode do
-    Puppet::Type.type(:service).newservice(:name => 'apache2').provider.status == :running
+    Puppet::Type.type(:service).newservice(name: 'apache2').provider.status == :running
   end
 end
 
 Facter.add(:apache_statuspage_present) do
-  confine :apache_present => true
+  confine apache_present: true
   setcode do
     uri = 'http://localhost/server-status'
     begin
       response = fetch(uri)
-      !!(response.body =~ /<title>Apache Status<\/title>/i)
-    rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
-             Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError, Errno::ECONNREFUSED
+      !!(response.body =~ %r{<title>Apache Status</title>}i)
+    rescue Timeout::Error,
+           Errno::EINVAL,
+           Errno::ECONNRESET,
+           EOFError,
+           Net::HTTPBadResponse,
+           Net::HTTPHeaderSyntaxError,
+           Net::ProtocolError,
+           Errno::ECONNREFUSED
       false
     end
   end
 end
 
-# TODO: use a full apache conf parser like https://github.com/bmatzelle/apache_config
-# and look for "SetHandler server-status"
+# TODO; use a full apache conf parser like https://github.com/bmatzelle/apache_config and look for "SetHandler server-status"

lib/facter/apache.rb

@@ -5,18 +5,17 @@
 end
 
 Facter.add(:rabbitmq_management_present) do
-  confine :rabbitmq_present => true
+  confine rabbitmq_present: true
   setcode do
     !!Facter::Util::Resolution.exec('/usr/sbin/rabbitmqctl status | grep rabbitmq_management')
   end
 end
 
 Facter.add(:rabbitmq_management_port) do
-  confine :rabbitmq_present => true
+  confine rabbitmq_present: true
   setcode do
     Facter::Util::Resolution.exec('/usr/sbin/rabbitmqctl environment | /bin/grep -A 10 rabbitmq_management | /bin/grep "listener,\[{port" | /bin/grep -o -E "[0-9]+"')
   end
 end
 
-
-# TODO parse /etc/rabbitmq/rabbitmq.config to get user/pass/port exposed as facts
+# TODO; parse /etc/rabbitmq/rabbitmq.config to get user/pass/port exposed as facts

lib/facter/rabbitmq.rb

@@ -1,4 +1,4 @@
-Facter.add("redis_present") do
+Facter.add(:redis_present) do
   setcode do
     !!Facter::Util::Resolution.which('redis-server')
   end

lib/facter/redis.rb

@@ -2,7 +2,7 @@
 
 describe 'configure server side' do
   context 'minimal config to enable client tests' do
-    it 'should install a working server side' do
+    it 'installs a working server side' do
       pp_master = <<-EOS
         class { '::rabbitmq':
           ssl               => false,
@@ -32,14 +32,14 @@ class { 'influxdb':
       EOS
 
       # Run it twice and test for idempotency
-      apply_manifest_on(master, pp_master, :catch_failures => true)
-      apply_manifest_on(master, pp_master, :catch_changes => true)
+      apply_manifest_on(master, pp_master, catch_failures: true)
+      apply_manifest_on(master, pp_master, catch_changes: true)
     end
   end
 end
 
 hosts.each do |host|
-  describe 'redis installed', :if => host['roles'].include?('client') do
+  describe 'redis installed', if: host['roles'].include?('client') do
     context 'during same run' do
       it 'works with no errors' do
         master_hostname = on(master, facter('hostname')).stdout.strip
@@ -57,8 +57,8 @@ class { 'monitoring':
         EOS
 
         # Run it twice and test for idempotency
-        apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
+        apply_manifest(pp, catch_failures: true)
+        apply_manifest(pp, catch_changes: true)
       end
 
       describe package('redis-server') do

spec/acceptance/class_spec.rb

@@ -8,15 +8,15 @@
           facts
         end
 
-        context "monitoring class without any parameters" do
+        context 'monitoring class without any parameters' do
           it { is_expected.to compile.with_all_deps }
 
           it { is_expected.to contain_class('monitoring::params') }
         end
 
-        context "rabbitmq present" do
+        context 'rabbitmq present' do
           let(:facts) do
-            facts.merge({rabbitmq_present: true, rabbitmq_management_present: true, rabbitmq_management_port: '15672'})
+            facts.merge(rabbitmq_present: true, rabbitmq_management_present: true, rabbitmq_management_port: '15672')
           end
 
           it { is_expected.to contain_class('monitoring::metrics::collectd') }
@@ -37,12 +37,12 @@
     describe 'monitoring class without any parameters on Solaris/Nexenta' do
       let(:facts) do
         {
-          :osfamily        => 'Solaris',
-          :operatingsystem => 'Nexenta',
+          osfamily:        'Solaris',
+          operatingsystem: 'Nexenta'
         }
       end
 
-      it { expect { is_expected.to contain_package('monitoring') }.to raise_error(Puppet::Error, /Nexenta not supported/) }
+      it { expect { is_expected.to contain_package('monitoring') }.to raise_error(Puppet::Error, %r{Nexenta not supported}) }
     end
   end
 end

spec/classes/init_spec.rb

@@ -1,33 +1,32 @@
 require 'puppetlabs_spec_helper/module_spec_helper'
 require 'rspec-puppet-facts'
-require 'webmock/rspec'
-
 include RspecPuppetFacts
 
-require 'simplecov'
-require 'simplecov-console'
-
-SimpleCov.start do
-  add_filter '/spec'
-  add_filter '/vendor'
-  formatter SimpleCov::Formatter::MultiFormatter.new([
+if Dir.exist?(File.expand_path('../../lib', __FILE__))
+  require 'coveralls'
+  require 'simplecov'
+  require 'simplecov-console'
+  SimpleCov.formatters = [
     SimpleCov::Formatter::HTMLFormatter,
-    SimpleCov::Formatter::Console
-  ])
+    SimpleCov::Formatter::Console,
+    Coveralls::SimpleCov::Formatter
+  ]
+  SimpleCov.start do
+    track_files 'lib/**/*.rb'
+    add_filter '/spec'
+    add_filter '/vendor'
+    add_filter '/.vendor'
+  end
 end
 
 RSpec.configure do |c|
-  c.before(:each) do
-    stub_request(:get, /.*/).
-      with(:headers => {'User-Agent'=>'Ruby'}).
-      to_return(:status => 200, :body => "", :headers => {})
-  end
-
   default_facts = {
     puppetversion: Puppet.version,
     facterversion: Facter.version
   }
   default_facts.merge!(YAML.load(File.read(File.expand_path('../default_facts.yml', __FILE__)))) if File.exist?(File.expand_path('../default_facts.yml', __FILE__))
   default_facts.merge!(YAML.load(File.read(File.expand_path('../default_module_facts.yml', __FILE__)))) if File.exist?(File.expand_path('../default_module_facts.yml', __FILE__))
   c.default_facts = default_facts
-end
+end
+
+# vim: syntax=ruby