RubyGems - rubocop - Versions diffs - 0.37.1 → 0.37.2 - Mend

rubocop 0.37.1 → 0.37.2

Potentially problematic release.

This version of rubocop might be problematic. Click here for more details.

Files changed (20) hide show

checksums.yaml +4 -4
data/README.md +1 -1
data/assets/logo.png +0 -0
data/assets/output.html.erb +247 -0
data/config/enabled.yml +1 -1
data/lib/rubocop/ast_node.rb +1 -1
data/lib/rubocop/cop/lint/literal_in_interpolation.rb +3 -1
data/lib/rubocop/cop/lint/parentheses_as_grouped_expression.rb +1 -1
data/lib/rubocop/cop/mixin/parentheses.rb +4 -3
data/lib/rubocop/cop/mixin/surrounding_space.rb +8 -11
data/lib/rubocop/cop/performance/casecmp.rb +0 -2
data/lib/rubocop/cop/performance/detect.rb +9 -10
data/lib/rubocop/cop/performance/redundant_merge.rb +13 -7
data/lib/rubocop/cop/style/align_hash.rb +0 -2
data/lib/rubocop/cop/style/redundant_parentheses.rb +23 -16
data/lib/rubocop/cop/style/rescue_modifier.rb +4 -7
data/lib/rubocop/cop/style/space_around_operators.rb +1 -1
data/lib/rubocop/result_cache.rb +8 -5
data/lib/rubocop/version.rb +1 -1
metadata +4 -2

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b67d84c23023e9ebfbbf8c68e50d03e81e635f49
-  data.tar.gz: 0a3e93f819e257610f970bc086d5e99578ad4655
+  metadata.gz: b548479b22a3d4b42dd0cf160e59a5dac37ed348
+  data.tar.gz: 8dffc754b643dd17217ba127b5fcaac29d9eaf7a
 SHA512:
-  metadata.gz: da04ad8512393920149f4ae5d0e9b284ebf91e1cff0c22df0261b432d4b30c4b1adb192df930a66e34e308a4a97c0ad5ed5024f11f99b8e55a7ce6784ed18ba2
-  data.tar.gz: df9eab441cdd4086a3af7a6ba5724e15cd6a047773c0acfb75ee47380e14681f3b613bfd5b69a3de2c15b54c2bc6c04d5814c271d61afc96e89d1b58c93ee8cd
+  metadata.gz: c6c841494e223ffe783fa455cda9de2fe53068cbf1e1f2477219b83c7f7e404289f211d0481b495991dc94d34c3c9c61cd9cba1e3214f262dc9ba4b57835da98
+  data.tar.gz: 3a06b603d732922bee4ffd5ec8c24d9c3c4b36eb5f26cd9c0bf7cf4d85a281e88afab9dfbed907adf04f56f7cded0b0184b71531e6bfc9980b86534968465efa

data/README.md CHANGED

@@ -115,7 +115,7 @@ haven't reached version 1.0 yet). To prevent an unwanted RuboCop update you
 might want to use a conservative version locking in your `Gemfile`:
 ```rb
-gem 'rubocop', '~> 0.37.1', require: false
+gem 'rubocop', '~> 0.37.2', require: false
 ```
 ## Basic Usage

data/assets/logo.png ADDED

Binary file

data/assets/output.html.erb ADDED

