rubocop 0.48.0 → 0.48.1

data/lib/rubocop/formatter/colorizable.rb

@@ -22,7 +22,7 @@ module RuboCop
         rainbow.wrap(string).color(*args)
       end
 
-      %i(
+      %i[
         black
         red
         green
@@ -31,7 +31,7 @@ module RuboCop
         magenta
         cyan
         white
-      ).each do |color|
+      ].each do |color|
         define_method(color) do |string|
           colorize(string, color)
         end

data/lib/rubocop/formatter/disabled_config_formatter.rb

@@ -102,7 +102,7 @@ module RuboCop
 
       def cop_config_params(default_cfg, cfg)
         default_cfg.keys -
-          %w(Description StyleGuide Reference Enabled Exclude) -
+          %w[Description StyleGuide Reference Enabled Exclude] -
           cfg.keys
       end
 

data/lib/rubocop/formatter/formatter_set.rb

@@ -22,7 +22,7 @@ module RuboCop
         'worst'    => WorstOffendersFormatter
       }.freeze
 
-      FORMATTER_APIS = %i(started finished).freeze
+      FORMATTER_APIS = %i[started finished].freeze
 
       FORMATTER_APIS.each do |method_name|
         define_method(method_name) do |*args|

data/lib/rubocop/options.rb

@@ -6,7 +6,7 @@ require 'shellwords'
 module RuboCop
   # This class handles command line options.
   class Options
-    EXITING_OPTIONS = %i(version verbose_version show_cops).freeze
+    EXITING_OPTIONS = %i[version verbose_version show_cops].freeze
     DEFAULT_MAXIMUM_EXCLUSION_ITEMS = 15
 
     def initialize
@@ -23,8 +23,16 @@ module RuboCop
 
       @validator.validate_compatibility
 
-      if @options[:stdin] && !args.one?
-        raise ArgumentError, '-s/--stdin requires exactly one path.'
+      if @options[:stdin]
+        # The parser has put the file name given after --stdin into
+        # @options[:stdin]. The args array should be empty.
+        if args.any?
+          raise ArgumentError, '-s/--stdin requires exactly one path.'
+        end
+        # We want the STDIN contents in @options[:stdin] and the file name in
+        # args to simplify the rest of the processing.
+        args = [@options[:stdin]]
+        @options[:stdin] = $stdin.binmode.read
       end
 
       [@options, args]
@@ -58,6 +66,8 @@ module RuboCop
         add_severity_option(opts)
         add_flags_with_optional_args(opts)
         add_boolean_flags(opts)
+
+        option(opts, '-s', '--stdin FILE')
       end
     end
 
@@ -142,11 +152,10 @@ module RuboCop
       end
       option(opts, '-a', '--auto-correct')
 
-      option(opts, '-n', '--[no-]color') { |c| @options[:color] = c }
+      option(opts, '--[no-]color') { |c| @options[:color] = c }
 
       option(opts, '-v', '--version')
       option(opts, '-V', '--verbose-version')
-      option(opts, '-s', '--stdin') { @options[:stdin] = $stdin.binmode.read }
     end
 
     def add_list_options(opts)
@@ -184,7 +193,7 @@ module RuboCop
       names.each do |name|
         next if Cop::Cop.registry.names.include?(name)
         next if departments.include?(name)
-        next if %w(Syntax Lint/Syntax).include?(name)
+        next if %w[Syntax Lint/Syntax].include?(name)
 
         raise ArgumentError, "Unrecognized cop or department: #{name}."
       end
@@ -215,16 +224,16 @@ module RuboCop
 
     def only_includes_unneeded_disable?
       @options.key?(:only) &&
-        (@options[:only] & %w(Lint/UnneededDisable UnneededDisable)).any?
+        (@options[:only] & %w[Lint/UnneededDisable UnneededDisable]).any?
     end
 
     def except_syntax?
       @options.key?(:except) &&
-        (@options[:except] & %w(Lint/Syntax Syntax)).any?
+        (@options[:except] & %w[Lint/Syntax Syntax]).any?
     end
 
     def boolean_or_empty_cache?
-      !@options.key?(:cache) || %w(true false).include?(@options[:cache])
+      !@options.key?(:cache) || %w[true false].include?(@options[:cache])
     end
 
     def no_offense_counts_without_auto_gen_config?
@@ -314,8 +323,8 @@ module RuboCop
       no_color:              'Force color output on or off.',
       version:               'Display version.',
       verbose_version:       'Display verbose version.',
-      stdin:                ['Pipe source from STDIN.',
-                             'This is useful for editor integration.']
+      stdin:                ['Pipe source from STDIN, using FILE in offense',
+                             'reports. This is useful for editor integration.']
     }.freeze
   end
 end

data/lib/rubocop/processed_source.rb

@@ -70,7 +70,7 @@ module RuboCop
 
     def valid_syntax?
       return false if @parser_error
-      @diagnostics.none? { |d| %i(error fatal).include?(d.level) }
+      @diagnostics.none? { |d| %i[error fatal].include?(d.level) }
     end
 
     # Raw source checksum for tracking infinite loops.

data/lib/rubocop/result_cache.rb

@@ -8,8 +8,8 @@ require 'etc'
 module RuboCop
   # Provides functionality for caching rubocop runs.
   class ResultCache
-    NON_CHANGING = %i(color format formatters out debug fail_level
-                      cache fail_fast stdin).freeze
+    NON_CHANGING = %i[color format formatters out debug fail_level
+                      cache fail_fast stdin].freeze
 
     # Remove old files so that the cache doesn't grow too big. When the
     # threshold MaxFilesInCache has been exceeded, the oldest 50% of all the

data/lib/rubocop/rspec/shared_examples.rb

@@ -22,7 +22,7 @@ shared_examples_for 'mimics MRI 2.1' do |grep_mri_warning|
         offense_by_mri = offenses_by_mri[index]
         # Exclude column attribute since MRI does not
         # output column number.
-        %i(severity line cop_name).each do |a|
+        %i[severity line cop_name].each do |a|
           expect(offense_by_cop.send(a)).to eq(offense_by_mri.send(a))
         end
       end

data/lib/rubocop/runner.rb

@@ -261,7 +261,7 @@ module RuboCop
       @mobilized_cop_classes[config.object_id] ||= begin
         cop_classes = Cop::Cop.all
 
-        %i(only except).each do |opt|
+        %i[only except].each do |opt|
           OptionsValidator.validate_cop_list(@options[opt])
         end
 

data/lib/rubocop/target_finder.rb

@@ -3,7 +3,7 @@
 require 'set'
 
 module RuboCop
-  RUBY_EXTENSIONS = %w(.rb
+  RUBY_EXTENSIONS = %w[.rb
                        .builder
                        .fcgi
                        .gemspec
@@ -21,15 +21,15 @@ module RuboCop
                        .ruby
                        .spec
                        .thor
-                       .watchr).freeze
+                       .watchr].freeze
 
-  RUBY_INTERPRETERS = %w(ruby
+  RUBY_INTERPRETERS = %w[ruby
                          macruby
                          rake
                          jruby
-                         rbx).freeze
+                         rbx].freeze
 
-  RUBY_FILENAMES = %w(.irbrc
+  RUBY_FILENAMES = %w[.irbrc
                       .pryrc
                       Appraisals
                       Berksfile
@@ -48,7 +48,7 @@ module RuboCop
                       Snapfile
                       Thorfile
                       Vagrantfile
-                      buildfile).freeze
+                      buildfile].freeze
 
   # This class finds target files to inspect by scanning the directory tree
   # and picking ruby files.

data/lib/rubocop/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '0.48.0'.freeze
+    STRING = '0.48.1'.freeze
 
     MSG = '%s (using Parser %s, running on %s %s %s)'.freeze
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 0.48.0
+  version: 0.48.1
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-26 00:00:00.000000000 Z
+date: 2017-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow