gazelle_styleguide 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjQxOGYzZTNlYTAzNWFiNjJlZmMwNjhhNDE1YzVmZTNiYTYzZTlkNA==
+    ZWRkZWZlY2I0OThiZmE2ZDBjZWYxN2JiMTE2MDcyNjk1MGIxYjY0OQ==
   data.tar.gz: !binary |-
-    MmExNTRkODM4YWFmMjE5NjJkNjk2ODFkYzhjYTZlMWI4YzA5NGFiNg==
+    OTQxOTM4YjI4YjJmNDZkNWM0NWRhZWViYWM0ZTRiMDkzM2JkZjg4Mg==
 SHA512:
   metadata.gz: !binary |-
-    NjBmNDI0MWEyOTc5MWU1MTMyMmE4MmJiY2NmZTc3NjFmNmU4MDQwZjJlZjA2
-    MjRiNGYwOGI0OTlhOWNlNTdlYTVmOGJiODYxMWNiZDc4Y2IxOWMyMTRkNTIz
-    YTE4MmI1OTgyOWFhYmFiYzliZTUzMjgxNWExNjI1NTdmNjVhZjg=
+    MjQ0OGJiYjllNDY3MmQwZjQxMTk0MjFjZDZjYTc3NjJkY2NmMzZmZGExNWIy
+    OWJhODU4YTlhYjVkMzkxNTE2YmE0ZmZjOWVjYzQ1OWVhNDE1MGNlZTNlYmY3
+    ZjNmMDc0MTM0YWMyYmExMjVmOGNmYzYxNDhhY2IyMzk4ZTFkNjI=
   data.tar.gz: !binary |-
-    OTk4NGNmZGViNWYyNmIzOWY4NWVkYzk0OGIzZDhiZmJiY2EyNjNlYTNmZDY4
-    MTZkMTlkMmUwNzk4MDU5MzQ0ZGVjYjBmZjQyZjIyOTEyMjRmYzBjOTcxODI5
-    NjcyMDhhYTRlOWE5MmY2OTg5OTQwMjlmM2RmZGU3MjMxMWY0NDU=
+    ODE0NjIyNTQ0NTg5YzJlNTM3ZWU5NjE3NzNiNDg1ZDhkZTQ2NzZiNTA4Mzdl
+    ZTYxZTgzNDgyMTMxMjE0NjM2NjY1YTI2Yzg4NjFjZmY5MmQ1Zjk2NjI5MWMx
+    MjYxNTM4YjUwMDg2MWVhY2NlOTEyYTU2YjA1NTJlMzgzMTQ0Yzk=

data/config/rubocop.yml

@@ -386,12 +386,6 @@ SpaceAroundEqualsInParameterDefault:
     - space
     - no_space
 
-TrailingBlankLines:
-  EnforcedStyle: final_newline
-  SupportedStyles:
-    - final_newline
-    - final_blank_line
-
 TrailingComma:
   EnforcedStyleForMultiline: no_comma
   SupportedStyles:

data/lib/gazelle_styleguide/cli.rb

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
 require 'grit'
+require 'grit_ext/status' # add ignored support
 require 'thor'
 require 'fileutils'
 
@@ -20,6 +21,7 @@ module GazelleStyleguide
     desc 'lint [flags|FILES]', 'Runs linters'
     option :all, aliases: :a
     option :changed, aliases: :c
+    option :staged, aliases: :s
     def lint(*files)
       require 'pre-commit'
       files = lint_files(files, options)
@@ -27,7 +29,19 @@ module GazelleStyleguide
       PreCommit::Runner.new($stderr, files).run
     end
 
-    private
+    desc 'fix [flags|FILES]', 'Runs rubocop fix against ruby files'
+    option :all, aliases: :a
+    option :changed, aliases: :c
+    option :staged, aliases: :s
+    def fix(*files)
+      require 'rubocop'
+      files = lint_files(files, options).select{|file| file =~ /\.rb|Gemfile|Rakefile|\.task|\.rake/}
+      args = ['-a', '-c', GazelleStyleguide.config_for('rubocop.yml')] + files
+
+      Rubocop::CLI.new.run(args)
+    end
+
+  private
 
     def install_pre_commit
       require 'pre-commit/installer'
@@ -64,14 +78,20 @@ module GazelleStyleguide
       if files.any?
         files
       elsif options[:all]
-        Dir['./**/*'].select { |f| File.file?(f) }
+        Dir['./**/*'].select{|f| File.file?(f)}
+      elsif options[:staged]
+        staged_files
       else
         changed_files
       end
     end
 
+    def staged_files
+      repo.status.changed.keys + repo.status.added.keys
+    end
+
     def changed_files
-      repo.status.files.select { |file, status| status.type == 'M' || status.untracked }.keys
+      repo.status.untracked.keys + staged_files
     end
 
     def repo

data/lib/gazelle_styleguide/version.rb

@@ -2,5 +2,5 @@
 
 # Styleguide version
 module GazelleStyleguide
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/lib/grit_ext/status.rb

