rubocop-magic_numbers 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4db321fec029b7e924bda74c35c9f9dcfdd902173d31965fad3ca07507ef606b
-  data.tar.gz: f477370605f885adfd7a1353a6065c637226ff4b637001546b4b2e4109787bde
+  metadata.gz: 12fab74132b62ca4cf123a33001e1eadc3f47b6a52c9599881b9b1cdf09861c0
+  data.tar.gz: b9e7dfba1c5fca384d64a82f77ea220393613bd594db4e60e734de29d50a4c7d
 SHA512:
-  metadata.gz: 408cb1f1488a6e57063a57b7422dc74145334c3c296e7d3dd129e1e7447c5e309df13040b7aae1d258294b21026e81ff586e4c9754f7af2be31b916343690a10
-  data.tar.gz: 4020f1a2891c85d1f0ed3c13acffb47e10a3213d073335d907a1d53f2faeaf912b631a80b332a443b3e2e6fc8da93f54a6958ca5e72590c34dd66d2ef00bcf50
+  metadata.gz: 01fa64c0680e19aa431490ccc976574c56f30f5a26b20776d292e2ba01f22c481c6072e2a465dae1fccdc64d7c23653308dd550295607102160e9f4973d806cc
+  data.tar.gz: 4f6875eb58bcfcde76128da2709d7f215e986ce8a9c0c6013dc10428e1eddec0b14060b7eb8207a8f3ff0cb5fb2423b07e4f51c32409e301ddef835830c92553

data/lib/rubocop/cop/magic_numbers/base.rb

@@ -1,12 +1,26 @@
 # frozen_string_literal: true
 
+require 'rubocop'
 require 'rubocop/cop/cop'
+begin
+  require 'rubocop/cop/base'
+rescue LoadError
+end
 
 module RuboCop
   module Cop
     module MagicNumbers
       # Base class for all shared behaviour between these cops
-      class Base < ::RuboCop::Cop::Cop
+
+      def self.best_base_class
+        if ::RuboCop::Cop.const_defined?('Base')
+          ::RuboCop::Cop::Base
+        else
+          ::RuboCop::Cop::Cop
+        end
+      end
+
+      class Base < best_base_class
         CONFIG_ALL = 'All'
         CONFIG_FLOAT = 'Float'
         CONFIG_INTEGER = 'Integer'

data/lib/rubocop/cop/magic_numbers/no_argument.rb

@@ -12,7 +12,7 @@ module RuboCop
       #
       # GOOD:
       # object.bottles_on_the_wall(DEFAULT_BOTTLE_COUNT)
