armitage-rubocop 1.3.1.1 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b53318fc5d75e3b7f804776a311944fe23127642126a1392b2fb2fc81d815ff
-  data.tar.gz: 99e48a94c3ec1a265623deebc79c25ecd7660ed818ad81054686fcb700b5beb7
+  metadata.gz: b300bd4a0d4d7b01a9c2249f1e8fb83ce5fbdcbc1925c056eecbdba03a6205b3
+  data.tar.gz: 58451e1b8322fec8e993db5639c2d60bfb9b1eaa77c47c724af349baec061536
 SHA512:
-  metadata.gz: abe8fad07125c511a9e427e92823bc41e36b703248b043fe5f98ca4a9156398a7bee675149f4a9505716115c3e32d9b7a34a22704ee70f89b193e860a6ed08d4
-  data.tar.gz: e119e27885f140e993982b1739bcb753721ec2e50a8027994eb99a65247311ea0b34b153174198134e430153e5f23a338c42e6c7035eb5411634bcc5fbf00089
+  metadata.gz: 70ed42502211016d45dfbd6b890daa0a2187faef42bd29aeaf81dc2e66686d12499718469e3da1fb6ad07581b8469ea02e956d09a92fed76bebe5fcda53f3750
+  data.tar.gz: 254883a9930ff28b65f88fb7ec025c3ea1c686be70e41385d002ebb950408fc091777a736ac905d64b3ae2e85568e45c122be4a39cd35faa0b1da815b3f8fe91

data/.gitignore

@@ -7,7 +7,6 @@
 /spec/reports/
 /tmp/
 .rspec_status
-/Gemfile.lock
 .ruby-version
 gemfiles/*.lock
 *.gem

data/Gemfile.lock

@@ -0,0 +1,78 @@
+PATH
+  remote: .
+  specs:
+    armitage-rubocop (1.6.1)
+      rubocop (= 1.6.1)
+      rubocop-performance (= 1.9.1)
+      rubocop-rails (= 2.9.0)
+      rubocop-rake (= 0.5.1)
+      rubocop-rspec (= 2.0.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (6.1.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    ast (2.4.1)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.7)
+    i18n (1.8.5)
+      concurrent-ruby (~> 1.0)
+    method_source (1.0.0)
+    minitest (5.14.2)
+    parallel (1.20.1)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rack (2.2.3)
+    rainbow (3.0.0)
+    rake (13.0.1)
+    regexp_parser (2.0.0)
+    rexml (3.2.4)
+    rubocop (1.6.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.1.5)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (1.3.0)
+      parser (>= 2.7.1.5)
+    rubocop-performance (1.9.1)
+      rubocop (>= 0.90.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.9.0)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 0.90.0, < 2.0)
+    rubocop-rake (0.5.1)
+      rubocop
+    rubocop-rspec (2.0.1)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    ruby-progressbar (1.10.1)
+    tzinfo (2.0.3)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (1.7.0)
+    zeitwerk (2.4.2)
+
+PLATFORMS
+  ruby
+  x86_64-darwin-20
+
+DEPENDENCIES
+  armitage-rubocop!
+  bundler
+  pry
+  rake
+
+BUNDLED WITH
+   2.2.0

data/Rakefile

@@ -5,20 +5,21 @@ require 'rubocop/rake_task'
 require 'open3'
 require 'yaml'
 require 'rubocop'
+require 'rubocop-performance'
 require 'rubocop-rspec'
 require 'rubocop-rails'
-require 'rubocop-performance'
 require 'rubocop-rake'
 
 RuboCop::RakeTask.new(:rubocop) do |t|
   config_path = File.expand_path(File.join('.rubocop.yml'), __dir__)
   t.options = ['--config', config_path]
-  t.requires << 'rubocop-rspec'
   t.requires << 'rubocop-performance'
   t.requires << 'rubocop-rails'
+  t.requires << 'rubocop-rspec'
   t.requires << 'rubocop-rake'
 end
 
+ARMITAGE_RUBOCOP_PATH = Pathname.new(__FILE__).join('../.rubocop.yml')
 NON_CHECKABLE_COPS = %w[Rails].freeze # NOTE: Global "Rails" cop has only `Enabled` option
 
 # rubocop:disable Rails/RakeEnvironment
@@ -78,58 +79,17 @@ namespace :armitage_rubocop do
 
     desc 'Checks that all defined cops can be used'
     task :recognizable_cops do
-      yamls = Dir[Pathname.new(__FILE__).join('../lib/**/*.yml')]
-      invalid_cops = Hash.new { |h, k| h[k] = +'' }
-
-      # NOTE: strongly rubocop-related realization
-      #  - see https://github.com/rubocop-hq/rubocop/blob/master/lib/rubocop/config.rb
-      #  - see https://github.com/rubocop-hq/rubocop/blob/master/lib/rubocop/config_loader.rb
-      #  - RuboCop::Config#validate
-      #  - RuboCop::Config#warn_about_unrecognized_cops
-      #  - RuboCop::ConfigLoader.load_file
-      #  - RuboCop::ConfigLoader.default_configuration
-      yamls.each do |yaml_file|
-        rubocop_config = RuboCop::ConfigLoader.load_file(yaml_file)
-
-        # NOTE: validate cop existence
-        rubocop_config.each_key do |cop|
-          next if RuboCop::ConfigLoader.default_configuration.key?(cop)
-          next if RuboCop::Cop::Cop.registry.contains_cop_matching?([cop])
-          next if cop == 'inherit_mode'
-
-          invalid_cops[cop] = "\e[31mBAD COP\e[0m"
-        end
-
-        # NOTE: validate cop params
-        rubocop_config.each_key do |cop|
-          next if invalid_cops.key?(cop)
-
-          invalid_params = Set.new
-
-          rubocop_config[cop].each_key do |cop_param|
-            next if RuboCop::ConfigValidator::COMMON_PARAMS.include?(cop_param)
-            next if NON_CHECKABLE_COPS.include?(cop)
-            next if RuboCop::ConfigLoader.default_configuration[cop].key?(cop_param)
-
-            invalid_params << "\e[35m#{cop_param}\e[0m"
-          end
-
-          next if invalid_params.empty?
-
-          invalid_cops[cop] = "\e[31mBAD PARAMS\e[0m: #{invalid_params.to_a.join(', ')}"
-        end
-      end
-
-      if invalid_cops.empty?
-        puts "[\e[32mCOP RECOGNITION CHECK\e[0m] => \e[1;33mall cops are recognizable!\e[0m"
-      else
-        invalid_cops_message = invalid_cops.each_pair.map do |cop, message|
-          "[\e[32m#{cop}\e[0m]\t- #{message}"
-        end.join("\n")
+      RuboCop::ConfigLoader.load_file(ARMITAGE_RUBOCOP_PATH)
+      # TODO: validate each configured cop individually
+      puts "[\e[32mCOP RECOGNITION CHECK\e[0m] => \e[1;33mall cops are recognizable!\e[0m"
+    rescue
+      abort "[\e[31mCOP RECOGNITION CHECK\e[0m] => some cops can not be fully recognized!\n" \
+            "Run rake validation:recognize_and_show to show which cops have incompatabilities."
+    end
 
-        abort "[\e[31mCOP RECOGNITION CHECK\e[0m] => some cops can not be fully recognized:\n" \
-              "#{invalid_cops_message}"
-      end
+    desc 'Show rubocop\'s validation result output'
+    task :recognize_and_show do
+      RuboCop::ConfigLoader.load_file(ARMITAGE_RUBOCOP_PATH) rescue nil
     end
   end
 end

data/armitage-rubocop.gemspec

@@ -4,7 +4,7 @@ lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
-  spec.version     = '1.3.1.1'
+  spec.version     = '1.6.1'
 
   spec.name        = 'armitage-rubocop'
   spec.license     = 'MIT'
@@ -22,10 +22,10 @@ Gem::Specification.new do |spec|
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
 
-  spec.add_dependency 'rubocop',             '= 1.3.1'
-  spec.add_dependency 'rubocop-performance', '= 1.9.0'
-  spec.add_dependency 'rubocop-rails',       '= 2.8.1'
-  spec.add_dependency 'rubocop-rspec',       '= 2.0.0'
+  spec.add_dependency 'rubocop',             '= 1.6.1'
+  spec.add_dependency 'rubocop-performance', '= 1.9.1'
+  spec.add_dependency 'rubocop-rails',       '= 2.9.0'
+  spec.add_dependency 'rubocop-rspec',       '= 2.0.1'
   spec.add_dependency 'rubocop-rake',        '= 0.5.1'
 
   spec.add_development_dependency 'bundler'

