rubocop 0.26.1 → 0.27.0

data/spec/support/cop_helper.rb

@@ -0,0 +1,72 @@
+# encoding: utf-8
+
+require 'tempfile'
+
+module CopHelper
+  def inspect_source_file(cop, source)
+    Tempfile.open('tmp') { |f| inspect_source(cop, source, f) }
+  end
+
+  def inspect_source(cop, source, file = nil)
+    RuboCop::Formatter::DisabledConfigFormatter.config_to_allow_offenses = {}
+    processed_source = parse_source(source, file)
+    fail 'Error parsing example code' unless processed_source.valid_syntax?
+    _investigate(cop, processed_source)
+  end
+
+  def parse_source(source, file = nil)
+    source = source.join($RS) if source.is_a?(Array)
+
+    if file && file.respond_to?(:write)
+      file.write(source)
+      file.rewind
+      file = file.path
+    end
+
+    RuboCop::ProcessedSource.new(source, file)
+  end
+
+  def autocorrect_source_file(cop, source)
+    Tempfile.open('tmp') { |f| autocorrect_source(cop, source, f) }
+  end
+
+  def autocorrect_source(cop, source, file = nil)
+    cop.instance_variable_get(:@options)[:auto_correct] = true
+    processed_source = parse_source(source, file)
+    _investigate(cop, processed_source)
+
+    corrector =
+      RuboCop::Cop::Corrector.new(processed_source.buffer, cop.corrections)
+    corrector.rewrite
+  end
+
+  def _investigate(cop, processed_source)
+    forces = RuboCop::Cop::Force.all.each_with_object([]) do |klass, instances|
+      next unless cop.join_force?(klass)
+      instances << klass.new([cop])
+    end
+
+    commissioner =
+      RuboCop::Cop::Commissioner.new([cop], forces, raise_error: true)
+    commissioner.investigate(processed_source)
+    commissioner
+  end
+end
+
+module RuboCop
+  module Cop
+    class Cop
+      def messages
+        offenses.sort.map(&:message)
+      end
+
+      def highlights
+        offenses.sort.map { |o| o.location.source }
+      end
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.include CopHelper
+end

data/spec/support/coverage.rb

@@ -0,0 +1,15 @@
+# encoding: utf-8
+
+if ENV['TRAVIS'] || ENV['COVERAGE']
+  require 'simplecov'
+
+  if ENV['TRAVIS']
+    require 'coveralls'
+    SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+  end
+
+  SimpleCov.start do
+    add_filter '/spec/'
+    add_filter '/vendor/bundle/'
+  end
+end

data/spec/support/{offenses_matcher.rb → custom_matchers.rb}

@@ -1,5 +1,33 @@
 # encoding: utf-8
 
+RSpec::Matchers.define :exit_with_code do |code|
+  supports_block_expectations
+
+  actual = nil
+
+  match do |block|
+    begin
+      block.call
+    rescue SystemExit => e
+      actual = e.status
+    end
+    actual && actual == code
+  end
+
+  failure_message do
+    "expected block to call exit(#{code}) but exit" +
+      (actual.nil? ? ' not called' : "(#{actual}) was called")
+  end
+
+  failure_message_when_negated do
+    "expected block not to call exit(#{code})"
+  end
+
+  description do
+    "expect block to call exit(#{code})"
+  end
+end
+
 RSpec::Matchers.define :find_offenses_in do |code|
   match do |cop|
     inspect_source(cop, [code])

data/spec/support/jruby_workaround.rb

@@ -0,0 +1,15 @@
+# encoding: utf-8
+
+# Force JRuby not to select the current working directory
+# as a temporary directory on Travis CI.
+# https://github.com/jruby/jruby/issues/405
+if ENV['TRAVIS'] && RUBY_ENGINE == 'jruby'
+  require 'fileutils'
+
+  tmp_dir = ENV['TMPDIR'] || ENV['TMP'] || ENV['TEMP'] ||
+            Etc.systmpdir || '/tmp'
+
+  non_world_writable_tmp_dir = File.join(tmp_dir, 'rubocop')
+  FileUtils.makedirs(non_world_writable_tmp_dir, mode: 0700)
+  ENV['TMPDIR'] = non_world_writable_tmp_dir
+end

data/spec/support/{isolated_environment.rb → shared_contexts.rb}

@@ -32,3 +32,22 @@ shared_context 'isolated environment', :isolated_environment do
     end
   end
 end
+
+# `cop_config` must be declared with #let.
+shared_context 'config', :config do
+  let(:config) do
+    # Module#<
+    unless described_class < RuboCop::Cop::Cop
+      fail '`config` must be used in `describe SomeCopClass do .. end`'
+    end
+
+    fail '`cop_config` must be declared with #let' unless cop_config.is_a?(Hash)
+
+    cop_name = described_class.cop_name
+    hash = {
+      cop_name =>
+      RuboCop::ConfigLoader.default_configuration[cop_name].merge(cop_config)
+    }
+    RuboCop::Config.new(hash, "#{Dir.pwd}/.rubocop.yml")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 0.26.1
+  version: 0.27.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2014-10-30 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.4
+        version: 2.2.0.pre.6
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -48,7 +48,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0.pre.4
+        version: 2.2.0.pre.6
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -187,6 +187,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- assets/logo.png
 - assets/output.html.erb
 - bin/rubocop
 - config/default.yml
@@ -240,6 +241,7 @@ 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/abc_size.rb
 - lib/rubocop/cop/metrics/block_nesting.rb
 - lib/rubocop/cop/metrics/class_length.rb
 - lib/rubocop/cop/metrics/cyclomatic_complexity.rb
@@ -257,11 +259,12 @@ files:
 - 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/empty_lines_around_body.rb
 - lib/rubocop/cop/mixin/end_keyword_alignment.rb
 - lib/rubocop/cop/mixin/if_node.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_method_def.rb
 - lib/rubocop/cop/mixin/on_normal_if_unless.rb
 - lib/rubocop/cop/mixin/parser_diagnostic.rb
 - lib/rubocop/cop/mixin/percent_literal.rb
@@ -271,6 +274,7 @@ files:
 - lib/rubocop/cop/mixin/space_inside.rb
 - lib/rubocop/cop/mixin/statement_modifier.rb
 - lib/rubocop/cop/mixin/string_help.rb
+- lib/rubocop/cop/mixin/string_literals_help.rb
 - lib/rubocop/cop/mixin/surrounding_space.rb
 - lib/rubocop/cop/mixin/unused_argument.rb
 - lib/rubocop/cop/offense.rb
@@ -319,10 +323,13 @@ files:
 - lib/rubocop/cop/style/dot_position.rb
 - lib/rubocop/cop/style/double_negation.rb
 - lib/rubocop/cop/style/each_with_object.rb
+- lib/rubocop/cop/style/else_alignment.rb
 - lib/rubocop/cop/style/empty_line_between_defs.rb
 - lib/rubocop/cop/style/empty_lines.rb
 - lib/rubocop/cop/style/empty_lines_around_access_modifier.rb
-- lib/rubocop/cop/style/empty_lines_around_body.rb
+- lib/rubocop/cop/style/empty_lines_around_class_body.rb
+- lib/rubocop/cop/style/empty_lines_around_method_body.rb
+- lib/rubocop/cop/style/empty_lines_around_module_body.rb
 - lib/rubocop/cop/style/empty_literal.rb
 - lib/rubocop/cop/style/encoding.rb
 - lib/rubocop/cop/style/end_block.rb
@@ -355,6 +362,7 @@ files:
 - 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_operation_indentation.rb
 - lib/rubocop/cop/style/multiline_ternary_operator.rb
 - lib/rubocop/cop/style/negated_if.rb
 - lib/rubocop/cop/style/negated_while.rb
@@ -405,6 +413,7 @@ files:
 - lib/rubocop/cop/style/space_inside_range_literal.rb
 - lib/rubocop/cop/style/special_global_vars.rb
 - lib/rubocop/cop/style/string_literals.rb
+- lib/rubocop/cop/style/string_literals_in_interpolation.rb
 - lib/rubocop/cop/style/symbol_array.rb
 - lib/rubocop/cop/style/symbol_proc.rb
 - lib/rubocop/cop/style/tab.rb
@@ -445,6 +454,7 @@ files:
 - lib/rubocop/formatter/offense_count_formatter.rb
 - lib/rubocop/formatter/progress_formatter.rb
 - lib/rubocop/formatter/simple_text_formatter.rb
