git_ls 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36a574370f3eb35ebc2809b74763a95b5e8ccfbcdeaa6a51c3e676b5c99169e1
-  data.tar.gz: 23edfa443ecf1ba37421b9722447d4222e9f243caa020649b08c89186b3b1b78
+  metadata.gz: 3b3b64d9243806400218962b09edcb66818cb89e937d26891cb166abcab21758
+  data.tar.gz: 35635cc661eeed4da50a7552a9843a5c65f9502d54e7970d1a4d704e9409ee6e
 SHA512:
-  metadata.gz: 1ec5afd8473e7549d01de8aa9396ce1fd498d761dc494f9a25145cf0234b59448c44d736bf5463b5d4dffbebb40eca661dfad5c10ab9644e4a0d132fad8df8a9
-  data.tar.gz: 1cd05421d153e6a12357db5689daf22a5932bdd2a40a044d058acbb9f8f5425c7728b4c32b6422c6b3d3de6b732852f45034891c5d892aba068f12a29fd6acc9
+  metadata.gz: ee0a4c6e09c94eb10a50f98035cca54ebaf7c5c5d581e2777e8f3db48e713864277f2478b297e0b6aac105af5f1dbb465f4f576fbcbbb3be5fb7d8d7158898ce
+  data.tar.gz: de60f8686d502bd616997b123089707e39e9c234faaf523b8df8037476013fa83f4114ee7ecb6a9a02c485d69b8e93c593dc8e9ae925aaeebe718e09a7316a9e

data/.simplecov

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+SimpleCov.start do
+  add_filter '/spec/'
+  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.5')
+    enable_coverage(:branch)
+    minimum_coverage line: 100, branch: 100
+  else
+    minimum_coverage 100
+  end
+end

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.2.0
+
+- Handles git index version 4
+- Handles git index version 3 with extended flags properly
+
 # 0.1.0
 
 Initial release

data/Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: .
   specs:
-    git_index (0.1.0)
+    git_ls (0.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     coderay (1.1.3)
     diff-lcs (1.4.4)
+    docile (1.3.2)
     method_source (1.0.0)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -26,16 +27,21 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
+    simplecov (0.18.5)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (>= 2)
-  git_index!
+  git_ls!
   pry (> 0)
   rake (~> 12.0)
   rspec (~> 3.0)
+  simplecov (~> 0.18.5)
 
 BUNDLED WITH
    2.1.4

data/README.md

@@ -30,9 +30,7 @@ Or install it yourself as:
 
 ## Issues
 
-- Doesn't work for git version 4 files at all
 - Doesn't understand split index files at all
-- Has only 1 test
 
 ## Development
 

data/git_index.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '>= 2'
   spec.add_development_dependency 'pry', '> 0'
+  spec.add_development_dependency 'simplecov', '~> 0.18.5'
 end

data/lib/git_ls.rb

@@ -13,6 +13,8 @@ module GitLS
     def files(path = ::Dir.pwd)
       path = ::File.join(path, '.git/index') if ::File.directory?(path)
       ::GitLS::Parser.new(::File.new(path)).files
+    rescue Errno::ENOENT => e
+      raise GitLS::Error, "Not a git directory: #{e.message}"
     end
   end
 end

data/lib/git_ls/parser.rb

@@ -19,10 +19,10 @@ module GitLS
       headers
 
       @files = Array.new(length)
-      case git_version
+      case git_index_version
       when 2 then files_2
       when 3 then files_3
-      when 4 then raise ::GitLS::Error, "4 is complicated git version, it's not done yet"
+      when 4 then files_4
       else raise ::GitLS::Error, 'Unrecognized git version'
       end
       @files
@@ -42,16 +42,58 @@ module GitLS
     def files_3
       @files.map! do
         @file.pos += 60 # skip 60 bytes (40 bytes of stat, 20 bytes of sha)
-        flags = @file.read(2) # 2 bytes flags
-        # skip extend flags if extended flags bit set
-        @file.pos += 2 if flags && (flags.unpack1('n') & 0b0100_0000_0000_0000).positive?
+        flag = @file.getbyte
+        extended_flag_offset = if (flag & 0b0100_0000).positive?
+          3 # skip next half of flag + extended flags
+        else
+          1 # skip next half of flag
+        end
+        @file.pos += extended_flag_offset
 
         ret = @file.readline("\0").chop
-        @file.pos += 7 - ((ret.bytesize - 2) % 8) # 1-8 bytes padding of nuls
+        @file.pos += 7 - ((ret.bytesize + extended_flag_offset - 3) % 8) # 1-8 bytes padding of nuls
         ret
       end
     end
 
+    def files_4
+      prev_entry_path = ""
+      @files.map! do
+        @file.pos += 60 # skip 60 bytes (40 bytes of stat, 20 bytes of sha)
+        flag = @file.getbyte
+        @file.pos += if (flag & 0b0100_0000).positive?
+          3 # skip next half of flag + extended flags
+        else
+          1 # skip next half of flag
+        end
+
+        # flags = @file.read(2) # 2 bytes flags
+        # # skip extend flags if extended flags bit set
+        # @file.pos += 2 if flags && (flags.unpack1('n') & 0b0100_0000_0000_0000).positive?
+
+        # documentation for this number from
+        # https://git-scm.com/docs/pack-format#_original_version_1_pack_idx_files_have_the_following_format
+        # offset encoding:
+        #   n bytes with MSB set in all but the last one.
+        #   The offset is then the number constructed by
+        #   concatenating the lower 7 bit of each byte, and
+        #   for n >= 2 adding 2^7 + 2^14 + ... + 2^(7*(n-1))
+        #   to the result.
+        read_offset = 0
+        prev_read_offset = @file.getbyte
+        n = 1
+        while (prev_read_offset & 0b1000_0000).positive?
+          read_offset += (prev_read_offset - 0b1000_0000)
+          read_offset += 2**(7 * n)
+          n += 1
+          prev_read_offset = @file.getbyte
+        end
+        read_offset += prev_read_offset
+
+        prev_entry_path = prev_entry_path.byteslice(0, prev_entry_path.bytesize - read_offset) + @file.readline("\0").chop
+      end
+    end
+
     def headers
       @headers ||= @file.read(12).unpack(::GitLS::Parser::HEADER)
     end
@@ -60,7 +102,7 @@ module GitLS
       headers[0] == 'DIRC'
     end
 
-    def git_version
+    def git_index_version
       @git_version = headers[1]
     end
 

data/lib/git_ls/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitLS
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_ls
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Dana Sherson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-17 00:00:00.000000000 Z
+date: 2020-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.5
 description: 
 email:
 - robot@dana.sh
@@ -47,6 +61,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".simplecov"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile