imap_notifier 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 070c8430cdeedbb65f412669840be00759a8423c
-  data.tar.gz: c6cfb31a9864c96f626a45c3d166dd5913fc1a8a
+  metadata.gz: 9a958142e6525ef4f9ee75b68ec554eb9068c85e
+  data.tar.gz: ef1bc7d0d5b902c6e38b8ca009883cb057b63a80
 SHA512:
-  metadata.gz: 34526617775c9a533ad70293f9fe230a04228708936c5003a05cff9706baa0dcde638acc2654abf3ff7291e248be148ff7e6c5905e630fcee21ac6905a63e812
-  data.tar.gz: c12eece42e6109ada6e6197e621da2c528c4a98e5b118b2d0babd40a6c71ba899249285f58a0cf0441ab29b858ca7253f8ca208ebfa736a1f1f223b324c909d1
+  metadata.gz: b081dfb55146fe8bf52ca2d3d34ee087c0c45a3ac6465953b79fcaa3b833744322595904cc9f4af0914a18c49a57c9bdf609b1e27f36108770c0dc1c1433c6e9
+  data.tar.gz: 5f6874f752af6c6cb7cc1f9797dd9fd2d44e6a78faa336f38e31b7fb08954444f6477b067b5bc25ea4ba2a3c1943799cac1ea1cb783cbca41fb8c5d9084dca72

data/README.md

@@ -22,6 +22,8 @@ Example ~/.imap_notifier file
     server: 'imap.server.com'
     password: "1H@t3BuG$!"
     max: 10
+    pid: /tmp/imap_notifier.1.pid  # defaults to /tmp/imap_notifier.pid set this to initialize multiple imap_notifier instances
+    ignore_exit_code: true  #defaults to false. When true, returns 0 instead of 1 on existing pidfile exit
 
 
 For Keychain Access support, specify the keychain item name and account in .imap_notifier.  The item must be designated an 'Internet password' in Keychain Access.

data/bin/imap_notifier

@@ -45,6 +45,10 @@ opt_parser = OptionParser.new do |opt|
     opts[:max] = m.to_i
   end
 
+  opt.on('-p','--pid STR', "PID file path. [Default: #{PIDFILE}]") do |m|
+    opts[:pid] = m.to_i
+  end
+
   opt.on('-k', '--kill', "Kill currently running #{opt.program_name} process with SIGINT") do
     IMAP_Notifier.kill_process
     exit
@@ -52,10 +56,4 @@ opt_parser = OptionParser.new do |opt|
 end
 
 opt_parser.parse!
-
-if File.exists?(PIDFILE) && IO.readlines(PIDFILE).any?
-  puts "#{PIDFILE} already exists -- Exiting..."
-  exit -1
-end
-
 IMAP_Notifier.new(opts)

data/lib/imap_notifier/base.rb

@@ -1,20 +1,40 @@
 class IMAP_Notifier
   def self.kill_process
-    pid = IO.readlines(PIDFILE).first.to_i
+    matching_pids = Dir['/tmp/imap_notifier*.pid']
+    if matching_pids.length > 1
+      prompts = ["[Q] Cancel"]
+      matching_pids.each_with_index do |p_file, i|
+        prompts.push("[#{i}] #{p_file}")
+      end
+      pidIndex = ask("Select PID by number\n" + prompts.join("\n")) { |q|
+        q.validate = /^[0-#{matching_pids.length-1},q,Q]{1}$/
+      }
+      return if pidIndex.downcase == "q"
+      pidFile = Dir['/tmp/imap_notifier*.pid'][pidIndex.to_i]
+    else
+      pidFile = Dir['/tmp/imap_notifier*.pid'].first
+    end
+      pid = IO.readlines(pidFile).first.to_i
     puts "Killing PID: #{pid}"
     Process.kill("SIGINT", pid)
   rescue Errno::ESRCH, Errno::ENOENT => e
     puts "#{e.message} - Exiting..."
   ensure
-    self.delete_pid
+    self.delete_pid(pidFile)
   end
 
-  def self.delete_pid
-    File.delete(PIDFILE) if File.exists?(PIDFILE)
+  def self.delete_pid(pidFile)
+    File.delete(pidFile) if File.exists?(pidFile)
   end
 
   def initialize(opts={})
     config opts
+
+    if File.exists?(@custom_pid) && IO.readlines(@custom_pid).any?
+      puts "#{@custom_pid} already exists -- Exiting..."
+      exit @ignore_exit_code ? 0 : 1
+    end
+
     @notifier = IMAP_Notifier::Alert.new
 
     pid = fork do
@@ -22,7 +42,7 @@ class IMAP_Notifier
       at_exit {  self.stop }
       run
     end
-    File.open(PIDFILE, 'w') { |f| f.write pid }
+    File.open(@custom_pid, 'w') { |f| f.write pid }
   end
 
   def run

data/lib/imap_notifier/config.rb

@@ -1,18 +1,20 @@
 class IMAP_Notifier
   def config(opts={})
     read_conf opts
-    @imap_server = opts[:server] || IMAP_SERVER
-    @domain      = opts[:domain] || @imap_server.split('.').pop(2).join('.')
-    @user        = "#{opts[:user]}@#{@domain}"
-    $key_name    = opts[:key_name] || false
-    $key_account = opts[:key_account] || false
-    $pass        = opts[:pass] || false
-    $one_path    = opts[:one_path] || false
-    $onepass     = opts[:onepass] || false
-    @password    = opts[:password] || get_password
-    @folders     = mbox_conf opts[:folders] || ['INBOX']
-    @debug       = opts[:debug] || false
-    @max_mail    = opts[:max]   || MAX_MAIL
+    @imap_server      = opts[:server] || IMAP_SERVER
+    @domain           = opts[:domain] || @imap_server.split('.').pop(2).join('.')
+    @user             = "#{opts[:user]}@#{@domain}"
+    $key_name         = opts[:key_name] || false
+    $key_account      = opts[:key_account] || false
+    $pass             = opts[:pass] || false
+    $one_path         = opts[:one_path] || false
+    $onepass          = opts[:onepass] || false
+    @password         = opts[:password] || get_password
+    @folders          = mbox_conf opts[:folders] || ['INBOX']
+    @debug            = opts[:debug] || false
+    @max_mail         = opts[:max]   || MAX_MAIL
+    @ignore_exit_code = opts[:ignore_exit_code].to_s == 'true'
+    @custom_pid       = opts[:pid] || PIDFILE
   end
 
   private

data/lib/imap_notifier/version.rb

@@ -1,3 +1,3 @@
 class IMAP_Notifier
-  VERSION='0.2.8'
+  VERSION='0.2.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imap_notifier
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - David Campbell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler