imap_notifier 0.2.2 → 0.2.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2E4MTk5Nzc3YTU1MjFjNmUyYzdlZjBjOTU4ZTgwOWIwZTBlMTBhYQ==
+    M2M4NjlmOTY0ZTUxNWRlY2JlOTUwNjY1ZDgyNGY5OTQ0YmZlNjE2YQ==
   data.tar.gz: !binary |-
-    ZmEwYTMyNjE4ZGY5YzljYzM2OWY3M2ZmZTBjZWY0MTY5Y2E0YzhlNw==
+    ZWE4OThiYjczOTM0MGY3YTVkN2Y4ZmFkZWQwMDI3YjEwM2M4YjQxZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YjFmMzgwZTZjZWY5ZTNmNjI0ZDdiOTVlYjhhNmM1ZjUxN2FjYmZhYTY2MzU5
-    OTBmMTM5MDgwZmVmNTNhZGIwMTZjMDA0MDc5MGZmYzc4MGRiZjk1YTMxMmU5
-    NmFiOWQwNzllMTBlMWU2MWQ0NTAxNWNhZGNlMTg2ZmU2NTFiNDU=
+    ZGUwMmJhNDQ2ODJlNjM0Y2UxYTRlODlmZjY4ZWZiMzNlYmFhYTE5OTg1Njhh
+    MGQxOWQ0YmQzZjAzNmU2YTBiNzM3ODRjMzMwYjI0NmE4OGJlYWIxMzFlNzhl
+    NDVkMzhlODAxNWEyMTA5OGU5ZWM1MGIxYTJjMmU3ZTEzZjc4OTE=
   data.tar.gz: !binary |-
-    ZmJiMTRjODRjMzgwOTBmZTA5ZmFhM2MzMTYwODY3ZWU1NTA1Yjk2ZDA4Yzdk
-    ZGJkMmE1NjQwZTFkZDdjMmM2NjJkODg4YTk1NDU3ZDE0NjI3MmQ3YzRkMjNl
-    MWZlZGEwNTU1YzhhNTc2NmQ5YzhhZWEyN2M3ZTNlZGI4NzJhNzA=
+    NmVkNTA3YzlmMDU5Y2IyOGJhMmQ4Y2EzOWY0MjI0N2NhMGY3N2Q3YzE2OTk2
+    NzVhNDViZTU5Y2ViZjdjNjllMDdmZThmMGM4YjYwMTM2YzRlZDlhMmIzZDE3
+    MzEyZGNiZDMzMmNiZjYwN2VkN2Q1OTM4MGU5M2FkZjlmOTNmODY=

data/Gemfile

@@ -3,14 +3,11 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in imap_notifier.gemspec
 gemspec
 
-if `uname`.strip == 'Darwin'
-   if `sw_vers -productVersion`.strip >= '10.8'
-     gem 'terminal-notifier'
-   else
-     gem 'ruby-growl'
-   end
-else
-  raise "You must be running Mac OS X for imap_notifier to work!"
+def is_mnt_lion?
+   @lion ||=  (RUBY_PLATFORM.match /(\d+)\.\d+\.\d+$/)[0].to_i >= 12
 end
 
+gem 'terminal-notifier', :require => is_mnt_lion?
+gem 'ruby-growl', :require => is_mnt_lion?
+
 gem 'highline'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    imap_notifier (0.2.2)
+    imap_notifier (0.2.3)
       highline
       ruby-growl
       terminal-notifier
@@ -16,7 +16,7 @@ GEM
     ruby-growl (4.0)
       uuid (~> 2.3, >= 2.3.5)
     systemu (2.5.2)
-    terminal-notifier (1.4.2)
+    terminal-notifier (1.5.1)
     uuid (2.3.7)
       macaddr (~> 1.0)
 
@@ -28,4 +28,5 @@ DEPENDENCIES
   highline
   imap_notifier!
   rake
+  ruby-growl
   terminal-notifier

data/bin/imap_notifier

@@ -24,29 +24,30 @@ opt_parser = OptionParser.new do |opt|
     opts[:debug] = true
   end
 
-  opt.on('-f', '--file FILE', "Read configuration file. [DEFAULT: ~/.imap_notifier]") do |c|
+  opt.on('-f', '--file FILE', "Read configuration file.\t[DEFAULT: ~/.imap_notifier]") do |c|
     opts[:config] = c
   end
 
-  opt.on('-s','--server STR', "Specify imap server. [Default: #{$imap_server}]") do |s|
+  opt.on('-s','--server STR', "Specify imap server.\t[Default: #{$imap_server}]") do |s|
     $imap_server = s
   end
 
   opt.on('-d','--domain STR',
-      "Specify email domain. [Default: #{$imap_server.split('.').pop(2).join('.')}]") do |d|
-    opts[:domain] = d.gsub('@','')
+      "Specify email domain.\t[Default: #{$imap_server.split('.').pop(2).join('.')}]") do |d|
+    opts[:domain] = d.gsub(/.+\@/,'')
   end
 
