popper 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4d3573cf92aaac10f752e63d0c82e3dad9201cd
-  data.tar.gz: 148797fb3219c862a66be540cab7fa4493fba856
+  metadata.gz: 95a2425b9e515ca0ee9d1aa86f438fce874368d6
+  data.tar.gz: ab1d06fb1f4b9cb9991cf0d016ff288dc2f7698e
 SHA512:
-  metadata.gz: c4f70fa38af7830fdc85d226f8dcb2a59b4f649433ca59ce61988615b272786131811a858acb759c59a2ef82aa99191d575ba9038534a957936e78ce0119f1d5
-  data.tar.gz: a95e921e1e04e8300cd61574704810d771589486aa1059a2ce8ea1c126c17874dfa420b5e9aee945d4b30c2eb296a82504b328b36862e2edb5971b79bbfb561b
+  metadata.gz: dbb98e0eb5f33a12c170d33caed4854482c08d83efa2a419bfcaea68c9eb5e2f4665c42d12f0c3b46e6f010a36b08a9f6d33058b777b5812e7c758e9bf44f3a0
+  data.tar.gz: edb360136ee5069d57bdec446914002865436f8c1b42a4c2a0ef76f9f5c8078250d7f75499b916cc206f7794789f268efc187f1bac9479ad9cd50826d8dacc6c

data/lib/popper.rb

@@ -8,9 +8,9 @@ require "popper/init"
 require "popper/sync"
 
 module Popper
-  def self.init_logger(options)
+  def self.init_logger(options, stdout=nil)
     log_path = options[:log] || File.join(Dir.home, "popper", "popper.log")
-    log_path = STDOUT if ENV["POPPER_TEST"]
+    log_path = STDOUT if ENV["POPPER_TEST"] || stdout
     @_logger = Logger.new(log_path)
   end
 

data/lib/popper/cli.rb

@@ -19,6 +19,7 @@ module Popper
     desc "prepop", "get current mailbox all uidl"
     def prepop
       Popper.load_config(options)
+      Popper.init_logger(options, true)
       Popper::Pop.prepop
     end
 

data/lib/popper/pop.rb

@@ -17,11 +17,11 @@ module Popper
     end
 
     def self.pop(account)
-      uidls = []
+      current_uidls = []
+      error_uidls = []
       Popper.log.info "start popper #{account.name}"
-
       connection(account) do |pop|
-        pop.mails.reject {|m| last_uidl(account.name).include?(m.uidl) }.each do |m|
+        pop.mails.reject {|m| current_uidls << m.uidl; last_uidl(account.name).include?(m.uidl) }.each do |m|
           begin
             mail = EncodeMail.new(m.mail)
             Popper.log.info "check mail:#{mail.date.to_s} #{mail.subject}"
@@ -29,14 +29,14 @@ module Popper
               Popper.log.info "do action:#{mail.subject}"
               Popper::Action::Git.run(account.action_by_rule(rule), mail) if account.action_by_rule(rule)
             end
-            uidls << m.uidl
-          rescue Net::POPError => e
+          rescue => e
+            error_uidls << m.uidl
             Popper.log.warn e
           end
         end
         Popper.log.info "success popper #{account.name}"
       end
-      uidls
+      current_uidls - error_uidls
     end
 
     def self.connection(account, &block)
@@ -75,14 +75,18 @@ module Popper
 
     def self.prepop
       Popper.configure.accounts.each do |account|
-        puts "start prepop #{account.name}"
+        Popper.log.info "start prepop #{account.name}"
         connection(account) do |pop|
-          uidls = pop.mails.map(&:uidl)
-          last_uidl(
-            account.name,
-            uidls
-          )
-          puts "success prepop #{account.name} mail count:#{uidls.count}"
+          begin
+            uidls = pop.mails.map(&:uidl)
+            last_uidl(
+              account.name,
+              uidls
+            )
+            Popper.log.info "success prepop #{account.name} mail count:#{uidls.count}"
+          rescue => e
+            Popper.log.warn  e
+          end
         end
       end
     end

data/lib/popper/version.rb

@@ -1,3 +1,3 @@
 module Popper
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: popper
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - pyama86
@@ -138,9 +138,6 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- coverage/.last_run.json
-- coverage/.resultset.json
-- coverage/.resultset.json.lock
 - exe/popper
 - lib/popper.rb
 - lib/popper/action.rb