rubocop 0.26.0 → 0.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 800751d069262c05789ef58ff88e1b89cc84926f
-  data.tar.gz: 87c0f2ae5445f9a95671dc7bdcc949545adcbf2f
+  metadata.gz: 8dd2c1c375e842c50e244af47472085016e9214e
+  data.tar.gz: 355612f83c8f6774162368b1dfdaaa677bd9dbb9
 SHA512:
-  metadata.gz: 85b985829442ce2e4fe87a526c5f214a78ea7956b0589e34620473e426a62783e2944e46acb28cef8fb7a2bd4e84e11e00fbf7e5f86025d6f5f88dc19047d27d
-  data.tar.gz: 3908cc133515d66b1d8e861c3caa7fd1e5a7eab03a4217a03c856586d9f2f1d9f31b4c949cd8c6aabc870dc5d2655a3bbc530eb4be17cd4c4550205e6710a626
+  metadata.gz: 3b9b20e7c9eca832d37b245745fe68c9b6d2bb0132c98b752ff530a2988e4d65cffd9d17d1d3a06785a75010dda8d69f827460cf1a141db6c6ca3da614f34e01
+  data.tar.gz: 909ee8bd3302d9c32c9340980d67f03b757de1745523f38d914173ec48203edf224145cc0890e79cdb6336ed7cea03aa0b1169692aec3db31ca3aa6f4fcea4c9

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## master (unreleased)
 
