popper 0.1.8 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e3e80b9450b5e0a70fca15e4abc2dc3a39e11e9
-  data.tar.gz: 82a664876f10f85daa0ae18dbf42445b1730d498
+  metadata.gz: 4c3c075a3c44288b2c8f7ed3e5dd890ef946f2bd
+  data.tar.gz: b60b17cfa8c19e4fda90dd8d6ab9639072744fb6
 SHA512:
-  metadata.gz: 4770a0411386ba1857f7b32c5675f0c84c5a99b3b3d83592e2913ec3efb5b07f6c950b73de69f8c676f8e32cdbbe43aab4b0bbbcad8c82726a43dd2151c44b13
-  data.tar.gz: 9117907fa16d7c0592106b3af4bd887b5591d669feaeb12d0ad465fde7604db66f79aef21f0b05f8260dd1e4de93d1e876ff2d33e40f2c2fe8fd994adb0bc79e
+  metadata.gz: 15c20311b6c773f3744f99c7909dbda33a3df4cca2dd2b49fac0af3196e65426494ff70ee18828ceca365af157dd492d174c315004bb4f0b9e280636cc6dd5b9
+  data.tar.gz: b8abc1581a23478b5806580dcce98660c9135d7da6e08bf90b21c1e198504019b666983d525f3c49a145714c06e42db7d581b8bdb556d6f3140c6a15d9b58437

data/README.md

@@ -13,26 +13,25 @@ To post a variety of services by analyzing the email
 
 # usage
 ```
-  # create ~/popper/popper.conf
+  # create /etc/popper.conf
   $ popper init
 
   # edit popper.conf
-  $ vi ~/popper/popper.conf
+  $ vi /etc/popper.conf
 
-  # pop uidl prefetch
-  # to avoid duplication and to fetch the uidl
-  $ popper prepop
+  # print config
+  $ popper print
 
-  $ popper
-```
-`crontab -l`
-```
-* * * * * /path/to/popper
+  $ popper --daemon --config /etc/popper.conf --log /var/log/popper.log --pidfile /var/run/popper/popper.pid
 ```
+systmd service config: https://github.com/pyama86/popper/tree/master/init_script/cent7/etc/systemd/system/popper.service
 
 # configure(toml)
 ## ~/popper/popper.conf
 ```
+[global]
+interval = 60         # fetch interbal default:60
+
 [default.condition]
 
 subject = ["^(?!.*Re:).+$"]
@@ -82,8 +81,12 @@ user = "example2@example.com"
 ```
 
 # option
-* config_file `--config or -c`
-* log_file(default=/var/log/popper.log) `--log or -l`
+```
+  -c, [--config=CONFIG]
+  -l, [--log=LOG]
+  -d, [--daemon], [--no-daemon]
+  -p, [--pidfile=PIDFILE]
+```
 
 # author
 * pyama

data/init_script/cent7/etc/systemd/system/popper.service

@@ -0,0 +1,17 @@
+[Unit]
+Description=Popper
+Requires=network.target
+After=network.target
+
+[Service]
+Type=forking
+User=root
+
+Restart=always
+RestartSec=120
+
+ExecStart=/usr/local/bin/popper --daemon --config /etc/popper.conf --log /var/log/popper.log --pidfile /var/run/popper/popper.pid
+PIDFile=/var/run/popper/popper.pid
+
+[Install]
+WantedBy=multi-user.target

data/lib/popper.rb

@@ -1,17 +1,18 @@
 require 'pp'
 require "popper/version"
 require "popper/cli"
-require 'popper/pop'
+require 'popper/mail_account'
 require "popper/config"
 require "popper/action"
 require "popper/init"
-require "popper/sync"
 
 module Popper
   def self.init_logger(options, stdout=nil)
-    log_path = options[:log] || File.join(Dir.home, "popper", "popper.log")
+    log_path = options[:log] || "/var/log/popper.log"
     log_path = STDOUT if ENV["POPPER_TEST"] || stdout
     @_logger = Logger.new(log_path)
