rubocop 0.24.1 → 0.25.0

data/spec/spec_helper.rb

@@ -67,6 +67,7 @@ RSpec.configure do |config|
   # get run.
   config.filter_run :focus
   config.run_all_when_everything_filtered = true
+  config.order = :random
 
   broken_filter = lambda do |v|
     v.is_a?(Symbol) ? RUBY_ENGINE == v.to_s : v

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 0.24.1
+  version: 0.25.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -38,7 +38,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0.pre.3
+        version: 2.2.0.pre.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -48,7 +48,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0.pre.3
+        version: 2.2.0.pre.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -66,26 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.6
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.7
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.7
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -245,21 +225,29 @@ files:
 - lib/rubocop/cop/lint/useless_else_without_rescue.rb
 - lib/rubocop/cop/lint/useless_setter_call.rb
 - lib/rubocop/cop/lint/void.rb
+- lib/rubocop/cop/metrics/block_nesting.rb
+- lib/rubocop/cop/metrics/class_length.rb
+- lib/rubocop/cop/metrics/cyclomatic_complexity.rb
+- lib/rubocop/cop/metrics/line_length.rb
+- lib/rubocop/cop/metrics/method_length.rb
+- lib/rubocop/cop/metrics/parameter_lists.rb
+- lib/rubocop/cop/metrics/perceived_complexity.rb
 - lib/rubocop/cop/mixin/access_modifier_node.rb
 - lib/rubocop/cop/mixin/annotation_comment.rb
 - lib/rubocop/cop/mixin/array_syntax.rb
 - lib/rubocop/cop/mixin/autocorrect_alignment.rb
 - lib/rubocop/cop/mixin/autocorrect_unless_changing_ast.rb
 - lib/rubocop/cop/mixin/check_assignment.rb
-- lib/rubocop/cop/mixin/check_methods.rb
 - lib/rubocop/cop/mixin/code_length.rb
 - lib/rubocop/cop/mixin/configurable_enforced_style.rb
 - lib/rubocop/cop/mixin/configurable_max.rb
 - lib/rubocop/cop/mixin/configurable_naming.rb
 - lib/rubocop/cop/mixin/end_keyword_alignment.rb
 - lib/rubocop/cop/mixin/if_node.rb
-- lib/rubocop/cop/mixin/if_then_else.rb
+- lib/rubocop/cop/mixin/method_complexity.rb
 - lib/rubocop/cop/mixin/negative_conditional.rb
+- lib/rubocop/cop/mixin/on_method.rb
+- lib/rubocop/cop/mixin/on_normal_if_unless.rb
 - lib/rubocop/cop/mixin/parser_diagnostic.rb
 - lib/rubocop/cop/mixin/percent_literal.rb
 - lib/rubocop/cop/mixin/safe_assignment.rb
@@ -291,9 +279,10 @@ files:
 - lib/rubocop/cop/style/ascii_comments.rb
 - lib/rubocop/cop/style/ascii_identifiers.rb
 - lib/rubocop/cop/style/attr.rb
+- lib/rubocop/cop/style/bare_percent_literals.rb
 - lib/rubocop/cop/style/begin_block.rb
 - lib/rubocop/cop/style/block_comments.rb
-- lib/rubocop/cop/style/block_nesting.rb
+- lib/rubocop/cop/style/block_end_newline.rb
 - lib/rubocop/cop/style/blocks.rb
 - lib/rubocop/cop/style/braces_around_hash_parameters.rb
 - lib/rubocop/cop/style/case_equality.rb
@@ -302,7 +291,6 @@ files:
 - lib/rubocop/cop/style/class_and_module_camel_case.rb
 - lib/rubocop/cop/style/class_and_module_children.rb
 - lib/rubocop/cop/style/class_check.rb
-- lib/rubocop/cop/style/class_length.rb
 - lib/rubocop/cop/style/class_methods.rb
 - lib/rubocop/cop/style/class_vars.rb
 - lib/rubocop/cop/style/collection_methods.rb
@@ -310,7 +298,6 @@ files:
 - lib/rubocop/cop/style/comment_annotation.rb
 - lib/rubocop/cop/style/comment_indentation.rb
 - lib/rubocop/cop/style/constant_name.rb
-- lib/rubocop/cop/style/cyclomatic_complexity.rb
 - lib/rubocop/cop/style/def_with_parentheses.rb
 - lib/rubocop/cop/style/deprecated_hash_methods.rb
 - lib/rubocop/cop/style/documentation.rb
@@ -344,14 +331,13 @@ files:
 - lib/rubocop/cop/style/lambda_call.rb
 - lib/rubocop/cop/style/leading_comment_space.rb
 - lib/rubocop/cop/style/line_end_concatenation.rb
