Merge pull request #251 from david22swan/Rubocop

Rubocop Implementation Finished

Author: tphoney

.rubocop.yml

@@ -3,3 +3,7 @@ NOTICE:
   unmanaged: true
 appveyor.yml:
   delete: true
+.travis.yml:
+  extras:
+    - rvm: 2.1.9
+      script: bundle exec rake rubocop

.rubocop_todo.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

.sync.yml

@@ -1,89 +1,89 @@
 #
 # create_ini_settings.rb
 #
-
 module Puppet::Parser::Functions
-  newfunction(:create_ini_settings, :type => :statement, :doc => <<-EOS
-Uses create_resources to create a set of ini_setting resources from a hash:
+  newfunction(:create_ini_settings, type: :statement, doc: <<-EOS
+    Uses create_resources to create a set of ini_setting resources from a hash:
 
-    $settings = {  section1 => {
-        setting1 => val1
-      },
-      section2 => {
-        setting2 => val2,
-        setting3 => {
-          ensure => absent
+        $settings = {  section1 => {
+            setting1 => val1
+          },
+          section2 => {
+            setting2 => val2,
+            setting3 => {
+              ensure => absent
+            }
+          }
+        }
+        $defaults = {
+          path => '/tmp/foo.ini'
         }
-      }
-    }
-    $defaults = {
-      path => '/tmp/foo.ini'
-    }
-    create_ini_settings($settings,$defaults)
+        create_ini_settings($settings,$defaults)
 
 
-Will create the following resources
+    Will create the following resources
 
-    ini_setting{'/tmp/foo.ini [section1] setting1':
-      ensure  => present,
-      section => 'section1',
-      setting => 'setting1',
-      value   => 'val1',
-      path    => '/tmp/foo.ini',
-    }
-    ini_setting{'/tmp/foo.ini [section2] setting2':
-      ensure  => present,
-      section => 'section2',
-      setting => 'setting2',
-      value   => 'val2',
-      path    => '/tmp/foo.ini',
-    }
-    ini_setting{'/tmp/foo.ini [section2] setting3':
-      ensure  => absent,
-      section => 'section2',
-      setting => 'setting3',
-      path    => '/tmp/foo.ini',
-    }
+        ini_setting{'/tmp/foo.ini [section1] setting1':
+          ensure  => present,
+          section => 'section1',
+          setting => 'setting1',
+          value   => 'val1',
+          path    => '/tmp/foo.ini',
+        }
+        ini_setting{'/tmp/foo.ini [section2] setting2':
+          ensure  => present,
+          section => 'section2',
+          setting => 'setting2',
+          value   => 'val2',
+          path    => '/tmp/foo.ini',
+        }
+        ini_setting{'/tmp/foo.ini [section2] setting3':
+          ensure  => absent,
+          section => 'section2',
+          setting => 'setting3',
+          path    => '/tmp/foo.ini',
+        }
 
-EOS
-  ) do |arguments|
+    EOS
+             ) do |arguments|
 
-    raise(Puppet::ParseError, "create_ini_settings(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1 or 2)") unless arguments.size.between?(1,2)
+    unless arguments.size.between?(1, 2)
+      raise(Puppet::ParseError, 'create_ini_settings(): Wrong number of arguments ' \
+        "given (#{arguments.size} for 1 or 2)")
+    end
 
     settings = arguments[0]
     defaults = arguments[1] || {}
 
-    if [settings,defaults].any?{|i| !i.is_a?(Hash) }
+    if [settings, defaults].any? { |i| !i.is_a?(Hash) }
       raise(Puppet::ParseError,
-        'create_ini_settings(): Requires all arguments to be a Hash')
+            'create_ini_settings(): Requires all arguments to be a Hash')
     end
 
-    resources = settings.keys.inject({}) do |res, section|
-      raise(Puppet::ParseError,
-        "create_ini_settings(): Section #{section} must contain a Hash") \
-        unless settings[section].is_a?(Hash)
-
-      unless path = defaults.merge(settings)['path']
-        raise Puppet::ParseError, 'create_ini_settings(): must pass the path parameter to the Ini_setting resource!'
+    resources = settings.keys.each_with_object({}) do |section, res|
+      unless settings[section].is_a?(Hash)
+        raise(Puppet::ParseError,
+              "create_ini_settings(): Section #{section} must contain a Hash")
       end
 
+      path = defaults.merge(settings)['path']
+      raise Puppet::ParseError, 'create_ini_settings(): must pass the path parameter to the Ini_setting resource!' unless path
+
       settings[section].each do |setting, value|
         res["#{path} [#{section}] #{setting}"] = {
           'ensure'  => 'present',
           'section' => section,
           'setting' => setting,
         }.merge(if value.is_a?(Hash)
-          value
-        else
-          { 'value'   => value, }
-        end)
+                  value
+                else
+                  { 'value' => value }
+                end)
       end
-      res
     end
 
     Puppet::Parser::Functions.function('create_resources')
-    function_create_resources(['ini_setting',resources,defaults])
+    function_create_resources(['ini_setting', resources, defaults])
   end
 end
 

.travis.yml

@@ -1,7 +1,6 @@
 require File.expand_path('../../../util/ini_file', __FILE__)
 
 Puppet::Type.type(:ini_setting).provide(:ruby) do
-
   def self.instances
     # this code is here to support purging and the query-all functionality of the
     # 'puppet resource' command, on a per-file basis.  Users
@@ -12,25 +11,23 @@ def self.instances
     # declaration).  This allows 'purging' to be used to clear out
     # all settings from a particular ini file except those included in
     # the catalog.
-    if self.respond_to?(:file_path)
-      # figure out what to do about the seperator
-      ini_file  = Puppet::Util::IniFile.new(file_path, '=')
-      resources = []
-      ini_file.section_names.each do |section_name|
-        ini_file.get_settings(section_name).each do |setting, value|
-          resources.push(
-            new(
-              :name   => namevar(section_name, setting),
-              :value  => value,
-              :ensure => :present
-            )
-          )
-        end
+    raise(Puppet::Error, 'Ini_settings only support collecting instances when a file path is hard coded') unless respond_to?(:file_path)
+
+    # figure out what to do about the seperator
+    ini_file  = Puppet::Util::IniFile.new(file_path, '=')
+    resources = []
+    ini_file.section_names.each do |section_name|
+      ini_file.get_settings(section_name).each do |setting, value|
+        resources.push(
+          new(
+            name: namevar(section_name, setting),
+            value: value,
+            ensure: :present,
+          ),
+        )
       end
-      resources
-    else
-      raise(Puppet::Error, 'Ini_settings only support collecting instances when a file path is hard coded')
     end
+    resources
   end
 
   def self.namevar(section_name, setting)
@@ -57,7 +54,7 @@ def value
     ini_file.get_value(section, setting)
   end
 
-  def value=(value)
+  def value=(_value)
     ini_file.set_value(section, setting, separator, resource[:value])
     ini_file.save
   end
@@ -127,8 +124,8 @@ def indent_width
   end
 
   private
+
   def ini_file
     @ini_file ||= Puppet::Util::IniFile.new(file_path, separator, section_prefix, section_suffix, indent_char, indent_width)
   end
-
 end

lib/puppet/parser/functions/create_ini_settings.rb

@@ -2,15 +2,14 @@
 require File.expand_path('../../../util/setting_value', __FILE__)
 
 Puppet::Type.type(:ini_subsetting).provide(:ruby) do
-
   def exists?
     setting_value.get_subsetting_value(subsetting, resource[:use_exact_match])
   end
 
   def create
     setting_value.add_subsetting(
-        subsetting, resource[:value], resource[:use_exact_match],
-        resource[:insert_type], resource[:insert_value]
+      subsetting, resource[:value], resource[:use_exact_match],
+      resource[:insert_type], resource[:insert_value]
     )
     ini_file.set_value(section, setting, key_val_separator, setting_value.get_value)
     ini_file.save
@@ -32,8 +31,8 @@ def value
 
   def value=(value)
     setting_value.add_subsetting(
-        subsetting, value, resource[:use_exact_match],
-        resource[:insert_type], resource[:insert_value]
+      subsetting, value, resource[:use_exact_match],
+      resource[:insert_type], resource[:insert_value]
     )
     ini_file.set_value(section, setting, key_val_separator, setting_value.get_value)
     ini_file.save
@@ -72,15 +71,15 @@ def quote_char
   end
 
   private
+
   def ini_file
     @ini_file ||= Puppet::Util::IniFile.new(file_path, key_val_separator)
   end
 
   def setting_value
     @setting_value ||= Puppet::Util::SettingValue.new(
-        ini_file.get_value(section, setting),
-        subsetting_separator, quote_char, subsetting_key_val_separator
+      ini_file.get_value(section, setting),
+      subsetting_separator, quote_char, subsetting_key_val_separator
     )
   end
-
 end