rubocop 0.26.1 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dd2c1c375e842c50e244af47472085016e9214e
-  data.tar.gz: 355612f83c8f6774162368b1dfdaaa677bd9dbb9
+  metadata.gz: 30651383f11c3dcaac288e77b0055e6523b509fe
+  data.tar.gz: 245cd91aaf840d894118ed9f0530c1d3019b9c1f
 SHA512:
-  metadata.gz: 3b9b20e7c9eca832d37b245745fe68c9b6d2bb0132c98b752ff530a2988e4d65cffd9d17d1d3a06785a75010dda8d69f827460cf1a141db6c6ca3da614f34e01
-  data.tar.gz: 909ee8bd3302d9c32c9340980d67f03b757de1745523f38d914173ec48203edf224145cc0890e79cdb6336ed7cea03aa0b1169692aec3db31ca3aa6f4fcea4c9
+  metadata.gz: 56e26bc6f778104eae7226a633e6eca1f5302d263c1ae4d8a208031c08bc688011817dc55272a8962c586cc436639749b504b208f4ac415d87f11aaedda40a49
+  data.tar.gz: f457149f614495b72eabfc4fece9f96007aa18f6debb384bc4dadb6bd580b45ac3bcf0818d8241cf3a5524f04ca881324c0c7ee4238f03973b41148f74e21f76

data/.rubocop.yml

@@ -2,5 +2,10 @@
 
 inherit_from: .rubocop_todo.yml
 
+AllCops:
+  Exclude:
+    - 'vendor/**/*'
+    - 'spec/fixtures/**/*'
+
 Style/Encoding:
   Enabled: true

data/.rubocop_todo.yml

@@ -1,24 +1,28 @@
 # This configuration was generated by `rubocop --auto-gen-config`
-# on 2014-07-27 10:46:47 +0200 using RuboCop version 0.24.1.
+# on 2014-10-22 08:31:49 +0200 using RuboCop version 0.26.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 8
+# Offense count: 116
+Metrics/AbcSize:
+  Max: 33
+
+# Offense count: 10
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
   Max: 131
 
-# Offense count: 30
+# Offense count: 27
 Metrics/CyclomaticComplexity:
   Max: 10
 
-# Offense count: 124
+# Offense count: 129
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 21
+  Max: 16
 
-# Offense count: 22
+# Offense count: 16
 Metrics/PerceivedComplexity:
   Max: 11

data/.travis.yml

@@ -11,6 +11,8 @@ matrix:
     - rvm: ruby-head
     - rvm: rbx-2
 before_install: gem update --remote bundler
+install:
+  - bundle install --retry=3
 script:
   - bundle exec rspec
   - bundle exec rubocop

data/CHANGELOG.md

@@ -2,6 +2,34 @@
 
 ## master (unreleased)
 