+## 0.26.1 (18/09/2014)
+
+### Bugs fixed
+
+* [#1326](https://github.com/bbatsov/rubocop/issues/1326): Fix problem in `SpaceInsideParens` with detecting space inside parentheses used for grouping expressions. ([@jonas054][])
+* [#1335](https://github.com/bbatsov/rubocop/issues/1335): Restrict URI schemes permitted by `LineLength` when `AllowURI` is enabled. ([@smangelsdorf][])
+* [#1339](https://github.com/bbatsov/rubocop/issues/1339): Handle `eql?` and `equal?` in `OpMethod`. ([@bbatsov][])
+* [#1340](https://github.com/bbatsov/rubocop/issues/1340): Fix crash in `Style/SymbolProc` cop when the block calls a method with no explicit receiver. ([@smangelsdorf][])
+
 ## 0.26.0 (03/09/2014)
 
 ### New features
@@ -1093,3 +1102,4 @@
 [@SkuliOskarsson]: https://github.com/SkuliOskarsson
 [@jspanjers]: https://github.com/jspanjers
 [@sch1zo]: https://github.com/sch1zo
+[@smangelsdorf]: https://github.com/smangelsdorf

data/README.md

@@ -5,7 +5,9 @@
 [![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)
 
-# RuboCop
+<p align="center">
+  <img src="https://raw.github.com/bbatsov/rubocop/master/logo/rubo-logo-horizontal.png" alt="RuboCop Logo"/>
+</p>
 
 > Role models are important. <br/>
 > -- Officer Alex J. Murphy / RoboCop
@@ -68,6 +70,7 @@ release.**
     - [Creating Custom Formatter](#creating-custom-formatter)
     - [Using Custom Formatter in Command Line](#using-custom-formatter-in-command-line)
 - [Team](#team)
+- [Logo](#logo)
 - [Contributors](#contributors)
 - [Mailing List](#mailing-list)
 - [Changelog](#changelog)
@@ -766,6 +769,14 @@ Here's a list of RuboCop's core developers:
 * [Yuji Nakayama](https://github.com/yujinakayama)
 * [Evgeni Dzhelyov](https://github.com/edzhelyov)
 
+## Logo
+
+RuboCop's logo was created by [Dimiter Petrov](https://www.chadomoto.com/). You can find the logo in various
+formats [here](https://github.com/bbatsov/rubocop/tree/master/logo).
+
+The logo is licensed under a
+[Creative Commons Attribution-NonCommercial 4.0 International License](http://creativecommons.org/licenses/by-nc/4.0/deed.en_GB).
+
 ## Contributors
 
 Here's a [list](https://github.com/bbatsov/rubocop/contributors) of

data/Rakefile

@@ -14,9 +14,7 @@ require 'rake'
 require 'rspec/core'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
+RSpec::Core::RakeTask.new(:spec)
 
 desc 'Run RSpec with code coverage'
 task :coverage do

data/config/default.yml

@@ -503,6 +503,9 @@ Metrics/CyclomaticComplexity:
 Metrics/LineLength:
   Max: 80
   AllowURI: true
+  URISchemes:
+    - http
+    - https
 
 Metrics/MethodLength:
   CountComments: false  # count full line comments?

data/config/enabled.yml

@@ -142,6 +142,7 @@ Style/CommentAnnotation:
   Description: >-
                  Checks formatting of special comments
                  (TODO, FIXME, OPTIMIZE, HACK, REVIEW).
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#annotate-keywords'
   Enabled: true
 
 Style/CommentIndentation:
@@ -155,6 +156,7 @@ Style/ConstantName:
 
 Style/DefWithParentheses:
   Description: 'Use def with parentheses when there are arguments.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#method-parens'
   Enabled: true
 
 Style/DeprecatedHashMethods:
@@ -335,6 +337,7 @@ Style/ModuleFunction:
 
 Style/MultilineBlockChain:
   Description: 'Avoid multi-line chains of blocks.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#single-line-blocks'
   Enabled: true
 
 Style/MultilineBlockLayout:
@@ -447,6 +450,7 @@ Style/RaiseArgs:
 
 Style/RedundantBegin:
   Description: "Don't use begin blocks when they are not needed."
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#begin-implicit'
   Enabled: true
 
 Style/RedundantException:

data/lib/rubocop/cop/metrics/line_length.rb

@@ -64,7 +64,7 @@ module RuboCop
           unscanned_position = 0
 
           loop do
-            match_data = string.match(URI.regexp, unscanned_position)
+            match_data = string.match(uri_regexp, unscanned_position)
             break unless match_data
 
             uri_ish_string = match_data[0]
@@ -82,6 +82,10 @@ module RuboCop
         rescue
           false
         end
+
+        def uri_regexp
+          URI.regexp(cop_config['URISchemes'])
+        end
       end
     end
   end

data/lib/rubocop/cop/style/op_method.rb

@@ -8,17 +8,25 @@ module RuboCop
       class OpMethod < Cop
         MSG = 'When defining the `%s` operator, name its argument `other`.'
 
+        OP_LIKE_METHODS = [:eql?, :equal?]
+
         BLACKLISTED = [:+@, :-@, :[], :[]=, :<<]
 
         TARGET_ARGS = [s(:args, s(:arg, :other)), s(:args, s(:arg, :_other))]
 
         def on_def(node)
           name, args, _body = *node
-          return unless name !~ /\A\w/ && !BLACKLISTED.include?(name) &&
-            args.children.size == 1 && !TARGET_ARGS.include?(args)
+          return unless op_method?(name) &&
+                        args.children.size == 1 &&
+                        !TARGET_ARGS.include?(args)
 
           add_offense(args.children[0], :expression, format(MSG, name))
         end
+
+        def op_method?(name)
+          return false if BLACKLISTED.include?(name)
+          name !~ /\A\w/ || OP_LIKE_METHODS.include?(name)
+        end
       end
     end
   end

data/lib/rubocop/cop/style/redundant_begin.rb

@@ -9,7 +9,7 @@ module RuboCop
       #
       # @example
       #
-      #   def test
+      #   def redundant
       #     begin
       #       ala
       #       bala
@@ -17,6 +17,13 @@ module RuboCop
       #       something
       #     end
       #   end
+      #
+      #   def preferred
+      #     ala
+      #     bala
+      #   rescue StandardError => e
+      #     something
+      #   end
       class RedundantBegin < Cop
         include OnMethod
 

data/lib/rubocop/cop/style/space_inside_parens.rb

@@ -8,7 +8,7 @@ module RuboCop
         include SpaceInside
 
         def specifics
-          [:tLPAREN2, :tRPAREN, 'parentheses']
+          [[:tLPAREN, :tLPAREN2], :tRPAREN, 'parentheses']
         end
       end
     end

data/lib/rubocop/cop/style/symbol_proc.rb

@@ -24,21 +24,9 @@ module RuboCop
           return if ignored_method?(bmethod_name)
           # File.open(file) { |f| f.readlines }
           return if bargs
-          # something { |x, y| ... }
-          return unless block_args.children.size == 1
-          return unless block_body && block_body.type == :send
-
-          receiver, method_name, args = *block_body
-
-          # method in block must be invoked on a lvar without args
-          return if args
-          return if receiver.type != :lvar
-
-          block_arg_name, = *block_args.children.first
-          receiver_name, = *receiver
-
-          return if block_arg_name != receiver_name
+          return unless can_shorten?(block_args, block_body)
 
+          _receiver, method_name, _args = *block_body
           add_offense(node,
                       :expression,
                       format(MSG,
@@ -65,6 +53,23 @@ module RuboCop
         def ignored_method?(name)
           ignored_methods.include?(name.to_s)
         end
+
+        def can_shorten?(block_args, block_body)
+          # something { |x, y| ... }
+          return false unless block_args.children.size == 1
+          return false unless block_body && block_body.type == :send
+
+          receiver, _method_name, args = *block_body
+
+          # method in block must be invoked on a lvar without args
+          return false if args
+          return false unless receiver && receiver.type == :lvar
+
+          block_arg_name, = *block_args.children.first
+          receiver_name, = *receiver
+
+          block_arg_name == receiver_name
+        end
       end
     end
   end

data/lib/rubocop/version.rb

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

data/relnotes/v0.26.1.md

@@ -0,0 +1,12 @@
+RuboCop 0.26.1 is a bugfix-only release. Below is a list of the bugs we've fixed since 0.26.0:
+
+### Bugs fixed
+
+* [#1326](https://github.com/bbatsov/rubocop/issues/1326): Fix problem in `SpaceInsideParens` with detecting space inside parentheses used for grouping expressions. ([@jonas054][])
+* [#1335](https://github.com/bbatsov/rubocop/issues/1335): Restrict URI schemes permitted by `LineLength` when `AllowURI` is enabled. ([@smangelsdorf][])
+* [#1339](https://github.com/bbatsov/rubocop/issues/1339): Handle `eql?` and `equal?` in `OpMethod`. ([@bbatsov][])
+* [#1340](https://github.com/bbatsov/rubocop/issues/1340): Fix crash in `Style/SymbolProc` cop when the block calls a method with no explicit receiver. ([@smangelsdorf][])
+
+[@bbatsov]: https://github.com/bbatsov
+[@jonas054]: https://github.com/jonas054
+[@smangelsdorf]: https://github.com/smangelsdorf

data/spec/rubocop/cli_spec.rb

@@ -589,7 +589,7 @@ describe RuboCop::CLI, :isolated_environment do
         expect(cli.run(['--auto-gen-config'])).to eq(1)
         expect(IO.readlines('.rubocop_todo.yml')[7..-1].map(&:chomp))
           .to eq(['# Offense count: 1',
-                  '# Configuration parameters: AllowURI.',
+                  '# Configuration parameters: AllowURI, URISchemes.',
                   'Metrics/LineLength:',
                   '  Max: 85',
                   '',
@@ -652,7 +652,7 @@ describe RuboCop::CLI, :isolated_environment do
            'again.',
            '',
            '# Offense count: 2',
-           '# Configuration parameters: AllowURI.',
+           '# Configuration parameters: AllowURI, URISchemes.',
            'Metrics/LineLength:',
            '  Max: 90',
            '',

data/spec/rubocop/config_loader_spec.rb

@@ -195,7 +195,8 @@ describe RuboCop::ConfigLoader do
               'https://github.com/bbatsov/ruby-style-guide#80-character-limits',
               'Enabled' => true,
               'Max' => 77,
-              'AllowURI' => true
+              'AllowURI' => true,
+              'URISchemes' => %w(http https)
             },
             'Metrics/MethodLength' => {
               'Description' =>

data/spec/rubocop/cop/metrics/line_length_spec.rb

@@ -79,6 +79,10 @@ describe RuboCop::Cop::Metrics::LineLength, :config do
 
     context 'and an error other than URI::InvalidURIError is raised ' \
             'while validating an URI-ish string' do
+      let(:cop_config) do
+        { 'Max' => 80, 'AllowURI' => true, 'URISchemes' => %w(LDAP) }
+      end
+
       # rubocop:disable Metrics/LineLength
       let(:source) { <<-END }
         xxxxxxxxxxxxxxxxxxxxxxxxxxxxzxxxxxxxxxxx = LDAP::DEFAULT_GROUP_UNIQUE_MEMBER_LIST_KEY
@@ -89,6 +93,30 @@ describe RuboCop::Cop::Metrics::LineLength, :config do
         expect { inspect_source(cop, source) }.not_to raise_error
       end
     end
+
+    context 'and the URL does not have a http(s) scheme' do
+      # rubocop:disable Metrics/LineLength
+      let(:source) { <<-END }
+        xxxxxxxxxxxxxxxxxxxxxxxxxxxxzxxxxxxxxxxx = 'otherprotocol://a.very.long.line.which.violates.LineLength/sadf'
+      END
+      # rubocop:enable Metrics/LineLength
+
+      it 'rejects the line' do
+        inspect_source(cop, source)
+        expect(cop.offenses.size).to eq(1)
+      end
+
+      context 'and the scheme has been configured' do
+        let(:cop_config) do
+          { 'Max' => 80, 'AllowURI' => true, 'URISchemes' => %w(otherprotocol) }
+        end
+
+        it 'accepts the line' do
+          inspect_source(cop, source)
+          expect(cop.offenses).to be_empty
+        end
+      end
+    end
   end
 
   context 'when AllowURI option is disabled' do

data/spec/rubocop/cop/style/op_method_spec.rb

@@ -5,14 +5,17 @@ require 'spec_helper'
 describe RuboCop::Cop::Style::OpMethod do
   subject(:cop) { described_class.new }
 
-  it 'registers an offense for arg not named other' do
-    inspect_source(cop,
-                   ['def +(another)',
-                    '  another',
-                    'end'])
-    expect(cop.offenses.size).to eq(1)
-    expect(cop.messages)
-      .to eq(['When defining the `+` operator, name its argument `other`.'])
+  [:+, :eql?, :equal?].each do |op|
+    it "registers an offense for #{op} with arg not named other" do
+      inspect_source(cop,
+                     ["def #{op}(another)",
+                      '  another',
+                      'end'])
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.messages)
+        .to eq(["When defining the `#{op}` operator, " \
+                'name its argument `other`.'])
+    end
   end
 
   it 'works properly even if the argument not surrounded with braces' do

data/spec/rubocop/cop/style/space_inside_parens_spec.rb

@@ -7,10 +7,8 @@ describe RuboCop::Cop::Style::SpaceInsideParens do
 
   it 'registers an offense for spaces inside parens' do
     inspect_source(cop, ['f( 3)',
-                         'g(3 )'])
-    expect(cop.messages).to eq(
-      ['Space inside parentheses detected.',
-       'Space inside parentheses detected.'])
+                         'g = (a + 3 )'])
+    expect(cop.messages).to eq(['Space inside parentheses detected.'] * 2)
   end
 
   it 'accepts parentheses in block parameter list' do
@@ -39,8 +37,8 @@ describe RuboCop::Cop::Style::SpaceInsideParens do
 
   it 'auto-corrects unwanted space' do
     new_source = autocorrect_source(cop, ['f( 3)',
-                                          'g(3 )'])
+                                          'g = ( a + 3 )'])
     expect(new_source).to eq(['f(3)',
-                              'g(3)'].join("\n"))
+                              'g = (a + 3)'].join("\n"))
   end
 end

data/spec/rubocop/cop/style/symbol_proc_spec.rb

@@ -73,4 +73,9 @@ describe RuboCop::Cop::Style::SymbolProc, :config do
     corrected = autocorrect_source(cop, ['coll.map { |s| s.upcase }'])
     expect(corrected).to eq 'coll.map(&:upcase)'
   end
+
+  it 'does not crash with a bare method call' do
+    run = -> { inspect_source(cop, ['coll.map { |s| bare_method }']) }
+    expect(&run).not_to raise_error
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.26.1
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2014-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -454,6 +454,10 @@ files:
 - lib/rubocop/target_finder.rb
 - lib/rubocop/token.rb
 - lib/rubocop/version.rb
+- logo/rubo-logo-horizontal.png
+- logo/rubo-logo-square.png
+- logo/rubo-logo-symbol.png
+- logo/rubocop-final-logo.eps
 - relnotes/v0.19.0.md
 - relnotes/v0.19.1.md
 - relnotes/v0.20.0.md
@@ -465,6 +469,7 @@ files:
 - relnotes/v0.24.1.md
 - relnotes/v0.25.0.md
 - relnotes/v0.26.0.md
+- relnotes/v0.26.1.md
 - rubocop.gemspec
 - spec/.rubocop.yml
 - spec/isolated_environment_spec.rb