-- lib/rubocop/cop/style/line_length.rb
 - lib/rubocop/cop/style/method_call_parentheses.rb
 - lib/rubocop/cop/style/method_called_on_do_end_block.rb
 - lib/rubocop/cop/style/method_def_parentheses.rb
-- lib/rubocop/cop/style/method_length.rb
 - lib/rubocop/cop/style/method_name.rb
 - lib/rubocop/cop/style/module_function.rb
 - lib/rubocop/cop/style/multiline_block_chain.rb
+- lib/rubocop/cop/style/multiline_block_layout.rb
 - lib/rubocop/cop/style/multiline_if_then.rb
 - lib/rubocop/cop/style/multiline_ternary_operator.rb
 - lib/rubocop/cop/style/negated_if.rb
@@ -364,9 +350,9 @@ files:
 - lib/rubocop/cop/style/numeric_literals.rb
 - lib/rubocop/cop/style/one_line_conditional.rb
 - lib/rubocop/cop/style/op_method.rb
-- lib/rubocop/cop/style/parameter_lists.rb
 - lib/rubocop/cop/style/parentheses_around_condition.rb
 - lib/rubocop/cop/style/percent_literal_delimiters.rb
+- lib/rubocop/cop/style/percent_q_literals.rb
 - lib/rubocop/cop/style/perl_backrefs.rb
 - lib/rubocop/cop/style/predicate_name.rb
 - lib/rubocop/cop/style/proc.rb
@@ -457,6 +443,7 @@ files:
 - relnotes/v0.23.0.md
 - relnotes/v0.24.0.md
 - relnotes/v0.24.1.md
+- relnotes/v0.25.0.md
 - rubocop.gemspec
 - spec/.rubocop.yml
 - spec/isolated_environment_spec.rb
@@ -507,6 +494,15 @@ files:
 - spec/rubocop/cop/lint/useless_else_without_rescue_spec.rb
 - spec/rubocop/cop/lint/useless_setter_call_spec.rb
 - spec/rubocop/cop/lint/void_spec.rb
+- spec/rubocop/cop/metrics/block_nesting_spec.rb
+- spec/rubocop/cop/metrics/class_length_spec.rb
+- spec/rubocop/cop/metrics/cyclomatic_complexity_spec.rb
+- spec/rubocop/cop/metrics/if_unless_modifier_spec.rb
+- spec/rubocop/cop/metrics/line_length_spec.rb
+- spec/rubocop/cop/metrics/method_length_spec.rb
+- spec/rubocop/cop/metrics/parameter_lists_spec.rb
+- spec/rubocop/cop/metrics/perceived_complexity_spec.rb
+- spec/rubocop/cop/metrics/while_until_modifier_spec.rb
 - spec/rubocop/cop/offense_spec.rb
 - spec/rubocop/cop/rails/action_filter_spec.rb
 - spec/rubocop/cop/rails/default_scope_spec.rb
@@ -528,9 +524,10 @@ files:
 - spec/rubocop/cop/style/ascii_comments_spec.rb
 - spec/rubocop/cop/style/ascii_identifiers_spec.rb
 - spec/rubocop/cop/style/attr_spec.rb
+- spec/rubocop/cop/style/bare_percent_literals_spec.rb
 - spec/rubocop/cop/style/begin_block_spec.rb
 - spec/rubocop/cop/style/block_comments_spec.rb
-- spec/rubocop/cop/style/block_nesting_spec.rb
+- spec/rubocop/cop/style/block_end_newline_spec.rb
 - spec/rubocop/cop/style/blocks_spec.rb
 - spec/rubocop/cop/style/braces_around_hash_parameters_spec.rb
 - spec/rubocop/cop/style/case_equality_spec.rb
@@ -539,7 +536,6 @@ files:
 - spec/rubocop/cop/style/class_and_module_camel_case_spec.rb
 - spec/rubocop/cop/style/class_and_module_children_spec.rb
 - spec/rubocop/cop/style/class_check_spec.rb
-- spec/rubocop/cop/style/class_length_spec.rb
 - spec/rubocop/cop/style/class_methods_spec.rb
 - spec/rubocop/cop/style/class_vars_spec.rb
 - spec/rubocop/cop/style/collection_methods_spec.rb
@@ -547,7 +543,6 @@ files:
 - spec/rubocop/cop/style/comment_annotation_spec.rb
 - spec/rubocop/cop/style/comment_indentation_spec.rb
 - spec/rubocop/cop/style/constant_name_spec.rb
-- spec/rubocop/cop/style/cyclomatic_complexity_spec.rb
 - spec/rubocop/cop/style/def_with_parentheses_spec.rb
 - spec/rubocop/cop/style/deprecated_hash_methods_spec.rb
 - spec/rubocop/cop/style/documentation_spec.rb