-      class NoArgument < Base
+      class NoArgument < RuboCop::Cop::MagicNumbers::Base
         MAGIC_NUMBER_ARGUMENT_PATTERN = <<-PATTERN
           (send
             {
@@ -38,14 +38,14 @@ module RuboCop
         }.freeze
 
         def cop_config
-          super.merge(DEFAULT_CONFIG)
+          DEFAULT_CONFIG.merge(super)
         end
 
         def on_message_send(node)
           return unless illegal_argument?(node)
           return if ignored_method?(node)
 
-          add_offense(node, location: :expression, message: ARGUMENT_MSG)
+          add_offense(node, message: ARGUMENT_MSG)
         end
         alias on_send on_message_send # rubocop API method name
 

data/lib/rubocop/cop/magic_numbers/no_assignment.rb

@@ -12,7 +12,7 @@ module RuboCop
       # bad: hours = 24
       #
       # good: HOURS_IN_ONE_DAY = 24
-      class NoAssignment < Base
+      class NoAssignment < RuboCop::Cop::MagicNumbers::Base
         MAGIC_NUMBER_ARGUMENT_TO_SETTER_PATTERN = <<-PATTERN
           (send
             ({send self} ...)
@@ -43,7 +43,7 @@ module RuboCop
           return unless illegal_scalar_value?(node)
           return unless node_within_method?(node)
 
-          add_offense(node, location: :expression, message: LOCAL_VARIABLE_ASSIGN_MSG)
+          add_offense(node, message: LOCAL_VARIABLE_ASSIGN_MSG)
         end
         alias on_lvasgn on_local_variable_assignment # rubocop API method name
 
@@ -51,7 +51,7 @@ module RuboCop
           return unless illegal_scalar_value?(node)
           return unless node_within_method?(node)
 
-          add_offense(node, location: :expression, message: INSTANCE_VARIABLE_ASSIGN_MSG)
+          add_offense(node, message: INSTANCE_VARIABLE_ASSIGN_MSG)
         end
         alias on_ivasgn on_instance_variable_assignment # rubocop API method name
 
@@ -59,7 +59,7 @@ module RuboCop
           return unless illegal_scalar_argument_to_setter?(node)
           return unless node_within_method?(node)
 
-          add_offense(node, location: :expression, message: PROPERTY_MSG)
+          add_offense(node, message: PROPERTY_MSG)
         end
         alias on_send on_message_send # rubocop API method name
 
@@ -69,7 +69,7 @@ module RuboCop
           # numbers amongst their assignments
           return false unless illegal_multi_assign_right_hand_side?(node)
 
-          add_offense(node, location: :expression, message: MULTIPLE_ASSIGN_MSG)
+          add_offense(node, message: MULTIPLE_ASSIGN_MSG)
         end
         alias on_masgn on_multiple_assign
 

data/lib/rubocop/cop/magic_numbers/no_default.rb

@@ -13,7 +13,7 @@ module RuboCop
       #
       # GOOD
       # def on_the_wall(bottles = DEFAULT_BOTTLE_COUNT)
-      class NoDefault < Base
+      class NoDefault < RuboCop::Cop::MagicNumbers::Base
         MAGIC_NUMBER_OPTIONAL_ARGUMENT_PATTERN = <<-PATTERN
           (def
             _
@@ -35,7 +35,7 @@ module RuboCop
 
           add_offense(
             node,
-            location: :expression,
+
             message: DEFAULT_OPTIONAL_ARGUMENT_MSG
           )
         end

data/lib/rubocop/cop/magic_numbers/no_return.rb

@@ -7,7 +7,7 @@ module RuboCop
     module MagicNumbers
       # Raises an offense if a method returns with a magic number
       # Catches both explicit and implicit returns
-      class NoReturn < Base
+      class NoReturn < RuboCop::Cop::MagicNumbers::Base
         MAGIC_NUMBER_RETURN_PATTERN = <<~PATTERN.chomp
           (%<illegal_scalar_pattern>s _)
         PATTERN
@@ -32,7 +32,7 @@ module RuboCop
           return if allowed_returns.include?(RETURN_TYPE_IMPLICIT)
           return unless implicit_return?(node.children.last)
 
-          add_offense(node.children.last, location: :expression, message: NO_EXPLICIT_RETURN_MSG)
+          add_offense(node.children.last, message: NO_EXPLICIT_RETURN_MSG)
         end
         alias on_def on_method_defined
 
@@ -40,7 +40,7 @@ module RuboCop
           return if allowed_returns.include?(RETURN_TYPE_EXPLICIT)
           return unless forbidden_numerics.include?(node.children.first&.type)
 
-          add_offense(node.children.first, location: :expression, message: NO_EXPLICIT_RETURN_MSG)
+          add_offense(node.children.first, message: NO_EXPLICIT_RETURN_MSG)
         end
 
         private

data/lib/rubocop/magic_numbers/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module MagicNumbers
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/lib/rubocop-magic_numbers.rb

@@ -0,0 +1 @@
+require 'rubocop/magic_numbers'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-magic_numbers
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Gavin Morrice
@@ -49,6 +49,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
+- lib/rubocop-magic_numbers.rb
 - lib/rubocop/cop/magic_numbers/base.rb
 - lib/rubocop/cop/magic_numbers/no_argument.rb
 - lib/rubocop/cop/magic_numbers/no_assignment.rb