prophet 1.6.2 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a03cdc7b74ef29b89a87fe997327cb088866998
-  data.tar.gz: 0c30193560861e6d77f8c72e51033f023fcae629
+  metadata.gz: afe7d79d028a1b2365986a403441c0c83ddd8833
+  data.tar.gz: 0819c0fd245bc51106ac93fda3a0f1669af8d8b0
 SHA512:
-  metadata.gz: 2f83eb11cc1a5d241598b66f05fa68e727cffa2a78ab154e7f09a06a02978c5f0fd894fda55920d54603a3f633d8384aac0c4d6000e56e09f943bc66f37a4b8a
-  data.tar.gz: 6c15d03d14ec406e7c612763c6408b1c71b9a10a7bcd3f219e4cf5a9a2686d99325e7c56eb02297f88525865000f820a64569df47f58b9608d729afbbfc8c3bf
+  metadata.gz: fa4ffda35c9052a9542259acf8fdb8508126ed0e523780faa604a39ee91c459b0da5978d994011a8be3503f10dcddb68b906206180772d9cbc93461b2c12f8a0
+  data.tar.gz: 96c4720864de08183fc6532903b3c5da54bec83dc29274c7ba305e70c367ff3018c61b4c49c72425f3b14297a9d9e318f1a4c4d08257711eed8a263fa8e59c34

data/lib/prophet/prophet.rb

@@ -1,3 +1,6 @@
+require 'English'
+require 'open3'
+
 class Prophet
 
   attr_accessor :username,
@@ -15,7 +18,10 @@ class Prophet
                 :status_success,
                 :comment_failure,
                 :comment_success,
-                :reuse_comments
+                :disable_comments,
+                :reuse_comments,
+                :status_context,
+                :status_target_url
 
   # Allow configuration blocks being passed to Prophet.
   # See the README.md for examples on how to call this method.
@@ -42,7 +48,7 @@ class Prophet
     begin
       self.prepare_block.call
     rescue Exception => e
-      @log.error "Preparation block raised an exception: #{e}"
+      logger.error "Preparation block raised an exception: #{e}"
     end
     # Loop through all 'open' pull requests.
     selected_requests = pull_requests.select do |request|
@@ -53,30 +59,38 @@ class Prophet
       remove_comment unless self.reuse_comments
       true
     end
+
     # Run code on all selected requests.
     selected_requests.each do |request|
       @request = request
-      @log.info "Running for request ##{@request.id}."
+      logger.info "Running for request ##{@request.id}."
       # GitHub always creates a merge commit for its 'Merge Button'.
       # Prophet reuses that commit to run the code on it.
-      switch_branch_to_merged_state
-      # Run specified code (i.e. tests) for the project.
-      begin
-        self.exec_block.call
-        # Unless self.success has already been set (to true/false) manually,
-        # the success/failure is determined by the last command's return code.
-        self.success = ($? && $?.exitstatus == 0) if self.success.nil?
-      rescue Exception => e
-        @log.error "Execution block raised an exception: #{e}"
-        self.success = false
+      if switch_branch_to_merged_state
+        # Run specified code (i.e. tests) for the project.
+        begin
+          self.exec_block.call
+          # Unless self.success has already been set (to true/false) manually,
+          # the success/failure is determined by the last command's return code.
+          self.success = ($CHILD_STATUS && $CHILD_STATUS.exitstatus == 0) if self.success.nil?
+        rescue Exception => e
+          logger.error "Execution block raised an exception: #{e}"
+          self.success = false
+        end
+        switch_branch_back
+        comment_on_github
+        set_status_on_github
       end
-      switch_branch_back
-      comment_on_github
-      set_status_on_github
       self.success = nil
     end
   end
 
+  def logger
+    @logger ||= Logger.new(STDOUT).tap do |log|
+      log.level = Logger::INFO
+    end
+  end
+
 
   private
 
@@ -86,13 +100,6 @@ class Prophet
   end
 
   def configure
-    # Use existing logger or fall back to a new one with standard log level.
-    if self.logger
-      @log = self.logger
-    else
-      @log = Logger.new(STDOUT)
-      @log.level = Logger::INFO
-    end
     # Set default fall back values for options that aren't set.
     self.username ||= git_config['github.login']
     self.password ||= git_config['github.password']
@@ -101,12 +108,14 @@ class Prophet
     self.rerun_on_source_change = true if self.rerun_on_source_change.nil?
     self.rerun_on_target_change = true if self.rerun_on_target_change.nil?
     self.reuse_comments = false if self.reuse_comments.nil?
+    self.disable_comments = false if self.disable_comments.nil?
     # Allow for custom messages.
     self.status_pending ||= 'Prophet is still running.'
     self.status_failure ||= 'Prophet reports failure.'
     self.status_success ||= 'Prophet reports success.'
     self.comment_failure ||= 'Prophet reports failure.'
     self.comment_success ||= 'Prophet reports success.'
+    self.status_context ||= 'prophet/default'
     # Find environment (tasks, project, ...).
     self.prepare_block ||= lambda {}
     self.exec_block ||= lambda { `rake` }
