Fix rubocop issues

Author: stschulte

lib/puppet/provider/oratab/parsed.rb

@@ -3,33 +3,32 @@
 require 'puppet/provider/parsedfile'
 
 oratab = case Facter.value(:operatingsystem)
-when 'Solaris'
-  '/var/opt/oracle/oratab'
-else
-  '/etc/oratab'
-end
-
-Puppet::Type.type(:oratab).provide(:parsed, :parent => Puppet::Provider::ParsedFile, :default_target => oratab, :filetype => :flat) do
+         when 'Solaris'
+           '/var/opt/oracle/oratab'
+         else
+           '/etc/oratab'
+         end
 
-  text_line :comment, :match => /^\s*#/
-  text_line :blank, :match => /^\s*$/
+Puppet::Type.type(:oratab).provide(:parsed, parent: Puppet::Provider::ParsedFile, default_target: oratab, filetype: :flat) do
+  text_line :comment, match: %r{^\s*#}
+  text_line :blank, match: %r{^\s*$}
 
-  record_line :parsed, :fields => %w{name home atboot description},
-    :optional   => %w{description},
-    :match      => /^\s*(.*?):(.*?):(.*?)\s*(?:#\s*(.*))?$/,
-    :post_parse => proc { |h|
+  record_line :parsed, fields: ['name', 'home', 'atboot', 'description'],
+    optional: ['description'],
+    match: %r{^\s*(.*?):(.*?):(.*?)\s*(?:#\s*(.*))?$},
+    post_parse: proc { |h|
       h[:atboot] = :yes if h[:atboot] == 'Y'
       h[:atboot] = :no if h[:atboot] == 'N'
       h
     },
-    :pre_gen    => proc { |h|
+    pre_gen: proc { |h|
       h[:atboot] = 'Y' if h[:atboot] == :yes
       h[:atboot] = 'N' if h[:atboot] == :no
       h
     },
-    :to_line    => proc { |h|
+    to_line: proc { |h|
       str = "#{h[:name]}:#{h[:home]}:#{h[:atboot]}"
-      if description = h[:description] and description != :absent and !description.empty?
+      if ((description = h[:description])) && (description != :absent) && !description.empty?
         str += " # #{description}"
       end
       str

lib/puppet/type/oratab.rb

@@ -3,7 +3,6 @@
 require 'puppet/provider/parsedfile'
 
 Puppet::Type.newtype(:oratab) do
-
   @doc = "Define database instaces in /etc/oratab with instance name
     home directory and a flag which indicates if the instance should
     be started together with the database"
@@ -14,8 +13,8 @@
     isnamevar
 
     validate do |value|
-      raise Puppet::Error, "Name must not contain whitespace: #{value}" if value =~ /\s/
-      raise Puppet::Error, "Name must not be empty" if value.empty?
+      raise Puppet::Error, "Name must not contain whitespace: #{value}" if %r{\s}.match?(value)
+      raise Puppet::Error, 'Name must not be empty' if value.empty?
     end
   end
 
@@ -26,7 +25,7 @@
       path"
 
     validate do |value|
-        raise Puppet::Error, "Home must be an absolute path: #{value}" unless value =~ /^\//
+      raise Puppet::Error, "Home must be an absolute path: #{value}" unless %r{^/}.match?(value)
     end
   end
 
@@ -42,11 +41,10 @@
   newproperty(:description) do
     desc "An optional description that will be added as an inline comment
       in the target file"
-
   end
 
   newproperty(:target) do
-    desc "The path of the target file to store the instance information in"
+    desc 'The path of the target file to store the instance information in'
 
     defaultto do
       if @resource.class.defaultprovider.ancestors.include?(Puppet::Provider::ParsedFile)

spec/integration/provider/oratab/parsed_spec.rb

@@ -3,18 +3,29 @@
 require 'spec_helper'
 require 'puppet/file_bucket/dipper'
 
-describe Puppet::Type.type(:oratab).provider(:parsed), '(integration)' do
+describe Puppet::Type.type(:oratab).provider(:parsed) do
   include PuppetlabsSpec::Files
 
   before :each do
     allow(described_class).to receive(:suitable?).and_return(true)
     allow(described_class).to receive(:default_target).and_return(fake_oratab)
     allow(Puppet::Type.type(:oratab)).to receive(:defaultprovider).and_return(described_class)
+    allow(Puppet::FileBucket::Dipper).to receive(:new).and_return(dipper)
+  end
+
+  let :dipper do
+    instance_double(Puppet::FileBucket::Dipper, backup: nil, 'name=': nil)
+  end
+
+  let :catalog do
+    c = Puppet::Resource::Catalog.new
+    c.host_config = false
+    c
   end
 
   let :fake_oratab do
     filename = tmpfilename('oratab')
-    unless File.exists? filename
+    unless File.exist? filename
       FileUtils.cp(my_fixture('input'), filename)
     end
     filename
@@ -23,75 +34,75 @@
   # this resource is absent in our fake oratab
   let :resource_absent do
     Puppet::Type.type(:oratab).new(
-      :name   => 'NO_SUCH_DATABASE',
-      :ensure => :absent
+      name: 'NO_SUCH_DATABASE',
+      ensure: :absent,
     )
   end
 
   # this resource is present in our fake oratab and completly insync
   let :resource_present do
     Puppet::Type.type(:oratab).new(
-      :name   => 'DB_INSYNC',
-      :ensure => :present,
-      :home   => '/u01/app/oracle/product/10.1.0/db_1',
-      :atboot => :yes
+      name: 'DB_INSYNC',
+      ensure: :present,
+      home: '/u01/app/oracle/product/10.1.0/db_1',
+      atboot: :yes,
     )
   end
 
   # this resource is not present in our fake oratab
   let :resource_create do
     Puppet::Type.type(:oratab).new(
-      :name        => 'DB_CREATE',
-      :ensure      => :present,
-      :home        => '/u01/app/oracle/product/10.1.0/db_2',
-      :description => 'added by puppet',
-      :atboot      => :no
+      name: 'DB_CREATE',
+      ensure: :present,
+      home: '/u01/app/oracle/product/10.1.0/db_2',
+      description: 'added by puppet',
+      atboot: :no,
     )
   end
 
   # this resource is present in our fake oratab
   let :resource_delete do
     Puppet::Type.type(:oratab).new(
-      :name   => 'DB_DELETE',
-      :ensure => :absent
+      name: 'DB_DELETE',
+      ensure: :absent,
     )
   end
 
   # this resource is present in our fake oratab but with :home => '/u01/app/oracle/product/10.1.0/db_4'
   let :resource_sync_home do
-     Puppet::Type.type(:oratab).new(
-      :name   => 'DB_SYNC_HOME',
-      :ensure => :present,
-      :home   => '/new/home'
-    )
+    Puppet::Type.type(:oratab).new(
+     name: 'DB_SYNC_HOME',
+     ensure: :present,
+     home: '/new/home',
+   )
   end
 
   # this resource is present in our fake oratab but with :atboot => :no
   let :resource_sync_atboot do
-     Puppet::Type.type(:oratab).new(
-      :name   => 'DB_SYNC_ATBOOT',
-      :ensure => :present,
-      :home   => '/u01/app/oracle/product/10.1.0/db_1',
-      :atboot => :yes
-    )
+    Puppet::Type.type(:oratab).new(
+     name: 'DB_SYNC_ATBOOT',
+     ensure: :present,
+     home: '/u01/app/oracle/product/10.1.0/db_1',
+     atboot: :yes,
+   )
   end
 
   # this resource is present in our fake oratab but with :description => 'change me'
   let :resource_sync_description do
     Puppet::Type.type(:oratab).new(
-      :name        => 'DB_SYNC_DESCRIPTION',
-      :ensure      => :present,
-      :atboot      => :no,
-      :description => 'new desc'
+      name: 'DB_SYNC_DESCRIPTION',
+      ensure: :present,
+      atboot: :no,
+      description: 'new desc',
     )
   end
 
   # this resource is present in our fake oratab but with :description => 'delete me'
   let :resource_delete_description do
     Puppet::Type.type(:oratab).new(
-      :name        => 'DB_DELETE_DESCRIPTION',
-      :ensure      => :present,
-      :description => ''
+      name: 'DB_DELETE_DESCRIPTION',
+      ensure: :present,
+      description: '',
     )
   end
 
@@ -100,9 +111,6 @@
   end
 
   def run_in_catalog(*resources)
-    allow_any_instance_of(Puppet::FileBucket::Dipper).to receive(:backup)
-    catalog = Puppet::Resource::Catalog.new
-    catalog.host_config = false
     resources.each do |resource|
       expect(resource).not_to receive(:err)
       catalog.add_resource(resource)
@@ -111,60 +119,59 @@ def run_in_catalog(*resources)
   end
 
   def check_content_against(fixture)
-    content = File.read(fake_oratab).lines.map{|l| l.chomp}.reject{|l| l=~ /^\s*#|^\s*$/}.sort.join("\n")
-    expected_content = File.read(my_fixture(fixture)).lines.map{|l| l.chomp}.reject{|l| l=~ /^\s*#|^\s*$/}.sort.join("\n")
+    content = File.read(fake_oratab).lines.map { |l| l.chomp }.reject { |l| l =~ %r{^\s*#|^\s*$} }.sort.join("\n")
+    expected_content = File.read(my_fixture(fixture)).lines.map { |l| l.chomp }.reject { |l| l =~ %r{^\s*#|^\s*$} }.sort.join("\n")
     expect(content).to eq(expected_content)
   end
 
-  describe "when managing one resource" do
-
-    describe "with ensure set to absent" do
-      it "should do nothing if already absent" do
+  describe 'when managing one resource' do
+    describe 'with ensure set to absent' do
+      it 'does nothing if already absent' do
         run_in_catalog(resource_absent)
         check_content_against('input')
       end
 
-      it "should remove oratab entry if currently present" do
+      it 'removes oratab entry if currently present' do
         run_in_catalog(resource_delete)
         check_content_against('output_single_delete')
       end
     end
 
-    describe "with ensure set to present" do
-      it "should do nothing if already present and in sync" do
+    describe 'with ensure set to present' do
+      it 'does nothing if already present and in sync' do
         run_in_catalog(resource_present)
         check_content_against('input')
       end
 
-      it "should create an oratab entry if currently absent" do
+      it 'creates an oratab entry if currently absent' do
         run_in_catalog(resource_create)
         check_content_against('output_single_create')
       end
 
-      it "should sync home if out of sync" do
+      it 'syncs home if out of sync' do
         run_in_catalog(resource_sync_home)
         check_content_against('output_single_sync_home')
       end
 
-      it "should sync atboot if out of sync" do
+      it 'syncs atboot if out of sync' do
         run_in_catalog(resource_sync_atboot)
         check_content_against('output_single_sync_atboot')
       end
 
-      it "should sync description if out sync" do
+      it 'syncs description if out sync' do
         run_in_catalog(resource_sync_description)
         check_content_against('output_single_sync_description')
       end
 
-      it "should remove the description (including the #-sign) if description is empty" do
+      it 'removes the description (including the #-sign) if description is empty' do
         run_in_catalog(resource_delete_description)
         check_content_against('output_single_sync_description_delete')
       end
     end
   end
 
-  describe "when managing multiple resources" do
-    it "should to the right thing (tm)" do
+  describe 'when managing multiple resources' do
+    it 'toes the right thing (tm)' do
       run_in_catalog(
         resource_absent,
         resource_present,
@@ -173,10 +180,9 @@ def check_content_against(fixture)
         resource_sync_home,
         resource_sync_atboot,
         resource_sync_description,
-        resource_delete_description
+        resource_delete_description,
       )
       check_content_against('output_multiple')
     end
   end
-
 end