rubocop 0.59.2 → 0.60.0

data/lib/rubocop/node_pattern.rb

@@ -96,27 +96,27 @@ module RuboCop
     # @private
     # Builds Ruby code which implements a pattern
     class Compiler
-      SYMBOL       = %r{:(?:[\w+@*/?!<>=~|%^-]+|\[\]=?)}
-      IDENTIFIER   = /[a-zA-Z_-]/
-      META         = /\(|\)|\{|\}|\[|\]|\$\.\.\.|\$|!|\^|\.\.\./
-      NUMBER       = /-?\d+(?:\.\d+)?/
-      STRING       = /".+?"/
-      METHOD_NAME  = /\#?#{IDENTIFIER}+[\!\?]?\(?/
-      PARAM_NUMBER = /%\d*/
-
-      SEPARATORS = /[\s]+/
+      SYMBOL       = %r{:(?:[\w+@*/?!<>=~|%^-]+|\[\]=?)}.freeze
+      IDENTIFIER   = /[a-zA-Z_-]/.freeze
+      META         = /\(|\)|\{|\}|\[|\]|\$\.\.\.|\$|!|\^|\.\.\./.freeze
+      NUMBER       = /-?\d+(?:\.\d+)?/.freeze
+      STRING       = /".+?"/.freeze
+      METHOD_NAME  = /\#?#{IDENTIFIER}+[\!\?]?\(?/.freeze
+      PARAM_NUMBER = /%\d*/.freeze
+
+      SEPARATORS = /[\s]+/.freeze
       TOKENS     = Regexp.union(META, PARAM_NUMBER, NUMBER,
                                 METHOD_NAME, SYMBOL, STRING)
 
-      TOKEN = /\G(?:#{SEPARATORS}|#{TOKENS}|.)/
+      TOKEN = /\G(?:#{SEPARATORS}|#{TOKENS}|.)/.freeze
 
-      NODE      = /\A#{IDENTIFIER}+\Z/
-      PREDICATE = /\A#{IDENTIFIER}+\?\(?\Z/
-      WILDCARD  = /\A_#{IDENTIFIER}*\Z/
-      FUNCALL   = /\A\##{METHOD_NAME}/
-      LITERAL   = /\A(?:#{SYMBOL}|#{NUMBER}|#{STRING})\Z/
-      PARAM     = /\A#{PARAM_NUMBER}\Z/
-      CLOSING   = /\A(?:\)|\}|\])\Z/
+      NODE      = /\A#{IDENTIFIER}+\Z/.freeze
+      PREDICATE = /\A#{IDENTIFIER}+\?\(?\Z/.freeze
+      WILDCARD  = /\A_#{IDENTIFIER}*\Z/.freeze
+      FUNCALL   = /\A\##{METHOD_NAME}/.freeze
+      LITERAL   = /\A(?:#{SYMBOL}|#{NUMBER}|#{STRING})\Z/.freeze
+      PARAM     = /\A#{PARAM_NUMBER}\Z/.freeze
+      CLOSING   = /\A(?:\)|\}|\])\Z/.freeze
 
       attr_reader :match_code
 

data/lib/rubocop/options.rb

@@ -94,22 +94,24 @@ module RuboCop
 
     def add_configuration_options(opts)
       option(opts, '-c', '--config FILE')
+      option(opts, '--force-exclusion')
+      option(opts, '--ignore-parent-exclusion')
+      option(opts, '--force-default-config')
+      add_auto_gen_options(opts)
+    end
 
+    def add_auto_gen_options(opts)
       option(opts, '--auto-gen-config')
 
       option(opts, '--exclude-limit COUNT') do
         @validator.validate_exclude_limit_option
       end
 
-      option(opts, '--force-exclusion')
-      option(opts, '--ignore-parent-exclusion')
-
-      option(opts, '--force-default-config')
-
       option(opts, '--no-offense-counts') do
         @options[:no_offense_counts] = true
       end
 
+      option(opts, '--auto-gen-only-exclude')
       option(opts, '--no-auto-gen-timestamp') do
         @options[:no_auto_gen_timestamp] = true
       end
@@ -156,6 +158,8 @@ module RuboCop
       option(opts, '-R', '--rails')
       option(opts, '-a', '--auto-correct')
 
+      option(opts, '--safe')
+
       option(opts, '--[no-]color')
 
       option(opts, '-v', '--version')
@@ -173,6 +177,9 @@ module RuboCop
         @options[:only] << 'Layout'
         @options[:auto_correct] = true
       end
+      option(opts, '--safe-auto-correct') do
+        @options[:auto_correct] = true
+      end
     end
 
     def add_list_options(opts)
@@ -272,7 +279,8 @@ module RuboCop
 
       message = '--%<flag>s can only be used together with --auto-gen-config.'
 
-      %i[exclude_limit no_offense_counts no_auto_gen_timestamp].each do |option|
+      %i[exclude_limit no_offense_counts no_auto_gen_timestamp
+         auto_gen_only_exclude].each do |option|
         if @options.key?(option)
           raise OptionArgumentError,
                 format(message, flag: option.to_s.tr('_', '-'))
@@ -342,84 +350,87 @@ module RuboCop
   module OptionsHelp
     MAX_EXCL = RuboCop::Options::DEFAULT_MAXIMUM_EXCLUSION_ITEMS.to_s
     TEXT = {
-      only:                  'Run only the given cop(s).',
-      only_guide_cops:      ['Run only cops for rules that link to a',
-                             'style guide.'],
-      except:                'Disable the given cop(s).',
-      require:               'Require Ruby file.',
-      config:                'Specify configuration file.',
-      auto_gen_config:      ['Generate a configuration file acting as a',
-                             'TODO list.'],
-      no_offense_counts:    ['Do not include offense counts in configuration',
-                             'file generated by --auto-gen-config.'],
-      no_auto_gen_timestamp:
-                            ['Do not include the date and time when',
-                             'the --auto-gen-config was run in the file it',
-                             'generates.'],
-      exclude_limit:        ['Used together with --auto-gen-config to',
-                             'set the limit for how many Exclude',
-                             "properties to generate. Default is #{MAX_EXCL}."],
-      force_exclusion:      ['Force excluding files specified in the',
-                             'configuration `Exclude` even if they are',
-                             'explicitly passed as arguments.'],
-      ignore_parent_exclusion:
-                            ['Prevent from inheriting AllCops/Exclude from',
-                             'parent folders.'],
+      only: 'Run only the given cop(s).',
+      only_guide_cops: ['Run only cops for rules that link to a',
+                        'style guide.'],
+      except: 'Disable the given cop(s).',
+      require: 'Require Ruby file.',
+      config: 'Specify configuration file.',
+      auto_gen_config: ['Generate a configuration file acting as a',
+                        'TODO list.'],
+      no_offense_counts: ['Do not include offense counts in configuration',
+                          'file generated by --auto-gen-config.'],
+      no_auto_gen_timestamp: ['Do not include the date and time when',
+                              'the --auto-gen-config was run in the file it',
+                              'generates.'],
+      auto_gen_only_exclude: ['Generate only Exclude parameters and not Max',
+                              'when running --auto-gen-config, except if the',
+                              'number of files with offenses is bigger than',
+                              'exclude-limit.'],
+      exclude_limit: ['Used together with --auto-gen-config to',
+                      'set the limit for how many Exclude',
+                      "properties to generate. Default is #{MAX_EXCL}."],
+      force_exclusion: ['Force excluding files specified in the',
+                        'configuration `Exclude` even if they are',
+                        'explicitly passed as arguments.'],
+      ignore_parent_exclusion: ['Prevent from inheriting AllCops/Exclude from',
+                                'parent folders.'],
       force_default_config: ['Use default configuration even if configuration',
                              'files are present in the directory tree.'],
-      format:               ['Choose an output formatter. This option',
-                             'can be specified multiple times to enable',
-                             'multiple formatters at the same time.',
-                             '  [p]rogress (default)',
-                             '  [s]imple',
-                             '  [c]lang',
-                             '  [d]isabled cops via inline comments',
-                             '  [fu]ubar',
-                             '  [e]macs',
-                             '  [j]son',
-                             '  [h]tml',
-                             '  [fi]les',
-                             '  [o]ffenses',
-                             '  [w]orst',
-                             '  [t]ap',
-                             '  [q]uiet',
-                             '  [a]utogenconf',
-                             '  custom formatter class name'],
-      out:                  ['Write output to a file instead of STDOUT.',
-                             'This option applies to the previously',
-                             'specified --format, or the default format',
-                             'if no format is specified.'],
-      fail_level:           ['Minimum severity (A/R/C/W/E/F) for exit',
-                             'with error code.'],
-      display_only_fail_level_offenses:
-                            ['Only output offense messages at',
-                             'the specified --fail-level or above'],
-      show_cops:            ['Shows the given cops, or all cops by',
-                             'default, and their configurations for the',
-                             'current directory.'],
-      fail_fast:            ['Inspect files in order of modification',
-                             'time and stop after the first file',
-                             'containing offenses.'],
-      cache:                ["Use result caching (FLAG=true) or don't",
-                             '(FLAG=false), default determined by',
-                             'configuration parameter AllCops: UseCache.'],
-      debug:                 'Display debug info.',
-      display_cop_names:     ['Display cop names in offense messages.',
-                              'Default is true.'],
-      display_style_guide:   'Display style guide URLs in offense messages.',
-      extra_details:         'Display extra details in offense messages.',
-      rails:                 'Run extra Rails cops.',
-      lint:                  'Run only lint cops.',
-      list_target_files:     'List all files RuboCop will inspect.',
-      auto_correct:          'Auto-correct offenses.',
-      fix_layout:            'Run only layout cops, with auto-correct on.',
-      color:                 'Force color output on or off.',
-      version:               'Display version.',
-      verbose_version:       'Display verbose version.',
-      parallel:             ['Use available CPUs to execute inspection in',
-                             'parallel.'],
-      stdin:                ['Pipe source from STDIN, using FILE in offense',
-                             'reports. This is useful for editor integration.']
+      format: ['Choose an output formatter. This option',
+               'can be specified multiple times to enable',
+               'multiple formatters at the same time.',
+               '  [p]rogress (default)',
+               '  [s]imple',
+               '  [c]lang',
+               '  [d]isabled cops via inline comments',
+               '  [fu]ubar',
+               '  [e]macs',
+               '  [j]son',
+               '  [h]tml',
+               '  [fi]les',
+               '  [o]ffenses',
+               '  [w]orst',
+               '  [t]ap',
+               '  [q]uiet',
+               '  [a]utogenconf',
+               '  custom formatter class name'],
+      out: ['Write output to a file instead of STDOUT.',
+            'This option applies to the previously',
+            'specified --format, or the default format',
+            'if no format is specified.'],
+      fail_level: ['Minimum severity (A/R/C/W/E/F) for exit',
+                   'with error code.'],
+      display_only_fail_level_offenses: ['Only output offense messages at',
+                                         'the specified --fail-level or above'],
+      show_cops: ['Shows the given cops, or all cops by',
+                  'default, and their configurations for the',
+                  'current directory.'],
+      fail_fast: ['Inspect files in order of modification',
+                  'time and stop after the first file',
+                  'containing offenses.'],
+      cache: ["Use result caching (FLAG=true) or don't",
+              '(FLAG=false), default determined by',
+              'configuration parameter AllCops: UseCache.'],
+      debug: 'Display debug info.',
+      display_cop_names: ['Display cop names in offense messages.',
+                          'Default is true.'],
+      display_style_guide: 'Display style guide URLs in offense messages.',
+      extra_details: 'Display extra details in offense messages.',
+      rails: 'Run extra Rails cops.',
+      lint: 'Run only lint cops.',
+      safe: 'Run only safe cops.',
+      list_target_files: 'List all files RuboCop will inspect.',
+      auto_correct: 'Auto-correct offenses.',
+      safe_auto_correct: 'Run auto-correct only when it\'s safe.',
+      fix_layout: 'Run only layout cops, with auto-correct on.',
+      color: 'Force color output on or off.',
+      version: 'Display version.',
+      verbose_version: 'Display verbose version.',
+      parallel: ['Use available CPUs to execute inspection in',
+                 'parallel.'],
+      stdin: ['Pipe source from STDIN, using FILE in offense',
+              'reports. This is useful for editor integration.']
     }.freeze
   end
 end

