Style fixes for rubocop

Author: austb

Gemfile

@@ -24,6 +24,7 @@ ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
 minor_version = ruby_version_segments[0..1].join('.')
 
 group :development do
+  gem "pry-byebug"
   gem "fast_gettext", '1.1.0',                         require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
   gem "fast_gettext",                                  require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
   gem "json_pure", '<= 2.0.1',                         require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')

lib/puppet/parser/functions/puppetdb_create_subsetting_resource_hash.rb

@@ -1,14 +1,14 @@
 module Puppet::Parser::Functions
-  newfunction(:puppetdb_create_subsetting_resource_hash, :type => :rvalue) do |args|
+  newfunction(:puppetdb_create_subsetting_resource_hash, type: :rvalue) do |args|
     java_args = args[0]
     params = args[1]
     resource_hash = {}
 
-    java_args.each { |k,v|
+    java_args.each do |k, v|
       item_params = { 'subsetting' => k, 'value' => (v || '') }
       item_params.merge!(params)
-      resource_hash.merge!({ "'#{k}'" => item_params })
-    }
+      resource_hash.merge!("'#{k}'" => item_params)
+    end
 
     resource_hash
   end

lib/puppet/parser/functions/puppetdb_flatten_java_args.rb

@@ -1,8 +1,8 @@
 module Puppet::Parser::Functions
-  newfunction(:puppetdb_flatten_java_args, :type => :rvalue) do |args|
+  newfunction(:puppetdb_flatten_java_args, type: :rvalue) do |args|
     java_args = args[0] || {}
-    args = ""
-    java_args.each {|k,v| args += "#{k}#{v} "}
+    args = ''
+    java_args.each { |k, v| args += "#{k}#{v} " }
     "\"#{args.chomp(' ')}\""
   end
 end

lib/puppet/provider/puppetdb_conn_validator/puppet_https.rb

@@ -6,7 +6,7 @@
 # In this case I'm trying the relative path first, then falling back to normal
 # mechanisms. This should be fixed in future versions of puppet but it looks
 # like we'll need to maintain this for some time perhaps.
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__),"..","..",".."))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
 require 'puppet/util/puppetdb_validator'
 
 # This file contains a provider for the resource type `puppetdb_conn_validator`,
@@ -38,7 +38,7 @@ def exists?
       # especially on the first install.  Therefore, our first connection attempt
       # may fail.  Here we have somewhat arbitrarily chosen to retry every 2
       # seconds until the configurable timeout has expired.
-      Puppet.notice("Failed to connect to puppetdb; sleeping 2 seconds before retry")
+      Puppet.notice('Failed to connect to puppetdb; sleeping 2 seconds before retry')
       sleep 2
       success = validator.attempt_connection
     end
@@ -67,6 +67,4 @@ def create
   def validator
     @validator ||= Puppet::Util::PuppetdbValidator.new(resource[:puppetdb_server], resource[:puppetdb_port], resource[:use_ssl], resource[:test_url])
   end
-
 end
-

lib/puppet/type/puppetdb_conn_validator.rb

@@ -1,5 +1,4 @@
 Puppet::Type.newtype(:puppetdb_conn_validator) do
-
   @doc = "Verify that a connection can be successfully established between a node
           and the puppetdb server.  Its primary use is as a precondition to
           prevent configuration changes from being applied if the puppetdb
@@ -11,7 +10,7 @@
     defaultto :present
   end
 
-  newparam(:name, :namevar => true) do
+  newparam(:name, namevar: true) do
     desc 'An arbitrary name used as the identity of the resource.'
   end
 
@@ -45,5 +44,4 @@
       Integer(value)
     end
   end
-
 end

lib/puppet/util/puppetdb_validator.rb

@@ -1,45 +1,40 @@
 require 'puppet/network/http_pool'
 
-module Puppet
-  module Util
-    # Validator class, for testing that PuppetDB is alive
-    class PuppetdbValidator
-      attr_reader :puppetdb_server
-      attr_reader :puppetdb_port
-      attr_reader :use_ssl
-      attr_reader :test_path
-      attr_reader :test_headers
+# Validator class, for testing that PuppetDB is alive
+class Puppet::Util::PuppetdbValidator
+  attr_reader :puppetdb_server
+  attr_reader :puppetdb_port
+  attr_reader :use_ssl
+  attr_reader :test_path
+  attr_reader :test_headers
 
