code_review_notifier 0.1.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6de431ed11fa0855c6ed44e294a4b8a76bd69ad845c1ea9bfacdd9a326e0b66
-  data.tar.gz: 0b084e6c55eda7ee644232ad770ad2bde38b43f12c1bea6f209d2ebce816b6dd
+  metadata.gz: fe98a79405c30d5a0ab08d8b8c3f0693cd1605fc81c413ddcfac136e52c54105
+  data.tar.gz: 0a31a14ea309f530e8927962f109e8660c6d63a1bad7da504ca46091b01fba92
 SHA512:
-  metadata.gz: 28eae7ef98c923678e89c54d3a23c73dd4ff649ce55fcb7ee9f51a80ea0e74e331aae31f878c432fdb6657e27f275afffce16001ffd5bdeb341f095235207f0c
-  data.tar.gz: b586a847bca12814d570e2f73ace4d5860cf144e0024ea503994cdc5846e489f88416f3b0847731a6feb6f40cc90714fa96aca2afb6f3c1ac17782ac44f9e175
+  metadata.gz: 89a05dabf9bb56d0e43cd6295ee64cfd01b114416b420b84cb8147876d047f66533d490820fecda9dea2858877a56ca61b1cc66f053e9b96f07aea952e257c71
+  data.tar.gz: 9a2af8b575e1a47781820937fd47b8ee6bc7b2c4dbe5356a470aeb721a60eaa762961ab7b9d36bf53e7cd3c2063661bbca7bb4fc4f2c8088de0b7b11ecb424b2

data/Gemfile

@@ -1,6 +1,5 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec
 
-gem "sqlite3"
-gem "httparty"
+gem "rubiclifier", "1.0.0"

data/bin/code_review_notifier

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'code_review_notifier'
+require_relative "../lib/code_review_notifier.rb"
 
-CodeReviewNotifier.call(ARGV)
+CodeReviewNotifier.new(ARGV).call

data/lib/code_change_notification.rb

@@ -0,0 +1,28 @@
+require "rubiclifier"
+require_relative "./api.rb"
+
+class CodeChangeNotification
+  attr_reader :code_change_activity
+  private :code_change_activity
+
+  def initialize(code_change_activity)
+    @code_change_activity = code_change_activity
+  end
+
+  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}",
+      Api.current_api.favicon,
+      Api.current_api.code_change_url(code_change)
+    ).send
+  end
+end

data/lib/code_review_notifier.rb

@@ -1,48 +1,24 @@
-require "io/console"
+require "rubiclifier"
 require_relative "./api.rb"
-require_relative "./notifier.rb"
+require_relative "./code_change_notification.rb"
 
 SECONDS_BETWEEN_RUNS = 90
 SECONDS_BETWEEN_NOTIFICATIONS = 5
 
-class CodeReviewNotifier
-  def self.setup(args)
-    system("mkdir -p ~/.code_review_notifier")
-    system("brew bundle --file #{File.expand_path(File.dirname(__FILE__) + "/..")}/Brewfile")
-
-    if args[0] == "--setup"
-      print("What's the base URL? (i.e. https://gerrit.google.com) ")
-      DB.save_setting("base_api_url", STDIN.gets.chomp, is_secret: false)
-
-      print("What's the account username? ")
-      DB.save_setting("username", STDIN.gets.chomp, is_secret: false)
-
-      print("What's the account password? (hiding input) ")
-      DB.save_setting("password", STDIN.noecho(&:gets).chomp, is_secret: true)
-      puts
-
-      print("What's the account id? (check #{Api.current_api.base_api_url}/settings/) ")
-      DB.save_setting("account_id", STDIN.gets.chomp, is_secret: false)
-
-      puts("All setup!")
-      puts
-      puts("It's recommended that you set this up as a system service with serviceman. Check it out here: https://git.rootprojects.org/root/serviceman")
-      puts("Set code_review_notifier to run on startup with `serviceman add --name code_review_notifier code_review_notifier`")
-      exit
-    end
-
-    if !Api.current_api.is_setup?
-      Notifier.notify("Missing Setup Info", "Run `code_review_notifier --setup` to setup.")
-      puts
-      puts("You must finish setup first by running with the `--setup` option.")
-      puts("`code_review_notifier --setup`")
-      exit
-    end
+class CodeReviewNotifier < Rubiclifier::BaseApplication
+  def show_help
+    puts
+    puts("This polls for updates to patch sets/pull requests and notifies you about any relevant changes.")
+    puts
+    puts("Usage:")
+    puts("  code_review_notifier --help  | Shows this help menu")
+    puts("  code_review_notifier --setup | Runs setup")
+    puts("  code_review_notifier         | Start listening for changes (should be run in background)")
+    puts
+    exit
   end
 
