code_review_notifier 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b7b5a5c91aa7b2d74cea6c33661b4b3546cdde5b2783f117162f91ece438897
-  data.tar.gz: 9dd69c5e3421bb3652c3fb7f7f0bf811d9f1bd3a9d97a44d02d53017e1d26f4f
+  metadata.gz: 5db0d8afcc1a0657f612a68d670b51aace38ac362dbd8ee2a3e4728eeed3b68d
+  data.tar.gz: f03fbd2d8aa52caa9e263e2e57465cf5017a713b341d6cdd98526e902b5efccc
 SHA512:
-  metadata.gz: 3ba039eeead30bf76ec8e8611211b768fb8fc4412b8e97cd549e21328db401d400c54722a212d0f7f783eb9b0d38d542a122da0a8c7867715820e6ffada6286f
-  data.tar.gz: 16a5339ad014a010711743789c317de5db793094024589c13d671321912cf36a4d51740b31df26c82c1b325ef0a8291e56b08182d1fc6d32b499928328afed1a
+  metadata.gz: ac5eef5dafb3832377600de260711d5a26ef1bf18d029ba1a4217ab57e57ddd0809e992f85d3f59a7a9c519322b3d038bfb0c9b01dc818ef3fe9d0707e233805
+  data.tar.gz: 6d31866de3088d69095cb875aca057e424b8aa4ac167fa3596adb25cf118722aa10e0f758afe3d196369c568113e1f0cc4d04cd88ad16ed39a26e88eb74d02d7

data/Gemfile

@@ -2,4 +2,6 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "rubiclifier", "2.1.3"
+gem "rubiclifier", "2.1.4"
+gem "graphql-client", "0.16.0"
+gem "byebug"

data/lib/api.rb

@@ -1,7 +1,7 @@
-require_relative "./gerrit_api.rb"
+require_relative "./gitlab_api.rb"
 
 class Api
   def self.current_api
-    GerritApi
+    GitlabApi
   end
 end

data/lib/code_change_notification.rb

@@ -11,16 +11,15 @@ class CodeChangeNotification
 
   def send
     code_change = code_change_activity.code_change
-    id = code_change.id
     owner = code_change.owner
     subject = code_change.subject
 
     message = code_change_activity.message
     author = code_change_activity.author
     Rubiclifier::Notification.new(
-      author,
-      message,
       "#{owner}: #{subject}",
+      message,
+      author,
       Api.current_api.favicon,
       Api.current_api.code_change_url(code_change)
     ).send

data/lib/code_review_notifier.rb

@@ -2,7 +2,7 @@ require "rubiclifier"
 require_relative "./api.rb"
 require_relative "./code_change_notification.rb"
 
-SECONDS_BETWEEN_RUNS = 90
+SECONDS_BETWEEN_RUNS = 60
 SECONDS_BETWEEN_NOTIFICATIONS = 5
 
 class CodeReviewNotifier < Rubiclifier::BaseApplication
@@ -19,10 +19,12 @@ class CodeReviewNotifier < Rubiclifier::BaseApplication
   end
 
   def run_application
+    $stdout.sync = true
     while true
       unless Rubiclifier::IdleDetector.is_idle?
         is_first_run = is_first_run?
         puts
+        puts(Time.now().to_s)
         puts("Querying API...")
         all_code_changes = Api.current_api.all_code_changes
         puts("Checking for notifications to display...")
@@ -39,6 +41,7 @@ class CodeReviewNotifier < Rubiclifier::BaseApplication
             sleep(SECONDS_BETWEEN_NOTIFICATIONS)
           end
         end
+        puts("Sleeping for #{SECONDS_BETWEEN_RUNS} seconds...")
       end
       sleep(SECONDS_BETWEEN_RUNS)
     end
@@ -63,9 +66,9 @@ class CodeReviewNotifier < Rubiclifier::BaseApplication
   def settings
     @settings ||= [
       Rubiclifier::Setting.new("base_api_url", "base URL", explanation: "e.g. https://gerrit.google.com"),
-      Rubiclifier::Setting.new("username", "account username"),
-      Rubiclifier::Setting.new("password", "account password", explanation: "input hidden", is_secret: true),
-      Rubiclifier::Setting.new("account_id", "account ID", explanation: -> {"check #{Api.current_api.base_api_url}/settings/"})
+      Rubiclifier::Setting.new("api_token", "API token"),
+      Rubiclifier::Setting.new("username", "Gitlab username"),
+      Rubiclifier::Setting.new("team_name", "Gitlab team")
     ]
   end
 

data/lib/gerrit_api.rb

@@ -41,7 +41,7 @@ class GerritApi < Rubiclifier::BaseApi
   end
 
   def self.code_change_from_json(json)
-    code_change = CodeChange.new(json["_number"].to_s, json["owner"]["name"], json["project"], json["subject"], Time.parse(json["updated"]).to_i)
+    code_change = CodeChange.new(json["_number"].to_s, json["owner"]["name"], json["project"], json["subject"])
     code_change.code_change_activity = json["messages"].map { |m| code_change_activity_from_json(code_change, m) }
     code_change
   end

data/lib/gitlab_api.rb

@@ -0,0 +1,180 @@
+require "rubiclifier"
+require "graphql/client"
+require "graphql/client/http"
+require "byebug"
+require_relative "./models/code_change.rb"
+require_relative "./models/gitlab_code_change_activity.rb"
+
+class StoredValues
+  def self.base_api_url
+    @base_api_url ||= Rubiclifier::DB.get_setting("base_api_url")
+  end
+
+  def self.username
+    @username ||= Rubiclifier::DB.get_setting("username")
+  end
+
+  def self.team_name
+    @team_name ||= Rubiclifier::DB.get_setting("team_name")
+  end
+
+  def self.api_token
+    @password ||= Rubiclifier::DB.get_setting("api_token")
+  end
+end
+
+class GitlabApi < Rubiclifier::BaseApi
+  Rubiclifier::DB.hydrate("~/.code_review_notifier", "/Users/kyle.grinstead@divvypay.com/Developer/code_review_notifier/migrations.rb")
+
+  HTTP = GraphQL::Client::HTTP.new(StoredValues.base_api_url) do
+    def headers(context)
+      { "Authorization": "Bearer #{StoredValues.api_token}" }
+    end
+  end
+
+  Schema = GraphQL::Client.load_schema(HTTP)
+
+  Client = GraphQL::Client.new(schema: Schema, execute: HTTP)
+
+  OpenMrCommentQuery = Client.parse <<-"GRAPHQL"
+  query {
+    group(fullPath: "#{StoredValues.team_name}") {
+      groupMembers {
+        nodes {
+          user {
+            name
+            username
+            openMRs: assignedMergeRequests(state: opened) {
+              nodes {
+                createdAt
+                headPipeline {
+                  updatedAt
+                  status
+                }
+                participants {
+                  nodes {
+                    username
+                  }
+                }
+                approved
+                title
+                project {
+                  group {
+                    path
+                  }
+                  name
+                }
+                id
+                webUrl
+                discussions {
+                  nodes {
+                    notes {
+                      nodes {
+                        body
+                        system
+                        createdAt
+                        id
+                        author {
+                          username
+                          name
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  GRAPHQL
+
+  MergedMrCommentQuery = Client.parse <<-"GRAPHQL"
+  query($mergedAfter: Time) {
+    group(fullPath: "#{StoredValues.team_name}") {
+      groupMembers {
+        nodes {
+          user {
+            name
+            username
+            mergedMRs: assignedMergeRequests(state: merged, mergedAfter: $mergedAfter) {
+              nodes {
+                createdAt
+                headPipeline {
+                  updatedAt
+                  status
+                }
+                participants {
+                  nodes {
+                    username
+                  }
+                }
+                approved
+                title
+                project {
+                  group {
+                    path
+                  }
+                  name
+                }
+                id
+                webUrl
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  GRAPHQL
+
+  def self.invalid_credentials_error
+    Rubiclifier::Notification.new(
+      "Incorrect Credentials",
+      "Trying running `code_review_notifier --setup` again."
+    ).send
+    sleep(120)
+    exit
+  end
+
+  def self.all_code_changes
+    open_mr_query = Client.query(OpenMrCommentQuery)
+    open_mrs = open_mr_query.data.group.group_members.nodes.flat_map { |n| n.user.open_m_rs.nodes.map { |n2| {user: n.user.name, username: n.user.username, mr: n2 } } }
+    merged_mr_query = Client.query(MergedMrCommentQuery, variables: {mergedAfter: Time.now - 61})
+    merged_mrs = merged_mr_query.data.group.group_members.nodes.flat_map { |n| n.user.merged_m_rs.nodes.map { |n2| {user: n.user.name, username: n.user.username, mr: n2 } } }
+    merged_mrs = merged_mrs.map { |mr| code_change_from_graphql(mr[:mr], mr[:user], mr[:username], true) }
+    open_mrs = open_mrs.map { |mr| code_change_from_graphql(mr[:mr], mr[:user], mr[:username], false) }
+    open_mrs.concat(merged_mrs)
+  end
+
+  def self.code_change_from_graphql(data, name, username, is_merged)
+    includes_self = data.participants.nodes.map { |p| p.username }.include?(StoredValues.username)
+    code_change = CodeChange.new(data.id, name, "#{data.project.group.path}/#{data.project.name}", data.title, data.web_url, data.head_pipeline&.updated_at && Time.parse(data.head_pipeline&.updated_at), data.head_pipeline&.status, data.approved, is_merged, username == StoredValues.username, includes_self)
+    if is_merged
+      code_change.code_change_activity = [
+        GitlabCodeChangeActivity.new("#{data.id}-merged-placeholder", name, true, "placeholder", Time.now() - 10000, code_change),
+        GitlabCodeChangeActivity.new("#{data.id}-merged", name, false, "merged", Time.now(), code_change)
+      ]
+    else
+      messages = data.discussions.nodes.flat_map { |n| n.notes.nodes }
+      code_change.code_change_activity = messages.map { |m| code_change_activity_from_json(code_change, m) }
+      code_change.generate_additional_activity
+    end
+    code_change.persist
+    code_change
+  end
+
+  def self.code_change_activity_from_json(code_change, message)
+    GitlabCodeChangeActivity.new(message.id, message.author.name, message.author.username == StoredValues.username, message.body, Time.parse(message.created_at), code_change)
+  end
+
+  def self.favicon
+    "https://about.gitlab.com/images/press/logo/png/gitlab-icon-rgb.png"
+  end
+
+  def self.code_change_url(code_change)
+    code_change.web_url
+  end
+end

data/lib/models/code_change.rb

@@ -2,17 +2,51 @@ require "date"
 
 class CodeChange
   attr_accessor :code_change_activity
-  attr_reader :id, :owner, :project, :subject, :updated_at
+  attr_reader :id, :owner, :project, :subject, :pipeline_updated_at, :last_pipeline_updated_at, :is_self, :includes_self,
+              :pipeline_status, :last_pipeline_status, :last_approval_status, :approved, :web_url, :is_merged
 
-  def initialize(id, owner, project, subject, updated_at)
+  def initialize(id, owner, project, subject, web_url = nil, pipeline_updated_at = nil, pipeline_status = nil, approved = nil, is_merged = nil, is_self = nil, includes_self = nil)
     @id = id
     @owner = owner
+    @is_merged = is_merged
     @project = project
     @subject = subject.gsub("'", "’")
-    @updated_at = updated_at
+    @web_url = web_url
+    @pipeline_updated_at = pipeline_updated_at
+    @pipeline_status = pipeline_status
+    @approved = approved
+    row = Rubiclifier::DB.query_single_row("SELECT pipeline_updated_at, last_approval_status, last_pipeline_status FROM code_change WHERE id = '#{id}'") || [Time.now().to_s, approved, pipeline_status]
+    @last_approval_status = row[1] == 1
+    @last_pipeline_status = row[2]
+    @last_pipeline_updated_at = row[0] == "" ? Time.now() : Time.parse(row[0])
+    @is_self = is_self
+    @includes_self = includes_self
   end
 
   def activity_from_self_at
     @activity_from_self_at ||= code_change_activity.find { |a| a.is_self }&.created_at
   end
+
+  def generate_additional_activity
+    if is_self
+      @code_change_activity.push(GitlabCodeChangeActivity.new("#{id}-placeholder", owner, true, "placeholder", Time.now() - 100000, self))
+    end
+    if !is_merged
+      @code_change_activity.push(GitlabCodeChangeActivity.new("#{id}-opened", owner, is_self, "just opened merge request", Time.now(), self))
+    end
+    if pipeline_updated_at && pipeline_updated_at > last_pipeline_updated_at && pipeline_status != last_pipeline_status
+      @code_change_activity.push(GitlabCodeChangeActivity.new(nil, "Gitlab", false, "pipeline status: #{pipeline_status}", Time.now(), self))
+    end
+    if approved != last_approval_status
+      @code_change_activity.push(GitlabCodeChangeActivity.new(nil, "Gitlab", false, approved ? "fully approved" : "needs approvals again", Time.now(), self))
+    end
+  end
+
+  def persist
+    if Rubiclifier::DB.query_single_row("SELECT id FROM code_change WHERE id = '#{id}'")
+      Rubiclifier::DB.execute("UPDATE code_change SET pipeline_updated_at = '#{pipeline_updated_at.to_s}', last_pipeline_status = '#{pipeline_status}', last_approval_status = #{approved} WHERE id = '#{id}';")
+    else
+      Rubiclifier::DB.execute("INSERT INTO code_change (id, pipeline_updated_at, last_pipeline_status, last_approval_status) VALUES('#{id}', '#{pipeline_updated_at.to_s}', '#{pipeline_status}', #{approved});")
+    end
+  end
 end

data/lib/models/code_change_activity.rb

@@ -1,49 +1,23 @@
 require "rubiclifier"
-
-MESSAGES_TO_IGNORE = [/Uploaded patch set 1/, /Build Started/, /owns \d+% of/]
-AUTHOR_TRANSLATIONS = {
-  "Service Cloud Jenkins" => "Jenkins",
-  /\w+ Gergich \(Bot\)/ => "Gergich"
-}
+require "byebug"
 
 class CodeChangeActivity
   attr_reader :id, :author, :is_self, :message, :created_at, :code_change
 
-  def initialize(id, author, is_self, message, created_at, code_change)
-    @id = id
-    @author = CodeChangeActivity.translate_author(author)
-    @is_self = is_self
-    @message = CodeChangeActivity.translate_message(message)
-    @created_at = created_at
-    @code_change = code_change
-  end
-
   def notified
-    Rubiclifier::DB.execute("INSERT INTO code_change_activity_notified (id, notified_at) VALUES('#{id}', CURRENT_TIMESTAMP);")
+    if id
+      Rubiclifier::DB.execute("INSERT INTO code_change_activity_notified (id, notified_at) VALUES('#{id}', CURRENT_TIMESTAMP);")
+    end
   end
 
   def should_notify?
     !is_self &&
-      code_change.activity_from_self_at && created_at > code_change.activity_from_self_at &&
-      MESSAGES_TO_IGNORE.none? { |m| message.match(m) } &&
+      (code_change.activity_from_self_at && created_at > code_change.activity_from_self_at && code_change.includes_self || message == "just opened merge request") &&
+      messages_to_ignore.none? { |m| message.match(m) } &&
       !Rubiclifier::DB.query_single_row("SELECT id FROM code_change_activity_notified WHERE id = '#{id}'")
   end
 
-  def self.translate_author(author)
-    AUTHOR_TRANSLATIONS.keys.each do |pattern|
-      author.sub!(pattern, AUTHOR_TRANSLATIONS[pattern])
-    end
-    author
-  end
-
-  def self.translate_message(message)
-    message.sub(/^Patch Set \d+:\s+/, "")
-           .gsub("'", %q(\\\\\\\\'))
-           .gsub("\n", " ")
-           .gsub("  ", " ")
-           .gsub(">", "")
-           .sub(/^\(/, "\\(")
-           .sub(/^\[/, "\\[")
-           .sub(/^-/, "\\-")
+  def messages_to_ignore
+    raise NotImplementedError
   end
 end

data/lib/models/gerrit_code_change_activity.rb

@@ -0,0 +1,40 @@
+require "rubiclifier"
+require_relative "./code_change_activity.rb"
+
+AUTHOR_TRANSLATIONS = {
+  "Service Cloud Jenkins" => "Jenkins",
+  /\w+ Gergich \(Bot\)/ => "Gergich"
+}
+
+class GerritCodeChangeActivity < CodeChangeActivity
+  def initialize(id, author, is_self, message, created_at, code_change)
+    @id = id
+    @author = CodeChangeActivity.translate_author(author)
+    @is_self = is_self
+    @message = CodeChangeActivity.translate_message(message)
+    @created_at = created_at
+    @code_change = code_change
+  end
+
+  def messages_to_ignore
+    [/Uploaded patch set 1/, /Build Started/, /owns \d+% of/]
+  end
+
+  def self.translate_author(author)
+    AUTHOR_TRANSLATIONS.keys.each do |pattern|
+      author.sub!(pattern, AUTHOR_TRANSLATIONS[pattern])
+    end
+    author
+  end
+
+  def self.translate_message(message)
+    message.sub(/^Patch Set \d+:\s+/, "")
+           .gsub("'", %q(\\\\\\\\'))
+           .gsub("\n", " ")
+           .gsub("  ", " ")
+           .gsub(">", "")
+           .sub(/^\(/, "\\(")
+           .sub(/^\[/, "\\[")
+           .sub(/^-/, "\\-")
+  end
+end

data/lib/models/gitlab_code_change_activity.rb

@@ -0,0 +1,28 @@
+require "rubiclifier"
+require_relative "./code_change_activity.rb"
+
+class GitlabCodeChangeActivity < CodeChangeActivity
+  def initialize(id, author, is_self, message, created_at, code_change)
+    @id = id
+    @author = author
+    @is_self = is_self
+    @message = GitlabCodeChangeActivity.translate_message(message)
+    @created_at = created_at
+    @code_change = code_change
+  end
+
+  def messages_to_ignore
+    [/^marked the task .* as (completed|incomplete)$/, /^changed the description$/, /^resolved all threads$/]
+  end
+
+  def self.translate_message(message)
+    message.sub(/^(added \d+ commits?).*/m, '\1')
+      .gsub("'", "’")
+      .gsub("\n", " ")
+      .gsub("  ", " ")
+      .gsub(">", "")
+      .sub(/^\(/, "\\(")
+      .sub(/^\[/, "\\[")
+      .sub(/^-/, "\\-")
+  end
+end

data/migrations.rb

@@ -5,4 +5,12 @@ migrations << <<SQL
     notified_at TIMESTAMP
   );
 SQL
+migrations << <<SQL
+  CREATE TABLE IF NOT EXISTS code_change (
+    id VARCHAR(50) PRIMARY KEY,
+    pipeline_updated_at TIMESTAMP,
+    last_pipeline_status VARCHAR(25),
+    last_approval_status BOOLEAN
+  );
+SQL
 migrations

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: code_review_notifier
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Kyle Grinstead
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-30 00:00:00.000000000 Z
+date: 2021-06-28 00:00:00.000000000 Z
 dependencies: []
 description:
 email: kyleag@hey.com
@@ -23,8 +23,11 @@ files:
 - lib/code_change_notification.rb
 - lib/code_review_notifier.rb
 - lib/gerrit_api.rb
+- lib/gitlab_api.rb
 - lib/models/code_change.rb
 - lib/models/code_change_activity.rb
+- lib/models/gerrit_code_change_activity.rb
+- lib/models/gitlab_code_change_activity.rb
 - migrations.rb
 homepage: https://rubygems.org/gems/code_review_notifier
 licenses:
@@ -47,8 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Get notifications when updates happen to patch sets/pull requests!