gergich 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2d7f7876019c563dcfb6312aee7d29b1aa49303
-  data.tar.gz: dde10dbf52e3f9b56694b656acf54a7bbb39a7bb
+  metadata.gz: 4a83e06009221c6f023ad9abb756eb7056d73c41
+  data.tar.gz: ddaf87be3594c80b6f4fad98f989d02cf5980e3b
 SHA512:
-  metadata.gz: 27c67980ae7aeaaa6c2846dff79f945d35c6ce95957213a1f2c7ee39498ef899824cfcedae2e1560fcd997e722d4ed58d2e8ee8f93917db88f896fd008a64e40
-  data.tar.gz: c990a1379e48090395d45cb2438630d6bdda86a645717180e1d3a8b4d2e1aa0bf09d2812453f595fb00a7f12757a0bc6f5310e314b3b8170babce7f7a0d5f066
+  metadata.gz: d4858b253d58eb97c5f8c8c41eb89edddd100061fbcf80609a7c9f61c7cda2cd7a61537352c15a036e7ad4ac33714a134f4e8d2c8700e74976d9bfd2fab72a3f
+  data.tar.gz: bfb624112eaf912a283836a46be4768eb7898b6042494b5e9f230c9f4f18e482f5c1e5aa744622f3c364df702e273a5c0c3a36e8734e8a2b4a6fa29dce7facd9

data/lib/gergich.rb

@@ -51,7 +51,7 @@ module Gergich
         if Gergich.use_git?
           Gergich.git("diff-tree --no-commit-id --name-only -r #{ref}").split
         else
-          raw = API.get("/changes/#{change_id}/revisions/#{revision_id}/patch", { raw: true })
+          raw = API.get("/changes/#{change_id}/revisions/#{revision_id}/patch", raw: true)
           Base64.decode64(raw)
             .scan(%r{^diff --git a/.*? b/(.*?)$})
             .flatten
@@ -204,11 +204,11 @@ module Gergich
       end
 
       def post(url, body, options = {})
-        perform(:post, url, options.merge({ body: body }))
+        perform(:post, url, options.merge(body: body))
       end
 
       def put(url, body, options = {})
-        perform(:put, url, options.merge({ body: body }))
+        perform(:put, url, options.merge(body: body))
       end
 
       private

data/lib/gergich/capture.rb

@@ -1,3 +1,4 @@
+require_relative "../gergich"
 require "English"
 
 module Gergich
@@ -20,31 +21,44 @@ module Gergich
     end
 
     class << self
-      def run(format, command)
+      def run(format, command, add_comments: true, suppress_output: false)
         captor = load_captor(format)
 
-        exit_code, output = run_command(command)
+        exit_code, output = run_command(command, suppress_output: suppress_output)
         comments = captor.new.run(output.gsub(/\e\[\d+m/m, ""))
+        comments.each do |comment|
+          comment[:path] = relativize(comment[:path])
+        end
 
         draft = Gergich::Draft.new
         skip_paths = (ENV["SKIP_PATHS"] || "").split(",")
-        comments.each do |comment|
-          next if skip_paths.any? { |path| comment[:path].start_with?(path) }
-          draft.add_comment comment[:path], comment[:position],
-                            comment[:message], comment[:severity]
+        if add_comments
+          comments.each do |comment|
+            next if skip_paths.any? { |path| comment[:path].start_with?(path) }
+            draft.add_comment comment[:path], comment[:position],
+                              comment[:message], comment[:severity]
+          end
         end
 
-        exit_code
+        [exit_code, comments]
+      end
+
+      def base_path
+        @base_path ||= File.expand_path(GERGICH_GIT_PATH) + "/"
+      end
+
+      def relativize(path)
+        path.sub(base_path, "")
       end
 
-      def run_command(command)
+      def run_command(command, suppress_output: false)
         exit_code = 0
 
         if command == "-"
-          output = wiretap($stdin)
+          output = wiretap($stdin, suppress_output)
         else
           IO.popen("#{command} 2>&1", "r+") do |io|
-            output = wiretap(io)
+            output = wiretap(io, suppress_output)
           end
           exit_code = $CHILD_STATUS.exitstatus
         end
@@ -52,10 +66,10 @@ module Gergich
         [exit_code, output]
       end
 
-      def wiretap(io)
+      def wiretap(io, suppress_output)
         output = ""
         io.each do |line|
-          $stdout.puts line
+          $stdout.puts line unless suppress_output
           output << line
         end
         output

data/lib/gergich/cli/gergich.rb

@@ -191,7 +191,8 @@ commands["capture"] = {
   summary: "Run a command and translate its output into `gergich comment` calls",
   action: ->(format, command) {
     require_relative "../../gergich/capture"
-    exit Gergich::Capture.run(format, command)
+    status, = Gergich::Capture.run(format, command)
+    exit status
   },
   help: ->() {
     <<-TEXT

data/spec/gergich/capture_spec.rb

@@ -3,25 +3,24 @@ require_relative "../../lib/gergich/capture"
 RSpec.describe Gergich::Capture do
   let!(:draft) { double }
 
+  let :output do
+    <<-OUTPUT
+#{path}
+  4:21  error  Missing semicolon  semi
+OUTPUT
+  end
+
   before do
     allow(Gergich::Draft).to receive(:new).and_return(draft)
+    $stdin = StringIO.new(output)
   end
 
-  context "stdin" do
-    let :output do
-      <<-OUTPUT
-jsapp/models/user.js
-  4:21  error  Missing semicolon  semi
-OUTPUT
-    end
-
-    before do
-      $stdin = StringIO.new(output)
-    end
+  after do
+    $stdin = STDIN
+  end
 
-    after do
-      $stdin = STDIN
-    end
+  context "stdin" do
+    let(:path) { "jsapp/models/user.js" }
 
     it "should catch errors" do
       expect(draft).to receive(:add_comment).with(
@@ -30,7 +29,7 @@ OUTPUT
         "[eslint] Missing semicolon",
         "error"
       )
-      described_class.run("eslint", "-")
+      described_class.run("eslint", "-", suppress_output: true)
     end
 
     it "shouldn't eat stdin" do
@@ -39,4 +38,36 @@ OUTPUT
       described_class.run("eslint", "-")
     end
   end
+
+  context "absolute paths" do
+    before do
+      allow(described_class).to receive(:base_path).and_return("/the/directory/")
+    end
+
+    context "under us" do
+      let(:path) { "/the/directory/jsapp/models/user.js" }
+      it "should be relativized" do
+        expect(draft).to receive(:add_comment).with(
+          "jsapp/models/user.js",
+          4,
+          "[eslint] Missing semicolon",
+          "error"
+        )
+        described_class.run("eslint", "-", suppress_output: true)
+      end
+    end
+
+    context "elsewhere" do
+      let(:path) { "/other/directory/jsapp/models/user.js" }
+      it "should not be relativized" do
+        expect(draft).to receive(:add_comment).with(
+          "/other/directory/jsapp/models/user.js",
+          4,
+          "[eslint] Missing semicolon",
+          "error"
+        )
+        described_class.run("eslint", "-", suppress_output: true)
+      end
+    end
+  end
 end

data/spec/gergich_spec.rb

@@ -1,5 +1,5 @@
 RSpec.describe Gergich::API do
-  let(:result) { double(:result, { body: "Not Found: 1234" }) }
+  let(:result) { double(:result, body: "Not Found: 1234") }
 
   before :each do
     allow(HTTParty).to receive(:send).and_return(result)
@@ -13,14 +13,15 @@ end
 
 RSpec.describe Gergich::Draft do
   let!(:draft) do
-    commit = double(:commit, {
+    commit = double(
+      :commit,
       files: [
         "foo.rb",
         "bar/baz.lol"
       ],
       revision_id: "test",
       change_id: "test"
-    })
+    )
     described_class.new commit
   end
 
@@ -36,12 +37,12 @@ RSpec.describe Gergich::Draft do
 
       it "includes file comments" do
         draft.add_comment "foo.rb", 1, "fix foo", "info"
-        expect(subject).to eq({ "foo.rb" => [{ line: 1, message: "[INFO] fix foo" }] })
+        expect(subject).to eq("foo.rb" => [{ line: 1, message: "[INFO] fix foo" }])
       end
 
       it "includes COMMIT_MSG comments" do
         draft.add_comment "/COMMIT_MSG", 1, "fix commit", "info"
-        expect(subject).to eq({ "/COMMIT_MSG" => [{ line: 1, message: "[INFO] fix commit" }] })
+        expect(subject).to eq("/COMMIT_MSG" => [{ line: 1, message: "[INFO] fix commit" }])
       end
 
       it "doesn't include orphaned file comments" do
@@ -89,10 +90,10 @@ RSpec.describe Gergich::Draft do
         draft.add_label "Code-Review", -2
         draft.add_label "Code-Review", 1
 
-        expect(subject).to eq({
+        expect(subject).to eq(
           "QA-Review" => -1,
           "Code-Review" => -2
-        })
+        )
       end
 
       it "disallows \"Verified\"" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gergich
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Jon Jensen
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Command-line tool for adding Gerrit comments