@@ -0,0 +1,247 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset='UTF-8' />
+    <title>RuboCop Inspection Report</title>
+    <%# TODO: Clean up the messy markup and style definitions. %>
+    <style>
+    * {
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    }
+    body, html {
+    font-size: 62.5%;
+    }
+    body {
+    background-color: #ecedf0;
+    font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+    margin: 0;
+    }
+    code {
+    font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
+    font-size: 85%;
+    }
+    #header {
+    background: #f9f9f9;
+    color: #333;
+    border-bottom: 3px solid #ccc;
+    height: 50px;
+    padding: 0;
+    }
+    #header .logo {
+    float: left;
+    margin: 5px 12px 7px 20px;
+    width: 38px;
+    height: 38px;
+    }
+    #header .title {
+    display: inline-block;
+    float: left;
+    height: 50px;
+    font-size: 2.4rem;
+    letter-spacing: normal;
+    line-height: 50px;
+    margin: 0;
+    }
+    .information, #offenses {
+    width: 100%;
+    padding: 20px;
+    color: #333;
+    }
+    #offenses {
+    padding: 0 20px;
+    }
+    .information .infobox {
+    border-left: 3px solid;
+    border-radius: 4px;
+    background-color: #fff;
+    -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
+    padding: 15px;
+    border-color: #0088cc;
+    font-size: 1.4rem;
+    }
+    .information .infobox .info-title {
+    font-size: 1.8rem;
+    line-height: 2.2rem;
+    margin: 0 0 0.5em;
+    }
+    .information .infobox ul {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+    }
+    .information .infobox ul li {
+    line-height: 1.8rem
+    }
+    #offenses .offense-box {
+    border-radius: 4px;
+    margin-bottom: 20px;
+    background-color: #fff;
+    -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
+    }
+    .fixed .box-title {
+    position: fixed;
+    top: 0;
+    z-index: 10;
+    width: 100%;
+    }
+    .box-title-placeholder {
+    display: none;
+    }
+    .fixed .box-title-placeholder {
+    display: block;
+    }
+    #offenses .offense-box .box-title h3, #offenses .offense-box .box-title-placeholder h3 {
+    color: #33353f;
+    background-color: #f6f6f6;
+    font-size: 2rem;
+    line-height: 2rem;
+    display: block;
+    padding: 15px;
+    border-radius: 5px;
+    margin: 0;
+    }
+    #offenses .offense-box .offense-reports  {
+    padding: 0 15px;
+    }
+    #offenses .offense-box .offense-reports .report {
+    border-bottom: 1px dotted #ddd;
+    padding: 15px 0px;
+    position: relative;
+    font-size: 1.3rem;
+    }
+    #offenses .offense-box .offense-reports .report:last-child {
+    border-bottom: none;
+    }
+    #offenses .offense-box .offense-reports .report pre code {
+    display: block;
+    background: #000;
+    color: #fff;
+    padding: 10px 15px;
+    border-radius: 5px;
+    line-height: 1.6rem;
+    }
+    #offenses .offense-box .offense-reports .report .location {
+    font-weight: bold;
+    }
+    #offenses .offense-box .offense-reports .report .message code {
+    padding: 0.3em;
+    background-color: rgba(0,0,0,0.07);
+    border-radius: 3px;
+    }
+    .severity {
+    text-transform: capitalize;
+    font-weight: bold;
+    }
+    .highlight {
+    padding: 2px;
+    border-radius: 2px;
+    font-weight: bold;
+    }
+    <%- SEVERITY_COLORS.each do |severity, color| %>
+    .severity.<%= severity %> {
+    color: <%= color %>;
+    }
+    .highlight.<%= severity %> {
+    background-color: <%= color.fade_out(0.4) %>;
+    border: 1px solid <%= color.fade_out(0.6) %>;
+    }
+    <%- end %>
+    footer {
+    margin-bottom: 20px;
+    margin-right: 20px;
+    font-size: 1.3rem;
+    color: #777;
+    text-align: right;
+    }
+    </style>
+    <script>
+    (function() {
+      // floating headers. requires classList support.
+      if (!('classList' in document.createElement("_"))) return;
+      var loaded = false,
+        boxes,
+        boxPositions;
+      window.onload = function() {
+        var scrollY = window.scrollY;
+        boxes = document.querySelectorAll('.offense-box');
+        boxPositions = [];
+        for (var i = 0; i < boxes.length; i++)
+          // need to add scrollY because the page might be somewhere other than the top when loaded.
+          boxPositions[i] = boxes[i].getBoundingClientRect().top + scrollY;
+        loaded = true;
+      };
+      window.onscroll = function() {
+        if (!loaded) return;
+        var i,
+          idx,
+          scrollY = window.scrollY;
+        for (i = 0; i < boxPositions.length; i++) {
+          if (scrollY <= boxPositions[i]) {
+            idx = i;
+            break;
+          }
+        }
+        if (typeof idx == 'undefined') idx = boxes.length;
+        if (idx > 0)
+          boxes[idx - 1].classList.add('fixed');
+        for (i = 0; i < boxes.length; i++) {
+          if (i < idx) continue;
+          boxes[i].classList.remove('fixed');
+        }
+      };
+    })();
+    </script>
+  </head>
+  <body>
+    <div id="header">
+      <img class="logo" src="data:image/png;base64,<%= base64_encoded_logo_image %>" alt="">
+      <h1 class="title">RuboCop Inspection Report</h1>
+    </div>
+    <div class="information">
+      <div class="infobox">
+        <%= pluralize(files.count, 'file') %> inspected,
+        <%= pluralize(summary.offense_count, 'offense', no_for_zero: true) %> detected
+      </div>
+    </div>
+    <div id="offenses">
+      <% files.each do |file| %>
+      <% if file.offenses.any? %>
+      <div class="offense-box">
+        <div class="box-title-placeholder"><h3>&nbsp;</h3></div>
+        <div class="box-title"><h3><%= relative_path(file.path) %> - <%= pluralize(file.offenses.count, 'offense') %></h3></div>
+        <div class="offense-reports">
+          <% file.offenses.each do |offense| %>
+          <div class="report">
+            <div class="meta">
+              <span class="location">Line #<%= offense.location.line %></span> –
+              <span class="severity <%= offense.severity %>"><%= offense.severity %>:</span>
+              <span class="message"><%= decorated_message(offense) %></span>
+            </div>
+            <% unless offense.location.source_line.strip.empty? %>
+            <pre><code><%= highlighted_source_line(offense) %></code></pre>
+            <% end %>
+          </div>
+          <% end %>
+        </div>
+      </div>
+      <% end %>
+      <% end %>
+    </div>
+    <footer>
+      Generated by <a href="https://github.com/bbatsov/rubocop">RuboCop</a>
+      <span class="version"><%= RuboCop::Version::STRING %></span>
+    </footer>
+  </body>
+</html>