-  opt.on('-u','--user STR', "Specify user login. [Default: ENV['USER']]") do |d|
-    opts[:domain] = d.gsub('@','')
+  opt.on('-u','--user STR', "Specify user login.\t[Default: ENV['USER']]") do |u|
+    opts[:user] = u
   end
 
-  opt.on('-m','--max INT', "Max mail mentioned before grouping them together. [Default: #{MAX_MAIL}]") do |m|
+  opt.on('-m','--max INT', "Group notify on N or more mails. [Default: #{MAX_MAIL}]") do |m|
     opts[:max] = m.to_i
   end
 
   opt.on('-k', '--kill', "Kill currently running #{opt.program_name} process with SIGINT") do
     IMAP_Notifier.kill_process
+    exit
   end
 end
 

data/imap_notifier.gemspec

@@ -20,6 +20,7 @@ If you're running Max OSX > 10.8, terminal-notifier is required, otherwise ruby-
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '>= 1.9.2'
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_dependency "highline"

data/lib/imap_notifier/base.rb

@@ -5,8 +5,6 @@ class IMAP_Notifier
     Process.kill("SIGINT", pid)
   rescue Errno::ESRCH, Errno::ENOENT => e
     puts "#{e.message} - Exiting..."
-  ensure
-    exit
   end
 
   def initialize(opts={})
@@ -15,69 +13,52 @@ class IMAP_Notifier
 
     pid = fork do
       $stderr.reopen(ERRFILE, 'w')
-      if @debug
-        $stdout.reopen(DEBUGFILE, 'w')
-        @notifier.alert("DEBUG MODE ENABLED", "DEBUG LOGFILE: #{DEBUGFILE}")
-      end
-      at_exit { File.delete(PIDFILE) if File.exists?(PIDFILE) }
+      at_exit {  self.stop }
       run
     end
     File.open(PIDFILE, 'w') { |f| f.write pid }
   end
 
-  def imap
-    @imap ||= _imap
-  end
-
   def run
     begin
       @folders.each do |f, ids|
-        imap.examine("#{f}")
-
-        p "Mailbox: #{f}" if @debug
-        unseen          = imap.search(["UNSEEN"])
-        ungrowled       = unseen - ids
-        ungrowled_count = ungrowled.length
-        p "All unseen mail ids: #{unseen}",
-        "All ungrowled mail ids: #{ungrowled}",
-        "Ungrowled count: #{ungrowled_count}" if @debug
-
-        if ungrowled_count > @max_mail
-          p "New Mail in #{f}!",
-          "New: #{ungrowled_count}\nTotal: #{unseen.length}" if @debug
-          @notifier.alert("New Mail in #{f}!", "New: #{ungrowled_count}")
-        else
-          ungrowled.each do |msg_id|
-            msg = imap.fetch(msg_id, "ENVELOPE")[0].attr["ENVELOPE"]
-            next if ids.include?(msg.message_id)
-            p "Growled about #{msg.message_id}" if @debug
-            @notifier.alert("Mail from #{msg.sender.first.mailbox}", "#{msg.subject}")
-          end
-        end
-        @folders[f] = unseen
+        alert_folder(f, ids)
       end
       sleep SLEEP
-    rescue Interrupt
-      @notifier.alert("Goodbye!", '')
-      raise
     rescue EOFError
-      imap.login(@user, @password)
+      @imap = nil
     rescue Exception => err
-      p "Class: #{err.class}",
-      "Message: #{err.message}",
-      "See #{ERRFILE} for more info." if @debug
-      @notifier.alert(err.class, err.message)
-
-      warn Time.now
-      warn @user
-      warn $imap_server
-      warn err.class
-      warn err.message
-      err.backtrace.map{ |e| warn e }
-      raise
+      say_goodbye(err.class.to_s) || handle_exception(err)
+      exit
     end while true
   end
 
+  def alert_folder(f, ids)
+    imap.examine(f)
+    unseen    = imap.search(["UNSEEN"])
+    unalerted = unseen - ids
+
+    if unalerted.length > @max_mail
+      @notifier.alert("#{f}: #{unalerted.length} new mails", :group => f)
+    else
+      unalerted.each do |msg_id|
+        msg = imap.fetch(msg_id, "ENVELOPE")[0].attr["ENVELOPE"]
+        next if ids.include?(msg.message_id)
+        @notifier.alert("#{f} #{msg.subject}", :title => "Mail from #{msg.sender.first.mailbox}", :group => msg_id)
+      end
+    end
+    @folders[f] = unseen
+  end
+
+  def imap
+    @imap ||= _imap
+  end
+
+  def stop
+    IMAP_Notifier::Alert.remove
+    File.delete(PIDFILE) if File.exists?(PIDFILE)
+  end
+
   private
   def get_password(prompt="Enter Password: ")
     ask(prompt) { |q| q.echo = false }