+## 0.27.0 (30/10/2014)
+
+### New features
+
+* [#1348](https://github.com/bbatsov/rubocop/issues/1348): New cop `ElseAlignment` checks alignment of `else` and `elsif` keywords. ([@jonas054][])
+* [#1321](https://github.com/bbatsov/rubocop/issues/1321): New cop `MultilineOperationIndentation` checks indentation/alignment of binary operations if they span more than one line. ([@jonas054][])
+* [#1077](https://github.com/bbatsov/rubocop/issues/1077): New cop `Metrics/AbcSize` checks the ABC metric, based on assignments, branches, and conditions. ([@jonas054][], [@jfelchner][])
+* [#1352](https://github.com/bbatsov/rubocop/issues/1352): `WordArray` is now configurable with the `WordRegex` option. ([@bquorning][])
+* [#1181](https://github.com/bbatsov/rubocop/issues/1181): New cop `Style/StringLiteralsInInterpolation` checks quotes inside interpolated expressions in strings. ([@jonas054][])
+* [#872](https://github.com/bbatsov/rubocop/issues/872): `Style/IndentationWidth` is now configurable with the `Width` option. ([@jonas054][])
+* [#1396](https://github.com/bbatsov/rubocop/issues/1396): Include `.opal` files by default. ([@bbatsov][])
+* [#771](https://github.com/bbatsov/rubocop/issues/771): Three new `Style` cops, `EmptyLinesAroundMethodBody` , `EmptyLinesAroundClassBody` , and `EmptyLinesAroundModuleBody` replace the `EmptyLinesAroundBody` cop. ([@jonas054][])
+
+### Changes
+
+* [#1084](https://github.com/bbatsov/rubocop/issues/1084): Disabled `Style/CollectionMethods` by default. ([@bbatsov][])
+
+### Bugs fixed
+
+* `AlignHash` no longer skips multiline hashes that contain some elements on the same line. ([@mvz][])
+* [#1349](https://github.com/bbatsov/rubocop/issues/1349): `BracesAroundHashParameters` no longer cleans up whitespace in autocorrect, as these extra corrections are likely to interfere with other cops' corrections. ([@jonas054][])
+* [#1350](https://github.com/bbatsov/rubocop/issues/1350): Guard against `Blocks` cop introducing syntax errors in auto-correct. ([@jonas054][])
+* [#1374](https://github.com/bbatsov/rubocop/issues/1374): To eliminate interference, auto-correction is now done by one cop at a time, with saving and re-parsing inbetween. ([@jonas054][])
+* [#1388](https://github.com/bbatsov/rubocop/issues/1388): Fix a false positive in `FormatString`. ([@bbatsov][])
+* [#1389](https://github.com/bbatsov/rubocop/issues/1389): Make `--out` to create parent directories. ([@yous][])
+* Refine HTML formatter. ([@yujinakayama][])
+* [#1410](https://github.com/bbatsov/rubocop/issues/1410): Handle specially Java primitive type references in `ColonMethodCall`. ([@bbatsov][])
+
 ## 0.26.1 (18/09/2014)
 
 ### Bugs fixed
@@ -1103,3 +1131,5 @@
 [@jspanjers]: https://github.com/jspanjers
 [@sch1zo]: https://github.com/sch1zo
 [@smangelsdorf]: https://github.com/smangelsdorf
+[@mvz]: https://github.com/mvz
+[@jfelchner]: https://github.com/jfelchner

data/README.md

@@ -4,6 +4,7 @@
 [![Coverage Status](http://img.shields.io/coveralls/bbatsov/rubocop/master.svg)](https://coveralls.io/r/bbatsov/rubocop)
 [![Code Climate](https://codeclimate.com/github/bbatsov/rubocop/badges/gpa.svg)](https://codeclimate.com/github/bbatsov/rubocop)
 [![Inline docs](http://inch-ci.org/github/bbatsov/rubocop.svg)](http://inch-ci.org/github/bbatsov/rubocop)
+[![Gratipay](http://img.shields.io/gratipay/bbatsov.svg)](https://www.gratipay.com/bbatsov/)
 
 <p align="center">
   <img src="https://raw.github.com/bbatsov/rubocop/master/logo/rubo-logo-horizontal.png" alt="RuboCop Logo"/>
@@ -22,6 +23,10 @@ Most aspects of its behavior can be tweaked via various
 Apart from reporting problems in your code, RuboCop can also
 automatically fix some of the problems for you.
 
+You can support my work on RuboCop and [all my other projects](https://github.com/bbatsov) via [gratipay](https://www.gratipay.com/bbatsov).
+
+[![Support via Gratipay](https://cdn.rawgit.com/gratipay/gratipay-badge/2.1.3/dist/gratipay.png)](https://gratipay.com/bbatsov)
+
 **This documentation tracks the `master` branch of RuboCop. Some of
 the features and settings discussed here might not be available in
 older releases (including the current stable release). Please, consult
@@ -794,9 +799,11 @@ priority right now. Writing a new cop is a great way to dive into RuboCop!
 Of course, bug reports and suggestions for improvements are always
 welcome. GitHub pull requests are even better! :-)
 
-I'm also accepting financial contributions via [gittip](https://www.gittip.com/bbatsov).
+You can also support my work on RuboCop and
+[all my other projects](https://github.com/bbatsov) via
+[gratipay](https://www.gratipay.com/bbatsov).
 
-[![Support via Gittip](https://rawgithub.com/twolfson/gittip-badge/0.2.0/dist/gittip.png)](https://www.gittip.com/bbatsov)
+[![Support via Gratipay](https://cdn.rawgit.com/gratipay/gratipay-badge/2.1.3/dist/gratipay.png)](https://gratipay.com/bbatsov)
 
 ## Mailing List
 

data/assets/output.html.erb

@@ -2,14 +2,15 @@
 <html>
   <head>
     <meta charset='UTF-8' />
-    <title>RuboCop output</title>
+    <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%;
     }
@@ -18,26 +19,33 @@
     font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
     margin: 0;
     }
+    code {
+    font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
+    font-size: 85%;
+    }
     #header {
-    background: #171717;
-    border-bottom: none;
-    border-left: 1px solid #3a3a3a;
-    box-shadow: 1px 3px 0 1px #cccccc;
+    background: #f9f9f9;
+    color: #333;
+    border-bottom: 3px solid #ccc;
     height: 50px;
     padding: 0;
     }
-    h2 {
-    color: #FFF;
+    #header .logo {
+    float: left;
+    margin: 5px 12px 7px 20px;
+    width: 38px;
+    height: 38px;
+    }
+    #header .title {
     display: inline-block;
     float: left;
     height: 50px;
-    font-size: 2rem;
+    font-size: 2.4rem;
     letter-spacing: normal;
     line-height: 50px;
     margin: 0;
-    padding: 0 22px 0 20px;
     }
-    
+
     .information, #offenses {
     width: 100%;
     padding: 20px;
@@ -46,7 +54,7 @@
     #offenses {
     padding: 0 20px;
     }
-    
+
     .information .infobox {
     border-left: 3px solid;
     border-radius: 4px;
@@ -55,24 +63,22 @@
     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;
+    margin: 0 0 0.5em;
     }
     .information .infobox ul {
-    font-size: 1.4rem;
     list-style: none;
     margin: 0;
-    margin-top: 5px;
     padding: 0;
     }
     .information .infobox ul li {
     line-height: 1.8rem
     }
-    
+
     #offenses .offense-box {
     border-radius: 4px;
     margin-bottom: 20px;
@@ -102,71 +108,76 @@
     #offenses .offense-box .offense-reports .report:last-child {
     border-bottom: none;
     }
-    #offenses .offense-box .offense-reports .report pre {
+    #offenses .offense-box .offense-reports .report pre code {
+    display: block;
     background: #000;
     color: #fff;
     padding: 10px 15px;
-    font-size: 1.2rem;
     border-radius: 5px;
     line-height: 1.6rem;
     }
     #offenses .offense-box .offense-reports .report .location {
-    padding: 0;
-    list-style: none;
+    font-weight: bold;
     }
-    #offenses .offense-box .offense-reports .report .location li {
-    display: inline;
-    margin-right: 10px;
+    #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;
     }
-    .severity.convention, .severity.refactor {
-    color: #47a447;
+    .highlight {
+    padding: 2px;
+    border-radius: 2px;
+    font-weight: bold;
     }
-    .severity.warning {
-    color: #ed9c28;
+    <%- SEVERITY_COLORS.each do |severity, color| %>
+    .severity.<%= severity %> {
+    color: <%= color %>;
     }
-    .severity.error, .severity.fatal {
-    color: #d2322d;
+    .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>
   </head>
   <body>
     <div id="header">
-      <h2>RuboCop Output</h2>
+      <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">
-        <h4 class="info-title">RuboCop Stats</h4>
-        <ul>
-          <li><strong>Offense Count:</strong> <%= output_hash[:summary][:offense_count] %></li>
-          <li><strong>Target File Count:</strong> <%= output_hash[:summary][:target_file_count] %></li>
-          <li><strong>Inspected File Count:</strong> <%= output_hash[:summary][:inspected_file_count] %></li>
-        </ul>
+        <%= pluralize(files.count, 'file') %> inspected,
+        <%= pluralize(summary.offense_count, 'offense', no_for_zero: true) %> detected
       </div>
     </div>
     <div id="offenses">
-      <% output_hash[:files].each do |file| %>
-      <% if file[:offenses].any? %>
+      <% files.each do |file| %>
+      <% if file.offenses.any? %>
       <div class="offense-box">
-        <div class="box-title"><h3><%= file[:path] %> - <%= file[:offenses].length %></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| %>
+          <% file.offenses.each do |offense| %>
           <div class="report">
-            <p class="message"><span class="severity <%= offense[:severity] %>"><%= offense[:severity] %>:</span> <%= offense[:message] %></p>
-            <% if offense[:location][:source_line].strip.length > 0 %>
-<pre>
-<%= offense[:location][:source_line] %>
-<%= offense[:location][:highlight] %>
-</pre>
+            <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 %>
-            <ul class="location">
-              <li><strong>Line: </strong> <%= offense[:location][:line] %></li>
-              <li><strong>Column: </strong> <%= offense[:location][:column] %></li>
-              <li><strong>Length: </strong> <%= offense[:location][:length] %></li>
-            </ul>
           </div>
           <% end %>
         </div>
@@ -174,17 +185,9 @@
       <% end %>
       <% end %>
     </div>
-    <div class="information">
-      <div class="infobox">
-        <h4 class="info-title">Environment Information</h4>
-        <ul>
-          <li><strong>RuboCop Version:</strong> <%= output_hash[:metadata][:rubocop_version] %></li>
-          <li><strong>Ruby Engine:</strong> <%= output_hash[:metadata][:ruby_engine] %></li>
-          <li><strong>Ruby Version:</strong> <%= output_hash[:metadata][:ruby_version] %></li>
-          <li><strong>Ruby Patch Level:</strong> <%= output_hash[:metadata][:ruby_patchlevel] %></li>
-          <li><strong>Ruby Platform:</strong> <%= output_hash[:metadata][:ruby_platform] %></li>
-        </ul>
-      </div>
-    </div>
+    <footer>
+      Generated by <a href="https://github.com/bbatsov/rubocop">RuboCop</a>
+      <span class="version"><%= RuboCop::Version::STRING %></span>
+    </footer>
   </body>
-</html>
+</html>

data/config/default.yml

@@ -13,6 +13,7 @@ AllCops:
     - '**/*.podspec'
     - '**/*.jbuilder'
     - '**/*.rake'
+    - '**/*.opal'
     - '**/Gemfile'
     - '**/Rakefile'
     - '**/Capfile'
@@ -20,6 +21,9 @@ AllCops:
     - '**/Podfile'
     - '**/Thorfile'
     - '**/Vagrantfile'
+    - '**/Berksfile'
+    - '**/Cheffile'
+    - '**/Vagabondfile'
   Exclude:
     - 'vendor/**/*'
   # By default, the rails cops are not run. Override in project or home
@@ -210,6 +214,18 @@ Style/EmptyLineBetweenDefs:
   # need an empty line between them.
   AllowAdjacentOneLineDefs: false
 
+Style/EmptyLinesAroundClassBody:
+  EnforcedStyle: no_empty_lines
+  SupportedStyles:
+    - empty_lines
+    - no_empty_lines
+
+Style/EmptyLinesAroundModuleBody:
+  EnforcedStyle: no_empty_lines
+  SupportedStyles:
+    - empty_lines
+    - no_empty_lines
+
 # Checks whether the source file has a utf-8 encoding comment or not
 Style/Encoding:
   EnforcedStyle: always
@@ -218,13 +234,9 @@ Style/Encoding:
     - always
 
 Style/FileName:
-  Exclude:
-    - '**/Rakefile'
-    - '**/Gemfile'
-    - '**/Capfile'
-    - '**/Vagrantfile'
-    - '**/Podfile'
-    - '**/Thorfile'
+  # File names listed in AllCops:Include are excluded by default. Add extra
+  # excludes here.
+  Exclude: []
 
 # Checks use of for or each in multiline loops.
 Style/For:
@@ -259,6 +271,10 @@ Style/HashSyntax:
 Style/IfUnlessModifier:
   MaxLineLength: 80
 
+Style/IndentationWidth:
+  # Number of spaces for each indentation level.
+  Width: 2
+
 # Checks the indentation of the first key in a hash literal.
 Style/IndentHash:
   # The value `special_inside_parentheses` means that hash literals with braces
@@ -312,6 +328,12 @@ Style/MethodName:
     - snake_case
     - camelCase
 
+Style/MultilineOperationIndentation:
+  EnforcedStyle: aligned
+  SupportedStyles:
+    - aligned
+    - indented
+
 Style/NumericLiterals:
   MinDigits: 5
 
@@ -393,6 +415,12 @@ Style/StringLiterals:
     - single_quotes
     - double_quotes
 
+Style/StringLiteralsInInterpolation:
+  EnforcedStyle: single_quotes
+  SupportedStyles:
+    - single_quotes
+    - double_quotes
+
 Style/SpaceAroundEqualsInParameterDefault:
   EnforcedStyle: space
   SupportedStyles:
@@ -486,9 +514,16 @@ Style/WhileUntilModifier:
 
 Style/WordArray:
   MinSize: 0
+  # The regular expression WordRegex decides what is considered a word.
+  WordRegex: !ruby/regexp '/\A[\p{Word}]+\z/'
 
 ##################### Metrics ##################################
 
+Metrics/AbcSize:
+  # The ABC size is a calculated magnitude, so this number can be a Fixnum or
+  # a Float.
+  Max: 15
+
 Metrics/BlockNesting:
   Max: 3