data/config/enabled.yml CHANGED

@@ -10,7 +10,7 @@ Style/AccessorMethodName:
   Enabled: true
 Style/Alias:
-  Description: 'Use alias_method instead of alias.'
+  Description: 'Use alias instead of alias_method.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#alias-method'
   Enabled: true

data/lib/rubocop/ast_node.rb CHANGED

@@ -500,7 +500,7 @@ module RuboCop
       index = parent.children.index { |child| child.equal?(self) }
       case parent.type
-      when :array, :block, :defined?, :dstr, :dsym, :eflipflop, :erange, :float,
+      when :array, :defined?, :dstr, :dsym, :eflipflop, :erange, :float,
            :hash, :iflipflop, :irange, :not, :pair, :regexp, :str, :sym, :when,
            :xstr
         parent.value_used?

data/lib/rubocop/cop/lint/literal_in_interpolation.rb CHANGED

@@ -25,6 +25,8 @@ module RuboCop
         end
         def autocorrect(node)
+          return if node.dstr_type? # nested, fixed in next iteration
           value = autocorrected_value(node)
           ->(corrector) { corrector.replace(node.parent.source_range, value) }
         end
@@ -44,7 +46,7 @@ module RuboCop
           when :sym
             autocorrected_value_for_symbol(node)
           else
-            node.source
+            node.source.gsub('"', '\"')
           end
         end

data/lib/rubocop/cop/lint/parentheses_as_grouped_expression.rb CHANGED