+- lib/rubocop/formatter/text_util.rb
 - lib/rubocop/options.rb
 - lib/rubocop/path_util.rb
 - lib/rubocop/processed_source.rb
@@ -470,8 +480,13 @@ files:
 - relnotes/v0.25.0.md
 - relnotes/v0.26.0.md
 - relnotes/v0.26.1.md
+- relnotes/v0.27.0.md
 - rubocop.gemspec
 - spec/.rubocop.yml
+- spec/fixtures/html_formatter/expected.html
+- spec/fixtures/html_formatter/project/app/controllers/application_controller.rb
+- spec/fixtures/html_formatter/project/app/controllers/books_controller.rb
+- spec/fixtures/html_formatter/project/app/models/book.rb
 - spec/isolated_environment_spec.rb
 - spec/project_spec.rb
 - spec/rubocop/cli_spec.rb
@@ -520,6 +535,7 @@ 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/abc_size_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
@@ -575,9 +591,12 @@ files:
 - spec/rubocop/cop/style/dot_position_spec.rb
 - spec/rubocop/cop/style/double_negation_spec.rb
 - spec/rubocop/cop/style/each_with_object_spec.rb
+- spec/rubocop/cop/style/else_alignment_spec.rb
 - spec/rubocop/cop/style/empty_line_between_defs_spec.rb
 - spec/rubocop/cop/style/empty_lines_around_access_modifier_spec.rb
-- spec/rubocop/cop/style/empty_lines_around_body_spec.rb
+- spec/rubocop/cop/style/empty_lines_around_class_body_spec.rb
+- spec/rubocop/cop/style/empty_lines_around_method_body_spec.rb
+- spec/rubocop/cop/style/empty_lines_around_module_body_spec.rb
 - spec/rubocop/cop/style/empty_lines_spec.rb
 - spec/rubocop/cop/style/empty_literal_spec.rb
 - spec/rubocop/cop/style/encoding_spec.rb
@@ -610,6 +629,7 @@ files:
 - 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_operation_indentation_spec.rb
 - spec/rubocop/cop/style/multiline_ternary_operator_spec.rb
 - spec/rubocop/cop/style/negated_if_spec.rb
 - spec/rubocop/cop/style/negated_while_spec.rb
@@ -659,6 +679,7 @@ files:
 - spec/rubocop/cop/style/space_inside_parens_spec.rb
 - spec/rubocop/cop/style/space_inside_range_literal_spec.rb
 - spec/rubocop/cop/style/special_global_vars_spec.rb
+- spec/rubocop/cop/style/string_literals_in_interpolation_spec.rb
 - spec/rubocop/cop/style/string_literals_spec.rb
 - spec/rubocop/cop/style/symbol_array_spec.rb
 - spec/rubocop/cop/style/symbol_proc_spec.rb
@@ -706,11 +727,13 @@ files:
 - spec/rubocop/target_finder_spec.rb
 - spec/rubocop/token_spec.rb
 - spec/spec_helper.rb
+- spec/support/cop_helper.rb
+- spec/support/coverage.rb
+- spec/support/custom_matchers.rb
 - spec/support/file_helper.rb
-- spec/support/isolated_environment.rb
+- spec/support/jruby_workaround.rb
 - spec/support/mri_syntax_checker.rb
-- spec/support/offenses_matcher.rb
-- spec/support/shared_context.rb
+- spec/support/shared_contexts.rb
 - spec/support/shared_examples.rb
 - spec/support/statement_modifier_helper.rb
 homepage: http://github.com/bbatsov/rubocop
@@ -739,6 +762,10 @@ specification_version: 4
 summary: Automatic Ruby code style checking tool.
 test_files:
 - spec/.rubocop.yml
+- spec/fixtures/html_formatter/expected.html
+- spec/fixtures/html_formatter/project/app/controllers/application_controller.rb
+- spec/fixtures/html_formatter/project/app/controllers/books_controller.rb
+- spec/fixtures/html_formatter/project/app/models/book.rb
 - spec/isolated_environment_spec.rb
 - spec/project_spec.rb
 - spec/rubocop/cli_spec.rb
@@ -787,6 +814,7 @@ 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/abc_size_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
@@ -842,9 +870,12 @@ test_files:
 - spec/rubocop/cop/style/dot_position_spec.rb
 - spec/rubocop/cop/style/double_negation_spec.rb
 - spec/rubocop/cop/style/each_with_object_spec.rb
+- spec/rubocop/cop/style/else_alignment_spec.rb
 - spec/rubocop/cop/style/empty_line_between_defs_spec.rb
 - spec/rubocop/cop/style/empty_lines_around_access_modifier_spec.rb
-- spec/rubocop/cop/style/empty_lines_around_body_spec.rb
+- spec/rubocop/cop/style/empty_lines_around_class_body_spec.rb
+- spec/rubocop/cop/style/empty_lines_around_method_body_spec.rb
+- spec/rubocop/cop/style/empty_lines_around_module_body_spec.rb
 - spec/rubocop/cop/style/empty_lines_spec.rb
 - spec/rubocop/cop/style/empty_literal_spec.rb
 - spec/rubocop/cop/style/encoding_spec.rb
@@ -877,6 +908,7 @@ test_files:
 - 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_operation_indentation_spec.rb
 - spec/rubocop/cop/style/multiline_ternary_operator_spec.rb
 - spec/rubocop/cop/style/negated_if_spec.rb
 - spec/rubocop/cop/style/negated_while_spec.rb
@@ -926,6 +958,7 @@ test_files:
 - spec/rubocop/cop/style/space_inside_parens_spec.rb
 - spec/rubocop/cop/style/space_inside_range_literal_spec.rb
 - spec/rubocop/cop/style/special_global_vars_spec.rb
+- spec/rubocop/cop/style/string_literals_in_interpolation_spec.rb
 - spec/rubocop/cop/style/string_literals_spec.rb
 - spec/rubocop/cop/style/symbol_array_spec.rb
 - spec/rubocop/cop/style/symbol_proc_spec.rb
@@ -973,11 +1006,13 @@ test_files:
 - spec/rubocop/target_finder_spec.rb
 - spec/rubocop/token_spec.rb
 - spec/spec_helper.rb
+- spec/support/cop_helper.rb
+- spec/support/coverage.rb
+- spec/support/custom_matchers.rb
 - spec/support/file_helper.rb
-- spec/support/isolated_environment.rb
+- spec/support/jruby_workaround.rb
 - spec/support/mri_syntax_checker.rb
-- spec/support/offenses_matcher.rb
-- spec/support/shared_context.rb
+- spec/support/shared_contexts.rb
 - spec/support/shared_examples.rb
 - spec/support/statement_modifier_helper.rb
 has_rdoc: 

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

@@ -1,75 +0,0 @@
-# encoding: utf-8
-
-module RuboCop
-  module Cop
-    module Style
-      # This cops checks redundant empty lines around the bodies of classes,
-      # modules & methods.
-      #
-      # @example
-      #
-      #   class Test
-      #
-      #      def something
-      #        ...
-      #      end
-      #
-      #   end
-      #
-      #   def something(arg)
-      #
-      #     ...
-      #   end
-      #
-      class EmptyLinesAroundBody < Cop
-        include OnMethod
-
-        MSG_BEG = 'Extra empty line detected at body beginning.'
-        MSG_END = 'Extra empty line detected at body end.'
-
-        def on_class(node)
-          check(node)
-        end
-
-        def on_module(node)
-          check(node)
-        end
-
-        def on_sclass(node)
-          check(node)
-        end
-
-        def autocorrect(range)
-          @corrections << ->(corrector) { corrector.remove(range) }
-        end
-
-        private
-
-        def on_method(node, _method_name, _args, _body)
-          check(node)
-        end
-
-        def check(node)
-          start_line = node.loc.keyword.line
-          end_line = node.loc.end.line
-
-          return if start_line == end_line
-
-          check_source(start_line, end_line)
-        end
-
-        def check_source(start_line, end_line)
-          check_line(start_line, MSG_BEG)
-          check_line(end_line - 2, MSG_END) unless end_line - 2 == start_line
-        end
-
-        def check_line(line, msg)
-          return unless processed_source.lines[line].empty?
-
-          range = source_range(processed_source.buffer, line + 1, 0)
-          add_offense(range, range, msg)
-        end
-      end
-    end
-  end
-end