bcbiff 0.2.1 → 0.3.0

data/.gitignore

@@ -0,0 +1,17 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/Gemfile

@@ -1,11 +1,4 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
-gem "mail"
-
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
-end
+# Specify your gem's dependencies in bcbiff.gemspec
+gemspec

data/Gemfile.lock

@@ -1,21 +1,23 @@
+PATH
+  remote: .
+  specs:
+    bcbiff (0.3.0)
+      mail
+
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    git (1.2.5)
-    i18n (0.6.0)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-    mail (2.3.0)
+    i18n (0.6.1)
+    json (1.7.7)
+    mail (2.5.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
-    polyglot (0.3.2)
-    rake (0.9.2)
-    rcov (0.9.10)
-    treetop (1.4.10)
+    mime-types (1.21)
+    polyglot (0.3.3)
+    rdoc (3.12.1)
+      json (~> 1.4)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
 
@@ -23,7 +25,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.6.4)
-  mail
-  rcov
+  bcbiff!
+  bundler (>= 1.2)
+  rdoc (> 2.4.2)

data/Rakefile

@@ -1,65 +1 @@
-# encoding: utf-8
-
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  eval File.read('./lib/bcbiff.rb').lines.find { |line|
-    /BCBIFF_VERSION/ =~ line
-  } if !defined?(BCBIFF_VERSION)
-
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "bcbiff"
-  gem.homepage = "http://github.com/knu/bcbiff"
-  gem.license = "2-clause BSDL"
-  gem.summary = %Q{bcbiff(1) - Boxcar based IMAP biff}
-  gem.description = <<-'EOS'
-Bcbiff checks the Inbox folder on an IMAP server for unread mails and
-sends a notification for each.  Ideal for enabling push notification
-for your Gmail account using Boxcar.
-  EOS
-  gem.email = "knu@idaemons.org"
-  gem.authors = ["Akinori MUSHA"]
-  gem.executables = ["bcbiff"]
-  gem.version = BCBIFF_VERSION
-
-  gem.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-  test.rcov_opts << '--exclude "gems/*"'
-end
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "bcbiff #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require 'bundler/gem_tasks'

data/bcbiff.gemspec

@@ -1,59 +1,37 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+eval File.read(
+  File.expand_path('../lib/bcbiff.rb', __FILE__)
+).lines.find { |line|
+  /BCBIFF_VERSION/ =~ line
+} if !defined?(BCBIFF_VERSION)
 
-Gem::Specification.new do |s|
-  s.name = "bcbiff"
-  s.version = "0.2.1"
+Gem::Specification.new do |gem|
+  gem.name          = "bcbiff"
+  gem.version       = BCBIFF_VERSION
+  gem.authors       = ["Akinori MUSHA"]
+  gem.email         = ["knu@idaemons.org"]
+  gem.homepage      = "https://github.com/knu/bcbiff"
+  gem.licenses      = ["2-clause BSDL"]
+  gem.description   = <<'EOS'
+Bcbiff checks the Inbox folder on an IMAP server for unread mails and
+sends a notification for each.  Ideal for enabling push notification
+for your Gmail account using Boxcar.
+EOS
+  gem.summary       = %q{bcbiff(1) - Boxcar based IMAP biff}
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Akinori MUSHA"]
-  s.date = "2011-09-26"
-  s.description = "Bcbiff checks the Inbox folder on an IMAP server for unread mails and\nsends a notification for each.  Ideal for enabling push notification\nfor your Gmail account using Boxcar.\n"
-  s.email = "knu@idaemons.org"
-  s.executables = ["bcbiff"]
-  s.extra_rdoc_files = [
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ["lib"]
+
+  gem.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
   ]
-  s.files = [
-    ".document",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "bcbiff.gemspec",
-    "bin/bcbiff",
-    "lib/bcbiff.rb"
-  ]
-  s.homepage = "http://github.com/knu/bcbiff"
-  s.licenses = ["2-clause BSDL"]
-  s.require_paths = ["lib"]
-  s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
-  s.rubygems_version = "1.8.10"
-  s.summary = "bcbiff(1) - Boxcar based IMAP biff"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mail>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-    else
-      s.add_dependency(%q<mail>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<mail>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-  end
+  gem.add_runtime_dependency("mail", [">= 0"])
+  gem.add_development_dependency("rdoc", ["> 2.4.2"])
+  gem.add_development_dependency("bundler", [">= 1.2"])
 end
-

data/lib/bcbiff.rb

@@ -3,7 +3,7 @@
 #
 # bcbiff(1) - Boxcar based IMAP biff
 #
-# Copyright (c) 2011 Akinori MUSHA
+# Copyright (c) 2011, 2012 Akinori MUSHA
 #
 # All rights reserved.
 #
@@ -28,13 +28,19 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 
+if defined?(Encoding)
+  Encoding.default_external = Encoding::UTF_8
+else
+  $KCODE = 'u'
+end
+
 require 'rubygems'
 require 'net/imap'
 require 'yaml'
 require 'mail'
 require 'shellwords'
 
-BCBIFF_VERSION = '0.2.1'
+BCBIFF_VERSION = '0.3.0'
 
 CERTS_PATHS   = [
   '/etc/ssl/cert.pem',		# FreeBSD
@@ -47,6 +53,7 @@ CERTS_PATH   = CERTS_PATHS.find { |f| File.exist?(f) }
 IDCACHE_FILE = '~/Maildir/idcache.%s.yml'
 IDCACHE_SIZE = 100
 BCBIFF_FILE  = '~/.bcbiff'
+ADDRESSES_FILE = '~/.addresses'
 
 def main(argv)
   accounts = config[:accounts]
@@ -79,6 +86,8 @@ Then add `:certs_path: /path/to/pem` to #{BCBIFF_FILE}.
     exit 1
   end
 
+  read_addresses
+
   accounts.each { |options|
     check_mails(options)
   }
@@ -121,6 +130,34 @@ def certs_path
   $certs_path ||= config[:certs_path] || CERTS_PATH
 end
 
+def read_addresses
+  $display_address = {}
+
+  begin
+    content = File.read(ADDRESSES_FILE)
+  rescue
+    return
+  end
+
+  content.each_line { |line|
+    line.chomp!
+    address, nickname, fullname = line.split("\t").map { |field|
+      if m = field.match(/\A"(.*)"\z/)
+        m[1].gsub(/\\(.)/, "\\1")
+      else
+        field
+      end
+    }
+    begin
+      addr = Mail::Address.new(address)
+      addr.display_name = nickname
+      $display_address[address.downcase] = addr.to_s
+    rescue
+    end
+  }
+rescue
+end
+
 def check_mails(options)
   #Net::IMAP.debug = true
   mailto = options[:mailto]
@@ -146,8 +183,8 @@ def check_mails(options)
         next if msgids.include?(msgid)
         msgids << msgid
 
-        (header = mail.header).fields.each { |field|
-          case name = field.name
+        (header = mail.header).fields.map(&:name).each { |name|
+          case name
           when /\A(From|Subject|Date)\z/i
             # preserve
           else
@@ -155,9 +192,18 @@ def check_mails(options)
           end
         }
 
-        open("| sendmail #{mailto.shellescape}", 'w') { |sendmail|
-          sendmail.print mail.encoded
-        }
+        mail.from = mail[:from].field.addrs.map { |addr|
+          $display_address[addr.address.downcase] || addr.to_s
+        }.join(', ')
+
+        begin
+          encoded = mail.encoded
+          open("| sendmail #{mailto.shellescape}", 'w') { |sendmail|
+            sendmail.print encoded
+          }
+        rescue => e
+          STDERR.puts "%s: %s" % [msgid, e.message]
+        end
       }
     }
     msgids.slice!(0...-IDCACHE_SIZE) if msgids.size > IDCACHE_SIZE

metadata

@@ -1,97 +1,83 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bcbiff
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 0.3.0
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 1
-  version: 0.2.1
 platform: ruby
-authors: 
+authors:
 - Akinori MUSHA
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-26 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id001
+date: 2013-02-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mail
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  version_requirements: *id002
-  name: bundler
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
-        version: 1.6.4
-  version_requirements: *id003
-  name: jeweler
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id004
-  name: rcov
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: 2.4.2
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: 2.4.2
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :development
-description: |
-  Bcbiff checks the Inbox folder on an IMAP server for unread mails and
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
+description: ! 'Bcbiff checks the Inbox folder on an IMAP server for unread mails
+  and
+
   sends a notification for each.  Ideal for enabling push notification
+
   for your Gmail account using Boxcar.
 
-email: knu@idaemons.org
-executables: 
+'
+email:
+- knu@idaemons.org
+executables:
 - bcbiff
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
+files:
 - .document
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -100,40 +86,29 @@ files:
 - bcbiff.gemspec
 - bin/bcbiff
 - lib/bcbiff.rb
-homepage: http://github.com/knu/bcbiff
-licenses: 
+homepage: https://github.com/knu/bcbiff
+licenses:
 - 2-clause BSDL
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
-      version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: bcbiff(1) - Boxcar based IMAP biff
 test_files: []
-