popper 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7232ff188e9e7483abf67f901bac0066af3cf11
-  data.tar.gz: ce479bb8379e9cba23f98a91c7f08c644058409e
+  metadata.gz: 8aa57a97616a3885fc9216806fde0f78ce86bafa
+  data.tar.gz: 1611c6a9cfaa3d53569b589da0eed2c62ed7dd67
 SHA512:
-  metadata.gz: 537aa5adb32b996c1c3ad3a19f959219ac66e3f8d58e2306760cc2ea36f09a3ca425db32c3cf4a160965fb4fb4c6e6406ea90317b2d3bea2cbf3b60eea7a72ce
-  data.tar.gz: 38d5d81059b220718748d12a59e9abec2d804677dc078a007561eab02b09f8c89b21fd48b7687dabe6b72160c60b4c04948c5f985f1b1d69bfc85d3786353a8c
+  metadata.gz: fdf39038cf7116daebea81aa8d1fa5826e32f8610d7609bc5ef2590c18a3b5d96d6492141c1aacc82e4107ffd31441e478965c46e4482897a460d870db93d30c
+  data.tar.gz: 25f8a470266ef54f88706672cb50af61757e86a8ed000171b9e1f20cd70f8a2377e39f7ce98bc281060c2757ec7d424185efd1186ed98b9475f57e883b7910bf

data/lib/popper/action/base.rb

@@ -6,16 +6,14 @@ module Popper::Action
 
     def self.run(config, mail, params={})
       @action_config = config.send(self.action) if config.respond_to?(self.action)
-      if action?
-        begin
-          Popper.log.info "run action #{self.action}"
-          params = task(mail, params)
-          Popper.log.info "exit action #{self.action}"
-        rescue => e
-          Popper.log.warn e
-          Popper.log.warn e.backtrace
-        end
-      end
+      begin
+        Popper.log.info "run action #{self.action}"
+        params = task(mail, params)
+        Popper.log.info "exit action #{self.action}"
+      rescue => e
+        Popper.log.warn e
+        Popper.log.warn e.backtrace
+      end if action?
       next_run(config, mail, params)
     end
 

data/lib/popper/cli.rb

@@ -21,9 +21,15 @@ module Popper
       Popper.load_config(options)
 
       accounts = Popper.configure.accounts.map {|account| MailAccount.new(account)}
+      interval = case
+                 when Popper.configure.global.respond_to?(:interval)
+                   Popper.configure.global.interval
+                 else
+                   60
+                 end
       while true
         accounts.each(&:run)
-        sleep(60 || Popper.configure.global.interval)
+        sleep(interval)
       end
 
       rescue => e
@@ -33,7 +39,7 @@ module Popper
 
     class_option :config, type: :string, aliases: '-c'
     desc "print", "print configure"
-    def print 
+    def print
       Popper.load_config(options)
       Popper.configure.accounts.each do |account|
         print_config(account)
@@ -56,26 +62,30 @@ module Popper
 
     no_commands do
       def print_config(config)
-        puts config.name
         last_rule = nil
-        last_header = nil
-
-        config.rule_with_conditions_each do |rule,mail_header,condition|
-          puts " "*1 + "rule[#{rule}]" if rule != last_rule
-          puts " "*2 + "actions" if rule != last_rule
+        puts config.name
 
-          config.action_by_rule(rule).each_pair do |action,params|
-            puts " "*3 + "#{action}"
-            params.each_pair do |k,v|
-              puts " "*4 + "#{k} #{v}"
+        config.rules.to_h.keys.each do |rule|
+          config.condition_by_rule(rule).to_h.each do |mail_header,conditions|
+            if rule != last_rule
+              puts " "*1 + "rule[#{rule}]"
+              puts " "*2 + "actions"
+              print_action(config, rule)
             end
-          end if rule != last_rule
 
-          puts " "*2 + "header[#{mail_header}]"
-          puts " "*3 + "#{condition}"
+            puts " "*2 + "header[#{mail_header}]"
+            puts " "*3 + "#{conditions}"
+            last_rule = rule
+          end
+        end
+      end
 
-          last_rule = rule
-          last_header = mail_header
+      def print_action(config, rule)
+        config.action_by_rule(rule).each_pair do |action,params|
+          puts " "*3 + "#{action}"
+          params.each_pair do |k,v|
+            puts " "*4 + "#{k} #{v}"
+          end
         end
       end
     end

data/lib/popper/config.rb

@@ -66,22 +66,6 @@ module Popper
         AccountAttributes.new(hash)
       end
     end
-
-    def rule_with_conditions_all?(&block)
-      rules.to_h.keys.find do |rule|
-        condition_by_rule(rule).to_h.all? do |mail_header,conditions|
-          block.call(rule, mail_header, conditions)
-        end
-      end
-    end
-
-    def rule_with_conditions_each(&block)
-      rules.to_h.keys.each do |rule|
-        condition_by_rule(rule).to_h.each do |mail_header,conditions|
-          block.call(rule, mail_header, conditions)
-        end
-      end
-    end
   end
 
   def self.load_config(options)

data/lib/popper/mail_account.rb

@@ -51,8 +51,11 @@ module Popper
 
     def session_start(&block)
       pop = Net::POP3.new(@config.login.server, @config.login.port || 110)
-      pop.open_timeout = ENV['POP_TIMEOUT'] || 120
-      pop.read_timeout = ENV['POP_TIMEOUT'] || 120
+      %w(
+        open_timeout
+        read_timeout
+      ).each {|m| pop.instance_variable_set("@#{m}", ENV['POP_TIMEOUT'] || 120) }
+
       pop.start(
         @config.login.user,
         @config.login.password
@@ -69,9 +72,11 @@ module Popper
     end
 
     def match_rule?(mail)
-      @config.rule_with_conditions_all? do |rule, mail_header, conditions|
-        conditions.all? do |condition|
-          mail.respond_to?(mail_header) && mail.send(mail_header).to_s.match(/#{condition}/)
+      @config.rules.to_h.keys.find do |rule|
+        @config.condition_by_rule(rule).to_h.all? do |mail_header,conditions|
+          conditions.all? do |condition|
+            mail.respond_to?(mail_header) && mail.send(mail_header).to_s.match(/#{condition}/)
+          end
         end
       end
     end

data/lib/popper/version.rb

@@ -1,3 +1,3 @@
 module Popper
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: popper
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - pyama86