-      def initialize(puppetdb_server, puppetdb_port, use_ssl=true, test_path = "/pdb/meta/v1/version")
-        @puppetdb_server = puppetdb_server
-        @puppetdb_port   = puppetdb_port
-        @use_ssl         = use_ssl
-        @test_path       = test_path
-        @test_headers    = { "Accept" => "application/json" }
-      end
+  def initialize(puppetdb_server, puppetdb_port, use_ssl = true, test_path = '/pdb/meta/v1/version')
+    @puppetdb_server = puppetdb_server
+    @puppetdb_port   = puppetdb_port
+    @use_ssl         = use_ssl
+    @test_path       = test_path
+    @test_headers    = { 'Accept' => 'application/json' }
+  end
 
-      # Utility method; attempts to make an http/https connection to the puppetdb server.
-      # This is abstracted out into a method so that it can be called multiple times
-      # for retry attempts.
-      #
-      # @return true if the connection is successful, false otherwise.
-      def attempt_connection
-        # All that we care about is that we are able to connect successfully via
-        # http(s), so here we're simpling hitting a somewhat arbitrary low-impact URL
-        # on the puppetdb server.
-        conn = Puppet::Network::HttpPool.http_instance(puppetdb_server, puppetdb_port, use_ssl)
+  # Utility method; attempts to make an http/https connection to the puppetdb server.
+  # This is abstracted out into a method so that it can be called multiple times
+  # for retry attempts.
+  #
+  # @return true if the connection is successful, false otherwise.
+  def attempt_connection
+    # All that we care about is that we are able to connect successfully via
+    # http(s), so here we're simpling hitting a somewhat arbitrary low-impact URL
+    # on the puppetdb server.
+    conn = Puppet::Network::HttpPool.http_instance(puppetdb_server, puppetdb_port, use_ssl)
 
-        response = conn.get(test_path, test_headers)
-        unless response.kind_of?(Net::HTTPSuccess)
-          Puppet.notice "Unable to connect to puppetdb server (http#{use_ssl ? "s" : ""}://#{puppetdb_server}:#{puppetdb_port}): [#{response.code}] #{response.msg}"
-          return false
-        end
-        return true
-      rescue Exception => e
-        Puppet.notice "Unable to connect to puppetdb server (http#{use_ssl ? "s" : ""}://#{puppetdb_server}:#{puppetdb_port}): #{e.message}"
-        return false
-      end
+    response = conn.get(test_path, test_headers)
+    unless response.is_a?(Net::HTTPSuccess)
+      Puppet.notice "Unable to connect to puppetdb server (http#{use_ssl ? 's' : ''}://#{puppetdb_server}:#{puppetdb_port}): [#{response.code}] #{response.msg}"
+      return false
     end
+    return true
+  rescue StandardError => e
+    Puppet.notice "Unable to connect to puppetdb server (http#{use_ssl ? 's' : ''}://#{puppetdb_server}:#{puppetdb_port}): #{e.message}"
+    return false
   end
 end
-

spec/acceptance/basic_spec.rb

@@ -3,9 +3,9 @@
 describe 'basic tests:' do
   it 'make sure we have copied the module across' do
     # No point diagnosing any more if the module wasn't copied properly
-    shell("ls /etc/puppetlabs/code/modules/puppetdb") do |r|
-      r.exit_code.should == 0
-      r.stdout.should =~ /metadata\.json/
+    shell('ls /etc/puppetlabs/code/modules/puppetdb') do |r|
+      r.exit_code.should be_zero
+      r.stdout.should =~ %r{metadata\.json}
       r.stderr.should == ''
     end
   end