+  rescue => e
+    puts e
   end
 
   def self.log

data/lib/popper/action/base.rb

@@ -2,14 +2,14 @@ module Popper::Action
   class Base
     @next_action = nil
     @action = nil
-    @_config = nil
+    @action_config = nil
 
     def self.run(config, mail, params={})
-      set_config(config)
+      @action_config = config.send(self.action) if config.respond_to?(self.action)
       if action?
         begin
           Popper.log.info "run action #{self.action}"
-          params = task(config, mail, params)
+          params = task(mail, params)
           Popper.log.info "exit action #{self.action}"
         rescue => e
           Popper.log.warn e
@@ -34,17 +34,8 @@ module Popper::Action
     end
 
     def self.action?
-      my_config && check_params
+      @action_config && check_params
     end
-
-    def self.set_config(config)
-      @_config = config.send(self.action) if config.respond_to?(self.action)
-    end
-
-    def self.my_config
-      @_config
-    end
-
-    def self.check_params(config); end
+    def self.check_params; end
   end
 end

data/lib/popper/action/ghe.rb

@@ -5,14 +5,14 @@ module Popper::Action
     def self.octkit
       Octokit.reset!
       Octokit.configure do |c|
-        c.web_endpoint = my_config.url
-        c.api_endpoint = File.join(my_config.url, "api/v3")
+        c.web_endpoint = @action_config.url
+        c.api_endpoint = File.join(@action_config.url, "api/v3")
       end
-      Octokit::Client.new(:access_token => my_config.token)
+      Octokit::Client.new(:access_token => @action_config.token)
     end
 
     def self.check_params
-      my_config.respond_to?(:url) && super
+      @action_config.respond_to?(:url) && super
     end
 
     next_action(Slack)

data/lib/popper/action/git.rb

@@ -2,9 +2,9 @@
 require 'octokit'
 module Popper::Action
   class Git < Base
-    def self.task(config, mail, params={})
+    def self.task(mail, params={})
       url = octkit.create_issue(
-        my_config.repo,
+        @action_config.repo,
         mail.subject,
         mail.body
       )
@@ -14,12 +14,12 @@ module Popper::Action
 
     def self.octkit
       Octokit.reset!
-      Octokit::Client.new(:access_token => my_config.token)
+      Octokit::Client.new(:access_token => @action_config.token)
     end
 
     def self.check_params
-      my_config.respond_to?(:repo) &&
-      my_config.respond_to?(:token)
+      @action_config.respond_to?(:repo) &&
+      @action_config.respond_to?(:token)
     end
 
     next_action(Ghe)

data/lib/popper/action/slack.rb

@@ -1,11 +1,11 @@
 require 'slack-notifier'
 module Popper::Action
   class Slack < Base
-    def self.task(config, mail, params={})
+    def self.task(mail, params={})
       notifier = ::Slack::Notifier.new(
-        my_config.webhook_url,
-        channel: my_config.channel,
-        username: my_config.user || 'popper',
+        @action_config.webhook_url,
+        channel: @action_config.channel,
+        username: @action_config.user || 'popper',
         link_names: 1
       )
 
@@ -15,8 +15,8 @@ module Popper::Action
         color: "good"
       }
 
