blinkenstein 0.2.0 → 0.2.1

data/lib/blinkenstein/logging.rb

@@ -1,21 +1,32 @@
+require "logger"
+
 module Blinkenstein
+  class << self
+    attr_accessor :logger
+  end
+
+  @logger       = Logger.new(STDOUT)
+  @logger.level = ENV["DEBUG"] ? Logger::DEBUG : Logger::INFO
+
   module Logging
-    def logger
-      @logger ||= Logging.logger_for(self.class.name)
+    def debug(*args)
+      Blinkenstein.logger.debug(*args) if Blinkenstein.logger
     end
 
-    @loggers = {}
+    def info(*args)
+      Blinkenstein.logger.info(*args) if Blinkenstein.logger
+    end
+
+    def warn(*args)
+      Blinkenstein.logger.warn(*args) if Blinkenstein.logger
+    end
 
-    class << self
-      def logger_for(classname)
-        @loggers[classname] ||= configure_logger_for(classname)
-      end
+    def error(*args)
+      Blinkenstein.logger.error(*args) if Blinkenstein.logger
+    end
 
-      def configure_logger_for(classname)
-        logger = Logger.new(STDOUT)
-        logger.progname = classname
-        logger
-      end
+    def fatal(*args)
+      Blinkenstein.logger.error(*args) if Blinkenstein.logger
     end
   end
 end

data/lib/blinkenstein/monitor.rb

@@ -1,14 +1,13 @@
 module Blinkenstein
   module Monitor
-    extend Logging
-    
-    def self.repository
-      @repository ||= []
+    class << self
+      attr_accessor :monitors
     end
 
+    @monitors = []
+
     def self.included(klass)
-      logger.info "Registering monitor #{klass}"
-      repository << klass.new
+      @monitors << klass
     end
   end
 end

data/lib/blinkenstein/monitors/eve_skill_queue_monitor.rb

@@ -7,18 +7,25 @@ module Blinkenstein
     include Monitor
     include Logging
 
+    def initialize
+      @skillQueue ||= Eve::SkillQueue.new
+    end
+
     def refresh 
       update_blink
     end
 
     def hours_left
-      @skillQueue ||= Eve::SkillQueue.new
       @skillQueue.hours_left
+    rescue => e
+      error "Something is wrong: #{e}"
+      error e.backtrace.join("\n")
+      failure
     end
 
     def update_blink
       case 
-      when hours_left < 0 then error
+      when hours_left < 0 then failure
       when hours_left < 8 && hours_left >= 0  then panic
       when hours_left > 8 && hours_left <= 24 then nervous
       when hours_left > 24 then cool 
@@ -26,22 +33,21 @@ module Blinkenstein
     end
 
     def cool 
-      logger.info "Everything is cool. #{hours_left}h left."
+      info "Everything is cool. #{hours_left}h left."
       Blink::Patterns.breath("#00ff00", 4, 0.2)
     end
 
     def nervous
-      logger.info "There's room in the queue. #{hours_left}h left."
+      info "There's room in the queue. #{hours_left}h left."
       Blink::Patterns.breath("#ff0000", 3, 0.3)
     end
 
     def panic
-      logger.info "Queue runs out soon. #{hours_left}h left."
+      info "Queue runs out soon. #{hours_left}h left."
       Blink::Patterns.police
     end
 
-    def error
-      logger.info "Ehm. Something is wrong"
+    def failure 
       Blink::Patterns.breath("#ff0000", 0.25, 0.75)
     end
   end

data/lib/blinkenstein/runner.rb

@@ -1,4 +1,5 @@
 require 'celluloid'
+require 'blink1'
 
 module Blinkenstein 
   class Runner 
@@ -6,6 +7,7 @@ module Blinkenstein
     include Logging
 
     def initialize
+      register_all
       refresh_all
 
       every(15) do
@@ -13,9 +15,23 @@ module Blinkenstein
       end
     end
 
+    def register_all
+      @monitors = Monitor.monitors.map do |monitor|
+        info "Registering montitor: #{monitor}"
+        monitor.new
+      end
+    end
+
     def refresh_all
-      logger.debug "Refreshing all monitors"
-      Monitor.repository.each(&:refresh)
+      debug "Refreshing all monitors"
+      @monitors.each(&:refresh)
+    end
+
+    def finalize
+      info "Shutting down. Turning off the lights..."
+      Blink1.open do |blink1|
+        blink1.off
+      end
     end
   end
 end

data/lib/blinkenstein/version.rb

@@ -1,3 +1,3 @@
 module Blinkenstein
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/blinkenstein.rb

@@ -12,3 +12,5 @@ module Blinkenstein
 end
 
 require "blinkenstein/monitors/eve_skill_queue_monitor"
+
+Celluloid.logger.level = Logger::ERROR

data/lib/eve/base.rb

@@ -14,7 +14,7 @@ module Eve
       begin
         config = YAML.load(File.read(File.expand_path('~/.eve-api')))
       rescue Errno::ENOENT
-        raise "No ~/.eve-monitor config. The skill queue monitor can't start..." 
+        raise "No ~/.eve-api config. The skill queue monitor can't start..." 
       rescue Psych::SyntaxError
         raise "Invalid syntax in ~/.eve-api. The skill queue monitor can't start..." 
       end

data/lib/eve/skill_queue.rb