data/lib/rubocop/result_cache.rb

@@ -97,7 +97,15 @@ module RuboCop
 
     def save(offenses)
       dir = File.dirname(@path)
-      FileUtils.mkdir_p(dir)
+
+      begin
+        FileUtils.mkdir_p(dir)
+      rescue Errno::EACCES => e
+        warn "Couldn't create cache directory. Continuing without cache."\
+             "\n  #{e.message}"
+        return
+      end
+
       preliminary_path = "#{@path}_#{rand(1_000_000_000)}"
       # RuboCop must be in control of where its cached data is stored. A
       # symbolic link anywhere in the cache directory tree can be an

data/lib/rubocop/rspec/expect_offense.rb

@@ -5,7 +5,7 @@ module RuboCop
     # Mixin for `expect_offense` and `expect_no_offenses`
     #
     # This mixin makes it easier to specify strict offense expectations
-    # and a declarative and visual fashion. Just type out the code that
+    # in a declarative and visual fashion. Just type out the code that
     # should generate a offense, annotate code by writing '^'s
     # underneath each character that should be highlighted, and follow
     # the carets with a string (separated by a space) that is the
@@ -65,7 +65,7 @@ module RuboCop
 
       # Parsed representation of code annotated with the `^^^ Message` style
       class AnnotatedSource