-      body = my_config.message || "popper mail notification"
-      body += " #{my_config.mentions.join(" ")}" if my_config.mentions
+      body = @action_config.message || "popper mail notification"
+      body += " #{@action_config.mentions.join(" ")}" if @action_config.mentions
       %w(
         git
         ghe
@@ -28,8 +28,8 @@ module Popper::Action
     end
 
     def self.check_params
-      my_config.respond_to?(:channel) &&
-      my_config.respond_to?(:webhook_url)
+      @action_config.respond_to?(:channel) &&
+      @action_config.respond_to?(:webhook_url)
     end
 
     action(:slack)

data/lib/popper/cli.rb

@@ -5,22 +5,39 @@ module Popper
   class CLI < Thor
     class_option :config, type: :string, aliases: '-c'
     class_option :log, type: :string, aliases: '-l'
+    class_option :daemon, type: :boolean, aliases: '-d'
+    class_option :pidfile, type: :string, aliases: '-p'
     default_task :pop
     desc "pop", "from pop3"
     def pop
+      if(options[:daemon])
+        Popper.init_logger(options)
+        Process.daemon
+        open(options[:pidfile] || "/var/run/popper.pid" , 'w') {|f| f << Process.pid}
+      else
+        Popper.init_logger(options, true)
+      end
+
       Popper.load_config(options)
-      Popper.init_logger(options)
-      Popper::Pop.run
+
+      accounts = Popper.configure.accounts.map {|account| MailAccount.new(account)}
+      while true
+        accounts.each(&:run)
+        sleep(60 || Popper.configure.global.interval)
+      end
+
       rescue => e
         Popper.log.fatal(e)
         Popper.log.fatal(e.backtrace)
     end
 
-    desc "prepop", "get current mailbox all uidl"
-    def prepop
+    class_option :config, type: :string, aliases: '-c'
+    desc "print", "print configure"
+    def print 
       Popper.load_config(options)
-      Popper.init_logger(options, true)
-      Popper::Pop.prepop
+      Popper.configure.accounts.each do |account|
+        print_config(account)
+      end
     end
 
     desc "init", "create home dir"
@@ -36,5 +53,32 @@ module Popper
     def __print_version
       puts "Popper version:#{Popper::VERSION}"
     end
+
+    no_commands do
+      def print_config(config)
+        puts config.name
+        last_rule = nil
+        last_header = nil
+
+        config.rule_with_conditions_all? do |rule,mail_header,condition|
+          puts " "*1 + "rule[#{rule}]" if rule != last_rule
+          puts " "*2 + "actions" if rule != last_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 if rule != last_rule
+
+          puts " "*2 + "header[#{mail_header}]" if mail_header != last_header
+          puts " "*3 + "#{condition}"
+
+          last_rule = rule
+          last_header = mail_header
+          true
+        end
+      end
+    end
   end
 end

data/lib/popper/config.rb

@@ -3,15 +3,16 @@ require 'ostruct'
 require 'logger'
 module Popper
   class Config
-    attr_reader :default, :accounts
+    attr_reader :global, :default, :accounts
     def initialize(config_path)
       raise "configure not fond #{config_path}" unless File.exist?(config_path)
 
       config = TOML.load_file(config_path)
+      @global  = AccountAttributes.new(config["global"]) if config["global"]
       @default = AccountAttributes.new(config["default"]) if config["default"]
       @accounts = []
 
-      config.select {|k,v| !%w(default).include?(k) }.each do |account|
+      config.select {|k,v| !%w(default global).include?(k) }.each do |account|
         _account = AccountAttributes.new(account[1])
         _account.name = account[0]
         @accounts << _account
@@ -66,11 +67,17 @@ module Popper
       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
   end
 
   def self.load_config(options)
-    config_path = options[:config] || File.join(Dir.home, "popper", "popper.conf")
+    config_path = options[:config] || "/etc/popper.conf"
     @_config = Config.new(config_path)
   end
 

data/lib/popper/init.rb

@@ -1,18 +1,20 @@
 module Popper
   class Init
     def self.run(options)
-      dirname = options[:config] || File.join(Dir.home, "popper")
-      unless FileTest.exist?(dirname)
-        FileUtils.mkdir_p(dirname)
-        open("#{dirname}/popper.conf","w") do |e|
+      filename = options[:config] || "/etc/popper.conf"
+      unless FileTest.exist?(filename)
+        open(filename,"w") do |e|
           e.puts sample_config
-        end if FileTest.exist?(dirname)
-        puts "create directry ~/popper"
+        end
+        puts "create sample config #{filename}"
       end
     end
 
     def self.sample_config
       <<-EOS
+[global]
+interval = 60         # fetch interbal default:60
+
 [default.condition]
 subject = ["^(?!.*Re:).+$"]
 

data/lib/popper/mail_account.rb

@@ -0,0 +1,100 @@
+require 'net/pop'
+require 'mail'
+require 'kconv'
+
+module Popper
+  class MailAccount
+    def initialize(config)
+      @config = config
+    end
+
+    def run
+      session_start do |conn|
+        @current_uidl_list = conn.mails.map(&:uidl)
+        @complete_uidl_list = @current_uidl_list unless @complete_uidl_list
+        pop(conn)
+      end
+      rescue => e
+        Popper.log.warn e
+    end
+
+    def pop(conn)
+      done_uidls = []
+      error_uidls = []
+
+      Popper.log.info "start popper #{@config.name}"
+
+      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
+
+        rescue Net::POPError => e
+          @complete_uidl_list += done_uidls
+          Popper.log.warn "pop err write uidl"
+          return
+        rescue => e
+          error_uidls << m.uidl
+          Popper.log.warn e
+        end
+      end
+
+      @complete_uidl_list = @current_uidl_list - error_uidls
+      Popper.log.info "success popper #{@config.name}"
+    end
+
+    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
+      pop.start(
+        @config.login.user,
+        @config.login.password
+      ) do |pop|
+        Popper.log.info "connect server #{@config.name}"
+        block.call(pop)
+        Popper.log.info "disconnect server #{@config.name}"
+      end
+    end
+
+    def process_uidl_list(conn)
+      uidl_list = @current_uidl_list - @complete_uidl_list
+      conn.mails.select {|_m|uidl_list.include?(_m.uidl)}
+    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}/)
+        end
+      end
+    end
+  end
+end
+
+class ::Hash
+  def deep_merge(second)
+    merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : Array === v1 && Array === v2 ? v1 | v2 : [:undefined, nil, :nil].include?(v2) ? v1 : v2 }
+    self.merge(second.to_h, &merger)
+  end
+
+  def deep_merge!(second)
+    self.merge!(deep_merge(second))
+  end
+end
+
+class EncodeMail < Mail::Message
+  def subject
+    Kconv.toutf8(self[:Subject].value) if self[:Subject]
+  end
+
+  def body
+    super.decoded.encode("UTF-8", self.charset)
+  end
+end

