pronto 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aee7842b944b766cac6e64a07fd72333b1b6ce36
-  data.tar.gz: b6147f255ec4aa33acb6bd36148bb1cdff8911cf
+  metadata.gz: 85dc0a7bada137f7afa7bcebe1c07ea768cee9c7
+  data.tar.gz: b6448d7d62c19197b5480e6b02d37e7ff5329a74
 SHA512:
-  metadata.gz: c02f143f97b9fb14dd2bf01642736cee91ce53053c2088219d2504dff5bdf3f0982c70aba54617f5cbfce30456b7c985e440984ae090802781a1321c3bd8e565
-  data.tar.gz: 521645b6364f2524132e732f07d8ce732039045cabf475871f2e6c815040b6a7276d5a2523d2e3c153f220a02427f2a85ca1d2dbe3caef2c2fbd146d209f5563
+  metadata.gz: 19a811421795f9d684e768342d875267a91152dbc1a1182a18c697788d5cbb92fec73a6454d80af1b2d7021123a749682cc92d7c22c6cbbd2c7eb57bfb29bc93
+  data.tar.gz: 1e048107685ea2175ce0d753823813c689932d4c8ebc7415cd429cd8a9d4a3e6afc68167db40e2db747cddfa606be8496cd4b4de0adaf782c8b459f4b15acc00

data/README.md

@@ -6,14 +6,15 @@
 
 ## Usage
 
-Pronto runs analysis quickly by checking only the introduced changes.
+Pronto runs analysis quickly by checking only the introduced changes. Created
+to be used on pull requets, but suited for other scenarios as well.
 
 ![Pronto demo](pronto.gif "")
 
 ### Pull Requests
 
-You can run Pronto as part of your builds and then get results as commit
-comments using `GithubFormatter`.
+You can run Pronto as part of your builds and then get results as comments
+using `GithubFormatter`.
 
 Actually, Pronto runs Pronto whenever you make a pull request on Pronto. It
 uses Travis CI and the included `TravisPullRequest` rake task for that.

data/lib/pronto.rb

@@ -1,11 +1,12 @@
 require 'rugged'
-require_relative 'pronto/rugged/diff'
-require_relative 'pronto/rugged/diff/delta'
-require_relative 'pronto/rugged/diff/patch'
-require_relative 'pronto/rugged/diff/line'
-require_relative 'pronto/rugged/tree'
-require_relative 'pronto/rugged/remote'
-require_relative 'pronto/rugged/repository'
+require 'pronto/rugged/diff'
+require 'pronto/rugged/diff/delta'
+require 'pronto/rugged/diff/patch'
+require 'pronto/rugged/diff/line'
+require 'pronto/rugged/tree'
+require 'pronto/rugged/remote'
+require 'pronto/rugged/repository'
+require 'pronto/rugged/commit'
 
 require 'pronto/plugin'
 require 'pronto/message'

data/lib/pronto/formatter/github_formatter.rb

@@ -6,12 +6,12 @@ module Pronto
       def format(messages)
         commit_messages = messages.map do |message|
           repo = github_slug(message)
-          sha = commit_sha(message)
-          position = message.line.position
+          sha = message.line.commit_sha
+          position = message.line.commit_line.position
           path = message.path
           body = message.msg
 
-          create_commit_comment(repo, sha, position, path, body)
+          create_comment(repo, sha, position, path, body)
         end
 
         "#{commit_messages.compact.count} Pronto messages posted to GitHub"
@@ -19,15 +19,16 @@ module Pronto
 
       private
 
-      def create_commit_comment(repo, sha, position, path, body)
-        commit_comments = client.commit_comments(repo, sha)
-        existing_comment = commit_comments.find do |comment|
-          comment.position = position &&
+      def create_comment(repo, sha, position, path, body)
+        comments = client.commit_comments(repo, sha)
+
+        existing_comment = comments.find do |comment|
+          comment.position == position &&
             comment.path == path &&
             comment.body == body
         end
 
-        if existing_comment.nil?
+        unless existing_comment
           client.create_commit_comment(repo, sha, body, path, nil, position)
         end
       end
@@ -43,21 +44,6 @@ module Pronto
       def github_slug(message)
         message.repo.remotes.map(&:github_slug).compact.first
       end
-
-      def commit_sha(message)
-        blamelines = blame(message).lines
-        lineno = message.line.new_lineno
-
-        blameline = blamelines.find { |line| line.lineno == lineno }
-
-        blameline.commit.id if blameline
-      end
-
-      def blame(message)
-        @blames ||= {}
-        @blames[message.path] ||= message.repo.blame(message.path)
-        @blames[message.path]
-      end
     end
   end
 end

data/lib/pronto/rake_task/travis_pull_request.rb

@@ -31,11 +31,11 @@ module Pronto
       end
 
       def run_task(verbose)
-        return if pull_request_number.nil? || pull_request_number == 'false'
+        return if pull_id.nil? || pull_id == 'false'
 
         client = Octokit::Client.new
 
-        pull_request = client.pull_request(repo_slug, pull_request_number)
+        pull_request = client.pull_request(repo_slug, pull_id)
         formatter = ::Pronto::Formatter::GithubFormatter.new
 
         ::Pronto.gem_names.each { |gem_name| require "pronto/#{gem_name}" }
@@ -44,7 +44,7 @@ module Pronto
 
       private
 
-      def pull_request_number
+      def pull_id
         ENV['TRAVIS_PULL_REQUEST']
       end
 

data/lib/pronto/rugged/commit.rb

@@ -0,0 +1,9 @@
+module Rugged
+  class Commit
+    def show
+      # TODO: Rugged does not seem to support diffing against multiple parents
+      return if parents.count != 1
+      diff(parents.first)
+    end
+  end
+end

data/lib/pronto/rugged/diff/line.rb

@@ -12,12 +12,49 @@ module Rugged
         line_index + hunk_index + 1
       end
 
+      def commit
+        @commit ||= begin
+          repo.lookup(commit_sha) if commit_sha
+        end
+      end
+
+      def commit_sha
+        @commit_sha ||= begin
+          blameline.commit.id if blameline
+        end
+      end
+
+      def commit_line
+        @commit_line ||= begin
+          commit_patch = commit.show.patches.find do |p|
+            patch.new_file_full_path == p.new_file_full_path
+          end
+
+          commit_patch.lines.find do |l|
+            blameline.oldlineno == l.old_lineno
+          end
+        end
+      end
+
       def ==(other)
         content == other.content &&
           line_origin == other.line_origin &&
           old_lineno == other.old_lineno &&
           new_lineno == other.new_lineno
       end
+
+      private
+
+      def repo
+        patch.diff.tree.repo
+      end
+
+      def blameline
+        @blameline ||= begin
+          blamelines = repo.blame(patch.new_file_full_path).lines
+          blamelines.find { |line| line.lineno == new_lineno }
+        end
+      end
     end
   end
 end

data/lib/pronto/version.rb

@@ -1,3 +1,3 @@
 module Pronto
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pronto
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Mindaugas Mozūras
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2013-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: grit
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +123,7 @@ files:
 - lib/pronto/message.rb
 - lib/pronto/plugin.rb
 - lib/pronto/rake_task/travis_pull_request.rb
+- lib/pronto/rugged/commit.rb
 - lib/pronto/rugged/diff/delta.rb
 - lib/pronto/rugged/diff/line.rb
 - lib/pronto/rugged/diff/patch.rb