@@ -15,9 +15,9 @@ module RuboCop
         def on_send(node)
           _receiver, method_name, *args = *node
+          return if args.size > 1
           return if operator?(method_name) || node.asgn_method_call?
           return unless args.first && args.first.source.start_with?('(')
-          return if args.size > 1
           space_length = spaces_before_left_parenthesis(node)
           return unless space_length > 0

data/lib/rubocop/cop/mixin/parentheses.rb CHANGED

@@ -6,9 +6,10 @@ module RuboCop
     # Common functionality for handling parentheses.
     module Parentheses
       def parens_required?(node)
-        source_buffer = node.source_range.source_buffer
-        source_buffer.source[node.source_range.begin_pos - 1] =~ /[a-z]/ ||
-          source_buffer.source[node.source_range.end_pos] =~ /[a-z]/
+        range  = node.source_range
+        source = range.source_buffer.source
+        source[range.begin_pos - 1] =~ /[a-z]/ ||
+          source[range.end_pos] =~ /[a-z]/
       end
       def autocorrect(node)

data/lib/rubocop/cop/mixin/surrounding_space.rb CHANGED

@@ -5,26 +5,23 @@ module RuboCop
   module Cop
     # Common functionality for checking surrounding space.
     module SurroundingSpace
-      def space_between?(t1, t2)
-        between = Parser::Source::Range.new(t1.pos.source_buffer,
-                                            t1.pos.end_pos,
-                                            t2.pos.begin_pos).source
+      def space_between?(t1, _t2)
         # Check if the range between the tokens starts with a space. It can
         # contain other characters, e.g. a unary plus, but it must start with
         # space.
-        between =~ /^\s/
+        t1.pos.source_buffer.source.match(/\G\s/, t1.pos.end_pos)
       end
       def index_of_first_token(node)
-        b = node.source_range.begin
-        token_table[b.line][b.column]
+        range = node.source_range
+        token_table[range.line][range.column]
       end
       def index_of_last_token(node)
-        e = node.source_range.end
-        (0...e.column).to_a.reverse_each do |c|
-          ix = token_table[e.line][c]
+        range = node.source_range
+        table_row = token_table[range.last_line]
+        (0...range.last_column).reverse_each do |c|
+          ix = table_row[c]
           return ix if ix
         end
       end

data/lib/rubocop/cop/performance/casecmp.rb CHANGED

@@ -20,8 +20,6 @@ module RuboCop
       #   'abc'.casecmp('abc').zero?
       #   'abc'.casecmp('ABC'.downcase).zero?
       class Casecmp < Cop
-        include IgnoredNode
         MSG = 'Use `casecmp` instead of `%s %s`.'.freeze
         CASE_METHODS = [:downcase, :upcase].freeze

data/lib/rubocop/cop/performance/detect.rb CHANGED

@@ -26,19 +26,15 @@ module RuboCop
         DANGEROUS_METHODS = [:first, :last].freeze
         def on_send(node)
-          receiver, second_method = *node
-          return if receiver.nil?
-          return unless DANGEROUS_METHODS.include?(second_method)
+          receiver, second_method, *args = *node
+          return unless check_second_call(receiver, second_method, args)
           receiver, _args, body = *receiver if receiver.block_type?
           caller, first_method, args = *receiver
           # check that we have usual block or block pass
           return if body.nil? && (args.nil? || !args.block_pass_type?)
           return unless SELECT_METHODS.include?(first_method)
           return if lazy?(caller)
           range = receiver.loc.selector.join(node.loc.selector)
@@ -59,10 +55,7 @@ module RuboCop
                           preferred_method
                         end
-          first_range = Parser::Source::Range.new(
-            receiver.source,
-            receiver.loc.end.end_pos,
-            receiver.loc.end.end_pos).join(node.loc.selector)
+          first_range = receiver.source_range.end.join(node.loc.selector)
           receiver, _args, _body = *receiver if receiver.block_type?
