Rubocop Finished

Author: David Swan

.rubocop.yml

@@ -96,3 +96,6 @@ Style/IfUnlessModifier:
   Enabled: false
 Style/SymbolProc:
   Enabled: false
+#TODO: Additional value added to resolve error's
+Style/GlobalVars:
+  Enabled: false

.sync.yml

@@ -10,3 +10,7 @@ spec/spec_helper.rb:
   env:
     global:
       - "PARALLEL_TEST_PROCESSORS=16 # reduce test parallelism to prevent overloading containers"
+  extras:
+    - rvm: 2.1.9
+      script: bundle exec rake rubocop
+

.travis.yml

@@ -28,5 +28,7 @@ matrix:
   - rvm: 2.1.9
     bundler_args: --without system_tests
     env: PUPPET_GEM_VERSION="~> 4.0"
+  - rvm: 2.1.9
+    script: bundle exec rake rubocop
 notifications:
   email: false

lib/facter/apache_version.rb

@@ -1,5 +1,5 @@
 Facter.add(:apache_version) do
-  confine :kernel => 'Linux'
+  confine kernel: 'Linux'
   setcode do
     if Facter::Util::Resolution.which('apachectl')
       apache_version = Facter::Util::Resolution.exec('apachectl -v 2>&1')

lib/puppet/functions/apache/apache_pw_hash.rb

@@ -10,6 +10,6 @@
 
   def apache_pw_hash(password)
     require 'base64'
-    return '{SHA}' + Base64.strict_encode64(Digest::SHA1.digest(password))
+    '{SHA}' + Base64.strict_encode64(Digest::SHA1.digest(password))
   end
 end

lib/puppet/functions/apache/bool2httpd.rb

@@ -14,12 +14,8 @@
 #    # => 'Off'
 Puppet::Functions.create_function(:'apache::bool2httpd') do
   def bool2httpd(arg)
-    if arg.nil? or arg == false or arg =~ /false/i or arg == :undef
-      return 'Off'
-    elsif arg == true or arg =~ /true/i
-      return 'On'
-    end
-
-    return arg.to_s
+    return 'Off' if arg.nil? || arg == false || arg =~ %r{false}i || arg == :undef
+    return 'On' if arg == true || arg =~ %r{true}i
+    arg.to_s
   end
 end

lib/puppet/functions/apache/validate_apache_log_level.rb

@@ -8,15 +8,14 @@
 #        validate_apache_loglevel('warn ssl_module:info')
 #
 #    Expected to be used from the main or vhost.
-#    
 #    Might be used from directory too later as apache supports that
 Puppet::Functions.create_function(:'apache::validate_apache_log_level') do
   dispatch :validate_apache_log_level do
     required_param 'String', :log_level
   end
 
-  def validate_apache_log_level (log_level)
+  def validate_apache_log_level(log_level)
     msg = "Log level '${log_level}' is not one of the supported Apache HTTP Server log levels."
-    raise Puppet::ParseError, (msg) unless log_level =~ Regexp.compile('(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])')
+    raise Puppet::ParseError, msg unless log_level =~ Regexp.compile('(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])')
   end
 end

lib/puppet/parser/functions/apache_pw_hash.rb

@@ -1,15 +1,15 @@
 require 'base64'
 
-Puppet::Parser::Functions::newfunction(:apache_pw_hash, :type => :rvalue, :doc => <<-EOS
-Hashes a password in a format suitable for htpasswd files read by apache.
+Puppet::Parser::Functions.newfunction(:apache_pw_hash, type: :rvalue, doc: <<-DOC
+  Hashes a password in a format suitable for htpasswd files read by apache.
 
-Currently uses SHA-hashes, because although this format is considered insecure, its the
-most secure format supported by the most platforms.
-EOS
-) do |args|
+  Currently uses SHA-hashes, because although this format is considered insecure, its the
+  most secure format supported by the most platforms.
+DOC
+                                     ) do |args|
   raise(Puppet::ParseError, "apache_pw_hash() wrong number of arguments. Given: #{args.size} for 1)") if args.size != 1
-  raise(Puppet::ParseError, "apache_pw_hash(): first argument must be a string") unless args[0].is_a? String
-  raise(Puppet::ParseError, "apache_pw_hash(): first argument must not be empty") if args[0].empty?
+  raise(Puppet::ParseError, 'apache_pw_hash(): first argument must be a string') unless args[0].is_a? String
+  raise(Puppet::ParseError, 'apache_pw_hash(): first argument must not be empty') if args[0].empty?
 
   password = args[0]
   return '{SHA}' + Base64.strict_encode64(Digest::SHA1.digest(password))

lib/puppet/parser/functions/bool2httpd.rb

@@ -1,30 +1,24 @@
-Puppet::Parser::Functions::newfunction(:bool2httpd, :type => :rvalue, :doc => <<-EOS
-Transform a supposed boolean to On or Off. Pass all other values through.
-Given a nil value (undef), bool2httpd will return 'Off'
+Puppet::Parser::Functions.newfunction(:bool2httpd, type: :rvalue, doc: <<-DOC
+  Transform a supposed boolean to On or Off. Pass all other values through.
+  Given a nil value (undef), bool2httpd will return 'Off'
 
-Example:
+  Example:
 
-    $trace_enable     = false
-    $server_signature = 'mail'
+      $trace_enable     = false
+      $server_signature = 'mail'
 
-    bool2httpd($trace_enable)
-    # => 'Off'
-    bool2httpd($server_signature)
-    # => 'mail'
-    bool2httpd(undef)
-    # => 'Off'
-
-EOS
-) do |args|
+      bool2httpd($trace_enable)
+      # => 'Off'
+      bool2httpd($server_signature)
+      # => 'mail'
+      bool2httpd(undef)
+      # => 'Off'
+DOC
+                                     ) do |args|
   raise(Puppet::ParseError, "bool2httpd() wrong number of arguments. Given: #{args.size} for 1)") if args.size != 1
 
   arg = args[0]