data/lib/popper/version.rb

@@ -1,3 +1,3 @@
 module Popper
-  VERSION = "0.1.8"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: popper
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - pyama86
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -139,6 +139,7 @@ files:
 - bin/console
 - bin/setup
 - exe/popper
+- init_script/cent7/etc/systemd/system/popper.service
 - lib/popper.rb
 - lib/popper/action.rb
 - lib/popper/action/base.rb
@@ -148,8 +149,7 @@ files:
 - lib/popper/cli.rb
 - lib/popper/config.rb
 - lib/popper/init.rb
-- lib/popper/pop.rb
-- lib/popper/sync.rb
+- lib/popper/mail_account.rb
 - lib/popper/version.rb
 - popper.gemspec
 homepage: http://ten-snapon.com

data/lib/popper/pop.rb

@@ -1,125 +0,0 @@
-require 'net/pop'
-require 'mail'
-require 'kconv'
-module Popper
-  class Pop
-    def self.run
-      begin
-        Popper::Sync.synchronized do
-          Popper.configure.accounts.each do |account|
-            begin
-              pop(account)
-            rescue => e
-              Popper.log.warn e
-            end
-          end
-        end
-      rescue Locked
-        puts "There will be a running process"
-      end
-    end
-
-    def self.pop(account)
-      done_uidls = []
-      error_uidls = []
-      Popper.log.info "start popper #{account.name}"
-      connection(account) do |pop|
-        current_uidls = pop.mails.map(&:uidl)
-        target_uidls = current_uidls - last_uidl(account.name)
-        pop.mails.select {|_m|target_uidls.include?(_m.uidl) }.each do |m|
-          begin
-            mail = EncodeMail.new(m.mail)
-            Popper.log.info "check mail:#{mail.date.to_s} #{mail.subject}"
-            if rule = matching?(account, mail)
-              Popper.log.info "do action:#{mail.subject}"
-              Popper::Action::Git.run(account.action_by_rule(rule), mail) if account.action_by_rule(rule)
-            end
-            done_uidls << m.uidl
-          rescue Net::POPError => e
-            last_uidl(account.name, last_uidl(account.name) + done_uidls)
-            raise e
-          rescue => e
-            error_uidls << m.uidl
-            Popper.log.warn e
-          end
-        end
-        # write cache
-        last_uidl(account.name, current_uidls - error_uidls)
-        Popper.log.info "success popper #{account.name}"
-      end
-    end
-
-    def self.connection(account, &block)
-      pop = Net::POP3.new(account.login.server, account.login.port || 110)
-      pop.open_timeout = ENV['POP_TIMEOUT'] || 120
-      pop.read_timeout = ENV['POP_TIMEOUT'] || 120
-      pop.start(
-        account.login.user,
-        account.login.password
-      ) do |pop|
-        Popper.log.info "connect server #{account.name}"
-        block.call(pop)
-        Popper.log.info "disconnect server #{account.name}"
-      end
-    end
-
-    def self.matching?(account, mail)
-      account.rules.to_h.keys.find do |rule|
-        account.condition_by_rule(rule).to_h.all? do |header,conditions|
-          conditions.all? do |condition|
-            mail.respond_to?(header) && mail.send(header).to_s.match(/#{condition}/)
-          end
-        end
-      end
-    end
-
-    def self.last_uidl(account, uidl=nil)
-      path = File.join(Dir.home, "popper", ".#{account}.uidl")
-      @_uidl ||= {}
-
-      File.write(File.join(path), uidl.join("\n")) if uidl
-
-      @_uidl[account] ||= File.exist?(path) ? File.read(path).split(/\r?\n/) : []
-      @_uidl[account]
-    end
-
-    def self.prepop
-      Popper.configure.accounts.each do |account|
-        Popper.log.info "start prepop #{account.name}"
-        begin
-          connection(account) do |pop|
-            uidls = pop.mails.map(&:uidl)
-            last_uidl(
-              account.name,
-              uidls
-            )
-            Popper.log.info "success prepop #{account.name} mail count:#{uidls.count}"
-          end
-        rescue => e
-          Popper.log.warn  e
-        end
-      end
-    end
-  end
-end
-
-class ::Hash
-  def deep_merge(second)
-    merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : Array === v1 && Array === v2 ? v1 | v2 : [:undefined, nil, :nil].include?(v2) ? v1 : v2 }
-    self.merge(second.to_h, &merger)
-  end
-
-  def deep_merge!(second)
-    self.merge!(deep_merge(second))
-  end
-end
-
-class EncodeMail < Mail::Message
-  def subject
-    Kconv.toutf8(self[:Subject].value) if self[:Subject]
-  end
-
-  def body
-    super.decoded.encode("UTF-8", self.charset)
-  end
-end

data/lib/popper/sync.rb

@@ -1,18 +0,0 @@
-module Popper
-  class Locked < StandardError; end
-  class Sync
-    def self.synchronized
-      File.open(lockfile, 'w') do |_lockfile|
-        if _lockfile.flock(File::LOCK_EX|File::LOCK_NB)
-          yield
-        else
-          raise Locked
-        end
-      end
-    end
-
-    def self.lockfile
-      File.join(Dir.home, "popper", "popper.lock")
-    end
-  end
-end