-        ANNOTATION_PATTERN = /\A\s*\^+ /
+        ANNOTATION_PATTERN = /\A\s*\^+ /.freeze
 
         # @param annotated_source [String] string passed to the matchers
         #

data/lib/rubocop/rspec/shared_contexts.rb

@@ -3,7 +3,7 @@
 require 'tmpdir'
 require 'fileutils'
 
-shared_context 'isolated environment', :isolated_environment do
+RSpec.shared_context 'isolated environment', :isolated_environment do
   around do |example|
     Dir.mktmpdir do |tmpdir|
       original_home = ENV['HOME']
@@ -36,7 +36,7 @@ shared_context 'isolated environment', :isolated_environment do
 end
 
 # `cop_config` must be declared with #let.
-shared_context 'config', :config do
+RSpec.shared_context 'config', :config do
   let(:config) do
     # Module#<
     unless described_class < RuboCop::Cop::Cop
@@ -59,38 +59,38 @@ shared_context 'config', :config do
   end
 end
 
-shared_context 'ruby 2.2', :ruby22 do
+RSpec.shared_context 'ruby 2.2', :ruby22 do
   let(:ruby_version) { 2.2 }
 end
 
-shared_context 'ruby 2.3', :ruby23 do
+RSpec.shared_context 'ruby 2.3', :ruby23 do
   let(:ruby_version) { 2.3 }
 end
 
-shared_context 'ruby 2.4', :ruby24 do
+RSpec.shared_context 'ruby 2.4', :ruby24 do
   let(:ruby_version) { 2.4 }
 end
 
-shared_context 'ruby 2.5', :ruby25 do
+RSpec.shared_context 'ruby 2.5', :ruby25 do
   let(:ruby_version) { 2.5 }
 end
 
-shared_context 'ruby 2.6', :ruby26 do
+RSpec.shared_context 'ruby 2.6', :ruby26 do
   let(:ruby_version) { 2.6 }
 end
 