-  def self.call(args)
-    setup(args)
-
+  def run_application
     while true
       is_first_run = is_first_run?
       puts
@@ -51,16 +27,14 @@ class CodeReviewNotifier
       puts("Checking for notifications to display...")
       all_activity = []
       all_code_changes.each do |cc|
-        activity_for_code_change = cc.code_change_activity
-        activity_for_code_change.sort! { |a, b| a.created_at <=> b.created_at }
-        cc.activity_from_self_at = activity_for_code_change.find { |a| a.is_self }&.created_at
-        all_activity.concat(activity_for_code_change)
+        cc.code_change_activity.sort! { |a, b| a.created_at <=> b.created_at }
+        all_activity.concat(cc.code_change_activity)
       end
       all_activity.select(&:should_notify?).each do |code_change_activity|
         code_change_activity.notified
         unless is_first_run
           puts("Notifying of change!")
-          Notifier.notify_about_code_change(code_change_activity)
+          CodeChangeNotification.new(code_change_activity).send
           sleep(SECONDS_BETWEEN_NOTIFICATIONS)
         end
       end
@@ -68,7 +42,43 @@ class CodeReviewNotifier
     end
   end
 
-  def self.is_first_run?
-    DB.query_single_row("SELECT id FROM code_change_activity_notified;").nil?
+  def not_setup
+    Rubiclifier::Notification.new(
+      "Missing Setup Info",
+      "Run `code_review_notifier --setup` to setup."
+    ).send
+  end
+
+  def features
+    [
+      Rubiclifier::Feature::BACKGROUND,
+      Rubiclifier::Feature::DATABASE,
+      Rubiclifier::Feature::NOTIFICATIONS
+    ]
+  end
+
+  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/"})
+    ]
+  end
+
+  def executable_name
+    "code_review_notifier"
+  end
+
+  def data_directory
+    "~/.code_review_notifier"
+  end
+
+  def migrations_location
+    "#{File.expand_path(File.dirname(__FILE__) + "/..")}/migrations.rb"
+  end
+
+  def is_first_run?
+    Rubiclifier::DB.query_single_row("SELECT id FROM code_change_activity_notified;").nil?
   end
 end

data/lib/gerrit_api.rb

@@ -1,9 +1,15 @@
-require_relative "./base_api.rb"
+require "rubiclifier"
 require_relative "./models/code_change.rb"
 require_relative "./models/code_change_activity.rb"
 