@@ -86,7 +67,20 @@ class IMAP_Notifier
   def _imap
     imap = Net::IMAP.new($imap_server, { :port => 993, :ssl => true } )
     imap.login(@user, @password)
-    @notifier.alert("User connected to #{@domain}!", "USER: #{@user}")
+    @notifier.alert("#{@user} connected!", :group => @domain)
     return imap
   end
+
+  def say_goodbye(klass)
+    return if !(klass.eql? "Interrupt")
+    @notifier.alert("Goodbye!", :group => @domain)
+    File.delete(ERRFILE) if File.exists?(ERRFILE)
+  end
+
+  def handle_exception(err)
+    @notifier.alert(err.message, :title => err.class, :open => "file://#{ERRFILE}")
+    warn("#{Time.now} - #{@user}")
+    warn("#{err.class}: #{err.message}")
+    err.backtrace.map{ |e| warn e }
+  end
 end

data/lib/imap_notifier/config.rb

@@ -1,21 +1,33 @@
 class IMAP_Notifier
   def config(opts={})
-    file = File.expand_path("~#{opts[:user]}/.imap_notifier")
-    if File.exists? file
-      m =  sprintf("%o", File.stat(file).mode).split('').last(3).join().to_i
-      if m != 600
-        warn "#{file} must have permissions 0644, not #{m}"
-        exit 1
-      end
-      YAML.load(File.open(file)).each do |k,v|
-        opts[k.to_sym] ||= v
-      end
-    end
+    read_conf opts
     @domain   = opts[:domain] || $imap_server.split('.').pop(2).join('.')
-    @user     = "#{opts[:user] || ENV['USER']}@#{@domain}"
+    @user     = "#{opts[:user]}@#{@domain}"
     @password = opts[:password] || get_password
-    @folders  = Hash[(opts[:folders] || ['INBOX']).map{ |f| [f,Array.new] }]
+    @folders  = mbox_conf opts[:folders] || ['INBOX']
     @debug    = opts[:debug] || false
-    @max_mail = opts[:max] || MAX_MAIL
+    @max_mail = opts[:max]   || MAX_MAIL
+  end
+
+  private
+  def mbox_conf ary
+    Hash[ary.map{ |f| [f,Array.new] }]
+  end
+
+  def read_conf opts
+    file = File.expand_path("~/.imap_notifier")
+    return if ! File.exists? file
+    ensure_perms file
+    YAML.load(File.open(file)).each do |k,v|
+      opts[k.to_sym] ||= v
+    end
+    opts[:user] ||= ENV['USER']
+  end
+
+  def ensure_perms file
+    m =  sprintf("%o", File.stat(file).mode).split('').last(3).join().to_i
+    return if m.eql? 600
+    warn "#{file} permissions should be set to 600 #{m}"
+    exit 1
   end
 end

data/lib/imap_notifier/growler.rb

@@ -1,13 +1,16 @@
 require 'ruby-growl'
 
 class IMAP_Notifier::Alert < Growl
+  def self.remove
+  end
+
   def initialize
     super("localhost", ::IMAP_Notifier::VERSION)
   end
 
-  def alert(title, body)
+  def alert(body, opts={})
+    opts[:title] ||= self.class.name
     add_notification ::IMAP_Notifier::VERSION
-    notify ::IMAP_Notifier::VERSION, title, body
+    notify ::IMAP_Notifier::VERSION, opts[:title], body
   end
-
 end

data/lib/imap_notifier/notifier.rb

@@ -1,9 +1,13 @@
 require 'terminal-notifier'
 
 class IMAP_Notifier::Alert
-  include TerminalNotifier
+  def self.remove
+    return if (msgs = TerminalNotifier.list).nil?
+    msgs.map{ |a| TerminalNotifier.remove a[:group]  }
+  end
 
-  def alert(title,body)
-    notify(body, :title => title)
+  def alert(body, opts={})
+    opts[:title] ||= self.class.name
+    TerminalNotifier.notify(body, opts.merge({:sender => 'com.apple.Mail'}))
   end
 end

data/lib/imap_notifier/version.rb

@@ -1,3 +1,3 @@
 class IMAP_Notifier
-  VERSION='0.2.2'
+  VERSION='0.2.3'
 end

data/lib/imap_notifier.rb

@@ -6,11 +6,10 @@ require 'imap_notifier/version'
 require 'imap_notifier/config'
 require 'imap_notifier/base'
 
-
 MAX_MAIL    = 5 # Max new mails mentioned before they
                 # are grouped together
 SLEEP       = 30
-ERRFILE     = '/tmp/imap_notifier.err'
+ERRFILE     = File.expand_path('~/Desktop/imap_notifier.log')
 DEBUGFILE   = '/tmp/imap_notifier.debug'
 PIDFILE     = '/tmp/imap_notifier.pid'
 $imap_server = "imap.gmail.com" # could be anything with tweaks

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imap_notifier
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - David Campbell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-20 00:00:00.000000000 Z
+date: 2013-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -113,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='