gergich 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a83e06009221c6f023ad9abb756eb7056d73c41
-  data.tar.gz: ddaf87be3594c80b6f4fad98f989d02cf5980e3b
+  metadata.gz: c3fa3adc0194c17f11a88ffd258d1384608caa83
+  data.tar.gz: ac80e9921090135a33095168c0f17bef37c3b80c
 SHA512:
-  metadata.gz: d4858b253d58eb97c5f8c8c41eb89edddd100061fbcf80609a7c9f61c7cda2cd7a61537352c15a036e7ad4ac33714a134f4e8d2c8700e74976d9bfd2fab72a3f
-  data.tar.gz: bfb624112eaf912a283836a46be4768eb7898b6042494b5e9f230c9f4f18e482f5c1e5aa744622f3c364df702e273a5c0c3a36e8734e8a2b4a6fa29dce7facd9
+  metadata.gz: 054fe528157dc92c224291821b897afcdb6995bd7dec16a567e19609a677dd4afa5f666a3b24195da80b4574c4a1f0b7b16e1d5da1c4cfd37cd0659b0e4393b3
+  data.tar.gz: 25c021aac67fce6ed1693dcc4e5fa95f110783fc056dcdbf6bd0702325f76c079feeefba77f9b7192a7a672da5668b9ac8b8a6577363bb4442ff7a8ef636568f

data/lib/gergich/capture/rubocop_capture.rb

@@ -14,21 +14,32 @@ module Gergich
         #   bin/gergich:47:8: C: Prefer double-quoted strings
         #   if ENV['DEBUG']
         #          ^^^^^^^
-        pattern = /
-          ^([^:\n]+):(\d+):\d+:\s(\w):\s(.*?)\n
-          ([^\n]+\n
-           [^^\n]*\^+[^^\n]*\n)?
-        /mx
+        first_line_pattern = /^([^:\n]+):(\d+):\d+:\s(\w):\s/
 
-        output.scan(pattern).map { |file, line, severity, error, context|
-          context = "\n\n" + context.gsub(/^/, " ") if context
-          {
+        parts = output.split(first_line_pattern)
+        parts.shift
+        messages = []
+
+        until parts.empty?
+          file = parts.shift
+          line = parts.shift
+          severity = parts.shift
+          message = parts.shift
+          # if there is code context at the end, separate it and indent it
+          # so that gerrit preserves formatting
+          if /(?<context>[^\n]+\n *\^+\n)/m =~ message
+            message.sub!(context, "\n" + context.gsub(/^/, " "))
+          end
+
+          messages << {
             path: file,
             position: line.to_i,
-            message: "[rubocop] #{error}#{context}",
+            message: "[rubocop] #{message}",
             severity: SEVERITY_MAP[severity]
           }
-        }.compact
+        end
+
+        messages
       end
     end
   end

data/spec/gergich/capture/rubocop_capture_spec.rb

@@ -3,9 +3,17 @@ require_relative "../../support/capture_shared_examples"
 RSpec.describe Gergich::Capture::RubocopCapture do
   let(:output) do
     <<-OUTPUT
+Offenses:
+
 bin/gergich:47:8: C: Prefer double-quoted strings
 if ENV['DEBUG']
        ^^^^^^^
+foo/bar/baz.rb:1:2: W: no context for this one :shrug:
+lib/gergich.rb:10:9: E: this is a terrible name
+
+seriously, what were you thinking?
+    def foo
+        ^^^
 lib/gergich.rb:22:55: W: Line is too long. [55/54]
     def initialize(ref = "HEAD", revision_number = nil)
                                                      ^^
@@ -19,6 +27,25 @@ lib/gergich.rb:22:55: W: Line is too long. [55/54]
         message: "[rubocop] Prefer double-quoted strings\n\n if ENV['DEBUG']\n        ^^^^^^^\n",
         severity: "info"
       },
+      {
+        path: "foo/bar/baz.rb",
+        position: 1,
+        message: "[rubocop] no context for this one :shrug:\n",
+        severity: "warn"
+      },
+      {
+        path: "lib/gergich.rb",
+        position: 10,
+        message: <<-OUTPUT,
+[rubocop] this is a terrible name
+
+seriously, what were you thinking?
+
+     def foo
+         ^^^
+        OUTPUT
+        severity: "error"
+      },
       {
         path: "lib/gergich.rb",
         position: 22,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gergich
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Jon Jensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-13 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -42,16 +42,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -70,30 +70,30 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.47.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.47.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.13.0
 description: Gergich is a little command-line tool for wiring up linters to Gerrit
   so you can get nice inline comments right on the review
 email: jon@instructure.com
@@ -155,9 +155,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Command-line tool for adding Gerrit comments
 test_files: []
-has_rdoc: