imap_notifier 0.2.4 → 0.2.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    imap_notifier (0.2.4)
+    imap_notifier (0.2.5)
       highline
       ruby-growl
       terminal-notifier

data/README.md

@@ -7,7 +7,7 @@ If you're running Max OSX > 10.8, [terminal-notifier](https://github.com/alloy/t
 
 Setup
 --------
-Configure your .imap_notifier config file in your homedir or specific the flags via the command line.   Your config file must have permissions of 600, thus allowing you to put in your password if you so choose.  The config file is in YAML format and should be read in as a hash.
+Configure your .imap_notifier config file in your homedir or specific the flags via the command line.  Your config file must have permissions of 600, thus allowing you to put in your password if you so choose.  The config file is in YAML format and should be read in as a hash.
 
 
 Example ~/.imap_notifier file
@@ -23,6 +23,12 @@ Example ~/.imap_notifier file
     password: "1H@t3BuG$!"
     max: 10
 
+
+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.
+
+    key_name:    'keychain.name.com'
+    key_account: 'han.solo@keychain-account.com'
+
 Usage
 ---------
 

data/lib/imap_notifier/base.rb

@@ -66,11 +66,6 @@ class IMAP_Notifier
     exit
   end
 
-  private
-  def get_password(prompt="Enter Password: ")
-    ask(prompt) { |q| q.echo = false }
-  end
-
   def _imap
     imap = Net::IMAP.new(@imap_server, { :port => 993, :ssl => true } )
     imap.login(@user, @password)

data/lib/imap_notifier/config.rb

@@ -4,7 +4,13 @@ class IMAP_Notifier
     @imap_server = opts[:server] || IMAP_SERVER
     @domain      = opts[:domain] || @imap_server.split('.').pop(2).join('.')
     @user        = "#{opts[:user]}@#{@domain}"
-    @password    = opts[:password] || get_password
+    $key_name    = opts[:key_name] || false
+    $key_account = opts[:key_account] || false
+    if $key_name && $key_account
+      @password  = keychain_access || get_password
+    else
+      @password  = opts[:password] || get_password
+    end
     @folders     = mbox_conf opts[:folders] || ['INBOX']
     @debug       = opts[:debug] || false
     @max_mail    = opts[:max]   || MAX_MAIL
@@ -15,6 +21,25 @@ class IMAP_Notifier
     Hash[ary.map{ |f| [f,Array.new] }]
   end
 
+  private
+  def keychain_access
+    key = get_keychain
+    if key == ""
+      return nil
+    end
+    return key.chomp
+  end
+
+  private
+  def get_keychain
+    key = %x{security find-internet-password -w -a #{$key_account} -s #{$key_name}}
+  end
+
+  private
+  def get_password(prompt="Enter Password: ")
+    ask(prompt) { |q| q.echo = false }
+  end
+
   def read_conf opts
     file = File.expand_path("~/.imap_notifier")
     return if ! File.exists? file
@@ -32,3 +57,4 @@ class IMAP_Notifier
     exit 1
   end
 end
+

data/lib/imap_notifier/version.rb

@@ -1,3 +1,3 @@
 class IMAP_Notifier
-  VERSION='0.2.4'
+  VERSION='0.2.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imap_notifier
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1862814060607132887
+      hash: 726022834722288523
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23