@@ -74,6 +67,12 @@ module RuboCop
         private
+        def check_second_call(receiver, method, args)
+          receiver &&
+            DANGEROUS_METHODS.include?(method) &&
+            args.empty?
+        end
         def preferred_method
           config.for_cop('Style/CollectionMethods') \
             ['PreferredMethods']['detect'] || 'detect'

data/lib/rubocop/cop/performance/redundant_merge.rb CHANGED

@@ -38,14 +38,11 @@ module RuboCop
               parent = node.parent
               if parent && pairs.size > 1
                 if modifier_flow_control(parent)
-                  cond, = *parent
-                  padding = "\n#{' ' * indent_width}"
-                  new_source.gsub!(/\n/, padding)
-                  new_source = parent.loc.keyword.source << ' ' <<
-                               cond.source << padding << leading_spaces(node) <<
-                               new_source << "\n" << leading_spaces(node) <<
-                               'end'
+                  new_source = rewrite_with_modifier(node, parent, new_source)
                   node = parent
+                else
+                  padding = "\n#{leading_spaces(node)}"
+                  new_source.gsub!(/\n/, padding)
                 end
               end
@@ -69,6 +66,15 @@ module RuboCop
           end
         end
+        def rewrite_with_modifier(node, parent, new_source)
+          cond, = *parent
+          padding = "\n#{(' ' * indent_width) + leading_spaces(node)}"
+          new_source.gsub!(/\n/, padding)
+          parent.loc.keyword.source << ' ' << cond.source << padding <<
+            new_source << "\n" << leading_spaces(node) << 'end'
+        end
         def leading_spaces(node)
           node.source_range.source_line[/\A\s*/]
         end

data/lib/rubocop/cop/style/align_hash.rb CHANGED

@@ -7,8 +7,6 @@ module RuboCop
       # Here we check if the keys, separators, and values of a multi-line hash
       # literal are aligned.
       class AlignHash < Cop
-        include IgnoredNode
         # Handles calculation of deltas (deviations from correct alignment)
         # when the enforced style is 'key'.
         class KeyAlignment

data/lib/rubocop/cop/style/redundant_parentheses.rb CHANGED

@@ -22,20 +22,31 @@ module RuboCop
         def_node_matcher :square_brackets?, '(send (send _recv _msg) :[] ...)'
         def_node_matcher :range_end?, '^^{irange erange}'
         def_node_matcher :method_node_and_args, '$(send _recv _msg $...)'
+        def_node_matcher :rescue?, '{^resbody ^^resbody}'
+        def_node_matcher :arg_in_call_with_block?,
+                         '^^(block (send _ _ equal?(%0) ...) ...)'
         def on_begin(node)
-          return unless parentheses?(node)
-          child_node = node.children.first
-          return if keyword_ancestor?(node) && parens_required?(node)
-          return if child_node.hash_type? && first_argument?(node) &&
-                    !parentheses?(node.parent)
+          return if !parentheses?(node) || parens_allowed?(node)
+          check(node)
+        end
-          return if rescue?(node)
-          check(node, child_node)
+        def parens_allowed?(node)
+          child  = node.children.first
+          parent = node.parent
+          # don't flag `break(1)`, etc
+          (keyword_ancestor?(node) && parens_required?(node)) ||
+            # don't flag `method ({key: value})`
+            (child.hash_type? && first_arg?(node) && !parentheses?(parent)) ||
+            # don't flag `rescue(ExceptionClass)`
+            rescue?(node) ||
+            # don't flag `method (arg) { }`
+            (arg_in_call_with_block?(node) && !parentheses?(parent))
         end
-        def check(begin_node, node)
+        def check(begin_node)
+          node = begin_node.children.first
           if keyword_with_redundant_parentheses?(node)
             return offense(begin_node, 'a keyword')
           end