-
-  if arg.nil? or arg == false or arg =~ /false/i or arg == :undef
-    return 'Off'
-  elsif arg == true or arg =~ /true/i
-    return 'On'
-  end
-
+  return 'Off' if arg.nil? || arg == false || arg =~ %r{false}i || arg == :undef
+  return 'On' if arg == true || arg =~ %r{true}i
   return arg.to_s
 end

lib/puppet/parser/functions/validate_apache_log_level.rb

@@ -1,5 +1,6 @@
+# validate_apache_log_level.rb
 module Puppet::Parser::Functions
-  newfunction(:validate_apache_log_level, :doc => <<-'ENDHEREDOC') do |args|
+  newfunction(:validate_apache_log_level, doc: <<-DOC
     Perform simple validation of a string against the list of known log
     levels as per http://httpd.apache.org/docs/current/mod/core.html#loglevel
         validate_apache_loglevel('info')
@@ -10,18 +11,17 @@ module Puppet::Parser::Functions
         validate_apache_loglevel('warn ssl_module:info')
 
     Expected to be used from the main or vhost.
-    
+
     Might be used from directory too later as apaceh supports that
 
-    ENDHEREDOC
-    if (args.size != 1) then
-      raise Puppet::ParseError, ("validate_apache_loglevel(): wrong number of arguments (#{args.length}; must be 1)")
+DOC
+             ) do |args|
+    if args.size != 1
+      raise Puppet::ParseError, "validate_apache_loglevel(): wrong number of arguments (#{args.length}; must be 1)"
     end
 
     log_level = args[0]
     msg = "Log level '${log_level}' is not one of the supported Apache HTTP Server log levels."
-
-    raise Puppet::ParseError, (msg) unless log_level =~ Regexp.compile('(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])')
-
+    raise Puppet::ParseError, msg unless log_level =~ Regexp.compile('(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])')
   end
 end

lib/puppet/provider/a2mod.rb

@@ -1,7 +1,9 @@
+# a2mod.rb
 class Puppet::Provider::A2mod < Puppet::Provider
   def self.prefetch(mods)
     instances.each do |prov|
-      if mod = mods[prov.name]
+      mod = mods[prov.name]
+      if mod
         mod.provider = prov
       end
     end
@@ -13,15 +15,15 @@ def flush
 
   def properties
     if @property_hash.empty?
-      @property_hash = query || {:ensure => :absent}
+      @property_hash = query || { ensure: :absent }
       @property_hash[:ensure] = :absent if @property_hash.empty?
     end
     @property_hash.dup
   end
 
   def query
     self.class.instances.each do |mod|
-      if mod.name == self.name or mod.name.downcase == self.name
+      if mod.name == name || mod.name.downcase == name
         return mod.properties
       end
     end

lib/puppet/provider/a2mod/a2mod.rb

@@ -1,35 +1,35 @@
 require 'puppet/provider/a2mod'
 
-Puppet::Type.type(:a2mod).provide(:a2mod, :parent => Puppet::Provider::A2mod) do
-    desc "Manage Apache 2 modules on Debian and Ubuntu"
+Puppet::Type.type(:a2mod).provide(:a2mod, parent: Puppet::Provider::A2mod) do
+  desc 'Manage Apache 2 modules on Debian and Ubuntu'
 
-    optional_commands :encmd => "a2enmod"
-    optional_commands :discmd => "a2dismod"
-    commands :apache2ctl => "apache2ctl"
+  optional_commands encmd: 'a2enmod'
+  optional_commands discmd: 'a2dismod'
+  commands apache2ctl: 'apache2ctl'
 
-    confine :osfamily => :debian
-    defaultfor :operatingsystem => [:debian, :ubuntu]
+  confine osfamily: :debian
+  defaultfor operatingsystem: [:debian, :ubuntu]
 
-    def self.instances
-      modules = apache2ctl("-M").lines.collect { |line|
-        m = line.match(/(\w+)_module \(shared\)$/)
-        m[1] if m
-      }.compact
+  def self.instances
+    modules = apache2ctl('-M').lines.map { |line|
+      m = line.match(%r{(\w+)_module \(shared\)$})
+      m[1] if m
+    }.compact
 
-      modules.map do |mod|
-        new(
-          :name     => mod,
-          :ensure   => :present,
-          :provider => :a2mod
-        )
-      end
+    modules.map do |mod|
+      new(
+        name: mod,
+        ensure: :present,
+        provider: :a2mod,
+      )
     end
+  end
 
-    def create
-        encmd resource[:name]
-    end
+  def create
+    encmd resource[:name]
+  end
 
-    def destroy
-        discmd resource[:name]
-    end
+  def destroy
+    discmd resource[:name]
+  end
 end