code_owners 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ec4a3443c169b75a265f905e95b9ff9595c8dfa
-  data.tar.gz: e877e2806c91021cffb6973eaed76b99fe51e226
+  metadata.gz: bddfbbd4ec9f5016192c995b8660325dae24b9aa
+  data.tar.gz: f04bbd2618f16253fba02cd8a40c8ba1483d7a66
 SHA512:
-  metadata.gz: db2915fe732ca2f1136f53c4440871bf87d7ebb402a0759296796ff0496d6e9daaa126354bc34b5de6b7c81543a3bffb8e50f369877bb69524dfb017dd3453a3
-  data.tar.gz: 95d8fed0a564d327db457f1dee58109bab2cd6847edefa51556a4a3b2342ef4562b2c20b43d58bad2018c70c4312bae50d34d3ba970cdfc4f1c090f116f67ace
+  metadata.gz: df7b7005d293e25b5ae35d32d450c69a2c2cafd51294dc7292eb0814a67f5126673b7511860d824d9db724145f33e6c15172cc052068d7fd79f76515df666e23
+  data.tar.gz: b51c33cb99006e79035e30dec7cfd5546bbd8188e48fd9dea8d47dc97b8cb58724348ce444d6bdffc1723be4d9d352ddbbce70c95e4d1c8f425d0e623617fc91

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    code_owners (1.0.2)
+    code_owners (1.0.3)
       rake
 
 GEM

data/lib/code_owners.rb

@@ -16,8 +16,7 @@ module CodeOwners
     def ownerships
       patterns, owners = pattern_owners.transpose
 
-      raw_git_ownership(patterns).map do |status|
-        _, _exfile, line, pattern, file = status.match(/^(.*):(\d*):(.*)\t(.*)$/).to_a
+      git_owner_info(patterns).map do |line, pattern, file|
         if line.empty?
           { file: file, owner: "UNOWNED" }
         else
@@ -35,15 +34,31 @@ module CodeOwners
       end
     end
 
+    def git_owner_info(patterns)
+      make_utf8(raw_git_owner_info(patterns)).lines.map do |info|
+        _, _exfile, line, pattern, file = info.strip.match(/^(.*):(\d*):(.*)\t(.*)$/).to_a
+        [line, pattern, file]
+      end
+    end
+
     # expects an array of gitignore compliant patterns
     # generates a check-ignore formatted string for each file in the repo
-    def raw_git_ownership(patterns)
+    def raw_git_owner_info(patterns)
       Tempfile.open('codeowner_patterns') do |file|
         file.write(patterns.join("\n"))
         file.rewind
-        cmd = "git ls-files | xargs -- git -c \"core.excludesfile=#{file.path}\" check-ignore --no-index -v -n"
-        `#{cmd}`.lines.map(&:strip)
+        `git ls-files | xargs -- git -c \"core.excludesfile=#{file.path}\" check-ignore --no-index -v -n`
       end
     end
+
+    private
+
+    def make_utf8(input)
+      input.force_encoding(Encoding::UTF_8)
+      return input if input.valid_encoding?
+      input.encode!(Encoding::UTF_16, invalid: :replace, replace: '�')
+      input.encode!(Encoding::UTF_8, Encoding::UTF_16)
+      input
+    end
   end
 end

data/lib/code_owners/version.rb

@@ -1,3 +1,3 @@
 module CodeOwners
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/spec/code_owners_spec.rb

@@ -4,10 +4,10 @@ RSpec.describe CodeOwners do
   describe ".ownerships" do
     it "assigns owners to things" do
       expect(CodeOwners).to receive(:pattern_owners).and_return([["pat1", "own1"], ["pat2", "own2"], ["pat3", "own3"]])
-      expect(CodeOwners).to receive(:raw_git_ownership).and_return(
+      expect(CodeOwners).to receive(:git_owner_info).and_return(
         [
-          "this_gets_discarded:2:whatever/pattern/thing\tthis/is/a/file",
-          "::\tunowned/file"
+          ["2", "whatever/pattern/thing", "this/is/a/file"],
+          ["", "", "unowned/file"]
         ]
       )
       expect(CodeOwners.ownerships).to eq(
@@ -35,11 +35,23 @@ RSpec.describe CodeOwners do
     end
   end
 
-  describe ".raw_git_ownership" do
+  describe ".git_owner_info" do
+    it "returns a massaged list of git ownership info" do
+      expect(CodeOwners).to receive(:raw_git_owner_info).and_return("this_gets_discarded:2:whatever/pattern/thing\tthis/is/a/file\n::\tBad\xEF\xEF\xEF\xEF chars\xC3\xA5\xE2\x88\x86\xC6\x92.txt" )
+      expect(CodeOwners.git_owner_info(["/lib/*"])).to eq(
+        [
+          ["2", "whatever/pattern/thing", "this/is/a/file"],
+          ["", "", "Bad���� charså∆ƒ.txt"]
+        ]
+      )
+    end
+  end
+
+  describe ".raw_git_owner_info" do
     it "establishes code owners from a list of patterns" do
-      raw_ownership = CodeOwners.raw_git_ownership(["/lib/*"])
+      raw_ownership = CodeOwners.raw_git_owner_info(["/lib/*"])
       expect(raw_ownership.size).to be >= 1
-      expect(raw_ownership).to all( match(/^.*:\d*:.*\t.*$/) )
+      expect(raw_ownership).to match(/^(?:.*:\d*:.*\t.*\n)+$/)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: code_owners
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Jonathan Cheatham
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: ".github/CODEOWNERS introspection utility gem"