@@ -570,7 +565,6 @@ files:
 - spec/rubocop/cop/style/global_vars_spec.rb
 - spec/rubocop/cop/style/guard_clause_spec.rb
 - spec/rubocop/cop/style/hash_syntax_spec.rb
-- spec/rubocop/cop/style/if_unless_modifier_spec.rb
 - spec/rubocop/cop/style/if_with_semicolon_spec.rb
 - spec/rubocop/cop/style/indent_array_spec.rb
 - spec/rubocop/cop/style/indent_hash_spec.rb
@@ -581,14 +575,13 @@ files:
 - spec/rubocop/cop/style/lambda_spec.rb
 - spec/rubocop/cop/style/leading_comment_space_spec.rb
 - spec/rubocop/cop/style/line_end_concatenation_spec.rb
-- spec/rubocop/cop/style/line_length_spec.rb
 - spec/rubocop/cop/style/method_call_parentheses_spec.rb
 - spec/rubocop/cop/style/method_called_on_do_end_block_spec.rb
 - spec/rubocop/cop/style/method_def_parentheses_spec.rb
-- spec/rubocop/cop/style/method_length_spec.rb
 - spec/rubocop/cop/style/method_name_spec.rb
 - spec/rubocop/cop/style/module_function_spec.rb
 - spec/rubocop/cop/style/multiline_block_chain_spec.rb
+- spec/rubocop/cop/style/multiline_block_layout_spec.rb
 - spec/rubocop/cop/style/multiline_if_then_spec.rb
 - spec/rubocop/cop/style/multiline_ternary_operator_spec.rb
 - spec/rubocop/cop/style/negated_if_spec.rb
@@ -601,9 +594,9 @@ files:
 - spec/rubocop/cop/style/numeric_literals_spec.rb
 - spec/rubocop/cop/style/one_line_conditional_spec.rb
 - spec/rubocop/cop/style/op_method_spec.rb
-- spec/rubocop/cop/style/parameter_lists_spec.rb
 - spec/rubocop/cop/style/parentheses_around_condition_spec.rb
 - spec/rubocop/cop/style/percent_literal_delimiters_spec.rb
+- spec/rubocop/cop/style/percent_q_literals_spec.rb
 - spec/rubocop/cop/style/perl_backrefs_spec.rb
 - spec/rubocop/cop/style/predicate_name_spec.rb
 - spec/rubocop/cop/style/proc_spec.rb
@@ -653,7 +646,6 @@ files:
 - spec/rubocop/cop/style/variable_name_spec.rb
 - spec/rubocop/cop/style/when_then_spec.rb
 - spec/rubocop/cop/style/while_until_do_spec.rb
-- spec/rubocop/cop/style/while_until_modifier_spec.rb
 - spec/rubocop/cop/style/word_array_spec.rb
 - spec/rubocop/cop/team_spec.rb
 - spec/rubocop/cop/util_spec.rb
@@ -703,7 +695,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -711,7 +703,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Automatic Ruby code style checking tool.
@@ -765,6 +757,15 @@ test_files:
 - spec/rubocop/cop/lint/useless_else_without_rescue_spec.rb
 - spec/rubocop/cop/lint/useless_setter_call_spec.rb
 - spec/rubocop/cop/lint/void_spec.rb
+- spec/rubocop/cop/metrics/block_nesting_spec.rb
+- spec/rubocop/cop/metrics/class_length_spec.rb
+- spec/rubocop/cop/metrics/cyclomatic_complexity_spec.rb
+- spec/rubocop/cop/metrics/if_unless_modifier_spec.rb
+- spec/rubocop/cop/metrics/line_length_spec.rb
+- spec/rubocop/cop/metrics/method_length_spec.rb
+- spec/rubocop/cop/metrics/parameter_lists_spec.rb
+- spec/rubocop/cop/metrics/perceived_complexity_spec.rb
+- spec/rubocop/cop/metrics/while_until_modifier_spec.rb
 - spec/rubocop/cop/offense_spec.rb
 - spec/rubocop/cop/rails/action_filter_spec.rb
 - spec/rubocop/cop/rails/default_scope_spec.rb
@@ -786,9 +787,10 @@ test_files:
 - spec/rubocop/cop/style/ascii_comments_spec.rb
 - spec/rubocop/cop/style/ascii_identifiers_spec.rb
 - spec/rubocop/cop/style/attr_spec.rb
+- spec/rubocop/cop/style/bare_percent_literals_spec.rb
 - spec/rubocop/cop/style/begin_block_spec.rb
 - spec/rubocop/cop/style/block_comments_spec.rb
-- spec/rubocop/cop/style/block_nesting_spec.rb
+- spec/rubocop/cop/style/block_end_newline_spec.rb
 - spec/rubocop/cop/style/blocks_spec.rb
 - spec/rubocop/cop/style/braces_around_hash_parameters_spec.rb
 - spec/rubocop/cop/style/case_equality_spec.rb
@@ -797,7 +799,6 @@ test_files:
 - spec/rubocop/cop/style/class_and_module_camel_case_spec.rb
 - spec/rubocop/cop/style/class_and_module_children_spec.rb
 - spec/rubocop/cop/style/class_check_spec.rb
-- spec/rubocop/cop/style/class_length_spec.rb
 - spec/rubocop/cop/style/class_methods_spec.rb
 - spec/rubocop/cop/style/class_vars_spec.rb
 - spec/rubocop/cop/style/collection_methods_spec.rb
@@ -805,7 +806,6 @@ test_files:
 - spec/rubocop/cop/style/comment_annotation_spec.rb
 - spec/rubocop/cop/style/comment_indentation_spec.rb
 - spec/rubocop/cop/style/constant_name_spec.rb
-- spec/rubocop/cop/style/cyclomatic_complexity_spec.rb
 - spec/rubocop/cop/style/def_with_parentheses_spec.rb
 - spec/rubocop/cop/style/deprecated_hash_methods_spec.rb
 - spec/rubocop/cop/style/documentation_spec.rb
@@ -828,7 +828,6 @@ test_files:
 - spec/rubocop/cop/style/global_vars_spec.rb
 - spec/rubocop/cop/style/guard_clause_spec.rb
 - spec/rubocop/cop/style/hash_syntax_spec.rb
-- spec/rubocop/cop/style/if_unless_modifier_spec.rb
 - spec/rubocop/cop/style/if_with_semicolon_spec.rb
 - spec/rubocop/cop/style/indent_array_spec.rb
 - spec/rubocop/cop/style/indent_hash_spec.rb
@@ -839,14 +838,13 @@ test_files:
 - spec/rubocop/cop/style/lambda_spec.rb
 - spec/rubocop/cop/style/leading_comment_space_spec.rb
 - spec/rubocop/cop/style/line_end_concatenation_spec.rb
-- spec/rubocop/cop/style/line_length_spec.rb
 - spec/rubocop/cop/style/method_call_parentheses_spec.rb
 - spec/rubocop/cop/style/method_called_on_do_end_block_spec.rb
 - spec/rubocop/cop/style/method_def_parentheses_spec.rb
-- spec/rubocop/cop/style/method_length_spec.rb
 - spec/rubocop/cop/style/method_name_spec.rb
 - spec/rubocop/cop/style/module_function_spec.rb
 - spec/rubocop/cop/style/multiline_block_chain_spec.rb
+- spec/rubocop/cop/style/multiline_block_layout_spec.rb
 - spec/rubocop/cop/style/multiline_if_then_spec.rb
 - spec/rubocop/cop/style/multiline_ternary_operator_spec.rb
 - spec/rubocop/cop/style/negated_if_spec.rb
@@ -859,9 +857,9 @@ test_files:
 - spec/rubocop/cop/style/numeric_literals_spec.rb
 - spec/rubocop/cop/style/one_line_conditional_spec.rb
 - spec/rubocop/cop/style/op_method_spec.rb
-- spec/rubocop/cop/style/parameter_lists_spec.rb
 - spec/rubocop/cop/style/parentheses_around_condition_spec.rb
 - spec/rubocop/cop/style/percent_literal_delimiters_spec.rb
+- spec/rubocop/cop/style/percent_q_literals_spec.rb
 - spec/rubocop/cop/style/perl_backrefs_spec.rb
 - spec/rubocop/cop/style/predicate_name_spec.rb
 - spec/rubocop/cop/style/proc_spec.rb
@@ -911,7 +909,6 @@ test_files:
 - spec/rubocop/cop/style/variable_name_spec.rb
 - spec/rubocop/cop/style/when_then_spec.rb
 - spec/rubocop/cop/style/while_until_do_spec.rb
-- spec/rubocop/cop/style/while_until_modifier_spec.rb
 - spec/rubocop/cop/style/word_array_spec.rb
 - spec/rubocop/cop/team_spec.rb
 - spec/rubocop/cop/util_spec.rb

data/lib/rubocop/cop/mixin/if_then_else.rb

@@ -1,23 +0,0 @@
-# encoding: utf-8
-
-module RuboCop
-  module Cop
-    # Common functionality for cops checking if and unless statements.
-    module IfThenElse
-      def on_if(node)
-        check(node)
-      end
-
-      def on_unless(node)
-        check(node)
-      end
-
-      def check(node)
-        # We won't check modifier or ternary conditionals.
-        return unless node.loc.expression.source =~ /\A(if|unless)\b/
-        return unless offending_line(node)
-        add_offense(node, :expression, error_message(node))
-      end
-    end
-  end
-end