emn 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fba0a6081b5f82515a2a108a97ffe1de70af9a83
-  data.tar.gz: 3ea0c86c34254dc7606f8289f1d46019a146477c
+  metadata.gz: 7859ee37dc3e8c7bd5a616c4e206070ab4efe8db
+  data.tar.gz: 7a85adb9dfce6b2f027e89e7275b021f3b66476a
 SHA512:
-  metadata.gz: b5c1af56493896170c053558afc23e60f8f813f0629326239106080f158af2c84d20f5246415ffccfee58a5e23aca3dda0007095b5d80c43278aba2850ae033f
-  data.tar.gz: 035cd4c92f83fb0d0d94c911e46454b06a9e274090ff34c07c1f5c4952fd1e5c22534d55a30181cd5f5d99232735661dde6772fa88dc6f1dbeb51baefdaed0ce
+  metadata.gz: bfed3767c44236dd8dd19155cdd2f430069efd5894fd841fa0d7e77b8f632a2aa86fd0f6168d19d1162f04e560880a8f1780466ca04c8aca0745d112abdb3a50
+  data.tar.gz: cf20b5003a66f1e2e318edaa28a76d8be759d0a916edf999110ac775e996149b63102a92a53b37f67a1409cf13702ef657ad44cf7502cd2105c1d9c8da7ba500

data/bin/emn

@@ -4,4 +4,4 @@ require 'emn'
 
 emn = EMN.new
 emn.parse_options
-emn.send!
+emn.process!

data/lib/emn/config.rb

@@ -0,0 +1,40 @@
+class EMN
+  class Config
+    def initialize(config="~/.emn", seen="~/.emn_seen")
+      @config_file = config
+      @seen_file = seen
+
+      load_config
+    end
+
+    def logger
+      if OPTIONS[:debug] || OPTIONS[:verbose]
+        return @logger ||= Logger.new(STDOUT)
+      else
+        return @logger ||= Logger.new(nil)
+      end
+    end
+
+    def seen
+      YAML.load(File.read(File.expand_path(@seen_file)))
+    rescue
+      {}
+    end
+
+    def save_seen!(seen)
+      return if OPTIONS[:debug]
+
+      File.open(File.expand_path(@seen_file), "w") do |file|
+        file.puts seen.to_yaml
+      end
+    end
+
+    def [](key)
+      @config[key]
+    end
+
+    def load_config
+      @config = YAML.load(File.read(File.expand_path(@config_file)))
+    end
+  end
+end

data/lib/emn/eve_api.rb

@@ -0,0 +1,48 @@
+class EMN
+  class EveAPI
+    attr_reader :config, :logger
+
+    def initialize(config)
+      @config = config
+      @logger = config.logger
+    end
+
+    def api
+      unless EAAL.cache.is_a?(EAAL::Cache::FileCache)
+        EAAL.cache = EAAL::Cache::FileCache.new
+      end
+
+      @api ||= EAAL::API.new(
+        config[:eve][:key_id],
+        config[:eve][:verification_code]
+      )
+    end
+
+    def planets(char)
+      api.scope = "char"
+      api.PlanetaryColonies("characterID" => char.characterID).colonies.sort_by{|c| c.planetID}
+    end
+
+    def planet_pins(char, planet)
+      api.scope = "char"
+      api.PlanetaryPins("characterID" => char.characterID, "planetID" => planet.planetID).pins.sort_by do |pin|
+        pin.pinID
+      end.map do |pin|
+        pin.expiryTime = Time.parse("%s UTC" % pin.expiryTime)
+        pin.lastLaunchTime = Time.parse("%s UTC" % pin.lastLaunchTime)
+        pin.installTime = Time.parse("%s UTC" % pin.installTime)
+        pin
+      end
+    end
+
+    def mails(char)
+      api.scope = "char"
+      api.MailMessages("characterID" => char.characterID).messages.sort_by{|m| m.messageID}
+    end
+
+    def characters
+      api.scope = "account"
+      api.Characters.characters
+    end
+  end
+end

data/lib/emn/monitor/mail.rb

@@ -0,0 +1,64 @@
+class EMN
+  class Monitor
+    class Mail
+      attr_reader :config, :logger, :api
+
+      def initialize(config)
+        @config = config
+        @logger = config.logger
+        @api = EveAPI.new(config)
+      end
+
+      def seen
+        @seen ||= {:mail => config.seen.fetch(:mail, {})}
+      end
+
+      def notifications
+        notifications = {
+          :template => "templates/mail.erb",
+          :subject => "Eve Mail",
+          :seen => config.seen,
+          :data => {}
+        }
+
+        api.characters.each do |toon|
+          logger.debug("Checking character %s" % toon.name)
+
+          messages = api.mails(toon)
+
+          logger.debug("Found %d messages for %s" % [messages.size, toon.name])
+
+          messages.each do |mail|
+            logger.debug("Processing email %s: from: %s subject: %s" % [mail.messageID, mail.senderName, mail.title])
+
+            seen[:mail][toon.name] ||= "0"
+
+            if seen[:mail][toon.name] < mail.messageID
+              seen[:mail][toon.name] = mail.messageID
+
+              if mail.senderName == toon.name
+                logger.debug("Skipping mail %s as it's from the character" % mail.messageID)
+                next
+              end
+
+              logger.debug("Adding email %s: %s to the queue" % [mail.messageID, mail.title])
+
+              notifications[:data][toon.name] ||= []
+              notifications[:data][toon.name] << {
+                :id => mail.messageID,
+                :from => mail.senderName,
+                :date => mail.sentDate,
+                :subject => mail.title
+              }
+            else
+              logger.debug("Skipping email %s: it's been seen before (%s)" % [mail.messageID, seen[:mail][toon.name]])
+            end
+          end
+        end
+
+        notifications[:seen] = seen
+        notifications
+      end
+    end
+  end
+end

data/lib/emn/monitor/pi.rb

@@ -0,0 +1,98 @@
+require 'time'
+
+class EMN
+  class Monitor
+    class Pi
+      attr_reader :config, :logger, :api
+
+      def initialize(config)
+        @config = config
+        @logger = config.logger
+        @api = EveAPI.new(config)
+      end
+
+      def seen
+        @seen ||= {:planets => config.seen.fetch(:planets, {})}
+      end
+
+      def seconds_to_human(seconds)
+        if seconds < 0
+          past = true
+          seconds = seconds.abs
+        end
+
+        days = seconds.to_i / 86400
+        seconds -= 86400 * days
+
+        hours = seconds.to_i / 3600
+        seconds -= 3600 * hours
+
+        minutes = seconds.to_i / 60
+        seconds -= 60 * minutes
+
+        time = if days > 1
+          "%d days %d hours %d minutes" % [days, hours, minutes]
+        elsif days == 1
+          "%d day %d hours %d minutes" % [days, hours, minutes]
+        elsif hours > 0
+          "%d hours %d minutes" % [hours, minutes]
+        elsif minutes > 0
+          "%d minutes" % [minutes]
+        else
+          "%d seconds" % [seconds]
+        end
+
+        past ? "%s ago" % time : time
+      end
+
+      def pins
+        api.characters.each do |toon|
+          logger.debug("Processing toon %s" % toon.name)
+          api.planets(toon).each do |planet|
+            logger.debug("Processing planet %s" % planet.planetName)
+            api.planet_pins(toon, planet).sort_by{|p| p.planetName}.each do |pin|
+              yield(toon, planet, pin)
+            end
+          end
+        end
+      end
+
+      def notifications
+        notifications = {
+          :template => "templates/pi.erb",
+          :subject => "Eve PI",
+          :data => {}
+        }
+
+        pins do |toon, planet, pin|
+          next if pin.expiryTime.year == 1
+
+          time_till_expire = pin.expiryTime - Time.now.utc
+          logger.debug("%s expires in %s / %s (%s)" % [planet.planetName, time_till_expire, seconds_to_human(time_till_expire), pin.expiryTime])
+
+          seen[:planets][toon.name] ||= {}
+
+          if (time_till_expire < 600) && (time_till_expire > -86400)
+            if seen[:planets][toon.name][planet.planetName]
+              next
+            else
+              seen[:planets][toon.name][planet.planetName] = true
+            end
+
+            notifications[:data][toon.name] ||= []
+            notifications[:data][toon.name] << {
+              :name => planet.planetName,
+              :time_till_expire => seconds_to_human(time_till_expire),
+              :expire_time => pin.expiryTime
+            }
+          else
+            seen[:planets][toon.name].delete(planet.planetName)
+          end
+        end
+
+        notifications[:seen] = seen
+        notifications
+      end
+    end
+  end
+end

data/lib/emn/notifier/pushover.rb

