rubocop-git 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c672dcd90e02f12fe912671d34296778f4c4126f
-  data.tar.gz: 7218bdfe3e468c96c93ebfe7b65761778d8bd097
+  metadata.gz: 090d9d83c07e1a98d759e498718d4180934d4dc9
+  data.tar.gz: b79390241bb3f9634f2502ec1ec7a462cae02883
 SHA512:
-  metadata.gz: 3aeafd917cf189510adc77bba476911ce0cc1bc4ea902305c68083e73967eabe23980984711c8ac02f559607b294b4431d8e730228546de27243121da50366cf
-  data.tar.gz: bb6f02b01e9eaf7331be756f07cef68aef73d4860c21be8551268a6e0175064537fd7707742ff4a3f979cd47e063faddf7eedc95961b8aa5e93a3cf85d58fc1f
+  metadata.gz: 8d588673e5a7ea69326a0f1783b24a2a08cd24eadb8194046a58e885433a6fa4c570032331c6856f938ac8abaf3f5e8e8cf28028ea4967803dfae460457fe810
+  data.tar.gz: b88912a13cdf6414d8127dd4561789c99dd01965ad5cbdb8c2fc50c129e819b9a1582aae2058b22505e554d88919ac99a1f69800b70c4570fb76a498bfa22cac

data/README.md

@@ -2,6 +2,9 @@
 
 RuboCop for git diff.
 
+[![Gem Version](https://badge.fury.io/rb/rubocop-git.svg)](http://badge.fury.io/rb/rubocop-git)
+[![Code Climate](https://codeclimate.com/github/m4i/rubocop-git.png)](https://codeclimate.com/github/m4i/rubocop-git)
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -20,10 +23,11 @@ Or install it yourself as:
 
     Usage: rubocop-git [options] [[commit] commit]
         -c, --config FILE                Specify configuration file
+        -d, --debug                      Display debug info
         -D, --display-cop-names          Display cop names in offense messages
             --cached                     git diff --cached
             --staged                     synonym of --cached
-            --hound                      Hound compatibility mode (require rubocop 0.22.0)
+            --hound                      Hound compatibility mode
 
 ## Contributing
 

data/hound.yml

@@ -5,6 +5,9 @@ AllCops:
 AccessorMethodName:
   Enabled: false
 
+ActionFilter:
+  Enabled: false
+
 Alias:
   Enabled: false
 
@@ -29,6 +32,9 @@ CaseEquality:
 CharacterLiteral:
   Enabled: false
 
+ClassAndModuleChildren:
+  Enabled: false
+
 ClassLength:
   Enabled: false
 
@@ -66,6 +72,9 @@ DotPosition:
 DoubleNegation:
   Enabled: false
 
+EachWithObject:
+  Enabled: false
+
 EmptyLiteral:
   Enabled: false
 
@@ -87,6 +96,9 @@ FormatString:
 GlobalVars:
   Enabled: false
 
+GuardClause:
+  Enabled: false
+
 IfUnlessModifier:
   Enabled: false
 

data/lib/rubocop/git.rb

@@ -1,18 +1,9 @@
 require 'rubocop/git/version'
 require 'rubocop'
 
-if defined?(Rubocop)
-  # rubocop 0.22.0
-  RuboCop::ConfigLoader = Rubocop::ConfigLoader
-  RuboCop::Formatter    = Rubocop::Formatter
-  RuboCop::Version      = Rubocop::Version
-else
-  # rubocop >= 0.23.0
-  Rubocop = RuboCop
-end
-
 module RuboCop
   module Git
+    autoload :Commit,            'rubocop/git/commit'
     autoload :CommitFile,        'rubocop/git/commit_file'
     autoload :DiffParser,        'rubocop/git/diff_parser'
     autoload :FileViolation,     'rubocop/git/file_violation'

data/lib/rubocop/git/cli.rb

@@ -30,6 +30,10 @@ module RuboCop
             @options.config = config
           end
 
+          opt.on('-d', '--debug', 'Display debug info') do
+            @options.rubocop[:debug] = true
+          end
+
           opt.on('-D', '--display-cop-names',
                  'Display cop names in offense messages') do
             @options.rubocop[:display_cop_names] = true
@@ -43,8 +47,7 @@ module RuboCop
             @options.cached = true
           end
 
-          opt.on('--hound',
-                 'Hound compatibility mode (require rubocop 0.22.0)') do
+          opt.on('--hound', 'Hound compatibility mode') do
             @options.hound = true
           end
         end

data/lib/rubocop/git/commit.rb

@@ -0,0 +1,22 @@
+require 'shellwords'
+
+module RuboCop
+  module Git
+    # ref. https://github.com/thoughtbot/hound/blob/d2f3933/app/models/commit.rb
+    class Commit
+      def initialize(options)
+        @options = options
+      end
+
+      def file_content(filename)
+        if @options.cached
+          `git show :#{filename.shellescape}`
+        elsif @options.commit_last
+          `git show #{@options.commit_last.shellescape}:#{filename.shellescape}`
+        else
+          File.read(filename)
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/git/commit_file.rb

@@ -1,17 +1,23 @@
 module RuboCop::Git
-# copy from https://github.com/thoughtbot/hound/blob/be2dd34/app/models/commit_file.rb
+# copy from https://github.com/thoughtbot/hound/blob/d2f3933/app/models/commit_file.rb
 class CommitFile
-  attr_reader :contents
-
-  def initialize(file, contents)
+  def initialize(file, commit)
     @file = file
-    @contents = contents
+    @commit = commit
   end
 
   def filename
     @file.filename
   end
 
+  def content
+    @content ||= begin
+      unless removed?
+        @commit.file_content(filename)
+      end
+    end
+  end
+
   def relevant_line?(line_number)
     modified_lines.detect do |modified_line|
       modified_line.line_number == line_number

data/lib/rubocop/git/file_violation.rb

@@ -1,5 +1,5 @@
 module RuboCop::Git
-# ref. https://github.com/thoughtbot/hound/blob/be2dd34/app/models/file_violation.rb
+# ref. https://github.com/thoughtbot/hound/blob/d2f3933/app/models/file_violation.rb
 class FileViolation < Struct.new(:filename, :offenses)
 end
 end

data/lib/rubocop/git/line.rb

@@ -1,5 +1,5 @@
 module RuboCop::Git
-# copy from https://github.com/thoughtbot/hound/blob/be2dd34/app/models/line.rb
+# copy from https://github.com/thoughtbot/hound/blob/d2f3933/app/models/line.rb
 class Line < Struct.new(:content, :line_number, :patch_position)
   def ==(other_line)
     content == other_line.content

data/lib/rubocop/git/options.rb

@@ -27,9 +27,6 @@ module RuboCop
       end
 
       def hound=(hound_)
-        if hound_ && RuboCop::Version.version != '0.22.0'
-          fail Invalid, 'Hound compatibility mode requires rubocop 0.22.0'
-        end
         @hound = !!hound_
       end
 
@@ -50,7 +47,7 @@ module RuboCop
         @commits = commits
       end
 
-      def config_path
+      def config_file
         if hound
           HOUND_DEFAULT_CONFIG_FILE
         elsif config

data/lib/rubocop/git/patch.rb

@@ -1,5 +1,5 @@
 module RuboCop::Git
-# copy from https://github.com/thoughtbot/hound/blob/be2dd34/app/models/patch.rb
+# copy from https://github.com/thoughtbot/hound/blob/d2f3933/app/models/patch.rb
 class Patch
   RANGE_INFORMATION_LINE = /^@@ .+\+(?<line_number>\d+),/
   MODIFIED_LINE = /^\+(?!\+|\+)/

data/lib/rubocop/git/pseudo_pull_request.rb

@@ -1,8 +1,6 @@
-require 'shellwords'
-
 module RuboCop
   module Git
-    # ref. https://github.com/thoughtbot/hound/blob/be2dd34/app/models/pull_request.rb
+    # ref. https://github.com/thoughtbot/hound/blob/d2f3933/app/models/pull_request.rb
     class PseudoPullRequest
       HOUND_CONFIG_FILE = '.hound.yml'
 
@@ -27,17 +25,11 @@ module RuboCop
       private
 
       def build_commit_file(file)
-        CommitFile.new(file, file_contents(file.filename))
+        CommitFile.new(file, head_commit)
       end
 
-      def file_contents(filename)
-        if @options.cached
-          `git show :#{filename.shellescape}`
-        elsif @options.commit_last
-          `git show #{@options.commit_last.shellescape}:#{filename.shellescape}`
-        else
-          File.read(filename)
-        end
+      def head_commit
+        @head_commit ||= Commit.new(@options)
       end
     end
   end

data/lib/rubocop/git/runner.rb

@@ -2,7 +2,7 @@ require 'shellwords'
 
 module RuboCop
   module Git
-    # ref. https://github.com/thoughtbot/hound/blob/be2dd34/app/services/build_runner.rb
+    # ref. https://github.com/thoughtbot/hound/blob/d2f3933/app/services/build_runner.rb
     class Runner
       def run(options)
         options = Options.new(options) unless options.is_a?(Options)
@@ -22,7 +22,7 @@ module RuboCop
       def style_checker
         StyleChecker.new(pull_request.pull_request_files,
                          @options.rubocop,
-                         @options.config_path,
+                         @options.config_file,
                          pull_request.config)
       end
 

data/lib/rubocop/git/style_checker.rb

@@ -1,13 +1,13 @@
 module RuboCop::Git
-# ref. https://github.com/thoughtbot/hound/blob/be2dd34/app/models/style_checker.rb
+# ref. https://github.com/thoughtbot/hound/blob/d2f3933/app/models/style_checker.rb
 class StyleChecker
   def initialize(modified_files,
                  rubocop_options,
-                 config_path,
+                 config_file,
                  custom_config = nil)
     @modified_files = modified_files
     @rubocop_options = rubocop_options
-    @config_path = config_path
+    @config_file = config_file
     @custom_config = custom_config
   end
 
@@ -36,7 +36,7 @@ class StyleChecker
 
   def style_guide
     @style_guide ||= StyleGuide.new(@rubocop_options,
-                                    @config_path,
+                                    @config_file,
                                     @custom_config)
   end
 end

data/lib/rubocop/git/style_guide.rb

@@ -1,9 +1,9 @@
 module RuboCop::Git
-# ref. https://github.com/thoughtbot/hound/blob/be2dd34/app/models/style_guide.rb
+# ref. https://github.com/thoughtbot/hound/blob/d2f3933/app/models/style_guide.rb
 class StyleGuide
-  def initialize(rubocop_options, config_path, override_config_content = nil)
+  def initialize(rubocop_options, config_file, override_config_content = nil)
     @rubocop_options = rubocop_options
-    @config_path = config_path
+    @config_file = config_file
     @override_config_content = override_config_content
   end
 
@@ -12,42 +12,53 @@ class StyleGuide
       []
     else
       parsed_source = parse_source(file)
-      team = Rubocop::Cop::Team.new(
-               Rubocop::Cop::Cop.all, configuration, @rubocop_options)
-      commissioner = Rubocop::Cop::Commissioner.new(team.cops, [])
-      commissioner.investigate(parsed_source)
+      cops = RuboCop::Cop::Cop.all
+      team = RuboCop::Cop::Team.new(cops, config, rubocop_options)
+      team.inspect_file(parsed_source)
     end
   end
 
   private
 
   def ignored_file?(file)
-    !file.ruby? ||
-      file.removed? ||
-        configuration.file_to_exclude?(file.filename)
+    !file.ruby? || file.removed? || excluded_file?(file)
   end
 
-  def parse_source(file)
-    Rubocop::SourceParser.parse(file.contents, file.filename)
+  def excluded_file?(file)
+    config.file_to_exclude?(file.filename)
   end
 
-  def configuration
-    config = Rubocop::ConfigLoader.configuration_from_file(@config_path)
+  def parse_source(file)
+    RuboCop::ProcessedSource.new(file.content)
+  end
 
-    if override_config
-      config = Rubocop::Config.new(
-        Rubocop::ConfigLoader.merge(config, override_config),
-        ''
-      )
-      config.make_excludes_absolute
+  def config
+    if @config.nil?
+      config = RuboCop::ConfigLoader.configuration_from_file(@config_file)
+      combined_config = RuboCop::ConfigLoader.merge(config, override_config)
+      @config = RuboCop::Config.new(combined_config, "")
     end
 
-    config
+    @config
+  end
+
+  def rubocop_options
+    if config["ShowCopNames"]
+      { debug: true }
+    else
+      {}
+    end.merge(@rubocop_options)
   end
 
   def override_config
     if @override_config_content
-      Rubocop::Config.new(YAML.load(@override_config_content))
+      config_content = YAML.load(@override_config_content)
+      override_config = RuboCop::Config.new(config_content, "")
+      override_config.add_missing_namespaces
+      override_config.make_excludes_absolute
+      override_config
+    else
+      {}
     end
   end
 end

data/lib/rubocop/git/version.rb

@@ -1,5 +1,5 @@
 module RuboCop
   module Git
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
   end
 end

data/rubocop-git.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake'
 
-  spec.add_dependency 'rubocop', ['>= 0.22.0', '< 0.24.0']
+  spec.add_dependency 'rubocop', '>= 0.24.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-git
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Masaki Takeuchi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-06 00:00:00.000000000 Z
+date: 2014-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,20 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.22.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.24.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.22.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.24.1
 description: RuboCop for git diff.
 email:
 - m.ishihara@gmail.com
@@ -75,6 +69,7 @@ files:
 - hound.yml
 - lib/rubocop/git.rb
 - lib/rubocop/git/cli.rb
+- lib/rubocop/git/commit.rb
 - lib/rubocop/git/commit_file.rb
 - lib/rubocop/git/diff_parser.rb
 - lib/rubocop/git/file_violation.rb