popper 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f134c1ecc38ef413d655eceaa8c8598388514446
-  data.tar.gz: 4987a54a2cc1d8e8723305513e005a8acc5dc16b
+  metadata.gz: 3bf4501b5c03655837fa6f91f609315df3577a21
+  data.tar.gz: cc12464e2003de2852826154f3c978f692421e00
 SHA512:
-  metadata.gz: 2ef7fa0af414c50b957133212e47e3bdd327764bb98d4fe4f32cef227de5cf93b0f3c0bda116df1904b77e00194b6bc2655d5fb5de6ef8da9330338b076df9f3
-  data.tar.gz: ff7366f6119d72d7c04f6fa79f7da5d716bf83a0e14f7d374bcb045ebb3289cc3b72b5b086e8afa3b665c8114dfa8d4fd5f147eff3b1f325e3fe3410e53d2854
+  metadata.gz: eb915ab4ce61eb8bc11353c848639fa953d41ce85608830696505dee7ebced3602325ee88b3dc2ac5ba1d35e82562b70241582d3cbeb2e9261875a44aaa97e9d
+  data.tar.gz: 61a374239c807012c5ff25c137e7237d590cb47f7e63cb9e746af2a5d5f82ac5d56edb8f982f70def8135c9ea3599fdbad23704cd6028de0ff7d307c0e73fdc7

data/README.md

@@ -7,6 +7,7 @@
 To post a variety of services by analyzing the email
 * slack notification
 * create issue to github.com or ghe
+* exec arbitrary commands
 
 # install
   $ gem install popper
@@ -30,7 +31,6 @@ systmd service config: https://github.com/pyama86/popper/tree/master/init_script
 ## ~/popper/popper.conf
 ```
 include = ["/etc/popper/*.conf"]
-[global]
 interval = 60         # fetch interbal default:60
 
 [default.condition]
@@ -74,9 +74,11 @@ mentions = ["@user"]
 message = "webmailer error mail"
 
 [example.rules.normal_log.action.git]
-
 repo = "example/fuu"
 
+[example.rules.normal_log.action.exec_cmd]
+repo = "/path/to/other_command.rb"
+
 [example2.login]
 user = "example2@example.com"
 ...

data/lib/popper/action.rb

@@ -1,6 +1,7 @@
 module Popper::Action
-  autoload :Base,  "popper/action/base"
-  autoload :Slack, "popper/action/slack"
-  autoload :Ghe,   "popper/action/ghe"
-  autoload :Git,   "popper/action/git"
+  autoload :Base,    "popper/action/base"
+  autoload :Slack,   "popper/action/slack"
+  autoload :Ghe,     "popper/action/ghe"
+  autoload :Git,     "popper/action/git"
+  autoload :ExecCmd, "popper/action/exec_cmd"
 end

data/lib/popper/action/base.rb

@@ -1,19 +1,18 @@
 module Popper::Action
   class Base
     @next_action = nil
-    @action = nil
     @action_config = nil
 
     def self.run(config, mail, params={})
-      @action_config = config.send(self.action) if config.respond_to?(self.action)
+      @action_config = config.send(action_name) if config.respond_to?(action_name)
       begin
-        Popper.log.info "run action #{self.action}"
+        Popper.log.info "run action #{action_name}"
         params = task(mail, params)
-        Popper.log.info "exit action #{self.action}"
+        Popper.log.info "exit action #{action_name}"
       rescue => e
         Popper.log.warn e
         Popper.log.warn e.backtrace
-      end if action?
+      end if do_action?
       next_run(config, mail, params)
     end
 
@@ -22,18 +21,20 @@ module Popper::Action
       @next_action
     end
 
-    def self.action(action=nil)
-      @action = action if action
-      @action
-    end
-
     def self.next_run(config, mail, params={})
       @next_action.run(config, mail, params) if @next_action
     end
 
-    def self.action?
+    def self.do_action?
       @action_config && check_params
     end
+
+    def self.action_name
+      self.name.split('::').last.downcase.to_sym
+    end
+
+
+
     def self.check_params; end
   end
 end

data/lib/popper/action/exec_cmd.rb

@@ -0,0 +1,18 @@
+module Popper::Action
+  class ExecCmd < Base
+    def self.task(mail, params={})
+      system(@action_config.cmd, mail.subject, mail.utf_body)
+      params
+    end
+
+    def self.check_params
+      @action_config.respond_to?(:cmd)
+    end
+
+    def self.action_name
+      :exec_cmd
+    end
+
+    next_action(Git)
+  end
+end

data/lib/popper/action/ghe.rb

@@ -16,6 +16,5 @@ module Popper::Action
     end
 
     next_action(Slack)
-    action(:ghe)
   end
 end

data/lib/popper/action/git.rb

@@ -8,7 +8,7 @@ module Popper::Action
         mail.subject,
         mail.utf_body
       )
-      params["#{self.action}_url".to_sym] = url[:html_url] if url
+      params["#{action_name}_url".to_sym] = url[:html_url] if url
       params
     end
 
@@ -23,6 +23,5 @@ module Popper::Action
     end
 
     next_action(Ghe)
-    action(:git)
   end
 end

data/lib/popper/action/slack.rb

@@ -32,6 +32,5 @@ module Popper::Action
       @action_config.respond_to?(:webhook_url)
     end
 
-    action(:slack)
   end
 end

data/lib/popper/cli.rb

@@ -20,16 +20,13 @@ 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
+      accounts = Popper.configure.accounts.map do |account|
+        MailAccount.new(account)
+      end.compact
+
       while true
         accounts.each(&:run)
-        sleep(interval)
+        sleep(Popper.configure.interval)
       end
 
       rescue => e

data/lib/popper/config.rb

@@ -3,45 +3,56 @@ require 'ostruct'
 require 'logger'
 module Popper
   class Config
-    attr_reader :global, :default, :accounts
+    attr_reader :default, :accounts, :interval
     def initialize(config_path)
       raise "configure not fond #{config_path}" unless File.exist?(config_path)
-      config = TOML.load_file(config_path)
-      if config.key?("include")
-        content = config["include"].map {|p| Dir.glob(p).map {|f|File.read(f)}}.join("\n")
-        config.delete("include")
-        config.deep_merge!(TOML::Parser.new(content).parsed)
-      end
-
-      @global  = AccountAttributes.new(config["global"]) if config["global"]
-      @default = AccountAttributes.new(config["default"]) if config["default"]
-      @accounts = []
+      config = read_file(config_path)
 
-      config.select {|k,v| !%w(default global).include?(k) }.each do |account|
+      @interval = config.key?("interval") ? config["interval"].to_i : 60
+      @default = config["default"] if config["default"]
+      @accounts = config.select {|k,v| v.is_a?(Hash) && v.key?("login") }.map do |account|
         _account = AccountAttributes.new(account[1])
         _account.name = account[0]
-        self.accounts << _account
+        _account
       end
     end
 
+    def read_file(file)
+      config = TOML.load_file(file)
+      if config.key?("include")
+        content = config["include"].map {|p| Dir.glob(p).map {|f|File.read(f)}}.join("\n")
+        config.deep_merge!(TOML::Parser.new(content).parsed)
+      end
+      config
+    end
+
+    %w(
+      condition
+      action
+    ).each do |name|
+      define_method("default_#{name}") {
+        begin
+          default[name]
+        rescue
+          {}
+        end
+      }
+    end
   end
 
   class AccountAttributes < OpenStruct
     def initialize(hash=nil)
       @table = {}
-      @hash_table = {}
+      @hash = hash
 
-      if hash
-        hash.each do |k,v|
-          @table[k.to_sym] = (v.is_a?(Hash) ? self.class.new(v) : v)
-          @hash_table[k.to_sym] = v
-          new_ostruct_member(k)
-        end
-      end
+      hash.each do |k,v|
+        @table[k.to_sym] = (v.is_a?(Hash) ? self.class.new(v) : v)
+        new_ostruct_member(k)
+      end if hash
     end
 
     def to_h
-      @hash_table
+      @hash
     end
 
     [
@@ -49,7 +60,7 @@ module Popper
       %w(each each),
     ].each do |arr|
       define_method("rule_with_conditions_#{arr[0]}") do |&blk|
-        self.rules.to_h.keys.send(arr[0]) do |rule|
+        @hash["rules"].keys.send(arr[0]) do |rule|
           self.condition_by_rule(rule).to_h.send(arr[1]) do |mail_header,conditions|
             blk.call(rule, mail_header, conditions)
           end
@@ -61,32 +72,33 @@ module Popper
       condition
       action
     ).each do |name|
-      define_method("global_default_#{name}") {
-        begin
-          Popper.configure.default.send(name).to_h
-        rescue
-          {}
-        end
-      }
-
       define_method("account_default_#{name}") {
         begin
-          self.default.send(name).to_h
+          @hash["default"][name]
         rescue
           {}
         end
       }
 
-      # merge global default and account default
+      # merge default and account default
       define_method("#{name}_by_rule") do |rule|
-        hash = self.send("global_default_#{name}")
-        hash = hash.deep_merge(self.send("account_default_#{name}").to_h) if self.send("account_default_#{name}")
-        hash = hash.deep_merge(self.rules.send(rule).send(name).to_h) if rules.send(rule).respond_to?(name.to_sym)
+        hash = Popper.configure.send("default_#{name}")
+        hash = hash.deep_merge(self.send("account_default_#{name}")) if self.send("account_default_#{name}")
+        hash = hash.deep_merge(rule_by_name(rule)[name]) if rule_by_name(rule).key?(name)
 
         # replace body to utf_body
         AccountAttributes.new(Hash[hash.map {|k,v| [k.to_s.gsub(/^body$/, "utf_body").to_sym, v]}])
       end
     end
+
+    def rule_by_name(name)
+      begin
+        @hash["rules"][name]
+      rescue
+        {}
+      end
+    end
+
   end
 
   def self.load_config(options)

data/lib/popper/init.rb

@@ -12,7 +12,6 @@ module Popper
 
     def self.sample_config
       <<-EOS
-[global]
 interval = 60         # fetch interbal default:60
 
 [default.condition]

data/lib/popper/mail_account.rb

@@ -28,15 +28,7 @@ module Popper
 
       process_uidl_list(conn).each do |m|
         begin
-          mail = EncodeMail.new(m.mail)
-          Popper.log.info "check mail:#{mail.date.to_s} #{mail.subject}"
-
-          if rule = match_rule?(mail)
-            Popper.log.info "do action:#{mail.subject}"
-            Popper::Action::Git.run(config.action_by_rule(rule), mail) if config.action_by_rule(rule)
-          end
-          done_uidls << m.uidl
-
+          done_uidls << check_and_action(m)
         rescue Net::POPError => e
           self.complete_list += done_uidls
           Popper.log.warn "pop err write uidl"
@@ -51,25 +43,42 @@ module Popper
       Popper.log.info "success popper #{config.name}"
     end
 
+    def check_and_action(m)
+      mail = EncodeMail.new(m.mail)
+      Popper.log.info "check mail:#{mail.date.to_s} #{mail.subject}"
+      if rule = match_rule?(mail)
+        Popper.log.info "do action:#{mail.subject}"
+        Popper::Action::ExecCmd.run(config.action_by_rule(rule), mail) if config.action_by_rule(rule)
+      end
+
+      m.uidl
+    end
+
     def session_start(&block)
       pop = Net::POP3.new(config.login.server, config.login.port || 110)
-      pop.enable_ssl if config.login.respond_to?(:ssl) && config.login.ssl
-
-      %w(
-        open_timeout
-        read_timeout
-      ).each {|m| pop.instance_variable_set("@#{m}", ENV['POP_TIMEOUT'] || 120) }
+      pop = set_pop_option(pop)
 
       pop.start(
         config.login.user,
         config.login.password
-      ) do |pop|
+      ) do |conn|
         Popper.log.info "connect server #{config.name}"
-        block.call(pop)
+        block.call(conn)
         Popper.log.info "disconnect server #{config.name}"
       end
     end
 
+    def set_pop_option(pop)
+      pop.enable_ssl if config.login.respond_to?(:ssl) && config.login.ssl
+      %w(
+        open_timeout
+        read_timeout
+      ).each do |m|
+        pop.instance_variable_set("@#{m}", ENV['POP_TIMEOUT'] || 120)
+      end
+      pop
+    end
+
     def process_uidl_list(conn)
       uidl_list = current_list - complete_list
       conn.mails.select {|_m|uidl_list.include?(_m.uidl)}

data/lib/popper/version.rb

@@ -1,3 +1,3 @@
 module Popper
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: popper
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - pyama86
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-01 00:00:00.000000000 Z
+date: 2016-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -143,6 +143,7 @@ files:
 - lib/popper.rb
 - lib/popper/action.rb
 - lib/popper/action/base.rb
+- lib/popper/action/exec_cmd.rb
 - lib/popper/action/ghe.rb
 - lib/popper/action/git.rb
 - lib/popper/action/slack.rb
@@ -172,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: email notification tool