@@ -0,0 +1,38 @@
+require 'pushover'
+
+class EMN
+  class Notifier
+    class Pushover
+      attr_reader :config, :logger, :debug
+
+      def initialize(config, debug=false)
+        @config = config
+        @logger = config.logger
+        @debug = debug
+      end
+
+      def api
+        ::Pushover.user = config[:pushover][:user_token]
+        ::Pushover.token = config[:pushover][:app_token]
+        ::Pushover
+      end
+
+      def publish(message, subject)
+        if debug
+          logger.debug("Would have published the message: ")
+          puts message
+          return true
+        else
+          responce = api.notification(:html => 1, :title => subject, :message => message)
+
+          if responce.code == 200
+            return true
+          else
+            STDERR.puts("Failed to notify pushover: %s" % responce.inspect)
+            return false
+          end
+        end
+      end
+    end
+  end
+end

data/lib/emn/version.rb

@@ -1,3 +1,3 @@
 class EMN
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/emn.rb

@@ -1,10 +1,15 @@
 require 'eaal'
 require 'yaml'
-require 'pushover'
 require 'optparse'
 require 'pp'
 require 'logger'
 require 'emn/version'
+require 'emn/config'
+require 'emn/eve_api'
+require 'emn/monitor/mail'
+require 'emn/monitor/pi'
+require 'emn/notifier/pushover'
+require 'tilt/erb'
 
 class EMN
   OPTIONS = {
@@ -12,17 +17,9 @@ class EMN
     :debug => false,
     :config => File.expand_path("~/.emn"),
     :seen => File.expand_path("~/.emn_seen"),
-    :logger => nil
+    :checkers => []
   }
 
-  def logger
-    if OPTIONS[:debug] || OPTIONS[:verbose]
-      return Logger.new(STDOUT)
-    else
-      return Logger.new(nil)
-    end
-  end
-
   def parse_options
     opt = OptionParser.new
 
@@ -45,149 +42,58 @@ class EMN
       OPTIONS[:seen] = File.expand_path(v)
     end
 
+    opt.on("--pi", "Check PI extractor cycles") do
+      OPTIONS[:checkers] << EMN::Monitor::Pi
+    end
+
+    opt.on("--mail", "Check for new emails") do
+      OPTIONS[:checkers] << EMN::Monitor::Mail
+    end
+
     opt.separator ""
     opt.separator "http://github.com/ripienaar/emn"
 
     opt.parse!
 
-    logger.info("emn %s starting with config %s and seen file %s" % [ EMN::VERSION, OPTIONS[:config], OPTIONS[:seen]])
-  end
-
-  def config
-    @config ||= YAML.load(File.read(File.expand_path(OPTIONS[:config])))
+    if OPTIONS[:checkers].empty?
+      abort("Please specify either --mail, --pi or both")
+    end
   end
 
-  def seen
-    @seen ||= YAML.load(File.read(File.expand_path(OPTIONS[:seen])))
-  rescue
-    @seen = {}
+  def logger
+    config.logger
   end
 
-  def save_seen!
-    return if OPTIONS[:debug]
-
-    File.open(File.expand_path(OPTIONS[:seen]), "w") do |file|
-      file.puts seen.to_yaml
-    end
+  def config
+    @config ||= EMN::Config.new(OPTIONS[:config], OPTIONS[:seen])
   end
 
   def pushover
-    Pushover.user = config[:pushover][:user_token]
-    Pushover.token = config[:pushover][:app_token]
-    Pushover
+    @pushover_api ||= Notifier::Pushover.new(config, OPTIONS[:debug])
   end
 
   def eve_api
-    unless EAAL.cache.is_a?(EAAL::Cache::FileCache)
-      EAAL.cache = EAAL::Cache::FileCache.new
-    end
-
-    @eve_api ||= EAAL::API.new(
-      config[:eve][:key_id],
-      config[:eve][:verification_code]
-    )
+    @eve_api ||= EveAPI.new(config)
   end
 
-  def mails(char)
-    eve_api.scope = "char"
-    eve_api.MailMessages("characterID" => char.characterID).messages.sort_by{|m| m.messageID}
-  end
-
-  def characters
-    eve_api.scope = "account"
-    eve_api.Characters.characters
-  end
-
-  def check_mail
-    notifications = {}
-
-    characters.each do |toon|
-      logger.debug("Checking character %s" % toon.name)
-
-      messages = mails(toon)
+  def process!
+    OPTIONS[:checkers].each do |klass|
+      checker = klass.new(config)
+      logger.debug("Processing %s" % checker.class)
 
-      logger.debug("Found %d messages for %s" % [messages.size, toon.name])
+      notifications = checker.notifications
 
-      messages.each do |mail|
-        logger.debug("Processing email %s: from: %s subject: %s" % [mail.messageID, mail.senderName, mail.title])
+      unless notifications[:data].empty?
+        template_file = File.expand_path(File.join(File.dirname(__FILE__), "..", notifications[:template]))
+        logger.debug("Sending notifications using template %s" % template_file)
 
-        seen[toon.name] ||= "0"
+        template = Tilt::ERBTemplate.new(template_file)
+        output = template.render(:data => notifications[:data], :config => config)
 
-        if seen[toon.name] < mail.messageID
-          seen[toon.name] = mail.messageID
-
-          if mail.senderName == toon.name
-            logger.debug("Skipping mail %s as it's from the character" % mail.messageID)
-            next
-          end
-
-          logger.debug("Adding email %s: %s to the queue" % [mail.messageID, mail.title])
-
-          notifications[toon.name] ||= []
-          notifications[toon.name] << {
-            :from => mail.senderName,
-            :date => mail.sentDate,
-            :subject => mail.title
-          }
-        else
-          logger.debug("Skipping email %s: it's been seen before (%s)" % [mail.messageID, seen[toon.name]])
+        if pushover.publish(output, notifications[:subject])
+          config.save_seen!(config.seen.merge(notifications[:seen]))
         end
       end
     end
-
-    notifications.empty? ? nil : notifications
-  end
-
-  def message_body(notifications)
-    summary = ["<b>"]
-    body = []
-
-    notifications.keys.sort.each do |toon|
-      summary << "%s: %d " % [toon, notifications[toon].size]
-
-      body << "<b>%s</b>" % toon
-      notifications[toon].reverse[0..config[:max_notifications] - 1].each do |notification|
-        body << "  %s: %s" % [notification[:from], notification[:subject]]
-      end
-
-      if notifications[toon].size > config[:max_notifications]
-        body << "   ... and %d more" % [notifications[toon].size - config[:max_notifications]]
-      end
-
-      body << ""
-    end
-
-    summary << "</b>"
-
-    [summary, "", body].flatten.join("\n")
-  end
-
-  def publish(message)
-    if OPTIONS[:debug]
-      logger.debug("Would have published the message: ")
-      puts message
-      return true
-    else
-      responce = pushover.notification(:html => 1, :message => message)
-
-      if responce.code == 200
-        return true
-      else
-        STDERR.puts("Failed to notify pushover: %s" % responce.inspect)
-        return false
-      end
-    end
-  end
-
-  def send!
-    if notifications = check_mail
-      logger.debug("Found mail for %d characters" % [notifications.keys.size])
-
-      if publish(message_body(notifications))
-        save_seen!
-      end
-    else
-      logger.debug("No new mail found, not sending any messages")
-    end
   end
 end

data/templates/mail.erb

@@ -0,0 +1,22 @@
+<b>
+<%=
+  self[:data].keys.sort.map do |toon|
+    "%s: %s" % [toon, self[:data][toon].size]
+  end.join("\n")
+%>
+</b>
+
+<% self[:data].keys.sort.map do |toon| %>
+<b><%= toon %>:</b>
+<%=
+  self[:data][toon].reverse[0..self[:config][:max_notifications] - 1].map do |notification|
+    "   %s: %s" % [notification[:from], notification[:subject]]
+  end.join("\n")
+%>
+<%=
+  if self[:data][toon].size > self[:config][:max_notifications]
+    "   ... and %d more" % [self[:data][toon].size - self[:config][:max_notifications]]
+  end
+%>
+
+<% end %>

data/templates/pi.erb

@@ -0,0 +1,6 @@
+<% self[:data].keys.sort.each do |toon| %>
+<b><%= toon %>:</b>
+<%   self[:data][toon].each do |planet| %>
+<%=    "   %s: %s\n" % [planet[:name], planet[:time_till_expire]] %>
+<%   end %>
+<% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emn
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - R.I.Pienaar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-29 00:00:00.000000000 Z
+date: 2015-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eaal
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Get Pushover notification when your characters get mail
 email: rip@devco.net
 executables:
@@ -47,7 +61,14 @@ extra_rdoc_files: []
 files:
 - bin/emn
 - lib/emn.rb
+- lib/emn/notifier/pushover.rb
 - lib/emn/version.rb
+- lib/emn/eve_api.rb
+- lib/emn/config.rb
+- lib/emn/monitor/mail.rb
+- lib/emn/monitor/pi.rb
+- templates/mail.erb
+- templates/pi.erb
 homepage: https://github.com/ripienaar/eve_mail_notifier
 licenses: []
 metadata: {}