rubocop-git 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e847268b1ab1d8961bb6afed3402f75cbc1abf60
-  data.tar.gz: 713c38e0742d3793d6234ab0ac8d971b3b821cae
+  metadata.gz: c672dcd90e02f12fe912671d34296778f4c4126f
+  data.tar.gz: 7218bdfe3e468c96c93ebfe7b65761778d8bd097
 SHA512:
-  metadata.gz: 3ab7b0885da47ed39deb523fa5dbd7daac6b406b9ebf260982120fa071b8c340eca530e032a04ad959cd61cf1a4ae9d98913d0bb0126fcd87b4d0df5c93508f5
-  data.tar.gz: c3016b240f51a4645938202dc43c955ef91e95847d6881742bce4baca3ef7c6e9c11068ea005f94d6772f7266ebe7b6ad32f44315b85e5e8ad65afd5259e4f38
+  metadata.gz: 3aeafd917cf189510adc77bba476911ce0cc1bc4ea902305c68083e73967eabe23980984711c8ac02f559607b294b4431d8e730228546de27243121da50366cf
+  data.tar.gz: bb6f02b01e9eaf7331be756f07cef68aef73d4860c21be8551268a6e0175064537fd7707742ff4a3f979cd47e063faddf7eedc95961b8aa5e93a3cf85d58fc1f

data/README.md

@@ -18,7 +18,7 @@ Or install it yourself as:
 
 ## Usage
 
-    Usage: rubocop-git [options]
+    Usage: rubocop-git [options] [[commit] commit]
         -c, --config FILE                Specify configuration file
         -D, --display-cop-names          Display cop names in offense messages
             --cached                     git diff --cached

data/lib/rubocop/git.rb

@@ -3,7 +3,9 @@ require 'rubocop'
 
 if defined?(Rubocop)
   # rubocop 0.22.0
-  RuboCop::Formatter = Rubocop::Formatter
+  RuboCop::ConfigLoader = Rubocop::ConfigLoader
+  RuboCop::Formatter    = Rubocop::Formatter
+  RuboCop::Version      = Rubocop::Version
 else
   # rubocop >= 0.23.0
   Rubocop = RuboCop
@@ -12,8 +14,10 @@ end
 module RuboCop
   module Git
     autoload :CommitFile,        'rubocop/git/commit_file'
+    autoload :DiffParser,        'rubocop/git/diff_parser'
     autoload :FileViolation,     'rubocop/git/file_violation'
     autoload :Line,              'rubocop/git/line'
+    autoload :Options,           'rubocop/git/options'
     autoload :Patch,             'rubocop/git/patch'
     autoload :PseudoPullRequest, 'rubocop/git/pseudo_pull_request'
     autoload :PseudoResource,    'rubocop/git/pseudo_resource'

data/lib/rubocop/git/cli.rb

@@ -5,44 +5,49 @@ module RuboCop
   module Git
     class CLI
       def run(args = ARGV)
-        options = parse_arguments(args)
-        Runner.new.run(options)
+        @options = Options.new
+        parse_arguments(args)
+        Runner.new.run(@options)
       end
 
       private
 
       def parse_arguments(args)
-        options = {}
+        @options.commits = option_parser.parse(args)
+      rescue OptionParser::InvalidOption, Options::Invalid => ex
+        warn "ERROR: #{ex.message}"
+        $stderr.puts
+        warn option_parser
+        exit 1
+      end
+
+      def option_parser
+        @option_parser ||= OptionParser.new do |opt|
+          opt.banner << ' [[commit] commit]'
 
-        OptionParser.new do |opt|
           opt.on('-c', '--config FILE',
                  'Specify configuration file') do |config|
-            options[:config] = config
+            @options.config = config
           end
 
           opt.on('-D', '--display-cop-names',
                  'Display cop names in offense messages') do
-            options[:rubocop] ||= {}
-            options[:rubocop][:display_cop_names] = true
+            @options.rubocop[:display_cop_names] = true
           end
 
           opt.on('--cached', 'git diff --cached') do
-            options[:cached] = true
+            @options.cached = true
           end
 
           opt.on('--staged', 'synonym of --cached') do
-            options[:cached] = true
+            @options.cached = true
           end
 
           opt.on('--hound',
                  'Hound compatibility mode (require rubocop 0.22.0)') do
-            options[:hound] = true
+            @options.hound = true
           end
-
-          opt.parse(args)
         end
-
-        options
       end
     end
   end

data/lib/rubocop/git/diff_parser.rb

@@ -0,0 +1,31 @@
+module RuboCop
+  module Git
+    class DiffParser
+      class << self
+        def parse(diff)
+          new.parse(diff)
+        end
+      end
+
+      def parse(diff)
+        files    = []
+        in_patch = false
+
+        diff.each_line do |line|
+          case line
+          when /^diff --git/
+            in_patch = false
+          when %r{^\+{3} b/(?<path>[^\t\n\r]+)}
+            files << PseudoResource.new(Regexp.last_match[:path])
+          when /^@@/
+            in_patch = true
+          end
+
+          files.last.patch << line if in_patch
+        end
+
+        files
+      end
+    end
+  end
+end

data/lib/rubocop/git/options.rb

@@ -0,0 +1,86 @@
+module RuboCop
+  module Git
+    class Options
+      class Invalid < StandardError; end
+
+      HOUND_DEFAULT_CONFIG_FILE =
+        File.expand_path('../../../../hound.yml', __FILE__)
+
+      attr_accessor :config
+      attr_reader   :cached, :hound, :rubocop
+
+      def initialize(hash_options = nil)
+        @config  = nil
+        @cached  = false
+        @hound   = false
+        @rubocop = {}
+        @commits = []
+
+        from_hash(hash_options) if hash_options
+      end
+
+      def cached=(cached_)
+        if cached_ && !@commits.empty?
+          fail Invalid, 'cached and commit cannot be specified together'
+        end
+        @cached = !!cached_
+      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
+
+      def rubocop=(rubocop_)
+        unless rubocop_.is_a?(Hash)
+          fail Invalid, "invalid rubocop: #{rubocop_.inspect}"
+        end
+        @rubocop = rubocop_
+      end
+
+      def commits=(commits)
+        unless commits.is_a?(Array) && commits.length <= 2
+          fail Invalid, "invalid commits: #{commits.inspect}"
+        end
+        if !commits.empty? && cached
+          fail Invalid, 'cached and commit cannot be specified together'
+        end
+        @commits = commits
+      end
+
+      def config_path
+        if hound
+          HOUND_DEFAULT_CONFIG_FILE
+        elsif config
+          config
+        elsif File.exist?(RuboCop::ConfigLoader::DOTFILE)
+          RuboCop::ConfigLoader::DOTFILE
+        else
+          RuboCop::ConfigLoader::DEFAULT_FILE
+        end
+      end
+
+      def commit_first
+        @commits.length == 1 ? @commits.first + '^' : @commits.first
+      end
+
+      def commit_last
+        @commits.last
+      end
+
+      private
+
+      def from_hash(hash_options)
+        hash_options = hash_options.dup
+        %w(config cached hound rubocop commits).each do |key|
+          public_send("#{key}=", hash_options.delete(key))
+        end
+        unless hash_options.empty?
+          fail Invalid, "invalid keys: #{hash_options.keys.join(' ')}"
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/git/pseudo_pull_request.rb

@@ -18,7 +18,7 @@ module RuboCop
       end
 
       def config
-        return unless @options[:hound]
+        return unless @options.hound
         File.read(HOUND_CONFIG_FILE)
       rescue Errno::ENOENT
         nil
@@ -31,8 +31,10 @@ module RuboCop
       end
 
       def file_contents(filename)
-        if @options[:cached]
+        if @options.cached
           `git show :#{filename.shellescape}`
+        elsif @options.commit_last
+          `git show #{@options.commit_last.shellescape}:#{filename.shellescape}`
         else
           File.read(filename)
         end

data/lib/rubocop/git/pseudo_resource.rb

@@ -1,6 +1,16 @@
 module RuboCop
   module Git
-    class PseudoResource < Struct.new(:filename, :status, :patch)
+    class PseudoResource
+      attr_reader :filename, :patch
+
+      def initialize(filename)
+        @filename = filename
+        @patch    = ''
+      end
+
+      def status
+        'modified'
+      end
     end
   end
 end

data/lib/rubocop/git/runner.rb

@@ -1,19 +1,14 @@
+require 'shellwords'
+
 module RuboCop
   module Git
     # ref. https://github.com/thoughtbot/hound/blob/be2dd34/app/services/build_runner.rb
     class Runner
-      DEFAULT_CONFIG_FILE = '.rubocop.yml'
-      HOUND_DEFAULT_CONFIG_FILE =
-        File.expand_path('../../../../hound.yml', __FILE__)
-
       def run(options)
-        if options[:hound] && RuboCop::Version.version != '0.22.0'
-          warn 'Hound compatibility mode require rubocop 0.22.0'
-          exit 1
-        end
+        options = Options.new(options) unless options.is_a?(Options)
 
         @options = options
-        @files = parse_diff(git_diff(options[:cached]))
+        @files = DiffParser.parse(git_diff(options))
 
         display_violations($stdout)
       end
@@ -26,8 +21,8 @@ module RuboCop
 
       def style_checker
         StyleChecker.new(pull_request.pull_request_files,
-                         @options[:rubocop],
-                         config_path,
+                         @options.rubocop,
+                         @options.config_path,
                          pull_request.config)
       end
 
@@ -35,40 +30,17 @@ module RuboCop
         @pull_request ||= PseudoPullRequest.new(@files, @options)
       end
 
-      def git_diff(cached)
-        if cached
-          `git diff --diff-filter=AMCR --cached --find-renames --find-copies`
-        else
-          `git diff --diff-filter=AM`
-        end
-      end
-
-      def parse_diff(diff)
-        files    = []
-        in_patch = false
-
-        diff.each_line do |line|
-          case line
-          when /^diff --git/
-            in_patch = false
-          when %r{^\+{3} b/([^\t\n\r]+)}
-            files << PseudoResource.new($1, 'modified', '')
-          when /^@@/
-            in_patch = true
-          end
+      def git_diff(options)
+        args = %w(diff --diff-filter=AMCR --find-renames --find-copies)
 
-          files.last.patch << line if in_patch
+        if options.cached
+          args << '--cached'
+        elsif options.commit_last
+          args << options.commit_first.shellescape
+          args << options.commit_last.shellescape
         end
 
-        files
-      end
-
-      def config_path
-        if @options[:hound]
-          HOUND_DEFAULT_CONFIG_FILE
-        else
-          @options[:config] || DEFAULT_CONFIG_FILE
-        end
+        `git #{args.join(' ')}`
       end
 
       def display_violations(io)

data/lib/rubocop/git/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-git
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Masaki Takeuchi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-02 00:00:00.000000000 Z
+date: 2014-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -76,8 +76,10 @@ files:
 - lib/rubocop/git.rb
 - lib/rubocop/git/cli.rb
 - lib/rubocop/git/commit_file.rb
+- lib/rubocop/git/diff_parser.rb
 - lib/rubocop/git/file_violation.rb
 - lib/rubocop/git/line.rb
+- lib/rubocop/git/options.rb
 - lib/rubocop/git/patch.rb
 - lib/rubocop/git/pseudo_pull_request.rb
 - lib/rubocop/git/pseudo_resource.rb