-class GerritApi < BaseApi
-  def self.authenticate
+class HTTParty::Parser
+  def json
+    JSON.parse(body.gsub(")]}'", ""))
+  end
+end
+
+class GerritApi < Rubiclifier::BaseApi
+  def self.login_and_get_api_token
     res = post("/login/", {
       body: "username=#{username}&password=#{URI.escape(password)}&rememberme=1",
       headers: {
@@ -12,19 +18,23 @@ class GerritApi < BaseApi
       follow_redirects: false
     })
     set_cookie_header = res.headers["set-cookie"] || ""
-    @token = set_cookie_header.match("GerritAccount=(.*?);")&.to_a&.fetch(1)
-    if @token.nil?
-      Notifier.notify("Incorrect Credentials", "Trying running `code_review_notifier --setup` again.")
-      sleep(120)
-      exit
-    end
+    set_cookie_header.match("GerritAccount=(.*?);")&.to_a&.fetch(1)
+  end
+
+  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
     wrap_with_authentication do
       get("/changes/?S=0&q=is%3Aopen%20owner%3Aself%20-is%3Awip%20-is%3Aignored%20limit%3A25&q=is%3Aopen%20owner%3Aself%20is%3Awip%20limit%3A25&q=is%3Aopen%20-owner%3Aself%20-is%3Awip%20-is%3Aignored%20reviewer%3Aself%20limit%3A25&q=is%3Aclosed%20-is%3Aignored%20%28-is%3Awip%20OR%20owner%3Aself%29%20%28owner%3Aself%20OR%20reviewer%3Aself%29%20-age%3A4w%20limit%3A10&o=DETAILED_ACCOUNTS&o=MESSAGES", {
         headers: {
-          "Cookie" => "GerritAccount=#{@token};"
+          "Cookie" => "GerritAccount=#{api_token};"
         }
       })
     end.parsed_response.flat_map { |js| js.map { |j| code_change_from_json(j) } }
@@ -47,4 +57,24 @@ class GerritApi < BaseApi
   def self.code_change_url(code_change)
     "#{base_api_url}/c/#{code_change.id}"
   end
+
+  def self.api_token_db_key
+    "api_token"
+  end
+
+  def self.base_api_url_db_key
+    "base_api_url"
+  end
+
+  def self.username
+    @username ||= Rubiclifier::DB.get_setting("username")
+  end
+
+  def self.password
+    @password ||= Rubiclifier::DB.get_setting("password")
+  end
+
+  def self.account_id
+    @account_id ||= Rubiclifier::DB.get_setting("account_id")
+  end
 end

data/lib/models/code_change.rb

@@ -1,21 +1,18 @@
 require "date"
-require_relative "../database.rb"
 
 class CodeChange
   attr_accessor :code_change_activity
   attr_reader :id, :owner, :project, :subject, :updated_at
-  attr_writer :activity_from_self_at
 
   def initialize(id, owner, project, subject, updated_at)
     @id = id
     @owner = owner
     @project = project
-    @subject = subject.gsub("'", "")
+    @subject = subject.gsub("'", "’")
     @updated_at = updated_at
   end
 
   def activity_from_self_at
-    raise "@activity_from_self_at is not set" unless instance_variable_defined?("@activity_from_self_at")
-    @activity_from_self_at
+    @activity_from_self_at ||= code_change_activity.find { |a| a.is_self }&.created_at
   end
 end

data/lib/models/code_change_activity.rb

@@ -1,3 +1,5 @@
+require "rubiclifier"
+
 MESSAGES_TO_IGNORE = [/Uploaded patch set 1/, /Build Started/, /owns \d+% of/]
 AUTHOR_TRANSLATIONS = {
   "Service Cloud Jenkins" => "Jenkins",
@@ -17,14 +19,14 @@ class CodeChangeActivity
   end
 
   def notified
-    DB.execute("INSERT INTO code_change_activity_notified (id, notified_at) VALUES('#{id}', CURRENT_TIMESTAMP);")
+    Rubiclifier::DB.execute("INSERT INTO code_change_activity_notified (id, notified_at) VALUES('#{id}', CURRENT_TIMESTAMP);")
   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) } &&
-      !DB.query_single_row("SELECT id FROM code_change_activity_notified WHERE id = '#{id}'")
+      !Rubiclifier::DB.query_single_row("SELECT id FROM code_change_activity_notified WHERE id = '#{id}'")
   end
 
   def self.translate_author(author)

data/migrations.rb

@@ -0,0 +1,8 @@
+migrations = []
+migrations << <<SQL
+  CREATE TABLE IF NOT EXISTS code_change_activity_notified (
+    id VARCHAR(50) PRIMARY KEY,
+    notified_at TIMESTAMP
+  );
+SQL
+migrations

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: code_review_notifier
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Kyle Grinstead
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-08 00:00:00.000000000 Z
+date: 2020-07-10 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: kyleag@hey.com
@@ -17,24 +17,22 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- Brewfile
 - Gemfile
 - bin/code_review_notifier
 - lib/api.rb
-- lib/base_api.rb
-- lib/cipher.rb
+- lib/code_change_notification.rb
 - lib/code_review_notifier.rb
-- lib/database.rb
 - lib/gerrit_api.rb
 - lib/models/code_change.rb
 - lib/models/code_change_activity.rb
-- lib/notifier.rb
+- migrations.rb
 homepage: https://rubygems.org/gems/code_review_notifier
 licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/MrGrinst/code_review_notifier
-post_install_message: 
+post_install_message: "\n\e[32mThanks for installing code_review_notifier!\e[0m\n\e[32mSet
+  it up by running `\e[0mcode_review_notifier --setup\e[32m`\e[0m\n\n"
 rdoc_options: []
 require_paths:
 - lib

data/Brewfile

@@ -1,2 +0,0 @@
-brew 'sqlite'
-brew 'terminal-notifier'

data/lib/base_api.rb

@@ -1,62 +0,0 @@
-require "httparty"
-require_relative "./gerrit_api.rb"
-
-class HTTParty::Parser
-  def json
-    JSON.parse(body.gsub(")]}'", ""))
-  end
-end
-
-class BaseApi
-  include HTTParty
-
-  def self.authenticate
-    raise NotImplementedError
-  end
-
-  def self.all_code_changes
-    raise NotImplementedError
-  end
-
-  def self.favicon
-    raise NotImplementedError
-  end
-
-  def self.code_change_url(code_change)
-    raise NotImplementedError
-  end
-
-  def self.wrap_with_authentication(&block)
-    res = block.call
-    if res.code == 401 || res.code == 403
-      self.authenticate
-      block.call
-    else
-      res
-    end
-  end
-
-  def self.is_setup?
-    base_api_url && username && password && account_id
-  end
-
-  def self.base_api_url
-    @base_api_url ||= begin
-                        url = DB.get_setting("base_api_url")
-                        base_uri(url)
-                        url.chomp("/")
-                      end
-  end
-
-  def self.username
-    @username ||= DB.get_setting("username")
-  end
-
-  def self.password
-    @password ||= DB.get_setting("password")
-  end
-
-  def self.account_id
-    @account_id ||= DB.get_setting("account_id")
-  end
-end

data/lib/cipher.rb

@@ -1,31 +0,0 @@
-require "base64"
-require "openssl"
-require "digest/sha1"
-
-KEY = ""
-
-class Cipher
-  def self.encrypt(text)
-    cipher = OpenSSL::Cipher.new("aes-256-cbc")
-    cipher.encrypt
-    key = Digest::SHA1.hexdigest("yourpass")[0..31]
-    iv = cipher.random_iv
-    cipher.key = key
-    cipher.iv = iv
-    encrypted = cipher.update(text)
-    encrypted << cipher.final
-    ["#{key}:#{Base64.encode64(iv).encode('utf-8')}", Base64.encode64(encrypted).encode('utf-8')]
-  end
-
-  def self.decrypt(encrypted, salt)
-    key, iv = salt.split(":")
-    iv = Base64.decode64(iv.encode('ascii-8bit'))
-    cipher = OpenSSL::Cipher.new("aes-256-cbc")
-    cipher.decrypt
-    cipher.key = key
-    cipher.iv = iv
-    decrypted = cipher.update(Base64.decode64(encrypted.encode('ascii-8bit')))
-    decrypted << cipher.final
-    decrypted
-  end
-end

data/lib/database.rb

@@ -1,48 +0,0 @@
-require "sqlite3"
-require_relative "./cipher.rb"
-
-class DB
-  def self.db
-    @db ||= begin
-              db = SQLite3::Database.new(File.expand_path("~/.code_review_notifier/data.db"))
-              migrate_if_needed(db)
-              db
-            end
-  end
-
-  def self.migrate_if_needed(db)
-    db.execute("CREATE TABLE IF NOT EXISTS code_change_activity_notified (id VARCHAR(50) PRIMARY KEY, notified_at TIMESTAMP);")
-    db.execute("CREATE TABLE IF NOT EXISTS settings (key VARCHAR(50) PRIMARY KEY, value TEXT, salt TEXT);")
-  end
-
-  def self.execute(sql)
-    db.execute(sql)
-  end
-
-  def self.query_single_row(sql)
-    db.execute(sql) do |row|
-      return row
-    end
-    return nil
-  end
-
-  def self.save_setting(key, value, is_secret:)
-    salt = "NULL"
-    if is_secret
-      salt, encrypted = Cipher.encrypt(value)
-      salt = "'#{salt}'"
-      value = encrypted
-    end
-    db.execute("DELETE FROM settings WHERE key = '#{key}';")
-    db.execute("INSERT INTO settings (key, value, salt) VALUES('#{key}', '#{value}', #{salt});")
-  end
-
-  def self.get_setting(key)
-    row = query_single_row("SELECT value, salt FROM settings WHERE key = '#{key}'")
-    if row && row[1]
-      Cipher.decrypt(row[0], row[1])
-    elsif row
-      row[0]
-    end
-  end
-end

data/lib/notifier.rb

@@ -1,31 +0,0 @@
-require_relative './api.rb'
-
-class Notifier
-  def self.notify_about_code_change(code_change_activity)
-    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
-    notify(author, message, "#{owner}: #{subject}", Api.current_api.favicon, Api.current_api.code_change_url(code_change))
-  end
-
-  def self.notify(title, message, subtitle = nil, icon = nil, url = nil)
-    args = {
-      "title" => title,
-      "message" => message,
-      "subtitle" => subtitle,
-      "appIcon" => icon,
-      "open" => url
-    }
-    all_args = args.keys.reduce("") do |arg_string, key|
-      if args[key]
-        arg_string += " -#{key} '#{args[key]}'"
-      end
-      arg_string
-    end
-    system("/usr/local/bin/terminal-notifier #{all_args}")
-  end
-end