@@ -18,8 +18,8 @@ class { 'puppetdb::master::config': puppetdb_port => '8080', puppetdb_server =>
     EOS
 
     it 'make sure it runs without error' do
-      apply_manifest(pp, :catch_errors  => true)
-      apply_manifest(pp, :catch_changes => true)
+      apply_manifest(pp, catch_errors: true)
+      apply_manifest(pp, catch_changes: true)
     end
   end
 
@@ -34,12 +34,12 @@ class { 'puppetdb::master::config':
       }
     EOS
 
-    it 'should add the puppetdb report processor to puppet.conf' do
-      apply_manifest(pp, :catch_errors  => true)
-      apply_manifest(pp, :catch_changes => true)
+    it 'adds the puppetdb report processor to puppet.conf' do
+      apply_manifest(pp, catch_errors: true)
+      apply_manifest(pp, catch_changes: true)
 
       shell('cat /etc/puppetlabs/puppet/puppet.conf') do |r|
-        expect(r.stdout).to match(/^reports\s*=\s*([^,]+,)*puppetdb(,[^,]+)*$/)
+        expect(r.stdout).to match(%r{^reports\s*=\s*([^,]+,)*puppetdb(,[^,]+)*$})
       end
     end
   end

spec/spec_helper_acceptance.rb

@@ -3,20 +3,20 @@
 require 'beaker/module_install_helper'
 
 hosts.each do |host|
-  if host['platform'] =~ /debian/
+  if host['platform'] =~ %r{debian}
     on host, 'echo \'export PATH=/var/lib/gems/1.8/bin/:${PATH}\' >> ~/.bashrc'
   end
-  #install_puppet
-  if host['platform'] =~ /el-(5|6|7)/
-    relver = $1
+  # install_puppet
+  if host['platform'] =~ %r{el-(5|6|7)}
+    relver = Regexp.last_match(1)
     on host, "rpm -ivh http://yum.puppetlabs.com/puppetlabs-release-pc1-el-#{relver}.noarch.rpm"
     on host, 'yum install -y puppetserver'
-  elsif host['platform'] =~ /fedora-(\d+)/
-    relver = $1
+  elsif host['platform'] =~ %r{fedora-(\d+)}
+    relver = Regexp.last_match(1)
     on host, "rpm -ivh http://yum.puppetlabs.com/puppetlabs-release-pc1-fedora-#{relver}.noarch.rpm"
     on host, 'yum install -y puppetserver'
-  elsif host['platform'] =~ /(ubuntu|debian)/
-    if ! host.check_for_package 'curl'
+  elsif host['platform'] =~ %r{(ubuntu|debian)}
+    unless host.check_for_package 'curl'
       on host, 'apt-get install -y curl'
     end
     on host, 'apt-get install apt-transport-https --assume-yes'

spec/unit/classes/init_spec.rb

@@ -1,45 +1,45 @@
 require 'spec_helper'
 
-describe 'puppetdb', :type => :class do
-  ttl_args = ['node_ttl','node_purge_ttl','report_ttl']
+describe 'puppetdb', type: :class do
+  ttl_args = ['node_ttl', 'node_purge_ttl', 'report_ttl']
 
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge({
-          :selinux => false
-        })
+        facts.merge(selinux: false)
       end
 
       describe 'when using default values for puppetdb class' do
-        it { should contain_class('puppetdb') }
-        it { should contain_class('puppetdb::server') }
-        it { should contain_class('puppetdb::database::postgresql') }
+        it { is_expected.to contain_class('puppetdb') }
+        it { is_expected.to contain_class('puppetdb::server') }
+        it { is_expected.to contain_class('puppetdb::database::postgresql') }
       end
     end
   end
 
   context 'with invalid arguments on a supported platform' do
     let(:facts) do
       {
-        :osfamily => 'RedHat',
-        :operatingsystem => 'Debian',
-        :puppetversion => Puppet.version,
-        :operatingsystemrelease => '6.0',
-        :kernel => 'Linux',
-        :concat_basedir => '/var/lib/puppet/concat',
-        :selinux => true,
-        :iptables_persistent_version => '0.5.7',
+        osfamily: 'RedHat',
+        operatingsystem: 'Debian',
+        puppetversion: Puppet.version,
+        operatingsystemrelease: '6.0',
+        kernel: 'Linux',
+        concat_basedir: '/var/lib/puppet/concat',
+        selinux: true,
+        iptables_persistent_version: '0.5.7',
       }
     end
+
     ttl_args.each do |ttl_arg|
       let(:params) do
         {
-          ttl_arg => 'invalid_value'
+          ttl_arg => 'invalid_value',
         }
       end
+
       it "when using a value that does not match the validation regex for #{ttl_arg} puppetdb class" do
-        expect { should contain_class('puppetdb') }.to raise_error(Puppet::Error)
+        expect { is_expected.to contain_class('puppetdb') }.to raise_error(Puppet::Error)
       end
     end
   end