code_review_notifier 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edabbf2ed573f0042d93ae9559b8345bfa2b4ad697db78b43a1d6e736d06355e
-  data.tar.gz: 5b9be1ccc0d16556a7045e4b639ae809c9afea160461581b9bf6dd95cb137bae
+  metadata.gz: c3615d3a36962ada56ab1f0e0cc212e73915ec1a656d563a7754490c8697c0f7
+  data.tar.gz: 5e9b86d5c6ebaa58b3b315b43b212eae412d5ac71d8cad9c27d212b66347af31
 SHA512:
-  metadata.gz: 567ac263894da8edae616278d2d558b9efce9f29987f24feb5497447b4d49f8328aa35beefff1c51c244ea1cc01b33c5445c441a485f50d056ed2b12c82e3926
-  data.tar.gz: 9f89909ef2d81828fb9d06b4e0d9a5bcb418b45c3814a584bd0845cafba0f4fc26d4c6a064d6deb7eab8e96aa99e21086a465f9892b90d10f4013e1a6d231606
+  metadata.gz: b9430f29ab8cda0f0096d6b8d67b5c8b7620cec2cae1574b7eccbdf9094d2bee134712f0b718b7b53cbb5167aa2d4adfee57fae06ae1da94c230963a6440f063
+  data.tar.gz: ceeb73098c2c8a322f30949f7f5af234dc2b153ef1dc48126693d5c1614420f54ec900aa7804e1b3c25ea13cc4d3fb9970be2e38d6c57e5fd095aaa12fcb5625

data/Brewfile

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

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec
 

data/bin/code_review_notifier

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

data/lib/base_api.rb

@@ -10,6 +10,10 @@ end
 class BaseApi
   include HTTParty
 
+  def self.token
+    @token ||= DB.get_setting("api_token") || self.authenticate
+  end
+
   def self.authenticate
     raise NotImplementedError
   end
@@ -44,7 +48,7 @@ class BaseApi
     @base_api_url ||= begin
                         url = DB.get_setting("base_api_url")
                         base_uri(url)
-                        url
+                        url&.chomp("/")
                       end
   end
 

data/lib/cipher.rb

@@ -2,8 +2,6 @@ require "base64"
 require "openssl"
 require "digest/sha1"
 
-KEY = ""
-
 class Cipher
   def self.encrypt(text)
     cipher = OpenSSL::Cipher.new("aes-256-cbc")
@@ -14,17 +12,17 @@ class Cipher
     cipher.iv = iv
     encrypted = cipher.update(text)
     encrypted << cipher.final
-    ["#{key}:#{Base64.encode64(iv).encode('utf-8')}", Base64.encode64(encrypted).encode('utf-8')]
+    ["#{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'))
+    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.update(Base64.decode64(encrypted.encode("ascii-8bit")))
     decrypted << cipher.final
     decrypted
   end

data/lib/code_review_notifier.rb

@@ -2,7 +2,7 @@ require "io/console"
 require_relative "./api.rb"
 require_relative "./notifier.rb"
 
-SECONDS_BETWEEN_RUNS = 120
+SECONDS_BETWEEN_RUNS = 90
 SECONDS_BETWEEN_NOTIFICATIONS = 5
 
 class CodeReviewNotifier
@@ -10,7 +10,7 @@ class CodeReviewNotifier
     system("mkdir -p ~/.code_review_notifier")
     system("brew bundle --file #{File.expand_path(File.dirname(__FILE__) + "/..")}/Brewfile")
 
-    if args[0] == "--setup" || !Api.current_api.is_setup?
+    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)
 
@@ -25,6 +25,18 @@ class CodeReviewNotifier
       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
   end
 
@@ -48,11 +60,11 @@ class CodeReviewNotifier
         code_change_activity.notified
         unless is_first_run
           puts("Notifying of change!")
-          Notifier.notify(code_change_activity)
-          sleep SECONDS_BETWEEN_NOTIFICATIONS
+          Notifier.notify_about_code_change(code_change_activity)
+          sleep(SECONDS_BETWEEN_NOTIFICATIONS)
         end
       end
-      sleep SECONDS_BETWEEN_RUNS
+      sleep(SECONDS_BETWEEN_RUNS)
     end
   end
 

data/lib/gerrit_api.rb

@@ -4,6 +4,7 @@ require_relative "./models/code_change_activity.rb"
 
 class GerritApi < BaseApi
   def self.authenticate
+    @token = nil
     res = post("/login/", {
       body: "username=#{username}&password=#{URI.escape(password)}&rememberme=1",
       headers: {
@@ -11,15 +12,23 @@ class GerritApi < BaseApi
       },
       follow_redirects: false
     })
-    @token = res.headers["set-cookie"].match("GerritAccount=(.*?);")[1]
-    raise "Your username or password is incorrect. Trying running `code_review_notifier --setup` again." if @token.nil?
+    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
+    else
+      DB.save_setting("api_token", token, is_secret: true)
+      token
+    end
   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=#{token};"
         }
       })
     end.parsed_response.flat_map { |js| js.map { |j| code_change_from_json(j) } }

data/lib/models/code_change.rb

@@ -10,7 +10,7 @@ class CodeChange
     @id = id
     @owner = owner
     @project = project
-    @subject = subject.gsub("'", "")
+    @subject = subject.gsub("'", "’")
     @updated_at = updated_at
   end
 

data/lib/notifier.rb

@@ -1,7 +1,7 @@
-require_relative './api.rb'
+require_relative "./api.rb"
 
 class Notifier
-  def self.notify(code_change_activity)
+  def self.notify_about_code_change(code_change_activity)
     code_change = code_change_activity.code_change
     id = code_change.id
     owner = code_change.owner
@@ -9,6 +9,23 @@ class Notifier
 
     message = code_change_activity.message
     author = code_change_activity.author
-    system("terminal-notifier -title '#{author}' -subtitle '#{owner}: #{subject}' -message '#{message}' -appIcon #{Api.current_api.favicon} -open '#{Api.current_api.code_change_url(code_change)}'")
+    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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: code_review_notifier
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Kyle Grinstead
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-07 00:00:00.000000000 Z
+date: 2020-07-08 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: kyleag@hey.com