@@ -59,7 +70,7 @@ module RuboCop
         end
         def keyword_ancestor?(node)
-          node.ancestors.first && node.ancestors.first.keyword?
+          node.parent && node.parent.keyword?
         end
         def disallowed_literal?(node)
@@ -89,16 +100,12 @@ module RuboCop
           args.empty? || parentheses?(send_node) || square_brackets?(send_node)
         end
-        def first_argument?(node)
+        def first_arg?(node)
           send_node = node.parent
           return false unless send_node && send_node.send_type?
           _receiver, _method_name, *args = *send_node
-          node == args.first
-        end
-        def rescue?(node)
-          node.parent && node.parent.array_type?
+          node.equal?(args.first)
         end
       end
     end

data/lib/rubocop/cop/style/rescue_modifier.rb CHANGED

@@ -26,25 +26,22 @@ module RuboCop
           operation, rescue_modifier, = *node
           *_, rescue_args = *rescue_modifier
+          indent = indentation(node)
           correction =
             "begin\n" \
-            "#{indentation(node)}#{operation.source}" \
+            "#{operation.source.gsub(/^/, indent)}" \
             "\n#{offset(node)}rescue\n" \
-            "#{indentation(node)}#{rescue_args.source}" \
+            "#{rescue_args.source.gsub(/^/, indent)}" \
             "\n#{offset(node)}end"
-          range = Parser::Source::Range.new(node.source_range.source_buffer,
-                                            node.source_range.begin_pos,
-                                            node.source_range.end_pos)
           lambda do |corrector|
-            corrector.replace(range, correction)
+            corrector.replace(node.source_range, correction)
           end
         end
         private
         def modifier?(node)
-          return false unless @modifier_locations.respond_to?(:include?)
           @modifier_locations.include?(node.loc.keyword)
         end
       end

data/lib/rubocop/cop/style/space_around_operators.rb CHANGED

@@ -41,7 +41,7 @@ module RuboCop
             on_special_asgn(node)
           elsif !node.unary_operation? && !called_with_dot?(node)
             op = node.method_name
-            if op != :[] && op != :! && operator?(op)
+            if op != :[] && op != :! && op != :[]= && operator?(op)
               _, _, right, = *node
               check_operator(node.loc.selector, right.source_range)
             end

data/lib/rubocop/result_cache.rb CHANGED

@@ -57,7 +57,7 @@ module RuboCop
     def initialize(file, options, config_store, cache_root = nil)
       cache_root ||= ResultCache.cache_root(config_store)
       @path = File.join(cache_root, rubocop_checksum,
-                        relevant_options(options),
+                        relevant_options_digest(options),
                         file_checksum(file, config_store))
       @cached_data = CachedData.new(file)
     end
@@ -129,12 +129,15 @@ module RuboCop
         end
     end
-    # Return the options given at invocation, minus the ones that have no
-    # effect on which offenses and disabled line ranges are found, and thus
+    # Return a hash of the options given at invocation, minus the ones that have
+    # no effect on which offenses and disabled line ranges are found, and thus
     # don't affect caching.
-    def relevant_options(options)
+    def relevant_options_digest(options)
       options = options.reject { |key, _| NON_CHANGING.include?(key) }
-      options.to_s.gsub(/[^a-z]+/i, '_')
+      options = options.to_s.gsub(/[^a-z]+/i, '_')
+      # We must avoid making file names too long for some filesystems to handle
+      # If they are short, we can leave them human-readable
+      options.length <= 32 ? options : Digest::MD5.hexdigest(options)
     end
   end
 end

data/lib/rubocop/version.rb CHANGED

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

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 0.37.1
+  version: 0.37.2
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -121,6 +121,8 @@ extra_rdoc_files:
 files:
 - LICENSE.txt
 - README.md
+- assets/logo.png
+- assets/output.html.erb
 - bin/rubocop
 - config/default.yml
 - config/disabled.yml