-shared_context 'with Rails', :enabled_rails do
+RSpec.shared_context 'with Rails', :enabled_rails do
   let(:enabled_rails) { true }
 end
 
-shared_context 'with Rails 3', :rails3 do
+RSpec.shared_context 'with Rails 3', :rails3 do
   let(:rails_version) { 3.0 }
 end
 
-shared_context 'with Rails 4', :rails4 do
+RSpec.shared_context 'with Rails 4', :rails4 do
   let(:rails_version) { 4.0 }
 end
 
-shared_context 'with Rails 5', :rails5 do
+RSpec.shared_context 'with Rails 5', :rails5 do
   let(:rails_version) { 5.0 }
 end

data/lib/rubocop/rspec/shared_examples.rb

@@ -2,7 +2,7 @@
 
 # `cop` and `source` must be declared with #let.
 
-shared_examples_for 'misaligned' do |annotated_source, used_style|
+RSpec.shared_examples_for 'misaligned' do |annotated_source, used_style|
   config_to_allow_offenses = if used_style
                                { 'EnforcedStyleAlignWith' => used_style.to_s }
                              else
@@ -31,7 +31,7 @@ shared_examples_for 'misaligned' do |annotated_source, used_style|
   end
 end
 
-shared_examples_for 'aligned' do |alignment_base, arg, end_kw, name|
+RSpec.shared_examples_for 'aligned' do |alignment_base, arg, end_kw, name|
   name ||= alignment_base
   name = name.gsub(/\n/, ' <newline>')
   it "accepts matching #{name} ... end" do
@@ -40,7 +40,7 @@ shared_examples_for 'aligned' do |alignment_base, arg, end_kw, name|
   end
 end
 
-shared_examples_for 'debugger' do |name, src|
+RSpec.shared_examples_for 'debugger' do |name, src|
   it "reports an offense for a #{name} call" do
     inspect_source(src)
     src = [src] if src.is_a? String
@@ -51,7 +51,7 @@ shared_examples_for 'debugger' do |name, src|
   end
 end
 
-shared_examples_for 'non-debugger' do |name, src|
+RSpec.shared_examples_for 'non-debugger' do |name, src|
   it "does not report an offense for #{name}" do
     inspect_source(src)
     expect(cop.offenses).to be_empty

data/lib/rubocop/string_interpreter.rb

@@ -16,7 +16,7 @@ module RuboCop
                             u[0-9a-fA-F]{4}   |   # unicode char escape
                             u\{[^}]*\}        |   # extended unicode escape
                             .                     # any other escaped char
-                          )/x
+                          )/x.freeze
     class << self
       def interpret(string)
         # We currently don't handle \cx, \C-x, and \M-x

data/lib/rubocop/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '0.59.2'.freeze
+    STRING = '0.60.0'.freeze
 
     MSG = '%<version>s (using Parser %<parser_version>s, running on ' \
           '%<ruby_engine>s %<ruby_version>s %<ruby_platform>s)'.freeze

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 0.59.2
+  version: 0.60.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-24 00:00:00.000000000 Z
+date: 2018-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jaro_winkler
@@ -114,20 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -174,8 +168,6 @@ files:
 - bin/console
 - bin/setup
 - config/default.yml
-- config/disabled.yml
-- config/enabled.yml
 - exe/rubocop
 - lib/rubocop.rb
 - lib/rubocop/ast/builder.rb
@@ -425,6 +417,7 @@ files:
 - lib/rubocop/cop/metrics/module_length.rb
 - lib/rubocop/cop/metrics/parameter_lists.rb
 - lib/rubocop/cop/metrics/perceived_complexity.rb
+- lib/rubocop/cop/metrics/utils/abc_size_calculator.rb
 - lib/rubocop/cop/mixin/alignment.rb
 - lib/rubocop/cop/mixin/annotation_comment.rb
 - lib/rubocop/cop/mixin/array_hash_indentation.rb
@@ -822,7 +815,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Automatic Ruby code style checking tool.