From 5d4ea142ad263dd800cd3cf1d441c8af3b303695 Mon Sep 17 00:00:00 2001 From: Michael Hashizume Date: Mon, 11 Dec 2023 16:04:46 -0800 Subject: [PATCH] Naming/PredicateName This commit addresses the Rubocop Naming/PredicateName cop by either exempting public methods with predicate names or renaming private methods. --- .rubocop.yml | 10 ++++++ .rubocop_todo.yml | 8 ----- lib/hiera/puppet_function.rb | 2 +- lib/puppet/datatypes.rb | 6 ++-- lib/puppet/face/help.rb | 2 +- lib/puppet/feature/base.rb | 2 +- lib/puppet/functions/defined.rb | 3 +- lib/puppet/generate/models/type/property.rb | 2 +- lib/puppet/graph/rb_tree_map.rb | 2 +- lib/puppet/interface/option.rb | 2 +- lib/puppet/module/plan.rb | 5 +-- lib/puppet/module_tool.rb | 2 +- lib/puppet/node.rb | 2 +- lib/puppet/pal/catalog_compiler.rb | 2 +- lib/puppet/pal/compiler.rb | 2 +- lib/puppet/parameter.rb | 2 ++ lib/puppet/parser/ast/pops_bridge.rb | 12 +++---- lib/puppet/parser/scope.rb | 12 +++---- lib/puppet/parser/templatewrapper.rb | 2 +- lib/puppet/pops/evaluator/access_operator.rb | 4 +-- lib/puppet/pops/evaluator/evaluator_impl.rb | 13 ++++---- lib/puppet/pops/evaluator/runtime3_support.rb | 4 +-- lib/puppet/pops/loader/loader_paths.rb | 2 +- .../pops/lookup/global_data_provider.rb | 2 +- lib/puppet/pops/lookup/hiera_config.rb | 6 ++-- lib/puppet/pops/lookup/lookup_adapter.rb | 4 +-- lib/puppet/pops/model/ast_transformer.rb | 4 +-- lib/puppet/pops/model/factory.rb | 2 +- lib/puppet/pops/model/model_tree_dumper.rb | 2 +- lib/puppet/pops/model/pn_transformer.rb | 2 +- lib/puppet/pops/model/tree_dumper.rb | 2 +- lib/puppet/pops/types/string_converter.rb | 16 +++++----- lib/puppet/pops/types/tree_iterators.rb | 8 ++--- lib/puppet/pops/types/type_factory.rb | 2 +- lib/puppet/pops/types/type_formatter.rb | 4 +-- lib/puppet/pops/types/types.rb | 5 +-- lib/puppet/pops/utils.rb | 4 +-- lib/puppet/pops/validation/checker4_0.rb | 6 ++-- lib/puppet/property.rb | 2 +- lib/puppet/property/keyvalue.rb | 2 +- lib/puppet/property/list.rb | 2 +- lib/puppet/provider/nameservice.rb | 2 ++ lib/puppet/provider/service/init.rb | 4 +-- lib/puppet/provider/service/upstart.rb | 20 ++++++------ lib/puppet/provider/user/pw.rb | 2 ++ lib/puppet/provider/user/user_role_add.rb | 4 ++- lib/puppet/provider/user/useradd.rb | 2 ++ lib/puppet/settings/base_setting.rb | 2 +- lib/puppet/settings/config_file.rb | 2 +- lib/puppet/transaction/report.rb | 4 +-- lib/puppet/type/file/group.rb | 2 +- lib/puppet/type/file/mode.rb | 2 +- lib/puppet/type/file/owner.rb | 2 +- lib/puppet/type/group.rb | 2 +- lib/puppet/type/package.rb | 2 +- lib/puppet/util/logging.rb | 6 ++-- lib/puppet/util/rubygems.rb | 4 +-- spec/unit/provider/service/upstart_spec.rb | 32 +++++++++---------- spec/unit/util/rubygems_spec.rb | 4 +-- 59 files changed, 146 insertions(+), 130 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 2e8149478f9..bec3e02f071 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -113,6 +113,16 @@ Naming/MethodName: Naming/MethodParameterName: Enabled: false +# Exclude public methods to avoid breaking changes +Naming/PredicateName: + Exclude: + - 'lib/puppet/module.rb' + - 'lib/puppet/module/task.rb' + - 'lib/puppet/parser/scope.rb' + - 'lib/puppet/pops/types/type_calculator.rb' + - 'lib/puppet/provider.rb' + - 'lib/puppet/util/rdoc/code_objects.rb' + Naming/RescuedExceptionsVariableName: Enabled: false diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index a70b0feb6a4..93175b15b16 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -643,14 +643,6 @@ Lint/ToJSON: Lint/UnusedMethodArgument: Enabled: false -# Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros. -# NamePrefix: is_, has_, have_ -# ForbiddenPrefixes: is_, has_, have_ -# AllowedMethods: is_a? -# MethodDefinitionMacros: define_method, define_singleton_method -Naming/PredicateName: - Enabled: false - # Configuration parameters: EnforcedStyle, AllowModifiersOnSymbols. # SupportedStyles: inline, group Style/AccessModifierDeclarations: diff --git a/lib/hiera/puppet_function.rb b/lib/hiera/puppet_function.rb index 29ee5d422cb..342672b0934 100644 --- a/lib/hiera/puppet_function.rb +++ b/lib/hiera/puppet_function.rb @@ -70,7 +70,7 @@ def lookup(scope, key, default, has_default, override, &default_block) lookup_invocation = Puppet::Pops::Lookup::Invocation.new(scope, {}, {}) adapter = lookup_invocation.lookup_adapter lookup_invocation.set_hiera_xxx_call - lookup_invocation.set_global_only unless adapter.global_only? || adapter.has_environment_data_provider?(lookup_invocation) + lookup_invocation.set_global_only unless adapter.global_only? || adapter.environment_data_provider?(lookup_invocation) lookup_invocation.set_hiera_v3_location_overrides(override) unless override.nil? || override.is_a?(Array) && override.empty? Puppet::Pops::Lookup.lookup(key, nil, default, has_default, merge_type, lookup_invocation, &default_block) end diff --git a/lib/puppet/datatypes.rb b/lib/puppet/datatypes.rb index 2cc008dfdf1..d508f6dffc0 100644 --- a/lib/puppet/datatypes.rb +++ b/lib/puppet/datatypes.rb @@ -179,7 +179,7 @@ def self._pcore_type created_type end - def has_implementation? + def implementation? !(@implementation_class.nil? && @implementation.nil?) end end @@ -198,12 +198,12 @@ def interface(type_string) end def implementation(&block) - raise ArgumentError, _('a data type can only have one implementation') if @type_builder.has_implementation? + raise ArgumentError, _('a data type can only have one implementation') if @type_builder.implementation? @type_builder.implementation = block end def implementation_class(ruby_class) - raise ArgumentError, _('a data type can only have one implementation') if @type_builder.has_implementation? + raise ArgumentError, _('a data type can only have one implementation') if @type_builder.implementation? @type_builder.implementation_class = ruby_class end diff --git a/lib/puppet/face/help.rb b/lib/puppet/face/help.rb index 0d5d6ac6563..a2afa6ef63d 100644 --- a/lib/puppet/face/help.rb +++ b/lib/puppet/face/help.rb @@ -230,7 +230,7 @@ def exclude_from_docs?(appname) # See #14205. #private :exclude_from_docs? - def is_face_app?(appname) + def is_face_app?(appname) # rubocop:disable Naming/PredicateName clazz = Puppet::Application.find(appname) clazz.ancestors.include?(Puppet::Application::FaceBase) diff --git a/lib/puppet/feature/base.rb b/lib/puppet/feature/base.rb index 2c1fefab05c..d8f1647148f 100644 --- a/lib/puppet/feature/base.rb +++ b/lib/puppet/feature/base.rb @@ -57,7 +57,7 @@ module WindowsSymlink require 'ffi' extend FFI::Library - def self.is_implemented + def self.is_implemented # rubocop:disable Naming/PredicateName begin ffi_lib :kernel32 attach_function :CreateSymbolicLinkW, [:lpwstr, :lpwstr, :dword], :boolean diff --git a/lib/puppet/functions/defined.rb b/lib/puppet/functions/defined.rb index 9107cece067..f5270938f62 100644 --- a/lib/puppet/functions/defined.rb +++ b/lib/puppet/functions/defined.rb @@ -107,7 +107,8 @@ required_repeated_param 'Variant[String, Type[CatalogEntry], Type[Type[CatalogEntry]]]', :vals end - def is_defined(scope, *vals) + + def is_defined(scope, *vals) # rubocop:disable Naming/PredicateName vals.any? do |val| case val when String diff --git a/lib/puppet/generate/models/type/property.rb b/lib/puppet/generate/models/type/property.rb index 828fe62ab21..9a3ecbc881f 100644 --- a/lib/puppet/generate/models/type/property.rb +++ b/lib/puppet/generate/models/type/property.rb @@ -26,7 +26,7 @@ def initialize(property) # Determines if this property is a namevar. # @return [Boolean] Returns true if the property is a namevar or false if not. - def is_namevar? + def is_namevar? # rubocop:disable Naming/PredicateName @is_namevar end diff --git a/lib/puppet/graph/rb_tree_map.rb b/lib/puppet/graph/rb_tree_map.rb index 7fc69c6ef87..8344590134d 100644 --- a/lib/puppet/graph/rb_tree_map.rb +++ b/lib/puppet/graph/rb_tree_map.rb @@ -67,7 +67,7 @@ def push(key, value) # map.push("GA", "Georgia") # map.has_key?("GA") #=> true # map.has_key?("DE") #=> false - def has_key?(key) + def has_key?(key) # rubocop:disable Naming/PredicateName !get_recursive(@root, key).nil? end diff --git a/lib/puppet/interface/option.rb b/lib/puppet/interface/option.rb index 43a5e7c95af..4d9a69cce9b 100644 --- a/lib/puppet/interface/option.rb +++ b/lib/puppet/interface/option.rb @@ -113,7 +113,7 @@ def required? !!@required end - def has_default? + def has_default? # rubocop:disable Naming/PredicateName !!@default end diff --git a/lib/puppet/module/plan.rb b/lib/puppet/module/plan.rb index 2045ce20117..c41c8ba30f7 100644 --- a/lib/puppet/module/plan.rb +++ b/lib/puppet/module/plan.rb @@ -52,13 +52,14 @@ def initialize(plan_name, module_name) callable data default enum float hash integer numeric optional pattern resource runtime scalar string struct tuple type undef variant} - def self.is_plan_name?(name) + + def self.is_plan_name?(name) # rubocop:disable Naming/PredicateName return true if name =~ /^[a-z][a-z0-9_]*$/ return false end # Determine whether a plan file has a legal name and extension - def self.is_plans_filename?(path) + def self.is_plans_filename?(path) # rubocop:disable Naming/PredicateName name = File.basename(path, '.*') ext = File.extname(path) return [false, _("Plan names must start with a lowercase letter and be composed of only lowercase letters, numbers, and underscores")] unless is_plan_name?(name) diff --git a/lib/puppet/module_tool.rb b/lib/puppet/module_tool.rb index 2153760904a..72816981871 100644 --- a/lib/puppet/module_tool.rb +++ b/lib/puppet/module_tool.rb @@ -61,7 +61,7 @@ def self.find_module_root(path) # # @param path [Pathname, String] path to analyse # @return [Boolean] true if the path is a module root, false otherwise - def self.is_module_root?(path) + def self.is_module_root?(path) # rubocop:disable Naming/PredicateName path = Pathname.new(path) if path.class == String FileTest.file?(path + 'metadata.json') diff --git a/lib/puppet/node.rb b/lib/puppet/node.rb index e47346c17f9..0e57c891d6f 100644 --- a/lib/puppet/node.rb +++ b/lib/puppet/node.rb @@ -94,7 +94,7 @@ def environment=(env) end end - def has_environment_instance? + def has_environment_instance? # rubocop:disable Naming/PredicateName !@environment.nil? end diff --git a/lib/puppet/pal/catalog_compiler.rb b/lib/puppet/pal/catalog_compiler.rb index 1cdce5347fc..5248ee26d11 100644 --- a/lib/puppet/pal/catalog_compiler.rb +++ b/lib/puppet/pal/catalog_compiler.rb @@ -20,7 +20,7 @@ def catalog # This implementation returns `true` # @return [Boolean] true # @api public - def has_catalog? + def has_catalog? # rubocop:disable Naming/PredicateName true end diff --git a/lib/puppet/pal/compiler.rb b/lib/puppet/pal/compiler.rb index 59c42dbc48e..b3dee6999de 100644 --- a/lib/puppet/pal/compiler.rb +++ b/lib/puppet/pal/compiler.rb @@ -197,7 +197,7 @@ def create(data_type, *arguments) # Returns true if this is a compiler that compiles a catalog. # This implementation returns `false` # @return Boolan false - def has_catalog? + def has_catalog? # rubocop:disable Naming/PredicateName false end diff --git a/lib/puppet/parameter.rb b/lib/puppet/parameter.rb index 8e6761da5af..0d6dec65d00 100644 --- a/lib/puppet/parameter.rb +++ b/lib/puppet/parameter.rb @@ -92,6 +92,7 @@ def defaultto(value = nil, &block) end end + # rubocop:disable Naming/PredicateName def sensitive(value = nil, &block) if block define_method(:is_sensitive, &block) @@ -99,6 +100,7 @@ def sensitive(value = nil, &block) define_method(:is_sensitive) do value end end end + # rubocop:enable Naming/PredicateName # Produces a documentation string. # If an enumeration of _valid values_ has been defined, it is appended to the documentation diff --git a/lib/puppet/parser/ast/pops_bridge.rb b/lib/puppet/parser/ast/pops_bridge.rb index 1a5122b4962..1c5de729f4e 100644 --- a/lib/puppet/parser/ast/pops_bridge.rb +++ b/lib/puppet/parser/ast/pops_bridge.rb @@ -118,18 +118,18 @@ def each end # Returns true if this Program only contains definitions - def is_definitions_only? - is_definition?(program_model) + def is_definitions_only? # rubocop:disable Naming/PredicateName + definition?(program_model) end private - def is_definition?(o) + def definition?(o) case o when Puppet::Pops::Model::Program - is_definition?(o.body) + definition?(o.body) when Puppet::Pops::Model::BlockExpression - o.statements.all {|s| is_definition?(s) } + o.statements.all {|s| definition?(s) } when Puppet::Pops::Model::Definition true else @@ -231,7 +231,7 @@ def code() Expression.new(:value => @value) end - def is_nop?(o) + def is_nop?(o) # rubocop:disable Naming/PredicateName @ast_transformer.is_nop?(o) end diff --git a/lib/puppet/parser/scope.rb b/lib/puppet/parser/scope.rb index a077f658be7..620dabcff1f 100644 --- a/lib/puppet/parser/scope.rb +++ b/lib/puppet/parser/scope.rb @@ -579,7 +579,7 @@ def inherited_scope # # @return [Puppet::Parser::Scope] The scope or nil if there is no enclosing scope def enclosing_scope - if has_enclosing_scope? + if enclosing_scope? if parent.is_topscope? || parent.is_nodescope? parent else @@ -614,7 +614,7 @@ def lookup_qualified_variable(fqn, options) begin qs = qualified_scope(class_name) unless qs.nil? - return qs.get_local_variable(leaf_name) if qs.has_local_variable?(leaf_name) + return qs.get_local_variable(leaf_name) if qs.local_variable?(leaf_name) iscope = qs.inherited_scope return lookup_qualified_variable("#{iscope.source.name}::#{leaf_name}", options) unless iscope.nil? end @@ -628,7 +628,7 @@ def lookup_qualified_variable(fqn, options) end # @api private - def has_local_variable?(name) + def local_variable?(name) @ephemeral.last.include?(name) end @@ -651,10 +651,10 @@ def handle_not_found(class_name, variable_name, position, reason = nil) variable_not_found("#{class_name}::#{variable_name}", reason) end - def has_enclosing_scope? + def enclosing_scope? ! parent.nil? end - private :has_enclosing_scope? + private :enclosing_scope? def qualified_scope(classname) klass = find_hostclass(classname) @@ -671,7 +671,7 @@ def qualified_scope(classname) # Optionally include the variables that are explicitly set to `undef`. # def to_hash(recursive = true, include_undef = false) - if recursive and has_enclosing_scope? + if recursive and enclosing_scope? target = enclosing_scope.to_hash(recursive) if !(inherited = inherited_scope).nil? target.merge!(inherited.to_hash(recursive)) diff --git a/lib/puppet/parser/templatewrapper.rb b/lib/puppet/parser/templatewrapper.rb index d3b897dafd3..5164b9eef0a 100644 --- a/lib/puppet/parser/templatewrapper.rb +++ b/lib/puppet/parser/templatewrapper.rb @@ -38,7 +38,7 @@ def script_line # Should return true if a variable is defined, false if it is not # @api public - def has_variable?(name) + def has_variable?(name) # rubocop:disable Naming/PredicateName scope.include?(name.to_s) end diff --git a/lib/puppet/pops/evaluator/access_operator.rb b/lib/puppet/pops/evaluator/access_operator.rb index 26ae462eb08..9c630cc6ed5 100644 --- a/lib/puppet/pops/evaluator/access_operator.rb +++ b/lib/puppet/pops/evaluator/access_operator.rb @@ -632,7 +632,7 @@ def access_PResourceType(o, scope, keys) end result = keys.map do |k| - unless is_parameter_of_resource?(scope, resource, k) + unless parameter_of_resource?(scope, resource, k) fail(Issues::UNKNOWN_RESOURCE_PARAMETER, @semantic, {:type_name => o.type_name, :title => o.title, :param_name=>k}) end @@ -700,7 +700,7 @@ def access_PClassType(o, scope, keys) resource = find_resource(scope, 'class', o.class_name) if resource result = keys.map do |k| - if is_parameter_of_resource?(scope, resource, k) + if parameter_of_resource?(scope, resource, k) get_resource_parameter_value(scope, resource, k) else fail(Issues::UNKNOWN_RESOURCE_PARAMETER, @semantic, diff --git a/lib/puppet/pops/evaluator/evaluator_impl.rb b/lib/puppet/pops/evaluator/evaluator_impl.rb index f52c7aa9da0..ce6149f8df3 100644 --- a/lib/puppet/pops/evaluator/evaluator_impl.rb +++ b/lib/puppet/pops/evaluator/evaluator_impl.rb @@ -322,7 +322,7 @@ def eval_QualifiedReference(o, scope) end def eval_NotExpression(o, scope) - ! is_true?(evaluate(o.expr, scope), o.expr) + ! true?(evaluate(o.expr, scope), o.expr) end def eval_UnaryMinusExpression(o, scope) @@ -642,7 +642,7 @@ def eval_InExpression o, scope # b is only evaluated if a is true # def eval_AndExpression o, scope - is_true?(evaluate(o.left_expr, scope), o.left_expr) ? is_true?(evaluate(o.right_expr, scope), o.right_expr) : false + true?(evaluate(o.left_expr, scope), o.left_expr) ? true?(evaluate(o.right_expr, scope), o.right_expr) : false end # @example @@ -650,7 +650,7 @@ def eval_AndExpression o, scope # b is only evaluated if a is false # def eval_OrExpression o, scope - is_true?(evaluate(o.left_expr, scope), o.left_expr) ? true : is_true?(evaluate(o.right_expr, scope), o.right_expr) + true?(evaluate(o.left_expr, scope), o.left_expr) ? true : true?(evaluate(o.right_expr, scope), o.right_expr) end # Evaluates each entry of the literal list and creates a new Array @@ -1050,7 +1050,7 @@ def eval_HeredocExpression o, scope # Evaluates Puppet DSL `if` def eval_IfExpression o, scope scope.with_guarded_scope do - if is_true?(evaluate(o.test, scope), o.test) + if true?(evaluate(o.test, scope), o.test) evaluate(o.then_expr, scope) else evaluate(o.else_expr, scope) @@ -1061,7 +1061,7 @@ def eval_IfExpression o, scope # Evaluates Puppet DSL `unless` def eval_UnlessExpression o, scope scope.with_guarded_scope do - unless is_true?(evaluate(o.test, scope), o.test) + unless true?(evaluate(o.test, scope), o.test) evaluate(o.then_expr, scope) else evaluate(o.else_expr, scope) @@ -1280,10 +1280,11 @@ def delete(x, y) # # This is the type of matching performed in a case option, using == for every type # of value except regular expression where a match is performed. - # + # rubocop:disable Naming/PredicateName def is_match?(left, right, o, option_expr, scope) @@compare_operator.match(left, right, scope) end + # rubocop:enable Naming/PredicateName # Maps the expression in the given array to their product except for UnfoldExpressions which are first unfolded. # The result is added to the given result Array. diff --git a/lib/puppet/pops/evaluator/runtime3_support.rb b/lib/puppet/pops/evaluator/runtime3_support.rb index cc92cb247eb..33f40284897 100644 --- a/lib/puppet/pops/evaluator/runtime3_support.rb +++ b/lib/puppet/pops/evaluator/runtime3_support.rb @@ -433,7 +433,7 @@ def get_resource_parameter_value(scope, resource, parameter_name) # Returns true, if the given name is the name of a resource parameter. # - def is_parameter_of_resource?(scope, resource, name) + def parameter_of_resource?(scope, resource, name) return false unless name.is_a?(String) resource.valid_parameter?(name) end @@ -446,7 +446,7 @@ def resource_to_ptype(resource) # This is the same type of "truth" as used in the current Puppet DSL. # - def is_true?(value, o) + def true?(value, o) # Is the value true? This allows us to control the definition of truth # in one place. case value diff --git a/lib/puppet/pops/loader/loader_paths.rb b/lib/puppet/pops/loader/loader_paths.rb index cdf4a28e47e..2d39d8b046d 100644 --- a/lib/puppet/pops/loader/loader_paths.rb +++ b/lib/puppet/pops/loader/loader_paths.rb @@ -280,7 +280,7 @@ def valid_path?(path) path.start_with?(generic_path) && is_task_name?(File.basename(path, '.*')) && !FORBIDDEN_EXTENSIONS.any? { |ext| path.end_with?(ext) } end - def is_task_name?(name) + def is_task_name?(name) # rubocop:disable Naming/PredicateName !!(name =~ /^[a-z][a-z0-9_]*$/) end end diff --git a/lib/puppet/pops/lookup/global_data_provider.rb b/lib/puppet/pops/lookup/global_data_provider.rb index 8e4a39bba97..e9c18d47108 100644 --- a/lib/puppet/pops/lookup/global_data_provider.rb +++ b/lib/puppet/pops/lookup/global_data_provider.rb @@ -20,7 +20,7 @@ def unchecked_key_lookup(key, lookup_invocation, merge) # Confine to global scope unless an environment data provider has been defined (same as for hiera_xxx functions) adapter = lookup_invocation.lookup_adapter - hiera_invocation.set_global_only unless adapter.global_only? || adapter.has_environment_data_provider?(lookup_invocation) + hiera_invocation.set_global_only unless adapter.global_only? || adapter.environment_data_provider?(lookup_invocation) hiera_invocation.lookup(key, lookup_invocation.module_name) { unchecked_key_lookup(key , hiera_invocation, merge) } end end diff --git a/lib/puppet/pops/lookup/hiera_config.rb b/lib/puppet/pops/lookup/hiera_config.rb index 63ceda3f1cf..1ffc912610d 100644 --- a/lib/puppet/pops/lookup/hiera_config.rb +++ b/lib/puppet/pops/lookup/hiera_config.rb @@ -187,7 +187,7 @@ def fail(issue, args = EMPTY_HASH, line = nil) issue.format(args.merge(:label => self)), @config_path, line, nil, nil, issue.issue_code) end - def has_default_hierarchy? + def default_hierarchy? false end @@ -204,7 +204,7 @@ def configured_data_providers(lookup_invocation, parent_data_provider, use_defau slc_invocation = ScopeLookupCollectingInvocation.new(lookup_invocation.scope) begin @data_providers = create_configured_data_providers(slc_invocation, parent_data_provider, false) - if has_default_hierarchy? + if default_hierarchy? @default_data_providers = create_configured_data_providers(slc_invocation, parent_data_provider, true) end rescue StandardError => e @@ -678,7 +678,7 @@ def create_configured_data_providers(lookup_invocation, parent_data_provider, us data_providers.values end - def has_default_hierarchy? + def default_hierarchy? @config.include?(KEY_DEFAULT_HIERARCHY) end diff --git a/lib/puppet/pops/lookup/lookup_adapter.rb b/lib/puppet/pops/lookup/lookup_adapter.rb index 72b778eb0cb..9261ec37ff3 100644 --- a/lib/puppet/pops/lookup/lookup_adapter.rb +++ b/lib/puppet/pops/lookup/lookup_adapter.rb @@ -183,7 +183,7 @@ def lookup_default_in_module(key, lookup_invocation) throw :no_such_key if module_name.nil? provider = module_provider(lookup_invocation, module_name) - throw :no_such_key if provider.nil? || !provider.config(lookup_invocation).has_default_hierarchy? + throw :no_such_key if provider.nil? || !provider.config(lookup_invocation).default_hierarchy? lookup_invocation.with(:scope, "Searching default_hierarchy of module \"#{module_name}\"") do merge_strategy = nil @@ -260,7 +260,7 @@ def extract_lookup_options_for_key(key, options) # @param lookup_invocation [Puppet::Pops::Lookup::Invocation] the lookup invocation # @return [Boolean] `true` if an environment data provider version 5 is configured - def has_environment_data_provider?(lookup_invocation) + def environment_data_provider?(lookup_invocation) ep = env_provider(lookup_invocation) ep.nil? ? false : ep.config(lookup_invocation).version >= 5 end diff --git a/lib/puppet/pops/model/ast_transformer.rb b/lib/puppet/pops/model/ast_transformer.rb index 2910504ca2d..0f08f74cb31 100644 --- a/lib/puppet/pops/model/ast_transformer.rb +++ b/lib/puppet/pops/model/ast_transformer.rb @@ -120,9 +120,9 @@ def transform_Object(o) end # Nil, nop - # Bee bopp a luh-lah, a bop bop boom. + # Be-Bop-a-Lula, a bop bop boom. # - def is_nop?(o) + def is_nop?(o) # rubocop:disable Naming/PredicateName o.nil? || o.is_a?(Model::Nop) end diff --git a/lib/puppet/pops/model/factory.rb b/lib/puppet/pops/model/factory.rb index 3bddf4d426f..747c196417f 100644 --- a/lib/puppet/pops/model/factory.rb +++ b/lib/puppet/pops/model/factory.rb @@ -1098,7 +1098,7 @@ def interpolate_CallMethodExpression(c) self end - def is_interop_rewriteable?(o) + def is_interop_rewriteable?(o) # rubocop:disable Naming/PredicateName mc = o.model_class if mc <= AccessExpression || mc <= QualifiedName || mc <= NamedAccessExpression || mc <= CallMethodExpression true diff --git a/lib/puppet/pops/model/model_tree_dumper.rb b/lib/puppet/pops/model/model_tree_dumper.rb index bfc807515ec..210e23dc1cb 100644 --- a/lib/puppet/pops/model/model_tree_dumper.rb +++ b/lib/puppet/pops/model/model_tree_dumper.rb @@ -440,7 +440,7 @@ def dump_Object o [o.class.to_s, o.to_s] end - def is_nop? o + def is_nop? o # rubocop:disable Naming/PredicateName o.nil? || o.is_a?(Puppet::Pops::Model::Nop) end end diff --git a/lib/puppet/pops/model/pn_transformer.rb b/lib/puppet/pops/model/pn_transformer.rb index 63e8aada9d5..f9e36c6c7d3 100644 --- a/lib/puppet/pops/model/pn_transformer.rb +++ b/lib/puppet/pops/model/pn_transformer.rb @@ -329,7 +329,7 @@ def transform_VirtualQuery(e) is_nop?(e.expr) ? PN::Call.new('virtual-query') : PN::Call.new('virtual-query', transform(e.expr)) end - def is_nop?(e) + def is_nop?(e) # rubocop:disable Naming/PredicateName e.nil? || e.is_a?(Nop) end diff --git a/lib/puppet/pops/model/tree_dumper.rb b/lib/puppet/pops/model/tree_dumper.rb index 0103886fa60..f0da2e94338 100644 --- a/lib/puppet/pops/model/tree_dumper.rb +++ b/lib/puppet/pops/model/tree_dumper.rb @@ -54,7 +54,7 @@ def format_r(x) result end - def is_nop? o + def is_nop? o # rubocop:disable Naming/PredicateName o.nil? || o.is_a?(Puppet::Pops::Model::Nop) end end diff --git a/lib/puppet/pops/types/string_converter.rb b/lib/puppet/pops/types/string_converter.rb index c2293929d5e..abe93279955 100644 --- a/lib/puppet/pops/types/string_converter.rb +++ b/lib/puppet/pops/types/string_converter.rb @@ -954,7 +954,7 @@ def string_PArrayType(val_type, val, format_map, indentation) children_indentation = children_indentation.subsequent end val_t = TypeCalculator.infer_set(v) - _convert(val_t, v, is_container?(val_t) ? format_map : string_formats, children_indentation) + _convert(val_t, v, container?(val_t) ? format_map : string_formats, children_indentation) end # compute widest run in the array, skip nested arrays and hashes @@ -962,7 +962,7 @@ def string_PArrayType(val_type, val, format_map, indentation) if format.alt? && format.width widest = val.each_with_index.reduce([0]) do | memo, v_i | # array or hash breaks - if is_a_or_h?(v_i[0]) + if a_or_h?(v_i[0]) memo << 0 else memo[-1] += mapped[v_i[1]].length @@ -982,7 +982,7 @@ def string_PArrayType(val_type, val, format_map, indentation) if children_indentation.first? children_indentation = children_indentation.subsequent # if breaking, indent first element by one - if sz_break && !is_a_or_h?(v) + if sz_break && !a_or_h?(v) buf << ' ' end else @@ -990,7 +990,7 @@ def string_PArrayType(val_type, val, format_map, indentation) # if break on each (and breaking will not occur because next is an array or hash) # or, if indenting, and previous was an array or hash, then break and continue on next line # indented. - if (sz_break && !is_a_or_h?(v)) || (format.alt? && i > 0 && is_a_or_h?(val[i-1]) && !is_a_or_h?(v)) + if (sz_break && !a_or_h?(v)) || (format.alt? && i > 0 && a_or_h?(val[i-1]) && !a_or_h?(v)) buf.rstrip! unless buf[-1] == "\n" buf << "\n" buf << children_indentation.padding @@ -1007,11 +1007,11 @@ def string_PArrayType(val_type, val, format_map, indentation) end end - def is_a_or_h?(x) + def a_or_h?(x) x.is_a?(Array) || x.is_a?(Hash) end - def is_container?(t) + def container?(t) case t when PArrayType, PHashType, PStructType, PTupleType, PObjectType true @@ -1071,8 +1071,8 @@ def string_PHashType(val_type, val, format_map, indentation) buf << val.map do |k,v| key_type = TypeCalculator.infer_set(k) val_type = TypeCalculator.infer_set(v) - key = _convert(key_type, k, is_container?(key_type) ? format_map : string_formats, children_indentation) - val = _convert(val_type, v, is_container?(val_type) ? format_map : string_formats, children_indentation) + key = _convert(key_type, k, container?(key_type) ? format_map : string_formats, children_indentation) + val = _convert(val_type, v, container?(val_type) ? format_map : string_formats, children_indentation) "#{padding}#{key}#{assoc}#{val}" end.join(sep) if format.alt? diff --git a/lib/puppet/pops/types/tree_iterators.rb b/lib/puppet/pops/types/tree_iterators.rb index 5be0550abac..b35f6e06b6a 100644 --- a/lib/puppet/pops/types/tree_iterators.rb +++ b/lib/puppet/pops/types/tree_iterators.rb @@ -106,7 +106,7 @@ def indexer_on(val) end private :indexer_on - def has_next?(iterator) + def next?(iterator) begin iterator.peek true @@ -114,7 +114,7 @@ def has_next?(iterator) false end end - private :has_next? + private :next? def extract_option(options, key, default) v = options[key] @@ -177,7 +177,7 @@ def next loop do pop_level at_the_very_end = @indexer_stack.empty? - break if at_the_very_end || has_next?(@indexer_stack[-1]) + break if at_the_very_end || next?(@indexer_stack[-1]) end end end @@ -235,7 +235,7 @@ def next loop do shift_level at_the_very_end = @indexer_stack.empty? - break if at_the_very_end || has_next?(@indexer_stack[0]) + break if at_the_very_end || next?(@indexer_stack[0]) end end end diff --git a/lib/puppet/pops/types/type_factory.rb b/lib/puppet/pops/types/type_factory.rb index 0ac8e3bdc02..f2899d439a6 100644 --- a/lib/puppet/pops/types/type_factory.rb +++ b/lib/puppet/pops/types/type_factory.rb @@ -623,7 +623,7 @@ def self.type_reference(type_string = nil) # Returns true if the given type t is of valid range parameter type (integer # or literal default). - def self.is_range_parameter?(t) + def self.is_range_parameter?(t) # rubocop:disable Naming/PredicateName t.is_a?(Integer) || t == 'default' || :default == t end diff --git a/lib/puppet/pops/types/type_formatter.rb b/lib/puppet/pops/types/type_formatter.rb index 4f28a40bc7a..7d98b980067 100644 --- a/lib/puppet/pops/types/type_formatter.rb +++ b/lib/puppet/pops/types/type_formatter.rb @@ -572,7 +572,7 @@ def string_PTypeReferenceType(t) # @api private def string_Array(t) append_array('') do - if @indent && !is_short_array?(t) + if @indent && !short_array?(t) @indent += 1 t.each { |elem| newline; append_string(elem); @bld << COMMA_SEP } chomp_list @@ -666,7 +666,7 @@ def capitalize_segments(qualified_name) HASH_ENTRY_OP = ' => ' - def is_short_array?(t) + def short_array?(t) t.empty? || 100 - @indent * @indent_width > t.inject(0) do |sum, elem| case elem when true, false, nil, Numeric, Symbol diff --git a/lib/puppet/pops/types/types.rb b/lib/puppet/pops/types/types.rb index c67a10a99cf..cda0e7fc43f 100644 --- a/lib/puppet/pops/types/types.rb +++ b/lib/puppet/pops/types/types.rb @@ -1350,7 +1350,8 @@ def size_range (@size_type || DEFAULT_SIZE).range end - def has_empty_range? + + def has_empty_range? # rubocop:disable Naming/PredicateName from, to = size_range from == 0 && to == 0 end @@ -2752,7 +2753,7 @@ def eql?(o) super && @key_type == o.key_type && @value_type == o.value_type end - def is_the_empty_hash? + def is_the_empty_hash? # rubocop:disable Naming/PredicateName self == EMPTY end diff --git a/lib/puppet/pops/utils.rb b/lib/puppet/pops/utils.rb index 8ff6486d7fb..683d4f2331d 100644 --- a/lib/puppet/pops/utils.rb +++ b/lib/puppet/pops/utils.rb @@ -7,7 +7,7 @@ module Utils # Returns a boolean if the value is numeric # If testing if value can be converted it is more efficient to call {#to_n} or {#to_n_with_radix} directly # and check if value is nil. - def self.is_numeric?(o) + def self.is_numeric?(o) # rubocop:disable Naming/PredicateName case o when Numeric true @@ -105,7 +105,7 @@ def self.to_n o end # is the name absolute (i.e. starts with ::) - def self.is_absolute? name + def self.is_absolute? name # rubocop:disable Naming/PredicateName name.start_with? "::" end diff --git a/lib/puppet/pops/validation/checker4_0.rb b/lib/puppet/pops/validation/checker4_0.rb index eb7ac5cc778..c062c9ae557 100644 --- a/lib/puppet/pops/validation/checker4_0.rb +++ b/lib/puppet/pops/validation/checker4_0.rb @@ -622,20 +622,20 @@ def initial_manifest?(path, manifest_setting) # if none is found. def get_module_relative_path(file_path, modulepath_directories) clean_file = file_path.cleanpath.to_s - parent_path = modulepath_directories.find { |path_dir| is_parent_dir_of(path_dir, clean_file) } + parent_path = modulepath_directories.find { |path_dir| parent_dir_of?(path_dir, clean_file) } return NO_PATH if parent_path.nil? file_path.relative_path_from(Pathname.new(parent_path)) end private :get_module_relative_path - def is_parent_dir_of(parent_dir, child_dir) + def parent_dir_of?(parent_dir, child_dir) parent_dir_path = Pathname.new(parent_dir) clean_parent = parent_dir_path.cleanpath.to_s + File::SEPARATOR return child_dir.start_with?(clean_parent) end - private :is_parent_dir_of + private :parent_dir_of? def dir_to_names(relative_path) # Downcasing here because check is case-insensitive diff --git a/lib/puppet/property.rb b/lib/puppet/property.rb index 31833dd0625..c684b7d837d 100644 --- a/lib/puppet/property.rb +++ b/lib/puppet/property.rb @@ -403,7 +403,7 @@ def property_matches?(current, desired) # are not already in suitable form. # @param value [Object] the value to format as a string # @return [String] a pretty printing string - def is_to_s(value) + def is_to_s(value) # rubocop:disable Naming/PredicateName self.class.format_value_for_display(value) end diff --git a/lib/puppet/property/keyvalue.rb b/lib/puppet/property/keyvalue.rb index bf7dcad0065..1d5759bb80d 100644 --- a/lib/puppet/property/keyvalue.rb +++ b/lib/puppet/property/keyvalue.rb @@ -33,7 +33,7 @@ def should_to_s(should_value) hash_to_key_value_s(should_value) end - def is_to_s(current_value) + def is_to_s(current_value) # rubocop:disable Naming/PredicateName hash_to_key_value_s(current_value) end diff --git a/lib/puppet/property/list.rb b/lib/puppet/property/list.rb index ff354b7b362..d7e8ede014b 100644 --- a/lib/puppet/property/list.rb +++ b/lib/puppet/property/list.rb @@ -8,7 +8,7 @@ class Property # class List < Property - def is_to_s(currentvalue) + def is_to_s(currentvalue) # rubocop:disable Naming/PredicateName currentvalue == :absent ? super(currentvalue) : currentvalue.join(delimiter) end diff --git a/lib/puppet/provider/nameservice.rb b/lib/puppet/provider/nameservice.rb index 243346efc3b..a933501db65 100644 --- a/lib/puppet/provider/nameservice.rb +++ b/lib/puppet/provider/nameservice.rb @@ -272,9 +272,11 @@ def set(param, value) end #Derived classes can override to declare sensitive data so a flag can be passed to execute + # rubocop:disable Naming/PredicateName def has_sensitive_data?(property = nil) false end + # rubocop:enable Naming/PredicateName # From overriding Puppet::Property#insync? Ruby Etc::getpwnam < 2.1.0 always # returns a struct with binary encoded string values, and >= 2.1.0 will return diff --git a/lib/puppet/provider/service/init.rb b/lib/puppet/provider/service/init.rb index 67579beee1a..e3c9213fb20 100644 --- a/lib/puppet/provider/service/init.rb +++ b/lib/puppet/provider/service/init.rb @@ -97,7 +97,7 @@ def self.get_services(defpath, exclude = self.excludes) next if exclude.include? name next if Puppet::FileSystem.directory?(fullpath) next unless Puppet::FileSystem.executable?(fullpath) - next unless is_init?(fullpath) + next unless init?(fullpath) instances << new(:name => name, :path => path, :hasstatus => true) end end @@ -185,7 +185,7 @@ def statuscmd private - def self.is_init?(script = initscript) + def self.init?(script = initscript) file = Puppet::FileSystem.pathname(script) !Puppet::FileSystem.symlink?(file) || Puppet::FileSystem.readlink(file) != "/lib/init/upstart-job" end diff --git a/lib/puppet/provider/service/upstart.rb b/lib/puppet/provider/service/upstart.rb index 42fca395fab..81ae391ed59 100644 --- a/lib/puppet/provider/service/upstart.rb +++ b/lib/puppet/provider/service/upstart.rb @@ -31,7 +31,7 @@ # upstart installed. confine :true => lambda { has_initctl? } - def self.has_initctl? + def self.has_initctl? # rubocop:disable Naming/PredicateName # Puppet::Util::Execution.execute does not currently work on jRuby. # Unfortunately, since this confine is invoked whenever we check for # provider suitability and since provider suitability is still checked @@ -125,7 +125,7 @@ def search(name) end def enabled? - return super if not is_upstart? + return super if not upstart? script_contents = read_script_from(initscript) if version_is_pre_0_6_7 @@ -138,7 +138,7 @@ def enabled? end def enable - return super if not is_upstart? + return super if not upstart? script_text = read_script_from(initscript) if version_is_pre_0_9_0 @@ -149,7 +149,7 @@ def enable end def disable - return super if not is_upstart? + return super if not upstart? script_text = read_script_from(initscript) if version_is_pre_0_6_7 @@ -162,25 +162,25 @@ def disable end def startcmd - is_upstart? ? [command(:start), @resource[:name]] : super + upstart? ? [command(:start), @resource[:name]] : super end def stopcmd - is_upstart? ? [command(:stop), @resource[:name]] : super + upstart? ? [command(:stop), @resource[:name]] : super end def restartcmd - is_upstart? ? (@resource[:hasrestart] == :true) && [command(:restart), @resource[:name]] : super + upstart? ? (@resource[:hasrestart] == :true) && [command(:restart), @resource[:name]] : super end def statuscmd - is_upstart? ? nil : super #this is because upstart is broken with its return codes + upstart? ? nil : super #this is because upstart is broken with its return codes end def status if (@resource[:hasstatus] == :false) || @resource[:status] || - ! is_upstart? + ! upstart? return super end @@ -193,7 +193,7 @@ def status end private - def is_upstart?(script = initscript) + def upstart?(script = initscript) Puppet::FileSystem.exist?(script) && script.match(/\/etc\/init\/\S+\.conf/) end diff --git a/lib/puppet/provider/user/pw.rb b/lib/puppet/provider/user/pw.rb index 8f26bb02fdf..6cf71a1590b 100644 --- a/lib/puppet/provider/user/pw.rb +++ b/lib/puppet/provider/user/pw.rb @@ -84,6 +84,7 @@ def password current_password end + # rubocop:disable Naming/PredicateName def has_sensitive_data?(property = nil) #Check for sensitive values? properties = property ? [property] : Puppet::Type.type(:user).validproperties @@ -92,6 +93,7 @@ def has_sensitive_data?(property = nil) p && p.respond_to?(:is_sensitive) && p.is_sensitive end end + # rubocop:enable Naming/PredicateName # Get expiry from system and convert to Puppet-style date def expiry diff --git a/lib/puppet/provider/user/user_role_add.rb b/lib/puppet/provider/user/user_role_add.rb index b512ef90539..57f7690db08 100644 --- a/lib/puppet/provider/user/user_role_add.rb +++ b/lib/puppet/provider/user/user_role_add.rb @@ -79,7 +79,7 @@ def command(cmd) super(cmd) end - def is_role? + def is_role? # rubocop:disable Naming/PredicateName user_attributes and user_attributes[:type] == "role" end @@ -205,9 +205,11 @@ def password_warn_days shadow_entry[5].empty? ? -1 : shadow_entry[5] end + # rubocop:disable Naming/PredicateName def has_sensitive_data?(property = nil) false end + # rubocop:enable Naming/PredicateName # Read in /etc/shadow, find the line for our used and rewrite it with the # new pw. Smooth like 80 grit sandpaper. diff --git a/lib/puppet/provider/user/useradd.rb b/lib/puppet/provider/user/useradd.rb index 877112692c3..ae59017a298 100644 --- a/lib/puppet/provider/user/useradd.rb +++ b/lib/puppet/provider/user/useradd.rb @@ -298,6 +298,7 @@ def get_value_for_property(property) value end + # rubocop:disable Naming/PredicateName def has_sensitive_data?(property = nil) #Check for sensitive values? properties = property ? [property] : Puppet::Type.type(:user).validproperties @@ -306,6 +307,7 @@ def has_sensitive_data?(property = nil) p && p.respond_to?(:is_sensitive) && p.is_sensitive end end + # rubocop:enable Naming/PredicateName def addcmd if @resource.forcelocal? diff --git a/lib/puppet/settings/base_setting.rb b/lib/puppet/settings/base_setting.rb index dabb9595ffe..22fdc90d016 100644 --- a/lib/puppet/settings/base_setting.rb +++ b/lib/puppet/settings/base_setting.rb @@ -79,7 +79,7 @@ def hook=(block) meta_def :handle, &block end - def has_hook? + def has_hook? # rubocop:disable Naming/PredicateName @has_hook end diff --git a/lib/puppet/settings/config_file.rb b/lib/puppet/settings/config_file.rb index 4776d5e1841..34c5beae70c 100644 --- a/lib/puppet/settings/config_file.rb +++ b/lib/puppet/settings/config_file.rb @@ -70,7 +70,7 @@ def setting(name) end Setting = Struct.new(:name, :value, :meta) do - def has_metadata? + def has_metadata? # rubocop:disable Naming/PredicateName meta != NO_META end end diff --git a/lib/puppet/transaction/report.rb b/lib/puppet/transaction/report.rb index 25205eb4cf7..8ab077922c7 100644 --- a/lib/puppet/transaction/report.rb +++ b/lib/puppet/transaction/report.rb @@ -199,7 +199,7 @@ def compute_status(resource_metrics, change_metric) end # @api private - def has_noop_events?(resource) + def noop_events?(resource) resource.events.any? { |event| event.status == 'noop' } end @@ -219,7 +219,7 @@ def finalize_report add_metric(:changes, {TOTAL => change_metric}) add_metric(:events, calculate_event_metrics) @status = compute_status(resource_metrics, change_metric) - @noop_pending = @resource_statuses.any? { |_name,res| has_noop_events?(res) } + @noop_pending = @resource_statuses.any? { |_name,res| noop_events?(res) } end # @api private diff --git a/lib/puppet/type/file/group.rb b/lib/puppet/type/file/group.rb index 37def601b1d..56e6e226490 100644 --- a/lib/puppet/type/file/group.rb +++ b/lib/puppet/type/file/group.rb @@ -38,7 +38,7 @@ def insync?(current) end # We want to print names, not numbers - def is_to_s(currentvalue) + def is_to_s(currentvalue) # rubocop:disable Naming/PredicateName super(provider.gid2name(currentvalue) || currentvalue) end diff --git a/lib/puppet/type/file/mode.rb b/lib/puppet/type/file/mode.rb index 3c5d0a760f1..8a837e02f52 100644 --- a/lib/puppet/type/file/mode.rb +++ b/lib/puppet/type/file/mode.rb @@ -177,7 +177,7 @@ def should_to_s(should_value) "'#{should_value.rjust(4, '0')}'" end - def is_to_s(currentvalue) + def is_to_s(currentvalue) # rubocop:disable Naming/PredicateName if currentvalue == :absent # This can occur during audits---if a file is transitioning from # present to absent the mode will have a value of `:absent`. diff --git a/lib/puppet/type/file/owner.rb b/lib/puppet/type/file/owner.rb index a9ecfda4d5b..944652e32dd 100644 --- a/lib/puppet/type/file/owner.rb +++ b/lib/puppet/type/file/owner.rb @@ -40,7 +40,7 @@ def insync?(current) end # We want to print names, not numbers - def is_to_s(currentvalue) + def is_to_s(currentvalue) # rubocop:disable Naming/PredicateName super(provider.uid2name(currentvalue) || currentvalue) end diff --git a/lib/puppet/type/group.rb b/lib/puppet/type/group.rb index 708087f3df6..d7c9c97fd15 100644 --- a/lib/puppet/type/group.rb +++ b/lib/puppet/type/group.rb @@ -102,7 +102,7 @@ def insync?(current) super(current) end - def is_to_s(currentvalue) + def is_to_s(currentvalue) # rubocop:disable Naming/PredicateName if provider.respond_to?(:members_to_s) currentvalue = '' if currentvalue.nil? currentvalue = currentvalue.is_a?(Array) ? currentvalue : currentvalue.split(',') diff --git a/lib/puppet/type/package.rb b/lib/puppet/type/package.rb index 312658ff1f4..b5005fda9b0 100644 --- a/lib/puppet/type/package.rb +++ b/lib/puppet/type/package.rb @@ -395,7 +395,7 @@ def should_to_s(newvalue) end end - def is_to_s(currentvalue) + def is_to_s(currentvalue) # rubocop:disable Naming/PredicateName if provider.respond_to?(:package_settings_is_to_s) provider.package_settings_is_to_s(should, currentvalue) else diff --git a/lib/puppet/util/logging.rb b/lib/puppet/util/logging.rb index 2e006c904ef..4efda324237 100644 --- a/lib/puppet/util/logging.rb +++ b/lib/puppet/util/logging.rb @@ -277,11 +277,11 @@ def issue_deprecation_warning(message, key, file, line, use_caller) end end - def is_resource? + def resource? defined?(Puppet::Type) && is_a?(Puppet::Type) end - def is_resource_parameter? + def resource_parameter? defined?(Puppet::Parameter) && is_a?(Puppet::Parameter) end @@ -294,7 +294,7 @@ def log_metadata def log_source # We need to guard the existence of the constants, since this module is used by the base Puppet module. - (is_resource? or is_resource_parameter?) and respond_to?(:path) and return path.to_s + (resource? or resource_parameter?) and respond_to?(:path) and return path.to_s to_s end end diff --git a/lib/puppet/util/rubygems.rb b/lib/puppet/util/rubygems.rb index a89f5743970..31c377d877e 100644 --- a/lib/puppet/util/rubygems.rb +++ b/lib/puppet/util/rubygems.rb @@ -9,7 +9,7 @@ module Puppet::Util::RubyGems class Source class << self # @api private - def has_rubygems? + def rubygems? # Gems are not actually available when Bundler is loaded, even # though the Gem constant is defined. This is because Bundler # loads in rubygems, but then removes the custom require that @@ -21,7 +21,7 @@ def has_rubygems? # @api private def source - if has_rubygems? + if rubygems? Gems18Source else NoGemsSource diff --git a/spec/unit/provider/service/upstart_spec.rb b/spec/unit/provider/service/upstart_spec.rb index 866f65cec4b..00cc462ae00 100644 --- a/spec/unit/provider/service/upstart_spec.rb +++ b/spec/unit/provider/service/upstart_spec.rb @@ -116,7 +116,7 @@ def lists_processes_as(output) it "should use the default status command if none is specified" do resource = Puppet::Type.type(:service).new(:name => "foo", :provider => :upstart) provider = provider_class.new(resource) - allow(provider).to receive(:is_upstart?).and_return(true) + allow(provider).to receive(:upstart?).and_return(true) expect(provider).to receive(:status_exec) .with(["foo"]) @@ -128,7 +128,7 @@ def lists_processes_as(output) it "should use the provided status command" do resource = Puppet::Type.type(:service).new(:name => 'foo', :provider => :upstart, :status => '/bin/foo') provider = provider_class.new(resource) - allow(provider).to receive(:is_upstart?).and_return(true) + allow(provider).to receive(:upstart?).and_return(true) expect(provider).not_to receive(:status_exec).with(['foo']) expect(provider).to receive(:execute) @@ -140,7 +140,7 @@ def lists_processes_as(output) it "should return :stopped when the provided status command return non-zero" do resource = Puppet::Type.type(:service).new(:name => 'foo', :provider => :upstart, :status => '/bin/foo') provider = provider_class.new(resource) - allow(provider).to receive(:is_upstart?).and_return(true) + allow(provider).to receive(:upstart?).and_return(true) expect(provider).not_to receive(:status_exec).with(['foo']) expect(provider).to receive(:execute) @@ -152,7 +152,7 @@ def lists_processes_as(output) it "should return :running when the provided status command return zero" do resource = Puppet::Type.type(:service).new(:name => 'foo', :provider => :upstart, :status => '/bin/foo') provider = provider_class.new(resource) - allow(provider).to receive(:is_upstart?).and_return(true) + allow(provider).to receive(:upstart?).and_return(true) expect(provider).not_to receive(:status_exec).with(['foo']) expect(provider).to receive(:execute) @@ -166,7 +166,7 @@ def lists_processes_as(output) it "should return :stopped if the pid can not be found" do resource = Puppet::Type.type(:service).new(:name => 'foo', :hasstatus => false, :provider => :upstart) provider = provider_class.new(resource) - allow(provider).to receive(:is_upstart?).and_return(true) + allow(provider).to receive(:upstart?).and_return(true) expect(provider).not_to receive(:status_exec).with(['foo']) expect(provider).to receive(:getpid).and_return(nil) @@ -176,7 +176,7 @@ def lists_processes_as(output) it "should return :running if the pid can be found" do resource = Puppet::Type.type(:service).new(:name => 'foo', :hasstatus => false, :provider => :upstart) provider = provider_class.new(resource) - allow(provider).to receive(:is_upstart?).and_return(true) + allow(provider).to receive(:upstart?).and_return(true) expect(provider).not_to receive(:status_exec).with(['foo']) expect(provider).to receive(:getpid).and_return(2706) @@ -188,7 +188,7 @@ def lists_processes_as(output) it "should use the provided status command" do resource = Puppet::Type.type(:service).new(:name => 'foo', :provider => :upstart, :status => '/bin/foo') provider = provider_class.new(resource) - allow(provider).to receive(:is_upstart?).and_return(true) + allow(provider).to receive(:upstart?).and_return(true) expect(provider).not_to receive(:status_exec).with(['foo']) expect(provider).to receive(:execute) @@ -200,7 +200,7 @@ def lists_processes_as(output) it "should return :stopped when the provided status command return non-zero" do resource = Puppet::Type.type(:service).new(:name => 'foo', :provider => :upstart, :status => '/bin/foo') provider = provider_class.new(resource) - allow(provider).to receive(:is_upstart?).and_return(true) + allow(provider).to receive(:upstart?).and_return(true) expect(provider).not_to receive(:status_exec).with(['foo']) expect(provider).to receive(:execute) @@ -212,7 +212,7 @@ def lists_processes_as(output) it "should return :running when the provided status command return zero" do resource = Puppet::Type.type(:service).new(:name => 'foo', :provider => :upstart, :status => '/bin/foo') provider = provider_class.new(resource) - allow(provider).to receive(:is_upstart?).and_return(true) + allow(provider).to receive(:upstart?).and_return(true) expect(provider).not_to receive(:status_exec).with(['foo']) expect(provider).to receive(:execute) @@ -226,7 +226,7 @@ def lists_processes_as(output) it "should return :stopped if the pid can not be found" do resource = Puppet::Type.type(:service).new(:name => 'foo', :hasstatus => false, :provider => :upstart) provider = provider_class.new(resource) - allow(provider).to receive(:is_upstart?).and_return(true) + allow(provider).to receive(:upstart?).and_return(true) expect(provider).not_to receive(:status_exec).with(['foo']) expect(provider).to receive(:getpid).and_return(nil) @@ -236,7 +236,7 @@ def lists_processes_as(output) it "should return :running if the pid can be found" do resource = Puppet::Type.type(:service).new(:name => 'foo', :hasstatus => false, :provider => :upstart) provider = provider_class.new(resource) - allow(provider).to receive(:is_upstart?).and_return(true) + allow(provider).to receive(:upstart?).and_return(true) expect(provider).not_to receive(:status_exec).with(['foo']) expect(provider).to receive(:getpid).and_return(2706) @@ -247,7 +247,7 @@ def lists_processes_as(output) it "should properly handle services with 'start' in their name" do resource = Puppet::Type.type(:service).new(:name => "foostartbar", :provider => :upstart) provider = provider_class.new(resource) - allow(provider).to receive(:is_upstart?).and_return(true) + allow(provider).to receive(:upstart?).and_return(true) expect(provider).to receive(:status_exec) .with(["foostartbar"]).and_return("foostartbar stop/waiting") @@ -267,7 +267,7 @@ def lists_processes_as(output) describe "when upstart job" do before(:each) do - allow(provider).to receive(:is_upstart?).and_return(true) + allow(provider).to receive(:upstart?).and_return(true) end ["start", "stop"].each do |action| @@ -354,7 +354,7 @@ def lists_processes_as(output) describe "Upstart version < 0.6.7" do before(:each) do - allow(provider).to receive(:is_upstart?).and_return(true) + allow(provider).to receive(:upstart?).and_return(true) allow(provider).to receive(:upstart_version).and_return("0.6.5") allow(provider).to receive(:search).and_return(init_script) end @@ -440,7 +440,7 @@ def lists_processes_as(output) describe "Upstart version < 0.9.0" do before(:each) do - allow(provider).to receive(:is_upstart?).and_return(true) + allow(provider).to receive(:upstart?).and_return(true) allow(provider).to receive(:upstart_version).and_return("0.7.0") allow(provider).to receive(:search).and_return(init_script) end @@ -558,7 +558,7 @@ def lists_processes_as(output) describe "Upstart version > 0.9.0" do before(:each) do - allow(provider).to receive(:is_upstart?).and_return(true) + allow(provider).to receive(:upstart?).and_return(true) allow(provider).to receive(:upstart_version).and_return("0.9.5") allow(provider).to receive(:search).and_return(init_script) allow(provider).to receive(:overscript).and_return(over_script) diff --git a/spec/unit/util/rubygems_spec.rb b/spec/unit/util/rubygems_spec.rb index 70453e22a42..e980fb048e3 100644 --- a/spec/unit/util/rubygems_spec.rb +++ b/spec/unit/util/rubygems_spec.rb @@ -8,12 +8,12 @@ describe "::new" do it "returns NoGemsSource if rubygems is not present" do - expect(described_class).to receive(:has_rubygems?).and_return(false) + expect(described_class).to receive(:rubygems?).and_return(false) expect(described_class.new).to be_kind_of(Puppet::Util::RubyGems::NoGemsSource) end it "returns Gems18Source if Gem::Specification responds to latest_specs" do - expect(described_class).to receive(:has_rubygems?).and_return(true) + expect(described_class).to receive(:rubygems?).and_return(true) expect(described_class.new).to be_kind_of(Puppet::Util::RubyGems::Gems18Source) end end