@@ -125,7 +134,7 @@ class Prophet
     )
     # Check user login to GitHub.
     github.login
-    @log.info "Successfully logged into GitHub (API v#{github.api_version}) with user '#{user}'."
+    logger.info "Successfully logged into GitHub with user '#{user}'."
     # Ensure the user has access to desired project.
     # NOTE: All three variants should work:
     # 'ssh://git@github.com:user/project.git'
@@ -134,20 +143,20 @@ class Prophet
     @project ||= /github\.com[\/:](.*)\.git$/.match(git_config['remote.origin.url'])[1]
     begin
       github.repo @project
-      @log.info "Successfully accessed GitHub project '#{@project}'"
+      logger.info "Successfully accessed GitHub project '#{@project}'"
       github
     rescue Octokit::Unauthorized => e
-      @log.error "Unable to access GitHub project with user '#{user}':\n#{e.message}"
+      logger.error "Unable to access GitHub project with user '#{user}':\n#{e.message}"
       abort
     end
   end
 
   def pull_requests
-    request_list = @github.pulls @project, 'open'
+    request_list = @github.pulls @project, state: 'open'
     requests = request_list.collect do |request|
       PullRequest.new(@github.pull_request @project, request.number)
     end
-    @log.info "Found #{requests.size > 0 ? requests.size : 'no'} open pull requests in '#{@project}'."
+    logger.info "Found #{requests.size > 0 ? requests.size : 'no'} open pull requests in '#{@project}'."
     requests
   end
 
@@ -156,72 +165,85 @@ class Prophet
   # - the pull request has been updated since the last run.
   # - the target (i.e. master) has been updated since the last run.
   def run_necessary?
-    @log.info "Checking pull request ##{@request.id}: #{@request.content.title}"
+    logger.info "Checking pull request ##{@request.id}: #{@request.content.title}"
     # Compare current sha ids of target and source branch with those from the last test run.
     @request.target_head_sha = @github.commits(@project).first.sha
     comments = @github.issue_comments(@project, @request.id)
     comments = comments.select { |c| [username, username_fail].include?(c.user.login) }.reverse
-    # Initialize shas to ensure it will live on after the 'each' block.
-    shas = nil
-    @request.comment = nil
     comments.each do |comment|
-      shas = /Merged ([\w]+) into ([\w]+)/.match(comment.body)
-      if shas && shas[1] && shas[2]
-        # Remember comment to be able to update or delete it later.
-        @request.comment = comment
-        break
-      end
+      @request.comment = comment if /Merged ([\w]+) into ([\w]+)/.match(comment.body)
     end
-    # If it's not mergeable, we need to delete all comments of former test runs.
-    unless @request.content.mergeable
+
+    statuses = @github.status(@project, @request.head_sha).statuses.select { |s| s.context == self.status_context }
+    # Only run if it's mergeable.
+    if @request.content.mergeable
+      if statuses.empty?
+        # If there is no status yet, it has to be a new request.
+        logger.info 'New pull request detected, run needed.'
+        return true
+      elsif !self.disable_comments && !@request.comment
+        logger.info 'Rerun forced.'
+        return true
+      end
+    else
       # Sometimes GitHub doesn't have a proper boolean value stored.
-      if @request.content.mergeable.nil? && switch_branch_to_merged_state(false)
+      if @request.content.mergeable.nil? && switch_branch_to_merged_state
         # Pull request is mergeable after all.
         switch_branch_back
       else
-        @log.info 'Pull request not auto-mergeable. Not running.'
+        logger.info 'Pull request not auto-mergeable. Not running.'
         if @request.comment
-          @log.info 'Deleting existing comment.'
+          logger.info 'Deleting existing comment.'
           call_github(old_comment_success?).delete_comment(@project, @request.comment.id)
         end
+        create_status(:error, "Pull request not auto-mergeable. Not running.") if statuses.first && statuses.first.state != 'error'
         return false
       end
     end
-    if @request.comment
-      @log.info "Current target sha: '#{@request.target_head_sha}', pull sha: '#{@request.head_sha}'."
-      @log.info "Last test run target sha: '#{shas[2]}', pull sha: '#{shas[1]}'."
+
+    # Initialize shas to ensure it will live on after the 'each' block.
+    shas = nil
+    statuses.each do |status|
+      shas = /Merged ([\w]+) into ([\w]+)/.match(status.description)
+      break if shas && shas[1] && shas[2]
+    end
+
+    if shas
+      logger.info "Current target sha: '#{@request.target_head_sha}', pull sha: '#{@request.head_sha}'."
+      logger.info "Last test run target sha: '#{shas[2]}', pull sha: '#{shas[1]}'."
       if self.rerun_on_source_change && (shas[1] != @request.head_sha)
-        @log.info 'Re-running due to new commit in pull request.'
+        logger.info 'Re-running due to new commit in pull request.'
         return true
       elsif self.rerun_on_target_change && (shas[2] != @request.target_head_sha)
-        @log.info 'Re-running due to new commit in target branch.'
-        return true
+        logger.info 'Re-running due to new commit in target branch.'
+         return true
       end
     else
-      # If there are no comments yet, it has to be a new request.
-      @log.info 'New pull request detected, run needed.'
+      # If there are no SHAs yet, it has to be a new request.
+      logger.info 'New pull request detected, run needed.'
       return true
     end
-    @log.info "Not running for request ##{@request.id}."
+
+    logger.info "Not running for request ##{@request.id}."
     false
   end
 
-  def switch_branch_to_merged_state(hard = true)
+  def switch_branch_to_merged_state
     # Fetch the merge-commit for the pull request.
     # NOTE: This commit is automatically created by 'GitHub Merge Button'.
-    # FIXME: Use cheetah to pipe to @log.debug instead of that /dev/null hack.
+    # FIXME: Use cheetah to pipe to logger.debug instead of that /dev/null hack.
     `git fetch origin refs/pull/#{@request.id}/merge: &> /dev/null`
-    `git checkout FETCH_HEAD &> /dev/null`
-    unless ($? && $?.exitstatus == 0)
-      @log.error 'Unable to switch to merge branch.'
-      hard ? abort : false
+    _output, status = Open3.capture2 'git checkout FETCH_HEAD &> /dev/null'
+    if status != 0
+      logger.error 'Unable to switch to merge branch.'
+      return false
     end
     true
   end
 
   def switch_branch_back
-    # FIXME: Use cheetah to pipe to @log.debug instead of that /dev/null hack.
-    @log.info 'Switching back to original branch.'
+    # FIXME: Use cheetah to pipe to logger.debug instead of that /dev/null hack.
+    logger.info 'Switching back to original branch.'
     # FIXME: For branches other than master, remember the original branch.
     `git checkout master &> /dev/null`
     # Clean up potential remains and run garbage collector.
@@ -243,33 +265,60 @@ class Prophet
   end
 
   def comment_on_github
+    return if self.disable_comments
+
     # Determine comment message.
     message = if self.success
-      @log.info 'Successful run.'
-      self.comment_success + "\n( Success: "
+      logger.info 'Successful run.'
+      self.comment_success
     else
-      @log.info 'Failing run.'
-      self.comment_failure + "\n( Failure: "
+      logger.info 'Failing run.'
+      self.comment_failure
     end
-    message += "Merged #{@request.head_sha} into #{@request.target_head_sha} )"
+    message += status_string
     if self.reuse_comments && old_comment_success? == self.success
       # Replace existing comment's body with the correct connection.
-      @log.info "Updating existing #{notion(self.success)} comment."
+      logger.info "Updating existing #{notion(self.success)} comment."
       call_github(self.success).update_comment(@project, @request.comment.id, message)
     else
       if @request.comment
-        @log.info "Deleting existing #{notion(!self.success)} comment."
+        logger.info "Deleting existing #{notion(!self.success)} comment."
         # Delete old comment with correct connection (if @request.comment exists).
         call_github(!self.success).delete_comment(@project, @request.comment.id)
       end
       # Create new comment with correct connection.
-      @log.info "Adding new #{notion(self.success)} comment."
+      logger.info "Adding new #{notion(self.success)} comment."
       call_github(self.success).add_comment(@project, @request.id, message)
     end
   end
 
+  def status_string
+    case self.success
+      when true
+        " (Merged #{@request.head_sha} into #{@request.target_head_sha})"
+      when false
+        " (Merged #{@request.head_sha} into #{@request.target_head_sha})"
+      else
+        ""
+    end
+  end
+
+  def create_status(state, description)
+    logger.info "Setting status '#{state}': '#{description}'"
+    @github.create_status(
+      @project,
+      @request.head_sha,
+      state,
+      {
+        "description" => description,
+        "context" => status_context,
+        "target_url" => self.status_target_url
+      }
+    )
+  end
+
   def set_status_on_github
-    @log.info 'Updating status on GitHub.'
+    logger.info 'Updating status on GitHub.'
     case self.success
     when true
       state_symbol = :success
@@ -281,12 +330,7 @@ class Prophet
       state_symbol = :pending
       state_message = self.status_pending
     end
-    @github.post(
-      "repos/#{@project}/statuses/#{@request.head_sha}", {
-        :state => state_symbol,
-        :description => state_message
-      }
-    )
+    create_status(state_symbol, state_message + status_string)
   end
 
   def notion(success)

data/lib/prophet/railtie.rb

@@ -3,6 +3,6 @@ require 'rails'
 
 class Railtie < Rails::Railtie
   rake_tasks do
-    load 'tasks/prophet.rake.rake'
+    load 'tasks/prophet.rake'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prophet
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.9.0
 platform: ruby
 authors:
 - Dominik Bamberger
@@ -10,50 +10,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2017-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.8
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.8
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.25.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.25.0
+        version: '4.0'
 description: Prophet runs custom code (i.e. your project's test suite) on open pull
   requests on GitHub. Afterwards it posts the result as a comment to the respective
   request. This should give you an outlook on the future state of your repository
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: An easy way to loop through open pull requests and run code onthe merged