@@ -0,0 +1,191 @@
+module Grit
+  class Status
+    include Enumerable
+
+    attr_reader :files
+
+    @base = nil
+    @files = nil
+
+    def initialize(base)
+      @base = base
+      construct_status
+    end
+
+    def changed
+      @files.select{|k, f| f.type == 'M'}
+    end
+
+    def added
+      @files.select{|k, f| f.type == 'A'}
+    end
+
+    def deleted
+      @files.select{|k, f| f.type == 'D'}
+    end
+
+    def untracked
+      @files.select{|k, f| f.untracked && !f.ignored}
+    end
+
+    def pretty
+      out = ''
+      each do |file|
+        out << file.path
+        out << "\n\tsha(r) " + file.sha_repo.to_s + ' ' + file.mode_repo.to_s
+        out << "\n\tsha(i) " + file.sha_index.to_s + ' ' + file.mode_index.to_s
+        out << "\n\ttype   " + file.type.to_s
+        out << "\n\tstage  " + file.stage.to_s
+        out << "\n\tuntrac " + file.untracked.to_s
+        out << "\n"
+      end
+      out << "\n"
+      out
+    end
+
+    # enumerable method
+
+    def [](file)
+      @files[file]
+    end
+
+    def each
+      @files.each do |k, file|
+        yield file
+      end
+    end
+
+    class StatusFile
+      attr_accessor :path, :type, :stage, :untracked, :ignored
+      attr_accessor :mode_index, :mode_repo
+      attr_accessor :sha_index, :sha_repo
+
+      @base = nil
+
+      def initialize(base, hash)
+        @base = base
+        @path = hash[:path]
+        @type = hash[:type]
+        @stage = hash[:stage]
+        @mode_index = hash[:mode_index]
+        @mode_repo = hash[:mode_repo]
+        @sha_index = hash[:sha_index]
+        @sha_repo = hash[:sha_repo]
+        @untracked = hash[:untracked]
+        @ignored = hash[:ignored]
+      end
+
+      def blob(type = :index)
+        if type == :repo
+          @base.object(@sha_repo)
+        else
+          @base.object(@sha_index) rescue @base.object(@sha_repo)
+        end
+      end
+    end
+
+  private
+
+    def construct_status
+      @files = ls_files
+
+      Dir.chdir(@base.working_dir) do
+        # find untracked in working dir
+        ls_untracked.each do |path, data|
+          @files[path] = data unless @files[path]
+        end
+
+        # find modified in tree
+        diff_files.each do |path, data|
+          @files[path] ? @files[path].merge!(data) : @files[path] = data
+        end
+
+        # find added but not committed - new files
+        diff_index('HEAD').each do |path, data|
+          @files[path] ? @files[path].merge!(data) : @files[path] = data
+        end
+
+        @files.each do |k, file_hash|
+          @files[k] = StatusFile.new(@base, file_hash)
+        end
+      end
+    end
+
+      # compares the index and the working directory
+    def diff_files
+      hsh = {}
+      @base.git.diff_files.split("\n").each do |line|
+        (info, file) = line.split("\t")
+        (mode_src, mode_dest, sha_src, sha_dest, type) = info.split
+        hsh[file] = {path: file, mode_file: mode_src.to_s[1, 7], mode_index: mode_dest,
+                     sha_file: sha_src, sha_index: sha_dest, type: type}
+      end
+      hsh
+    end
+
+      # compares the index and the repository
+    def diff_index(treeish)
+      hsh = {}
+      @base.git.diff_index({}, treeish).split("\n").each do |line|
+        (info, file) = line.split("\t")
+        (mode_src, mode_dest, sha_src, sha_dest, type) = info.split
+        hsh[file] = {path: file, mode_repo: mode_src.to_s[1, 7], mode_index: mode_dest,
+                     sha_repo: sha_src, sha_index: sha_dest, type: type}
+      end
+      hsh
+    end
+
+    def ls_files
+      hsh = {}
+      lines = @base.git.ls_files(stage: true)
+      lines.split("\n").each do |line|
+        (info, file) = line.split("\t")
+        (mode, sha, stage) = info.split
+        hsh[file] = {path: file, mode_index: mode, sha_index: sha, stage: stage}
+      end
+      hsh
+    end
+
+    def ls_untracked
+      hsh, wdir = {}, @base.working_dir
+
+      # directories and hidden files are skiped so as to preserve
+      # backward compatibility with 2.4.1
+      skip = lambda{|f|
+        File.directory?(File.join(wdir, f)) || f =~ /^\./
+      }
+
+      # `git ls-files --others --ignore --exclude-standard --directory`
+      # returns untracked and ignored files as well as ignored
+      # directories
+      ignored_dirs = []
+      @base.git.ls_files(:others => true,
+                         :ignored => true, :directory => true,
+                         :"exclude-standard" => true).
+                split("\n").each do |file|
+        if File.directory?(File.join(wdir, file))
+          ignored_dirs << file
+        elsif !skip[file]
+          hsh[file] = {path: file,
+                       untracked: true,
+                       ignored: true}
+        end
+      end
+
+      # `git ls-files --others` is used for remaining files
+      @base.git.ls_files(others: true).
+                split("\n").each do |file|
+        if ignored_dirs.any?{|d| file.index(d) == 0}
+          hsh[file] = {path: file,
+                       untracked: true,
+                       ignored: true}
+        elsif !(skip[file] || hsh[file])
+          hsh[file] = {path: file,
+                       untracked: true}
+        end
+      end
+
+      hsh
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gazelle_styleguide
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Allen Madsen
@@ -162,6 +162,7 @@ files:
 - lib/gazelle_styleguide.rb
 - lib/gazelle_styleguide/cli.rb
 - lib/gazelle_styleguide/version.rb
+- lib/grit_ext/status.rb
 - spec/gazelle_styleguide_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/secondrotation/gazelle_styleguide