prophet 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed9b0b0e2821b581f67b8a01188cd52dcd4c61df9c52c8aead49b31ef3a308bf
-  data.tar.gz: a8a515670defc56c3783d1664cd800f6666c58bee95857c5410ef17f5daad521
+  metadata.gz: 63a3b73db0063a2926440a4e1f19a0ae76d62be4a5ae20e7a88fb677229000b5
+  data.tar.gz: 7fff7b419b81c22b5f612a3523a04a73b71c53f935d1bdd7f0aca05ec4470ee5
 SHA512:
-  metadata.gz: b3588a318caa6750522714f552c1657e04b8c8b6bc96dde64819c284a691eb0ea1d03262a8986cbadd358f83c2174d5b07347e15255b87649148436999f66a55
-  data.tar.gz: d9796bd8369db7d1e2c61da378a4dc4899a040ff296c1f12699457013e45c9c2b3a3928c870106580d34680eb37c1c54ccf1fc6ffec4deef5f4706ae5f9e4eca
+  metadata.gz: 12ce2eda7bcb9e7e401b32c0f28375a7e873188d41b83dc1a6ec892dc7f4f14f64daeb79f6e3509f918f086852368e0fb2ba0b8bc7310f00d7ec4e00621409e5
+  data.tar.gz: 0bd79da7a4d39026bc89e3cdb31a8efcc7109cf1c98948f57e915349fa4689a162c9ac6814b54156c480aabd7561bb9e4fe22d4580eadc195b912ac642d85840

data/lib/prophet/prophet.rb

@@ -3,10 +3,10 @@ require 'open3'
 
 class Prophet
 
-  attr_accessor :username,
-                :password,
+  attr_accessor :username_pass,
+                :access_token_pass,
                 :username_fail,
-                :password_fail,
+                :access_token_fail,
                 :rerun_on_source_change,
                 :rerun_on_target_change,
                 :prepare_block,
@@ -100,11 +100,10 @@ class Prophet
   end
 
   def configure
+    self.username_fail ||= self.username_pass
+    self.access_token_fail ||= self.access_token_pass
+
     # Set default fall back values for options that aren't set.
-    self.username ||= git_config['github.login']
-    self.password ||= git_config['github.password']
-    self.username_fail ||= self.username
-    self.password_fail ||= self.password
     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?
@@ -119,22 +118,17 @@ class Prophet
     # Find environment (tasks, project, ...).
     self.prepare_block ||= lambda {}
     self.exec_block ||= lambda { `rake` }
-    @github = connect_to_github
-    @github_fail = if self.username == self.username_fail
-      @github
-    else
-      connect_to_github self.username_fail, self.password_fail
-    end
+    @github = connect_to_github(access_token: access_token_pass)
+    @github_fail = connect_to_github(access_token: access_token_fail)
   end
 
-  def connect_to_github(user = self.username, pass = self.password)
-    github = Octokit::Client.new(
-      :login => user,
-      :password => pass
-    )
+  def connect_to_github(access_token:)
+    github = Octokit::Client.new(access_token: access_token)
+
     # Check user login to GitHub.
     github.login
-    logger.info "Successfully logged into GitHub with user '#{user}'."
+    logger.info "Successfully logged into GitHub with user '#{github.user.login}'."
+
     # Ensure the user has access to desired project.
     # NOTE: All three variants should work:
     # 'ssh://git@github.com:user/project.git'
@@ -146,7 +140,7 @@ class Prophet
       logger.info "Successfully accessed GitHub project '#{@project}'"
       github
     rescue Octokit::Unauthorized => e
-      logger.error "Unable to access GitHub project with user '#{user}':\n#{e.message}"
+      logger.error "Unable to access GitHub project with user '#{github.user}':\n#{e.message}"
       abort
     end
   end
@@ -172,7 +166,7 @@ class Prophet
       # 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
+      comments = comments.select { |c| [username_pass, username_fail].include?(c.user.login) }.reverse
       comments.each do |comment|
         @request.comment = comment if /Merged ([\w]+) into ([\w]+)/.match(comment.body)
       end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: prophet
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Dominik Bamberger
 - Thomas Schmidt
 - Jordi Massaguer Pla
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-25 00:00:00.000000000 Z
+date: 2020-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
@@ -73,7 +73,7 @@ homepage: http://github.com/b4mboo/prophet
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -88,8 +88,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: An easy way to loop through open pull requests and run code onthe merged
   branch.