code_review_notifier 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e426f5dccd98b195d1c7293883395783661f4d2f7415bbef49dec86366c359ed
-  data.tar.gz: 1bc90b0595fef06e71915280ae60abccb4b4f0210e5f5989b108f00c531f1d09
+  metadata.gz: d6de431ed11fa0855c6ed44e294a4b8a76bd69ad845c1ea9bfacdd9a326e0b66
+  data.tar.gz: 0b084e6c55eda7ee644232ad770ad2bde38b43f12c1bea6f209d2ebce816b6dd
 SHA512:
-  metadata.gz: 3d04f2041ece20693f1111669c23d995173a7f463bbe40663de23542285c3610243aa099ad65a8f1dd9d14b45e930f332a74de89e25ec5dbb85a0cd6d644f05a
-  data.tar.gz: 4b7f3b4e1193931f975f350d51f18b14e57094ca82991a9ebd1f759901d6fc1cfd23b3d46b4f86e6402b3183c6aaaef737673f7c7c3f4827829b65b54bc7133c
+  metadata.gz: 28eae7ef98c923678e89c54d3a23c73dd4ff649ce55fcb7ee9f51a80ea0e74e331aae31f878c432fdb6657e27f275afffce16001ffd5bdeb341f095235207f0c
+  data.tar.gz: b586a847bca12814d570e2f73ace4d5860cf144e0024ea503994cdc5846e489f88416f3b0847731a6feb6f40cc90714fa96aca2afb6f3c1ac17782ac44f9e175

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

@@ -11,8 +11,13 @@ 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
+    end
   end
 
   def self.all_code_changes

data/lib/notifier.rb

@@ -1,7 +1,7 @@
 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("/usr/local/bin/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.2
+  version: 0.1.3
 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