From c081cfac8274a3fac28863d5d53a05835a5b6bc9 Mon Sep 17 00:00:00 2001 From: Christoph Hartmann Date: Wed, 9 Sep 2015 00:07:08 +0100 Subject: [PATCH] improve reliability of method_missing --- lib/resources/auditd_conf.rb | 2 +- lib/resources/inetd_conf.rb | 2 +- lib/resources/limits_conf.rb | 2 +- lib/resources/login_def.rb | 2 +- lib/resources/ntp_conf.rb | 1 + lib/resources/ssh_conf.rb | 1 + 6 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/resources/auditd_conf.rb b/lib/resources/auditd_conf.rb index fff2ca2c5..75eda9cce 100644 --- a/lib/resources/auditd_conf.rb +++ b/lib/resources/auditd_conf.rb @@ -28,7 +28,7 @@ class AuditDaemonConf < Vulcano.resource(1) def method_missing(name) @params || read_content - @params[name.to_s] + !@params.nil? ? (return @params[name.to_s]) : (return nil) end def read_content diff --git a/lib/resources/inetd_conf.rb b/lib/resources/inetd_conf.rb index 530caebc0..be22feade 100644 --- a/lib/resources/inetd_conf.rb +++ b/lib/resources/inetd_conf.rb @@ -29,7 +29,7 @@ class InetdConf < Vulcano.resource(1) def method_missing(name) @params || read_content - @params[name.to_s] + !@params.nil? ? (return @params[name.to_s]) : (return nil) end def read_content diff --git a/lib/resources/limits_conf.rb b/lib/resources/limits_conf.rb index 6d88d8687..480cf5b1e 100644 --- a/lib/resources/limits_conf.rb +++ b/lib/resources/limits_conf.rb @@ -27,7 +27,7 @@ class LimitsConf < Vulcano.resource(1) def method_missing(name) @params || read_content - @params[name.to_s] + !@params.nil? ? (return @params[name.to_s]) : (return nil) end def read_content diff --git a/lib/resources/login_def.rb b/lib/resources/login_def.rb index 4370e3484..2a01045b4 100644 --- a/lib/resources/login_def.rb +++ b/lib/resources/login_def.rb @@ -33,7 +33,7 @@ class LoginDef < Vulcano.resource(1) def method_missing(name) @params || read_content - @params[name.to_s] + !@params.nil? ? (return @params[name.to_s]) : (return nil) end def read_content diff --git a/lib/resources/ntp_conf.rb b/lib/resources/ntp_conf.rb index 649e0d082..578d28976 100644 --- a/lib/resources/ntp_conf.rb +++ b/lib/resources/ntp_conf.rb @@ -28,6 +28,7 @@ class NtpConf < Vulcano.resource(1) def method_missing(name) @params || read_content + return nil if @params.nil? param = @params[name.to_s] # extract first value if we have only one value in array param = param[0] if !param.nil? && param.length == 1 diff --git a/lib/resources/ssh_conf.rb b/lib/resources/ssh_conf.rb index eb2e64551..98f7014a6 100644 --- a/lib/resources/ssh_conf.rb +++ b/lib/resources/ssh_conf.rb @@ -31,6 +31,7 @@ class SshConf < Vulcano.resource(1) end def method_missing(name) + return nil if @params.nil? param = @params[name.to_s] # extract first value if we have only one value in array param = param[0] if !param.nil? && param.length == 1