data/lib/common/layout.yml

@@ -111,6 +111,9 @@ Layout/EmptyLineBetweenDefs:
   Enabled: true
   NumberOfEmptyLines: 1
   AllowAdjacentOneLineDefs: false
+  EmptyLineBetweenMethodDefs: true
+  EmptyLineBetweenClassDefs: true
+  EmptyLineBetweenModuleDefs: true
 
 Layout/EmptyLines:
   Enabled: true

data/lib/common/lint.yml

@@ -176,7 +176,7 @@ Lint/MixedRegexpCaptureTypes:
   # NOTE: if you use named captures - numbered captures will be ignored. it is bad. validate it.
 
 Lint/MissingSuper:
-  Enabled: false
+  Enabled: true
 
 Lint/MultipleComparison:
   Enabled: true
@@ -301,6 +301,9 @@ Lint/TopLevelReturnWithArgument:
 Lint/TrailingCommaInAttributeDeclaration:
   Enabled: true
 
+Lint/UnexpectedBlockArity:
+  Enabled: false
+
 Lint/UnderscorePrefixedVariableName:
   Enabled: false
 

data/lib/common/metrics.yml

@@ -1,13 +1,16 @@
 Metrics/AbcSize:
   Enabled: true
   Max: 19
+  CountRepeatedAttributes: true
   IgnoredMethods: []
 
 Metrics/BlockLength:
   Enabled: true
   CountComments: false
+  CountAsOne: []
   Max: 25
-  ExcludedMethods: []
+  IgnoredMethods:
+    - refine
   Exclude:
     - Rakefile
     - spec/**/*
@@ -32,6 +35,8 @@ Metrics/MethodLength:
   Enabled: true
   Max: 25
   CountComments: false
+  CountAsOne: []
+  IgnoredMethods: []
 
 Metrics/ModuleLength:
   Enabled: true
@@ -41,6 +46,7 @@ Metrics/ModuleLength:
 Metrics/ParameterLists:
   Enabled: true
   Max: 5
+  MaxOptionalParameters: 3
   CountKeywordArgs: true
 
 Metrics/PerceivedComplexity:

data/lib/common/performance.yml

@@ -1,5 +1,5 @@
 Performance/ArraySemiInfiniteRangeSlice:
-  Enabled: true
+  Enabled: false
 
 Performance/AncestorsInclude:
   Enabled: true

data/lib/common/rails.yml

@@ -33,6 +33,12 @@ Rails/ApplicationController:
 Rails/ApplicationMailer:
   Enabled: false
 
+Rails/AttributeDefaultBlockValue:
+  Enabled: true
+
+Rails/ArelStar:
+  Enabled: true
+
 Rails/RakeEnvironment:
   Enabled: true
   AutoCorrect: true
@@ -271,6 +277,9 @@ Rails/UnknownEnv:
 Rails/Validation:
   Enabled: true
 
+Rails/WhereEquals:
+  Enabled: true
+
 Rails/WhereExists:
   Enabled: false
   EnforcedStyle: exists

data/lib/common/style.yml

@@ -466,6 +466,9 @@ Style/RaiseArgs:
 Style/RandomWithOffset:
   Enabled: true
 
+Style/RedundantArgument:
+  Enabled: false
+
 Style/RedundantAssignment:
   Enabled: true
 
@@ -669,6 +672,7 @@ Style/RedundantSort:
 
 Style/SoleNestedConditional:
   Enabled: true
+  AutoCorrect: true
   AllowModifier: true
 
 Style/UnpackFirst:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: armitage-rubocop
 version: !ruby/object:Gem::Version
-  version: 1.3.1.1
+  version: 1.6.1
 platform: ruby
 authors:
 - Rustam Ibragimov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-18 00:00:00.000000000 Z
+date: 2020-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.9.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: 2.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: 2.9.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -135,6 +135,7 @@ files:
 - ".yamllint"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -179,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.rc.1
+rubygems_version: 3.2.0
 signing_key:
 specification_version: 4
 summary: A set of rubocop settings