@@ -1,66 +1,68 @@
 require "eve/base"
 
 class Eve::SkillQueue < Eve::Base
-    attr_reader :expire_time
+  include Blinkenstein::Logging
 
-    def initialize
-      @expire_time = Time.now - 1
-    end
+  attr_reader :expire_time
 
-    def hours_left
-      refresh
+  def initialize
+    @expire_time = Time.now - 1
+  end
 
-      return ((end_time - current_time) * 24).to_i if end_time 
-      return  0 if paused? || empty?
-      return -1 if blocked?
-      -1
-    end
+  def hours_left
+    refresh
 
-    def paused?
-      return false if blocked?
+    return ((end_time - current_time) * 24).to_i if end_time 
+    return  0 if paused? || empty?
+    return -1 if blocked?
+    -1
+  end
 
-      last_skill.fetch("endTime", false) == "" 
-    end
+  def paused?
+    return false if blocked?
 
-    def blocked?
-      @response.fetch("eveapi", {}).fetch("error", false)
-    end
+    last_skill.fetch("endTime", false) == "" 
+  end
 
-    def empty?
-      return false if blocked?
-      
-      last_skill.empty?
-    end
+  def blocked?
+    @response.fetch("eveapi", {}).fetch("error", false)
+  end
 
-    def last_skill
-      @last_skill ||= Array[@response.fetch("eveapi", {}).fetch("result", {}).fetch("rowset", {}).fetch("row", {})].flatten.last
-    end
+  def empty?
+    return false if blocked?
 
-    def current_time 
-      parse_date(@response.fetch("eveapi", {}).fetch("currentTime", {}))
-    end
+    last_skill.empty?
+  end
 
-    def cached_until
-      parse_date(@response.fetch("eveapi", {}).fetch("cachedUntil", {}))
-    end
+  def last_skill
+    @last_skill ||= Array[@response.fetch("eveapi", {}).fetch("result", {}).fetch("rowset", {}).fetch("row", {})].flatten.last
+  end
 
-    def end_time
-      parse_date(last_skill.fetch("endTime", ""))
-    end
+  def current_time 
+    parse_date(@response.fetch("eveapi", {}).fetch("currentTime", {}))
+  end
 
-    def update_cache
-      if current_time && cached_until
-        @expire_time = Time.now + ((cached_until - current_time) * 24 * 60 * 60).to_i
-      else
-        @expire_time = Time.now + 60 
-      end
-    end
+  def cached_until
+    parse_date(@response.fetch("eveapi", {}).fetch("cachedUntil", {}))
+  end
 
-    def refresh 
-      return if @response && Time.now < @expire_time 
+  def end_time
+    parse_date(last_skill.fetch("endTime", ""))
+  end
 
-      @response = self.class.get('/char/SkillQueue.xml.aspx', query: query)
-      update_cache 
+  def update_cache
+    if current_time && cached_until
+      @expire_time = Time.now + ((cached_until - current_time) * 24 * 60 * 60).to_i
+    else
+      @expire_time = Time.now + 60 
     end
   end
 
+  def refresh 
+    return if @response && Time.now < @expire_time 
+    info "Updating Skillqueue from Eve-API"
+    @response = self.class.get('/char/SkillQueue.xml.aspx', query: query)
+    update_cache
+  end
+end
+

data/spec/blinkenstein/monitors/eve_skill_queue_monitor_spec.rb

@@ -1,5 +1,5 @@
 require "spec_helper"
-require "blinkenstein/monitors/eve_skill_queue_monitor"
+require "blinkenstein"
 
 module Blinkenstein
   describe EveSkillQueueMonitor do
@@ -8,7 +8,7 @@ module Blinkenstein
     describe "refresh" do
       it "goes into error mode if queue left is < 0" do
         monitor.stub(:hours_left).and_return(-1)
-        monitor.should_receive(:error)
+        monitor.should_receive(:failure)
         monitor.refresh
       end
 
@@ -30,5 +30,13 @@ module Blinkenstein
         monitor.refresh
       end
     end
+
+    describe ".hours_left" do
+      it "is showing a failure if something is wrong while calling the API" do
+        Eve::SkillQueue.any_instance.stub(:hours_left).and_raise("whatever")
+        monitor.should_receive(:failure)
+        monitor.hours_left
+      end
+    end
   end
 end

data/spec/eve/base_spec.rb

@@ -1,3 +1,5 @@
+require "spec_helper"
+
 module Eve 
   describe Base do
     describe "parse_date" do

data/spec/eve/skill_queue_spec.rb

@@ -1,5 +1,4 @@
 require "spec_helper"
-require "eve/skill_queue"
 
 module Eve
   describe SkillQueue do

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require "blinkenstein/logging"
+Blinkenstein.logger = nil
+
 Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f}
 
 RSpec.configure do |config|
@@ -11,3 +14,4 @@ RSpec.configure do |config|
   #     --seed 1234
   config.order = 'random'
 end
+

metadata

@@ -2,14 +2,14 @@
 name: blinkenstein
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Michael Schmidt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2013-02-17 00:00:00.000000000 Z
+date: 2013-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -142,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 4488431557902824984
+      hash: 2791825359093468587
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 4488431557902824984
+      hash: 2791825359093468587
       version: '0'
 requirements: []
 rubyforge_project: