fixup! feat!: parse trailers using git if available

Author: aduh95

lib/gitlint-parser.js

@@ -37,27 +37,27 @@ export default class Parser extends Base {
       'interpret-trailers', '--only-trailers', '--only-input', '--no-divider'
     ], {
       encoding: 'utf-8',
-      input: `${commitMessage}\n`
+      input: `'dummy subject\n\n${commitMessage.join('\n')}\n`
     }).stdout
 
     let originalTrailers
     try {
-      originalTrailers = interpretTrailers(body.join('\n')).trim()
+      originalTrailers = interpretTrailers(body).trim()
     } catch (err) {
       console.warn('git is not available, trailers detection might be a bit ' +
                    'off which is acceptable in most cases', err)
       return body
     }
     const trailerFreeBody = body.slice(1) // clone, and remove the first empty line
     const stillInTrailers = () => {
-      const result = interpretTrailers(trailerFreeBody.join('\n'))
+      const result = interpretTrailers(trailerFreeBody)
       return result.length && originalTrailers.startsWith(result.trim())
     }
     for (let i = trailerFreeBody.length - 1; stillInTrailers(); i--) {
       // Remove last line until git no longer detects any trailers
       trailerFreeBody.pop()
     }
-    this._metaStart = trailerFreeBody.length + 1
+    this._metaStart = trailerFreeBody.length + 1 // the subject line needs to be counted
     for (let i = trailerFreeBody.length - 1; trailerFreeBody[i] === ''; i--) {
       // Remove additional empty line(s)
       trailerFreeBody.pop()

lib/rules/line-length.js

@@ -45,7 +45,7 @@ export default {
           message: `Line should be <= ${len} columns.`,
           string: line,
           maxLength: len,
-          line: i,
+          line: i + parsed.body.length - body.length,
           column: len,
           level: 'fail'
         })

test/rules/line-length.js

@@ -205,6 +205,7 @@ Trailer: value
   })
 
   t.test('Signed-off-by and Assisted-by non-trailers', (tt) => {
+    tt.plan(8)
     const v = new Validator()
 
     const context = new Commit({
@@ -224,10 +225,14 @@ Trailer: value
       ].join('\n')
     }, v)
 
+    let called = 0
     context.report = (opts) => {
       tt.pass('called report')
       tt.equal(opts.id, 'line-length', 'id')
-      tt.equal(opts.string, 'Assisted-by: The Longest-Named Code Agent In The World <[email protected]>', 'string')
+      tt.equal(opts.string,
+        called++
+          ? 'Assisted-by: The Longest-Named Code Agent In The World <[email protected]>'
+          : 'Signed-off-by: John Connor <[email protected]>', 'string')
       tt.equal(opts.level, 'fail', 'level')
     }