linterbot 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0855f6f991d806deaac1e48b543f4e1e6d5bc2d
-  data.tar.gz: ea8df8218f21898b019d54ee266ec766f040daf7
+  metadata.gz: cce54b3ca86af1db3baa979278f68036d03da1a5
+  data.tar.gz: e3df14ecdf920e210fdb35f868db099fbc66e9b9
 SHA512:
-  metadata.gz: 57f8c014d89d3a9db300779eb9b9a6544ec9313a2de978fbbd6cd2c9adc126a27e953f428fd0f6be474a237f63fcac18e45be5feff56d39b7ffba49717b94b0e
-  data.tar.gz: bae55d188438380ded222c10a3ebf88c291ad492b6586bd92da74c0d2609f0843954037f05b8e058ffbb9e5816506b81a6530a19167fa2973c96c7b908573d57
+  metadata.gz: e54bcb55cb4aeb26371740bfdd6d08623170f768bd3d1aa692cc13de8067d376c15dacc4c7726cccb6e05cc2155232f0c42736dfdc257b7e9863c25b0ba45971
+  data.tar.gz: 2062dbecbe6e8ea52fc148728f7974b3f4ae2596e69de932caa2f1a62ba086aecee54995e13a32816a7c69496a70bdfe4a4ae80744bab42ab75cda7288e4339d

data/.ruby-version

@@ -1 +1 @@
-2.3.0
+2.3.1

data/README.md

@@ -29,7 +29,7 @@ Or install it yourself as:
 If you want to try it locally:
 
 ```
-swiftlint --reporter json | linterbot REPOSITORY PULL_REQUEST_NUMBER
+swiftlint lint --reporter json | linterbot REPOSITORY PULL_REQUEST_NUMBER
 ```
 
 ### TravisCI

data/lib/linterbot/comment_generator.rb

@@ -5,11 +5,13 @@ module Linterbot
     attr_accessor :filename
     attr_accessor :commit
     attr_accessor :pull_request_file_patch
+    attr_accessor :commits_count_for_file
 
-    def initialize(filename, commit, pull_request_file_patch)
+    def initialize(filename, commit, pull_request_file_patch, commits_count_for_file)
       @filename = filename
       @commit = commit
       @pull_request_file_patch = Patch.new(pull_request_file_patch)
+      @commits_count_for_file = commits_count_for_file
     end
 
     def generate_comments(hints)
@@ -18,10 +20,9 @@ module Linterbot
     end
 
     def generate_comment_for_hint(hint)
-      if new_file?
-        generate_comment_for_new_file_and_hint(hint)
-      elsif modified_file? && included_in_file_patch?(hint)
-        generate_comment_for_modified_file_and_hint(hint)
+      patch_line_number = comment_position_for_hint(hint)
+      if patch_line_number
+        Comment.new(sha: commit.sha, patch_line_number: patch_line_number, hint: hint)
       end
     end
 
@@ -59,13 +60,12 @@ module Linterbot
           .first
       end
 
-      def generate_comment_for_modified_file_and_hint(hint)
-        patch_line_number = pull_request_file_patch_line_number(hint)
-        Comment.new(sha: commit.sha, patch_line_number: patch_line_number, hint: hint)
-      end
-
-      def generate_comment_for_new_file_and_hint(hint)
-        Comment.new(sha: commit.sha, patch_line_number: hint.line, hint: hint)
+      def comment_position_for_hint(hint)
+        if new_file? && commits_count_for_file == 1
+          hint.line
+        elsif modified_file? && included_in_file_patch?(hint)
+          pull_request_file_patch_line_number(hint)
+        end
       end
 
   end

data/lib/linterbot/pull_request_analyzer.rb

@@ -36,9 +36,11 @@ module Linterbot
 
       def generate_comments(filename, hints)
         pull_request_file_patch = pull_request.patch_for_file(filename)
-        pull_request.commits_for_file(filename)
-          .map { |commit| CommentGenerator.new(filename, commit, pull_request_file_patch).generate_comments(hints) }
-          .flatten
+        commits = pull_request.commits_for_file(filename)
+        commits.map do |commit|
+          CommentGenerator.new(filename, commit, pull_request_file_patch, commits.length)
+            .generate_comments(hints)
+        end.flatten
       end
 
   end

data/lib/linterbot/version.rb

@@ -1,3 +1,3 @@
 module Linterbot
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linterbot
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Guido Marucci Blas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-26 00:00:00.000000000 Z
+date: 2016-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler