diff options
Diffstat (limited to 'lib/puppet/provider')
48 files changed, 131 insertions, 381 deletions
diff --git a/lib/puppet/provider/augeas/augeas.rb b/lib/puppet/provider/augeas/augeas.rb index 163c864fa..e41570105 100644 --- a/lib/puppet/provider/augeas/augeas.rb +++ b/lib/puppet/provider/augeas/augeas.rb @@ -62,9 +62,7 @@ Puppet::Type.type(:augeas).provide(:augeas) do context << "/" if context[-1, 1] != "/" end - if data.is_a?(String) - data = data.split($/) - end + data = data.split($/) if data.is_a?(String) data = data.flatten args = [] data.each do |line| @@ -116,9 +114,7 @@ Puppet::Type.type(:augeas).provide(:augeas) do else argline << sc.scan(/[^\s]+/) end - unless argline[-1] - fail("missing string argument #{narg} for #{cmd}") - end + fail("missing string argument #{narg} for #{cmd}") unless argline[-1] elsif f == :comparator argline << sc.scan(/(==|!=|=~|<|<=|>|>=)/) unless argline[-1] @@ -147,9 +143,7 @@ Puppet::Type.type(:augeas).provide(:augeas) do debug("Opening augeas with root #{root}, lens path #{load_path}, flags #{flags}") @aug = Augeas::open(root, load_path,flags) - if get_augeas_version >= "0.3.6" - debug("Augeas version #{get_augeas_version} is installed") - end + debug("Augeas version #{get_augeas_version} is installed") if get_augeas_version >= "0.3.6" if resource[:incl] aug.set("/augeas/load/Xfm/lens", resource[:lens]) @@ -309,16 +303,12 @@ Puppet::Type.type(:augeas).provide(:augeas) do # Re-connect to augeas, and re-execute the changes begin open_augeas - if get_augeas_version >= "0.3.6" - set_augeas_save_mode(SAVE_OVERWRITE) - end + set_augeas_save_mode(SAVE_OVERWRITE) if get_augeas_version >= "0.3.6" do_execute_changes success = @aug.save - if success != true - fail("Save failed with return code #{success}") - end + fail("Save failed with return code #{success}") if success != true ensure close_augeas end diff --git a/lib/puppet/provider/confine/variable.rb b/lib/puppet/provider/confine/variable.rb index 0a5cc2960..66fe9b836 100644 --- a/lib/puppet/provider/confine/variable.rb +++ b/lib/puppet/provider/confine/variable.rb @@ -18,9 +18,7 @@ class Puppet::Provider::Confine::Variable < Puppet::Provider::Confine # Retrieve the value from facter def facter_value - unless defined?(@facter_value) and @facter_value - @facter_value = ::Facter.value(name).to_s.downcase - end + @facter_value = ::Facter.value(name).to_s.downcase unless defined?(@facter_value) and @facter_value @facter_value end diff --git a/lib/puppet/provider/confiner.rb b/lib/puppet/provider/confiner.rb index 65243efce..1649336f3 100644 --- a/lib/puppet/provider/confiner.rb +++ b/lib/puppet/provider/confiner.rb @@ -6,9 +6,7 @@ module Puppet::Provider::Confiner end def confine_collection - unless defined?(@confine_collection) - @confine_collection = Puppet::Provider::ConfineCollection.new(self.to_s) - end + @confine_collection = Puppet::Provider::ConfineCollection.new(self.to_s) unless defined?(@confine_collection) @confine_collection end diff --git a/lib/puppet/provider/cron/crontab.rb b/lib/puppet/provider/cron/crontab.rb index 5f2999fa2..a9c9889f8 100755 --- a/lib/puppet/provider/cron/crontab.rb +++ b/lib/puppet/provider/cron/crontab.rb @@ -21,9 +21,7 @@ tab = case Facter.value(:operatingsystem) commands :crontab => "crontab" text_line :comment, :match => %r{^#}, :post_parse => proc { |record| - if record[:line] =~ /Puppet Name: (.+)\s*$/ - record[:name] = $1 - end + record[:name] = $1 if record[:line] =~ /Puppet Name: (.+)\s*$/ } text_line :blank, :match => %r{^\s*$} @@ -66,9 +64,7 @@ tab = case Facter.value(:operatingsystem) # Add name and environments as necessary. def to_line(record) str = "" - if record[:name] - str = "# Puppet Name: #{record[:name]}\n" - end + str = "# Puppet Name: #{record[:name]}\n" if record[:name] if record[:environment] and record[:environment] != :absent and record[:environment] != [:absent] record[:environment].each do |env| str += env + "\n" diff --git a/lib/puppet/provider/group/groupadd.rb b/lib/puppet/provider/group/groupadd.rb index 65c3a5008..d9c50c2d5 100644 --- a/lib/puppet/provider/group/groupadd.rb +++ b/lib/puppet/provider/group/groupadd.rb @@ -20,9 +20,7 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe cmd << flag(:gid) << gid end end - if @resource.allowdupe? - cmd << "-o" - end + cmd << "-o" if @resource.allowdupe? cmd << @resource[:name] return cmd diff --git a/lib/puppet/provider/group/ldap.rb b/lib/puppet/provider/group/ldap.rb index 87d62d53a..73524c268 100644 --- a/lib/puppet/provider/group/ldap.rb +++ b/lib/puppet/provider/group/ldap.rb @@ -30,9 +30,7 @@ Puppet::Type.type(:group).provide :ldap, :parent => Puppet::Provider::Ldap do existing.each do |hash| next unless value = hash[:gid] num = value[0].to_i - if num > largest - largest = num - end + largest = num if num > largest end end largest + 1 diff --git a/lib/puppet/provider/host/parsed.rb b/lib/puppet/provider/host/parsed.rb index 7c824ac9b..be2f735cd 100644 --- a/lib/puppet/provider/host/parsed.rb +++ b/lib/puppet/provider/host/parsed.rb @@ -45,9 +45,7 @@ end raise Puppet::Error, "Could not match '#{line}'" end - if hash[:host_aliases] == "" - hash[:host_aliases] = [] - end + hash[:host_aliases] = [] if hash[:host_aliases] == "" return hash end @@ -56,9 +54,7 @@ end def self.to_line(hash) return super unless hash[:record_type] == :parsed [:ip, :name].each do |n| - unless hash[n] and hash[n] != :absent - raise ArgumentError, "#{n} is a required attribute for hosts" - end + raise ArgumentError, "#{n} is a required attribute for hosts" unless hash[n] and hash[n] != :absent end str = "#{hash[:ip]}\t#{hash[:name]}" diff --git a/lib/puppet/provider/ldap.rb b/lib/puppet/provider/ldap.rb index 098daa6ab..650258957 100644 --- a/lib/puppet/provider/ldap.rb +++ b/lib/puppet/provider/ldap.rb @@ -111,9 +111,7 @@ class Puppet::Provider::Ldap < Puppet::Provider def properties if @property_hash.empty? @property_hash = query || {:ensure => :absent} - if @property_hash.empty? - @property_hash[:ensure] = :absent - end + @property_hash[:ensure] = :absent if @property_hash.empty? end @property_hash.dup end diff --git a/lib/puppet/provider/macauthorization/macauthorization.rb b/lib/puppet/provider/macauthorization/macauthorization.rb index 696b5bb82..a372618cc 100644 --- a/lib/puppet/provider/macauthorization/macauthorization.rb +++ b/lib/puppet/provider/macauthorization/macauthorization.rb @@ -63,9 +63,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe def populate_rules_rights auth_plist = Plist::parse_xml(AuthDB) - if not auth_plist - raise Puppet::Error.new("Cannot parse: #{AuthDB}") - end + raise Puppet::Error.new("Cannot parse: #{AuthDB}") if not auth_plist self.rights = auth_plist["rights"].dup self.rules = auth_plist["rules"].dup self.parsed_auth_db = self.rights.dup @@ -163,9 +161,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe cmds << :security << "authorizationdb" << "read" << resource[:name] output = execute(cmds, :combine => false) current_values = Plist::parse_xml(output) - if current_values.nil? - current_values = {} - end + current_values = {} if current_values.nil? specified_values = convert_plist_to_native_attributes(@property_hash) # take the current values, merge the specified values to obtain a @@ -178,9 +174,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe authdb = Plist::parse_xml(AuthDB) authdb_rules = authdb["rules"].dup current_values = {} - if authdb_rules[resource[:name]] - current_values = authdb_rules[resource[:name]] - end + current_values = authdb_rules[resource[:name]] if authdb_rules[resource[:name]] specified_values = convert_plist_to_native_attributes(@property_hash) new_values = current_values.merge(specified_values) set_rule(resource[:name], new_values) @@ -254,9 +248,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe def retrieve_value(resource_name, attribute) # We set boolean values to symbols when retrieving values - if not self.class.parsed_auth_db.has_key?(resource_name) - raise Puppet::Error.new("Cannot find #{resource_name} in auth db") - end + raise Puppet::Error.new("Cannot find #{resource_name} in auth db") if not self.class.parsed_auth_db.has_key?(resource_name) if PuppetToNativeAttributeMap.has_key?(attribute) native_attribute = PuppetToNativeAttributeMap[attribute] diff --git a/lib/puppet/provider/maillist/mailman.rb b/lib/puppet/provider/maillist/mailman.rb index 5e60b20f1..cfb788b31 100755 --- a/lib/puppet/provider/maillist/mailman.rb +++ b/lib/puppet/provider/maillist/mailman.rb @@ -1,7 +1,7 @@ require 'puppet/provider/parsedfile' Puppet::Type.type(:maillist).provide(:mailman) do - if [ "CentOS", "RedHat", "Fedora" ].any? { |os| Facter.value(:operatingsystem) == os } then + if [ "CentOS", "RedHat", "Fedora" ].any? { |os| Facter.value(:operatingsystem) == os } commands :list_lists => "/usr/lib/mailman/bin/list_lists", :rmlist => "/usr/lib/mailman/bin/rmlist", :newlist => "/usr/lib/mailman/bin/newlist" commands :mailman => "/usr/lib/mailman/mail/mailman" else @@ -16,9 +16,7 @@ Puppet::Type.type(:maillist).provide(:mailman) do def self.instances list_lists.split("\n").reject { |line| line.include?("matching mailing lists") }.collect do |line| name, description = line.sub(/^\s+/, '').sub(/\s+$/, '').split(/\s+-\s+/) - if description.include?("no description available") - description = :absent - end + description = :absent if description.include?("no description available") new(:ensure => :present, :name => name, :description => description) end end @@ -69,9 +67,7 @@ Puppet::Type.type(:maillist).provide(:mailman) do # Delete the list. def destroy(purge = false) args = [] - if purge - args << "--archives" - end + args << "--archives" if purge args << self.name rmlist(*args) end @@ -90,9 +86,7 @@ Puppet::Type.type(:maillist).provide(:mailman) do def properties if @property_hash.empty? @property_hash = query || {:ensure => :absent} - if @property_hash.empty? - @property_hash[:ensure] = :absent - end + @property_hash[:ensure] = :absent if @property_hash.empty? end @property_hash.dup end diff --git a/lib/puppet/provider/mcx/mcxcontent.rb b/lib/puppet/provider/mcx/mcxcontent.rb index de60de15a..3a1deb5f3 100644 --- a/lib/puppet/provider/mcx/mcxcontent.rb +++ b/lib/puppet/provider/mcx/mcxcontent.rb @@ -140,15 +140,11 @@ Puppet::Type.type(:mcx).provide :mcxcontent, :parent => Puppet::Provider do # This is a private instance method, not a class method. def get_dsparams ds_type = resource[:ds_type] - if ds_type.nil? - ds_type = parse_type(resource[:name]) - end + ds_type = parse_type(resource[:name]) if ds_type.nil? raise MCXContentProviderException unless TypeMap.keys.include? ds_type.to_sym ds_name = resource[:ds_name] - if ds_name.nil? - ds_name = parse_name(resource[:name]) - end + ds_name = parse_name(resource[:name]) if ds_name.nil? rval = { :ds_type => ds_type.to_sym, diff --git a/lib/puppet/provider/mount.rb b/lib/puppet/provider/mount.rb index a63a0402c..86361969c 100644 --- a/lib/puppet/provider/mount.rb +++ b/lib/puppet/provider/mount.rb @@ -11,14 +11,10 @@ module Puppet::Provider::Mount # Manually pass the mount options in, since some OSes *cough*OS X*cough* don't # read from /etc/fstab but still want to use this type. args = [] - if self.options and self.options != :absent - args << "-o" << self.options - end + args << "-o" << self.options if self.options and self.options != :absent args << resource[:name] - if respond_to?(:flush) - flush - end + flush if respond_to?(:flush) mountcmd(*args) end diff --git a/lib/puppet/provider/nameservice.rb b/lib/puppet/provider/nameservice.rb index dace6b512..4a7c38bdb 100644 --- a/lib/puppet/provider/nameservice.rb +++ b/lib/puppet/provider/nameservice.rb @@ -44,9 +44,7 @@ class Puppet::Provider::NameService < Puppet::Provider end def options(name, hash) - unless resource_type.valid_parameter?(name) - raise Puppet::DevError, "#{name} is not a valid attribute for #{resource_type.name}" - end + raise Puppet::DevError, "#{name} is not a valid attribute for #{resource_type.name}" unless resource_type.valid_parameter?(name) @options ||= {} @options[name] ||= {} @@ -65,9 +63,7 @@ class Puppet::Provider::NameService < Puppet::Provider begin while ent = Etc.send("get#{section()}ent") names << ent.name - if block_given? - yield ent.name - end + yield ent.name if block_given? end ensure Etc.send("end#{section()}ent") @@ -80,12 +76,8 @@ class Puppet::Provider::NameService < Puppet::Provider super @resource_type.validproperties.each do |prop| next if prop == :ensure - unless public_method_defined?(prop) - define_method(prop) { get(prop) || :absent} - end - unless public_method_defined?(prop.to_s + "=") - define_method(prop.to_s + "=") { |*vals| set(prop, *vals) } - end + define_method(prop) { get(prop) || :absent} unless public_method_defined?(prop) + define_method(prop.to_s + "=") { |*vals| set(prop, *vals) } unless public_method_defined?(prop.to_s + "=") end end @@ -109,9 +101,7 @@ class Puppet::Provider::NameService < Puppet::Provider name = name.intern if name.is_a? String if @checks.include? name block = @checks[name][:block] - unless block.call(value) - raise ArgumentError, "Invalid value #{value}: #{@checks[name][:error]}" - end + raise ArgumentError, "Invalid value #{value}: #{@checks[name][:error]}" unless block.call(value) end end @@ -164,9 +154,7 @@ class Puppet::Provider::NameService < Puppet::Provider else Etc.send(group) { |obj| if obj.gid > highest - unless obj.send(method) > 65000 - highest = obj.send(method) - end + highest = obj.send(method) unless obj.send(method) > 65000 end } @@ -264,9 +252,7 @@ class Puppet::Provider::NameService < Puppet::Provider while group = Etc.getgrent members = group.mem - if members.include? user - groups << group.name - end + groups << group.name if members.include? user end # We have to close the file, so each listing is a separate @@ -281,9 +267,7 @@ class Puppet::Provider::NameService < Puppet::Provider hash = {} self.class.resource_type.validproperties.each do |param| method = posixmethod(param) - if info.respond_to? method - hash[param] = info.send(posixmethod(param)) - end + hash[param] = info.send(posixmethod(param)) if info.respond_to? method end return hash @@ -298,9 +282,7 @@ class Puppet::Provider::NameService < Puppet::Provider def set(param, value) self.class.validate(param, value) cmd = modifycmd(param, value) - unless cmd.is_a?(Array) - raise Puppet::DevError, "Nameservice command must be an array" - end + raise Puppet::DevError, "Nameservice command must be an array" unless cmd.is_a?(Array) begin execute(cmd) rescue Puppet::ExecutionFailure => detail diff --git a/lib/puppet/provider/nameservice/directoryservice.rb b/lib/puppet/provider/nameservice/directoryservice.rb index 251f496d5..5ee4d8e21 100644 --- a/lib/puppet/provider/nameservice/directoryservice.rb +++ b/lib/puppet/provider/nameservice/directoryservice.rb @@ -93,9 +93,7 @@ class DirectoryService < Puppet::Provider::NameService # For example, if we're working with an user type, this will be /Users # with a group type, this will be /Groups. # @ds_path is an attribute of the class itself. - if defined?(@ds_path) - return @ds_path - end + return @ds_path if defined?(@ds_path) # JJM: "Users" or "Groups" etc ... (Based on the Puppet::Type) # Remember this is a class method, so self.class is Class # Also, @resource_type seems to be the reference to the @@ -104,9 +102,7 @@ class DirectoryService < Puppet::Provider::NameService end def self.get_macosx_version_major - if defined?(@macosx_version_major) - return @macosx_version_major - end + return @macosx_version_major if defined?(@macosx_version_major) begin # Make sure we've loaded all of the facts Facter.loadfacts @@ -117,14 +113,10 @@ class DirectoryService < Puppet::Provider::NameService # TODO: remove this code chunk once we require Facter 1.5.5 or higher. Puppet.warning("DEPRECATION WARNING: Future versions of the directoryservice provider will require Facter 1.5.5 or newer.") product_version = Facter.value(:macosx_productversion) - if product_version.nil? - fail("Could not determine OS X version from Facter") - end + fail("Could not determine OS X version from Facter") if product_version.nil? product_version_major = product_version.scan(/(\d+)\.(\d+)./).join(".") end - if %w{10.0 10.1 10.2 10.3}.include?(product_version_major) - fail("#{product_version_major} is not supported by the directoryservice provider") - end + fail("#{product_version_major} is not supported by the directoryservice provider") if %w{10.0 10.1 10.2 10.3}.include?(product_version_major) @macosx_version_major = product_version_major return @macosx_version_major rescue Puppet::ExecutionFailure => detail @@ -215,9 +207,7 @@ class DirectoryService < Puppet::Provider::NameService # stored in the user record. It is stored at a path that involves the # UUID of the user record for non-Mobile local acccounts. # Mobile Accounts are out of scope for this provider for now - if @resource_type.validproperties.include?(:password) and Puppet.features.root? - attribute_hash[:password] = self.get_password(attribute_hash[:guid]) - end + attribute_hash[:password] = self.get_password(attribute_hash[:guid]) if @resource_type.validproperties.include?(:password) and Puppet.features.root? return attribute_hash end @@ -323,9 +313,7 @@ class DirectoryService < Puppet::Provider::NameService password_hash = nil password_hash_file = "#{@@password_hash_dir}/#{guid}" if File.exists?(password_hash_file) and File.file?(password_hash_file) - if not File.readable?(password_hash_file) - fail("Could not read password hash file at #{password_hash_file}") - end + fail("Could not read password hash file at #{password_hash_file}") if not File.readable?(password_hash_file) f = File.new(password_hash_file) password_hash = f.read f.close @@ -383,9 +371,7 @@ class DirectoryService < Puppet::Provider::NameService # If we are meant to be authoritative for the group membership # then remove all existing members who haven't been specified # in the manifest. - if @resource[:auth_membership] and not current_members.nil? - remove_unwanted_members(current_members, value) - end + remove_unwanted_members(current_members, value) if @resource[:auth_membership] and not current_members.nil? # if they're not a member, make them one. add_members(current_members, value) diff --git a/lib/puppet/provider/package.rb b/lib/puppet/provider/package.rb index f7ff7e55a..0ce6cca0a 100644 --- a/lib/puppet/provider/package.rb +++ b/lib/puppet/provider/package.rb @@ -20,9 +20,7 @@ class Puppet::Provider::Package < Puppet::Provider def properties if @property_hash.empty? @property_hash = query || {:ensure => :absent} - if @property_hash.empty? - @property_hash[:ensure] = :absent - end + @property_hash[:ensure] = :absent if @property_hash.empty? end @property_hash.dup end diff --git a/lib/puppet/provider/package/aix.rb b/lib/puppet/provider/package/aix.rb index 7523b776d..fd0cfdc7e 100644 --- a/lib/puppet/provider/package/aix.rb +++ b/lib/puppet/provider/package/aix.rb @@ -22,9 +22,7 @@ Puppet::Type.type(:package).provide :aix, :parent => Puppet::Provider::Package d end def self.prefetch(packages) - if Process.euid != 0 - raise Puppet::Error, "The aix provider can only be used by root" - end + raise Puppet::Error, "The aix provider can only be used by root" if Process.euid != 0 return unless packages.detect { |name, package| package.should(:ensure) == :latest } @@ -42,9 +40,7 @@ Puppet::Type.type(:package).provide :aix, :parent => Puppet::Provider::Package d if updates.key?(current[:name]) previous = updates[current[:name]] - unless Puppet::Util::Package.versioncmp(previous[:version], current[:version]) == 1 - updates[ current[:name] ] = current - end + updates[ current[:name] ] = current unless Puppet::Util::Package.versioncmp(previous[:version], current[:version]) == 1 else updates[current[:name]] = current @@ -73,9 +69,7 @@ Puppet::Type.type(:package).provide :aix, :parent => Puppet::Provider::Package d pkg = @resource[:name] - if (! @resource.should(:ensure).is_a? Symbol) and useversion - pkg << " #{@resource.should(:ensure)}" - end + pkg << " #{@resource.should(:ensure)}" if (! @resource.should(:ensure).is_a? Symbol) and useversion installp "-acgwXY", "-d", source, pkg end @@ -118,9 +112,7 @@ Puppet::Type.type(:package).provide :aix, :parent => Puppet::Provider::Package d unless upd.nil? return "#{upd[:version]}" else - if properties[:ensure] == :absent - raise Puppet::DevError, "Tried to get latest on a missing package" - end + raise Puppet::DevError, "Tried to get latest on a missing package" if properties[:ensure] == :absent return properties[:ensure] end diff --git a/lib/puppet/provider/package/apt.rb b/lib/puppet/provider/package/apt.rb index 622e182ea..afbff6237 100755 --- a/lib/puppet/provider/package/apt.rb +++ b/lib/puppet/provider/package/apt.rb @@ -42,9 +42,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do # Install a package using 'apt-get'. This function needs to support # installing a specific version. def install - if @resource[:responsefile] - self.run_preseed - end + self.run_preseed if @resource[:responsefile] should = @resource[:ensure] checkforcdrom() @@ -100,16 +98,12 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do end def uninstall - if @resource[:responsefile] - self.run_preseed - end + self.run_preseed if @resource[:responsefile] aptget "-y", "-q", :remove, @resource[:name] end def purge - if @resource[:responsefile] - self.run_preseed - end + self.run_preseed if @resource[:responsefile] aptget '-y', '-q', :remove, '--purge', @resource[:name] # workaround a "bug" in apt, that already removed packages are not purged super diff --git a/lib/puppet/provider/package/aptitude.rb b/lib/puppet/provider/package/aptitude.rb index 607f8c0dc..5529535de 100755 --- a/lib/puppet/provider/package/aptitude.rb +++ b/lib/puppet/provider/package/aptitude.rb @@ -11,9 +11,7 @@ Puppet::Type.type(:package).provide :aptitude, :parent => :apt, :source => :dpkg def aptget(*args) args.flatten! # Apparently aptitude hasn't always supported a -q flag. - if args.include?("-q") - args.delete("-q") - end + args.delete("-q") if args.include?("-q") output = aptitude(*args) # Yay, stupid aptitude doesn't throw an error when the package is missing. diff --git a/lib/puppet/provider/package/aptrpm.rb b/lib/puppet/provider/package/aptrpm.rb index a3ad3b447..42f7e706c 100644 --- a/lib/puppet/provider/package/aptrpm.rb +++ b/lib/puppet/provider/package/aptrpm.rb @@ -59,9 +59,7 @@ Puppet::Type.type(:package).provide :aptrpm, :parent => :rpm, :source => :rpm do if available_versions.length == 0 self.debug "No latest version" - if Puppet[:debug] - print output - end + print output if Puppet[:debug] end # Get the latest and greatest version number diff --git a/lib/puppet/provider/package/blastwave.rb b/lib/puppet/provider/package/blastwave.rb index ee1e8f73a..d1cfe6f2b 100755 --- a/lib/puppet/provider/package/blastwave.rb +++ b/lib/puppet/provider/package/blastwave.rb @@ -2,9 +2,7 @@ Puppet::Type.type(:package).provide :blastwave, :parent => :sun, :source => :sun do desc "Package management using Blastwave.org's ``pkg-get`` command on Solaris." pkgget = "pkg-get" - if FileTest.executable?("/opt/csw/bin/pkg-get") - pkgget = "/opt/csw/bin/pkg-get" - end + pkgget = "/opt/csw/bin/pkg-get" if FileTest.executable?("/opt/csw/bin/pkg-get") confine :operatingsystem => :solaris @@ -37,9 +35,7 @@ Puppet::Type.type(:package).provide :blastwave, :parent => :sun, :source => :sun def self.blastlist(hash) command = ["-c"] - if hash[:justme] - command << hash[:justme] - end + command << hash[:justme] if hash[:justme] output = Puppet::Util::Execution::withenv(:PAGER => "/usr/bin/cat") { pkgget command } @@ -74,9 +70,7 @@ Puppet::Type.type(:package).provide :blastwave, :parent => :sun, :source => :sun end hash[:avail] = $5 - if hash[:avail] == "SAME" - hash[:avail] = hash[:ensure] - end + hash[:avail] = hash[:ensure] if hash[:avail] == "SAME" # Use the name method, so it works with subclasses. hash[:provider] = self.name diff --git a/lib/puppet/provider/package/darwinport.rb b/lib/puppet/provider/package/darwinport.rb index 2153d2f83..4b9fdb462 100755 --- a/lib/puppet/provider/package/darwinport.rb +++ b/lib/puppet/provider/package/darwinport.rb @@ -56,9 +56,7 @@ Puppet::Type.type(:package).provide :darwinport, :parent => Puppet::Provider::Pa def query version = nil self.class.eachpkgashash do |hash| - if hash[:name] == @resource[:name] - return hash - end + return hash if hash[:name] == @resource[:name] end return nil diff --git a/lib/puppet/provider/package/dpkg.rb b/lib/puppet/provider/package/dpkg.rb index 3c3141b4f..77f7a61eb 100755 --- a/lib/puppet/provider/package/dpkg.rb +++ b/lib/puppet/provider/package/dpkg.rb @@ -52,9 +52,7 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package elsif ['config-files', 'half-installed', 'unpacked', 'half-configured'].include?(hash[:status]) hash[:ensure] = :absent end - if hash[:desired] == 'hold' - hash[:ensure] = :held - end + hash[:ensure] = :held if hash[:desired] == 'hold' else Puppet.warning "Failed to match dpkg-query line #{line.inspect}" return nil @@ -91,9 +89,7 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package def latest output = dpkg_deb "--show", @resource[:source] matches = /^(\S+)\t(\S+)$/.match(output).captures - unless matches[0].match( Regexp.escape(@resource[:name]) ) - warning "source doesn't contain named package, but #{matches[0]}" - end + warning "source doesn't contain named package, but #{matches[0]}" unless matches[0].match( Regexp.escape(@resource[:name]) ) matches[1] end diff --git a/lib/puppet/provider/package/fink.rb b/lib/puppet/provider/package/fink.rb index 3f0d79475..a7310b00a 100755 --- a/lib/puppet/provider/package/fink.rb +++ b/lib/puppet/provider/package/fink.rb @@ -22,9 +22,7 @@ Puppet::Type.type(:package).provide :fink, :parent => :dpkg, :source => :dpkg do # Install a package using 'apt-get'. This function needs to support # installing a specific version. def install - if @resource[:responsefile] - self.run_preseed - end + self.run_preseed if @resource[:responsefile] should = @resource.should(:ensure) str = @resource[:name] diff --git a/lib/puppet/provider/package/freebsd.rb b/lib/puppet/provider/package/freebsd.rb index 0c816cdb6..20ded987e 100755 --- a/lib/puppet/provider/package/freebsd.rb +++ b/lib/puppet/provider/package/freebsd.rb @@ -29,9 +29,7 @@ Puppet::Type.type(:package).provide :freebsd, :parent => :openbsd do end end else - if @resource[:source] - Puppet.warning "source is defined but does not have trailing slash, ignoring #{@resource[:source]}" - end + Puppet.warning "source is defined but does not have trailing slash, ignoring #{@resource[:source]}" if @resource[:source] pkgadd "-r", @resource[:name] end end diff --git a/lib/puppet/provider/package/gem.rb b/lib/puppet/provider/package/gem.rb index 1c345097f..53677a9c5 100755 --- a/lib/puppet/provider/package/gem.rb +++ b/lib/puppet/provider/package/gem.rb @@ -69,9 +69,7 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d def install(useversion = true) command = [command(:gemcmd), "install"] - if (! resource[:ensure].is_a? Symbol) and useversion - command << "-v" << resource[:ensure] - end + command << "-v" << resource[:ensure] if (! resource[:ensure].is_a? Symbol) and useversion # Always include dependencies command << "--include-dependencies" @@ -101,9 +99,7 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d output = execute(command) # Apparently some stupid gem versions don't exit non-0 on failure - if output.include?("ERROR") - self.fail "Could not install: #{output.chomp}" - end + self.fail "Could not install: #{output.chomp}" if output.include?("ERROR") end def latest diff --git a/lib/puppet/provider/package/nim.rb b/lib/puppet/provider/package/nim.rb index a798f338a..8b273767e 100644 --- a/lib/puppet/provider/package/nim.rb +++ b/lib/puppet/provider/package/nim.rb @@ -28,9 +28,7 @@ Puppet::Type.type(:package).provide :nim, :parent => :aix, :source => :aix do pkg = @resource[:name] - if (! @resource.should(:ensure).is_a? Symbol) and useversion - pkg << " " << @resource.should(:ensure) - end + pkg << " " << @resource.should(:ensure) if (! @resource.should(:ensure).is_a? Symbol) and useversion nimclient "-o", "cust", "-a", "installp_flags=acgwXY", "-a", "lpp_source=#{source}", "-a", "filesets='#{pkg}'" end diff --git a/lib/puppet/provider/package/openbsd.rb b/lib/puppet/provider/package/openbsd.rb index 149b557ae..f5f978056 100755 --- a/lib/puppet/provider/package/openbsd.rb +++ b/lib/puppet/provider/package/openbsd.rb @@ -65,9 +65,7 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa if @resource[:source] =~ /\/$/ withenv :PKG_PATH => @resource[:source] do - if (@resource[:ensure] = get_version) == nil - @resource[:ensure] = old_ensure - end + @resource[:ensure] = old_ensure if (@resource[:ensure] = get_version) == nil full_name = [ @resource[:name], @resource[:ensure], @resource[:flavor] ] pkgadd full_name.join('-').chomp('-') end diff --git a/lib/puppet/provider/package/pkg.rb b/lib/puppet/provider/package/pkg.rb index c0767a7f0..ab8429864 100644 --- a/lib/puppet/provider/package/pkg.rb +++ b/lib/puppet/provider/package/pkg.rb @@ -100,9 +100,7 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d hash = self.class.parse_line(output) || {:ensure => :absent, :status => 'missing', :name => @resource[:name], :error => 'ok'} - if hash[:error] != "ok" - raise Puppet::Error.new( "Package #{hash[:name]}, version #{hash[:version]} is in error state: #{hash[:error]}") - end + raise Puppet::Error.new( "Package #{hash[:name]}, version #{hash[:version]} is in error state: #{hash[:error]}") if hash[:error] != "ok" return hash end diff --git a/lib/puppet/provider/package/pkgdmg.rb b/lib/puppet/provider/package/pkgdmg.rb index ac4853d83..b533f1002 100644 --- a/lib/puppet/provider/package/pkgdmg.rb +++ b/lib/puppet/provider/package/pkgdmg.rb @@ -92,9 +92,7 @@ Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Packag File.open(cached_source) do |dmg| xml_str = hdiutil "mount", "-plist", "-nobrowse", "-readonly", "-noidme", "-mountrandom", "/tmp", dmg.path hdiutil_info = Plist::parse_xml(xml_str) - unless hdiutil_info.has_key?("system-entities") - raise Puppet::Error.new("No disk entities returned by mount at #{dmg.path}") - end + raise Puppet::Error.new("No disk entities returned by mount at #{dmg.path}") unless hdiutil_info.has_key?("system-entities") mounts = hdiutil_info["system-entities"].collect { |entity| entity["mount-point"] }.compact diff --git a/lib/puppet/provider/package/portage.rb b/lib/puppet/provider/package/portage.rb index 7e1119a1a..a8d071f41 100644 --- a/lib/puppet/provider/package/portage.rb +++ b/lib/puppet/provider/package/portage.rb @@ -20,9 +20,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa search_format = "<category> <name> [<installedversions:LASTVERSION>] [<bestversion:LASTVERSION>] <homepage> <description>\n" begin - if !FileUtils.uptodate?("/var/cache/eix", %w{/usr/bin/eix /usr/portage/metadata/timestamp}) - update_eix - end + update_eix if !FileUtils.uptodate?("/var/cache/eix", %w{/usr/bin/eix /usr/portage/metadata/timestamp}) search_output = nil Puppet::Util::Execution.withenv :LASTVERSION => version_format do @@ -83,9 +81,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa search_value = package_name begin - if !FileUtils.uptodate?("/var/cache/eix", %w{/usr/bin/eix /usr/portage/metadata/timestamp}) - update_eix - end + update_eix if !FileUtils.uptodate?("/var/cache/eix", %w{/usr/bin/eix /usr/portage/metadata/timestamp}) search_output = nil Puppet::Util::Execution.withenv :LASTVERSION => version_format do diff --git a/lib/puppet/provider/package/ports.rb b/lib/puppet/provider/package/ports.rb index 286aca8e1..4a925aa8d 100755 --- a/lib/puppet/provider/package/ports.rb +++ b/lib/puppet/provider/package/ports.rb @@ -10,9 +10,7 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :fre # I hate ports %w{INTERACTIVE UNAME}.each do |var| - if ENV.include?(var) - ENV.delete(var) - end + ENV.delete(var) if ENV.include?(var) end def install diff --git a/lib/puppet/provider/package/rpm.rb b/lib/puppet/provider/package/rpm.rb index 6d5adf2ef..abcfbd3b6 100755 --- a/lib/puppet/provider/package/rpm.rb +++ b/lib/puppet/provider/package/rpm.rb @@ -94,9 +94,7 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr end flag = "-i" - if @property_hash[:ensure] and @property_hash[:ensure] != :absent - flag = "-U" - end + flag = "-U" if @property_hash[:ensure] and @property_hash[:ensure] != :absent rpm flag, "--oldpackage", source end diff --git a/lib/puppet/provider/package/sun.rb b/lib/puppet/provider/package/sun.rb index f0a1c6ac5..2d4e1ac3f 100755 --- a/lib/puppet/provider/package/sun.rb +++ b/lib/puppet/provider/package/sun.rb @@ -50,9 +50,7 @@ Puppet::Type.type(:package).provide :sun, :parent => Puppet::Provider::Package d name = $1 value = $2 if names.include?(name) - unless names[name].nil? - hash[names[name]] = value - end + hash[names[name]] = value unless names[name].nil? end when /\s+\d+.+/ # nothing; we're ignoring the FILES info @@ -84,9 +82,7 @@ Puppet::Type.type(:package).provide :sun, :parent => Puppet::Provider::Package d hash = {} cmd = "#{command(:pkginfo)} -l" - if device - cmd += " -d #{device}" - end + cmd += " -d #{device}" if device cmd += " #{@resource[:name]}" begin @@ -101,9 +97,7 @@ Puppet::Type.type(:package).provide :sun, :parent => Puppet::Provider::Package d name = $1 value = $2 if names.include?(name) - unless names[name].nil? - hash[names[name]] = value - end + hash[names[name]] = value unless names[name].nil? end when /\s+\d+.+/ # nothing; we're ignoring the FILES info @@ -119,18 +113,12 @@ Puppet::Type.type(:package).provide :sun, :parent => Puppet::Provider::Package d end def install - unless @resource[:source] - raise Puppet::Error, "Sun packages must specify a package source" - end + raise Puppet::Error, "Sun packages must specify a package source" unless @resource[:source] cmd = [] - if @resource[:adminfile] - cmd << "-a" << @resource[:adminfile] - end + cmd << "-a" << @resource[:adminfile] if @resource[:adminfile] - if @resource[:responsefile] - cmd << "-r" << @resource[:responsefile] - end + cmd << "-r" << @resource[:responsefile] if @resource[:responsefile] cmd << "-d" << @resource[:source] cmd << "-n" << @resource[:name] @@ -151,9 +139,7 @@ Puppet::Type.type(:package).provide :sun, :parent => Puppet::Provider::Package d def uninstall command = ["-n"] - if @resource[:adminfile] - command << "-a" << @resource[:adminfile] - end + command << "-a" << @resource[:adminfile] if @resource[:adminfile] command << @resource[:name] pkgrm command @@ -162,9 +148,7 @@ Puppet::Type.type(:package).provide :sun, :parent => Puppet::Provider::Package d # Remove the old package, and install the new one. This will probably # often fail. def update - if (@property_hash[:ensure] || info2hash()[:ensure]) != :absent - self.uninstall - end + self.uninstall if (@property_hash[:ensure] || info2hash()[:ensure]) != :absent self.install end end diff --git a/lib/puppet/provider/package/yum.rb b/lib/puppet/provider/package/yum.rb index 4ff365de7..17981f03c 100755 --- a/lib/puppet/provider/package/yum.rb +++ b/lib/puppet/provider/package/yum.rb @@ -22,9 +22,7 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do defaultfor :operatingsystem => [:fedora, :centos, :redhat] def self.prefetch(packages) - if Process.euid != 0 - raise Puppet::Error, "The yum provider can only be used as root" - end + raise Puppet::Error, "The yum provider can only be used as root" if Process.euid != 0 super return unless packages.detect { |name, package| package.should(:ensure) == :latest } @@ -68,15 +66,11 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do output = yum "-d", "0", "-e", "0", "-y", :install, wanted is = self.query - unless is - raise Puppet::Error, "Could not find package #{self.name}" - end + raise Puppet::Error, "Could not find package #{self.name}" unless is # FIXME: Should we raise an exception even if should == :latest # and yum updated us to a version other than @param_hash[:ensure] ? - if should && should != is[:ensure] - raise Puppet::Error, "Failed to update to version #{should}, got version #{is[:ensure]} instead" - end + raise Puppet::Error, "Failed to update to version #{should}, got version #{is[:ensure]} instead" if should && should != is[:ensure] end # What's the latest package version available? @@ -89,9 +83,7 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do else # Yum didn't find updates, pretend the current # version is the latest - if properties[:ensure] == :absent - raise Puppet::DevError, "Tried to get latest on a missing package" - end + raise Puppet::DevError, "Tried to get latest on a missing package" if properties[:ensure] == :absent return properties[:ensure] end end diff --git a/lib/puppet/provider/parsedfile.rb b/lib/puppet/provider/parsedfile.rb index e4d1e95f3..65842a28b 100755 --- a/lib/puppet/provider/parsedfile.rb +++ b/lib/puppet/provider/parsedfile.rb @@ -22,9 +22,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider def self.clean(hash) newhash = hash.dup [:record_type, :on_disk].each do |p| - if newhash.include?(p) - newhash.delete(p) - end + newhash.delete(p) if newhash.include?(p) end return newhash @@ -36,9 +34,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider end def self.filetype - unless defined?(@filetype) - @filetype = Puppet::Util::FileType.filetype(:flat) - end + @filetype = Puppet::Util::FileType.filetype(:flat) unless defined?(@filetype) return @filetype end @@ -83,9 +79,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider def self.backup_target(target) return nil unless target_object(target).respond_to?(:backup) - unless defined?(@backup_stats) - @backup_stats = {} - end + @backup_stats = {} unless defined?(@backup_stats) return nil if @backup_stats[target] == @records.object_id target_object(target).backup @@ -229,13 +223,9 @@ class Puppet::Provider::ParsedFile < Puppet::Provider r[:ensure] = :present end - if respond_to?(:prefetch_hook) - target_records = prefetch_hook(target_records) - end + target_records = prefetch_hook(target_records) if respond_to?(:prefetch_hook) - unless target_records - raise Puppet::DevError, "Prefetching #{target} for provider #{self.name} returned nil" - end + raise Puppet::DevError, "Prefetching #{target} for provider #{self.name} returned nil" unless target_records target_records end @@ -292,9 +282,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider def self.targets(resources = nil) targets = [] # First get the default target - unless self.default_target - raise Puppet::DevError, "Parsed Providers must define a default target" - end + raise Puppet::DevError, "Parsed Providers must define a default target" unless self.default_target targets << self.default_target # Then get each of the file objects @@ -364,16 +352,12 @@ class Puppet::Provider::ParsedFile < Puppet::Provider # The 'record' could be a resource or a record, depending on how the provider # is initialized. If we got an empty property hash (probably because the resource # is just being initialized), then we want to set up some defualts. - if @property_hash.empty? - @property_hash = self.class.record?(resource[:name]) || {:record_type => self.class.name, :ensure => :absent} - end + @property_hash = self.class.record?(resource[:name]) || {:record_type => self.class.name, :ensure => :absent} if @property_hash.empty? end # Retrieve the current state from disk. def prefetch - unless @resource - raise Puppet::DevError, "Somehow got told to prefetch with no resource set" - end + raise Puppet::DevError, "Somehow got told to prefetch with no resource set" unless @resource self.class.prefetch(@resource[:name] => @resource) end @@ -388,8 +372,6 @@ class Puppet::Provider::ParsedFile < Puppet::Provider if defined?(@resource) and restarget = @resource.should(:target) and restarget != @property_hash[:target] self.class.modified(restarget) end - if @property_hash[:target] != :absent and @property_hash[:target] - self.class.modified(@property_hash[:target]) - end + self.class.modified(@property_hash[:target]) if @property_hash[:target] != :absent and @property_hash[:target] end end diff --git a/lib/puppet/provider/selboolean/getsetsebool.rb b/lib/puppet/provider/selboolean/getsetsebool.rb index 940ce3b70..21604efd4 100644 --- a/lib/puppet/provider/selboolean/getsetsebool.rb +++ b/lib/puppet/provider/selboolean/getsetsebool.rb @@ -9,7 +9,7 @@ Puppet::Type.type(:selboolean).provide(:getsetsebool) do status = getsebool(@resource[:name]) - if status =~ / off$/ then + if status =~ / off$/ return :off elsif status =~ / on$/ then return :on diff --git a/lib/puppet/provider/selmodule/semodule.rb b/lib/puppet/provider/selmodule/semodule.rb index 2f2416b4b..2f88d3dfe 100644 --- a/lib/puppet/provider/selmodule/semodule.rb +++ b/lib/puppet/provider/selmodule/semodule.rb @@ -39,7 +39,7 @@ Puppet::Type.type(:selmodule).provide(:semodule) do if(loadver) then filever = selmodversion_file - if (filever == loadver) then + if (filever == loadver) return :true end end @@ -89,13 +89,9 @@ Puppet::Type.type(:selmodule).provide(:semodule) do (hdr, ver, numsec) = mod.read(12).unpack('LLL') - if hdr != magic - raise Puppet::Error, "Found #{hdr} instead of magic #{magic} in #{filename}" - end + raise Puppet::Error, "Found #{hdr} instead of magic #{magic} in #{filename}" if hdr != magic - if ver != 1 - raise Puppet::Error, "Unknown policy file version #{ver} in #{filename}" - end + raise Puppet::Error, "Unknown policy file version #{ver} in #{filename}" if ver != 1 # Read through (and throw away) the file section offsets, and also # the magic header for the first section. @@ -129,7 +125,7 @@ Puppet::Type.type(:selmodule).provide(:semodule) do lines.each do |line| line.chomp! bits = line.split - if bits[0] == @resource[:name] then + if bits[0] == @resource[:name] self.debug "load version #{bits[1]}" return bits[1] end diff --git a/lib/puppet/provider/service/base.rb b/lib/puppet/provider/service/base.rb index 7428f266c..42f2ea01c 100755 --- a/lib/puppet/provider/service/base.rb +++ b/lib/puppet/provider/service/base.rb @@ -18,13 +18,9 @@ Puppet::Type.type(:service).provide :base do # Get the process ID for a running process. Requires the 'pattern' # parameter. def getpid - unless @resource[:pattern] - @resource.fail "Either stop/status commands or a pattern must be specified" - end + @resource.fail "Either stop/status commands or a pattern must be specified" unless @resource[:pattern] ps = Facter["ps"].value - unless ps and ps != "" - @resource.fail "You must upgrade Facter to a version that includes 'ps'" - end + @resource.fail "You must upgrade Facter to a version that includes 'ps'" unless ps and ps != "" regex = Regexp.new(@resource[:pattern]) self.debug "Executing '#{ps}'" IO.popen(ps) { |table| diff --git a/lib/puppet/provider/service/bsd.rb b/lib/puppet/provider/service/bsd.rb index fed65591d..814dbd340 100644 --- a/lib/puppet/provider/service/bsd.rb +++ b/lib/puppet/provider/service/bsd.rb @@ -17,17 +17,13 @@ Puppet::Type.type(:service).provide :bsd, :parent => :init do # remove service file from rc.conf.d to disable it def disable rcfile = File.join(@@rcconf_dir, @model[:name]) - if File.exists?(rcfile) - File.delete(rcfile) - end + File.delete(rcfile) if File.exists?(rcfile) end # if the service file exists in rc.conf.d then it's already enabled def enabled? rcfile = File.join(@@rcconf_dir, @model[:name]) - if File.exists?(rcfile) - return :true - end + return :true if File.exists?(rcfile) return :false end @@ -35,9 +31,7 @@ Puppet::Type.type(:service).provide :bsd, :parent => :init do # enable service by creating a service file under rc.conf.d with the # proper contents def enable - if not File.exists?(@@rcconf_dir) - Dir.mkdir(@@rcconf_dir) - end + Dir.mkdir(@@rcconf_dir) if not File.exists?(@@rcconf_dir) rcfile = File.join(@@rcconf_dir, @model[:name]) open(rcfile, 'w') { |f| f << "%s_enable=\"YES\"\n" % @model[:name] } end diff --git a/lib/puppet/provider/service/freebsd.rb b/lib/puppet/provider/service/freebsd.rb index 32f8abb7c..05383a998 100644 --- a/lib/puppet/provider/service/freebsd.rb +++ b/lib/puppet/provider/service/freebsd.rb @@ -56,9 +56,7 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do service = self.service_name rcvar = self.rcvar_name self.debug("Editing rc files: setting #{rcvar} to #{yesno} for #{service}") - if not self.rc_replace(service, rcvar, yesno) - self.rc_add(service, rcvar, yesno) - end + self.rc_add(service, rcvar, yesno) if not self.rc_replace(service, rcvar, yesno) end # Try to find an existing setting in the rc files @@ -106,7 +104,7 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do end def enabled? - if /YES$/ =~ self.rcvar_value then + if /YES$/ =~ self.rcvar_value self.debug("Is enabled") return :true end diff --git a/lib/puppet/provider/service/init.rb b/lib/puppet/provider/service/init.rb index d5dc21477..17d3bad36 100755 --- a/lib/puppet/provider/service/init.rb +++ b/lib/puppet/provider/service/init.rb @@ -42,9 +42,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do check = [:ensure] - if public_method_defined? :enabled? - check << :enable - end + check << :enable if public_method_defined? :enabled? Dir.entries(path).each do |name| fullpath = File.join(path, name) diff --git a/lib/puppet/provider/service/launchd.rb b/lib/puppet/provider/service/launchd.rb index 635c30b49..1813f2cfb 100644 --- a/lib/puppet/provider/service/launchd.rb +++ b/lib/puppet/provider/service/launchd.rb @@ -75,9 +75,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do end # if we didn't find the job above and we should have, error. - if label - raise Puppet::Error.new("Unable to find launchd plist for job: #{label}") - end + raise Puppet::Error.new("Unable to find launchd plist for job: #{label}") if label # if returning all jobs label_to_path_map end @@ -92,9 +90,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do def self.get_macosx_version_major - if defined?(@macosx_version_major) - return @macosx_version_major - end + return @macosx_version_major if defined?(@macosx_version_major) begin # Make sure we've loaded all of the facts Facter.loadfacts @@ -105,14 +101,10 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do # TODO: remove this code chunk once we require Facter 1.5.5 or higher. Puppet.warning("DEPRECATION WARNING: Future versions of the launchd provider will require Facter 1.5.5 or newer.") product_version = Facter.value(:macosx_productversion) - if product_version.nil? - fail("Could not determine OS X version from Facter") - end + fail("Could not determine OS X version from Facter") if product_version.nil? product_version_major = product_version.scan(/(\d+)\.(\d+)./).join(".") end - if %w{10.0 10.1 10.2 10.3}.include?(product_version_major) - fail("#{product_version_major} is not supported by the launchd provider") - end + fail("#{product_version_major} is not supported by the launchd provider") if %w{10.0 10.1 10.2 10.3}.include?(product_version_major) @macosx_version_major = product_version_major return @macosx_version_major rescue Puppet::ExecutionFailure => detail @@ -127,9 +119,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do job = self.class.jobsearch(label) job_path = job[label] job_plist = Plist::parse_xml(job_path) - if not job_plist - raise Puppet::Error.new("Unable to parse launchd plist at path: #{job_path}") - end + raise Puppet::Error.new("Unable to parse launchd plist at path: #{job_path}") if not job_plist [job_path, job_plist] end @@ -142,9 +132,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do # between 10.4 and 10.5, thus the necessity for splitting begin output = launchctl :list - if output.nil? - raise Puppet::Error.new("launchctl list failed to return any data.") - end + raise Puppet::Error.new("launchctl list failed to return any data.") if output.nil? output.split("\n").each do |j| return :running if j.split(/\s/).last == resource[:name] end @@ -174,9 +162,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do raise Puppet::Error.new("Unable to start service: #{resource[:name]} at path: #{job_path}") end # As load -w clears the Disabled flag, we need to add it in after - if did_enable_job and resource[:enable] == :false - self.disable - end + self.disable if did_enable_job and resource[:enable] == :false end @@ -196,9 +182,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do raise Puppet::Error.new("Unable to stop service: #{resource[:name]} at path: #{job_path}") end # As unload -w sets the Disabled flag, we need to add it in after - if did_disable_job and resource[:enable] == :true - self.enable - end + self.enable if did_disable_job and resource[:enable] == :true end @@ -213,18 +197,14 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do overrides_disabled = nil job_path, job_plist = plist_from_label(resource[:name]) - if job_plist.has_key?("Disabled") - job_plist_disabled = job_plist["Disabled"] - end + job_plist_disabled = job_plist["Disabled"] if job_plist.has_key?("Disabled") if self.class.get_macosx_version_major == "10.6": overrides = Plist::parse_xml(Launchd_Overrides) unless overrides.nil? if overrides.has_key?(resource[:name]) - if overrides[resource[:name]].has_key?("Disabled") - overrides_disabled = overrides[resource[:name]]["Disabled"] - end + overrides_disabled = overrides[resource[:name]]["Disabled"] if overrides[resource[:name]].has_key?("Disabled") end end end diff --git a/lib/puppet/provider/user/ldap.rb b/lib/puppet/provider/user/ldap.rb index 888d3bfd7..03fa0d376 100644 --- a/lib/puppet/provider/user/ldap.rb +++ b/lib/puppet/provider/user/ldap.rb @@ -39,9 +39,7 @@ Puppet::Type.type(:user).provide :ldap, :parent => Puppet::Provider::Ldap do existing.each do |hash| next unless value = hash[:uid] num = value[0].to_i - if num > largest - largest = num - end + largest = num if num > largest end end largest + 1 @@ -49,9 +47,7 @@ Puppet::Type.type(:user).provide :ldap, :parent => Puppet::Provider::Ldap do # Convert our gid to a group name, if necessary. def gid=(value) - unless [Fixnum, Bignum].include?(value.class) - value = group2id(value) - end + value = group2id(value) unless [Fixnum, Bignum].include?(value.class) @property_hash[:gid] = value end diff --git a/lib/puppet/provider/user/pw.rb b/lib/puppet/provider/user/pw.rb index a2fb52fa8..cee136ec8 100644 --- a/lib/puppet/provider/user/pw.rb +++ b/lib/puppet/provider/user/pw.rb @@ -31,13 +31,9 @@ Puppet::Type.type(:user).provide :pw, :parent => Puppet::Provider::NameService:: end end - if @resource.allowdupe? - cmd << "-o" - end + cmd << "-o" if @resource.allowdupe? - if @resource.managehome? - cmd << "-m" - end + cmd << "-m" if @resource.managehome? return cmd end diff --git a/lib/puppet/provider/user/user_role_add.rb b/lib/puppet/provider/user/user_role_add.rb index 126b95e95..880a18b66 100644 --- a/lib/puppet/provider/user/user_role_add.rb +++ b/lib/puppet/provider/user/user_role_add.rb @@ -53,9 +53,7 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source => end def command(cmd) - if is_role? or (!exists? and @resource[:ensure] == :role) - cmd = ("role_#{cmd}").intern - end + cmd = ("role_#{cmd}").intern if is_role? or (!exists? and @resource[:ensure] == :role) super(cmd) end @@ -85,9 +83,7 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source => run(addcmd, "create") end # added to handle case when password is specified - if @resource[:password] - self.password = @resource[:password] - end + self.password = @resource[:password] if @resource[:password] end def destroy @@ -103,27 +99,19 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source => end def roles - if user_attributes - user_attributes[:roles] - end + user_attributes[:roles] if user_attributes end def auths - if user_attributes - user_attributes[:auths] - end + user_attributes[:auths] if user_attributes end def profiles - if user_attributes - user_attributes[:profiles] - end + user_attributes[:profiles] if user_attributes end def project - if user_attributes - user_attributes[:project] - end + user_attributes[:project] if user_attributes end def managed_attributes @@ -170,7 +158,7 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source => begin File.open("/etc/shadow", "r") do |shadow| File.open("/etc/shadow_tmp", "w", 0600) do |shadow_tmp| - while line = shadow.gets do + while line = shadow.gets line_arr = line.split(':') if line_arr[0] == @resource[:name] line_arr[1] = cryptopw diff --git a/lib/puppet/provider/user/useradd.rb b/lib/puppet/provider/user/useradd.rb index fc5eabcbc..e6c9aa5f4 100644 --- a/lib/puppet/provider/user/useradd.rb +++ b/lib/puppet/provider/user/useradd.rb @@ -19,9 +19,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ has_features :manages_homedir, :allows_duplicates - if Puppet.features.libshadow? - has_feature :manages_passwords - end + has_feature :manages_passwords if Puppet.features.libshadow? def check_allow_dup @resource.allowdupe? ? ["-o"] : [] diff --git a/lib/puppet/provider/zone/solaris.rb b/lib/puppet/provider/zone/solaris.rb index a5345e457..e35db6f56 100644 --- a/lib/puppet/provider/zone/solaris.rb +++ b/lib/puppet/provider/zone/solaris.rb @@ -17,9 +17,7 @@ Puppet::Type.type(:zone).provide(:solaris) do } # Configured but not installed zones do not have IDs - if properties[:id] == "-" - properties.delete(:id) - end + properties.delete(:id) if properties[:id] == "-" properties[:ensure] = symbolize(properties[:ensure]) @@ -42,9 +40,7 @@ Puppet::Type.type(:zone).provide(:solaris) do # Then perform all of our configuration steps. It's annoying # that we need this much internal info on the resource. @resource.send(:properties).each do |property| - if property.is_a? ZoneConfigProperty and ! property.insync?(properties[property.name]) - str += property.configtext + "\n" - end + str += property.configtext + "\n" if property.is_a? ZoneConfigProperty and ! property.insync?(properties[property.name]) end str += "commit\n" @@ -121,9 +117,7 @@ Puppet::Type.type(:zone).provide(:solaris) do hash[$1.intern] = $2 when /^\s+(\S+):\s*(.+)$/ if name - unless hash.include? name - hash[name] = [] - end + hash[name] = [] unless hash.include? name unless current current = {} @@ -171,9 +165,7 @@ Puppet::Type.type(:zone).provide(:solaris) do f.puts cfg end rescue => detail - if Puppet[:debug] - puts detail.stacktrace - end + puts detail.stacktrace if Puppet[:debug] raise Puppet::Error, "Could not create sysidcfg: #{detail}" end end diff --git a/lib/puppet/provider/zpool/solaris.rb b/lib/puppet/provider/zpool/solaris.rb index a54af3df8..bfd37085a 100644 --- a/lib/puppet/provider/zpool/solaris.rb +++ b/lib/puppet/provider/zpool/solaris.rb @@ -46,9 +46,7 @@ Puppet::Type.type(:zpool).provide(:solaris) do end def current_pool - unless (defined?(@current_pool) and @current_pool) - @current_pool = process_zpool_data(get_pool_data) - end + @current_pool = process_zpool_data(get_pool_data) unless (defined?(@current_pool) and @current_pool) @current_pool end |