co2-notify 0.4.0 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 656c1119c1229e7d4cafdae776a7491e0adb61af
-  data.tar.gz: a6ef10621f4b2303cf76a84d0ac21093b6cc70fb
+  metadata.gz: d0898262a63f0164a54f0c5b7bbb08d347313804
+  data.tar.gz: e56659a2bd9e16205d9b822c3aa2d61b0e1cd877
 SHA512:
-  metadata.gz: 642c10670207bb1f234ca3b1d8c1e2f0186d1cff24348a39770cd8c89bc1eb7205d902590f72974ef1382497f17ff3a62289faa7eddc4fb73c0ee331cc36cf88
-  data.tar.gz: de9473448fbc5a1071d198a4b4d86738f80c5197edeaa09790f87ea890d2f5bcb7e2cb9f287ec03db36b4594481139b694752956f291298bcb51ca377f86b5b2
+  metadata.gz: 4d8227a661bc931192432f35448b1c7d8fb429231bdcf847b132b674fd63c086d5889f7533e8a3423ac5dc0fcc47513e269169bace208ad0e9de7289e1f9e4ae
+  data.tar.gz: 2beb06bb5b919344a9d8d2def12ea496e3cbcc0a6805211dfa3644df532e9e70b24a3faae468de7c07d151241fabd5eda8f3cf50d88c7b51b7098c48613550df

data/lib/co2-notify/config.rb

@@ -8,6 +8,7 @@ class Co2Notify::Config < OpenStruct
   DEFAULT_VERY_HIGH_LEVEL = 1200.freeze
   DEFAULT_START_TIME = "12:00".freeze
   DEFAULT_STOP_TIME = "19:00".freeze
+  DEFAULR_PING_TIMEOUT = 10.freeze
 
   def self.get
     new YAML.load_file(config_file)
@@ -27,9 +28,11 @@ class Co2Notify::Config < OpenStruct
       h["timeout"] = STDIN.gets.chomp.presence || DEFAULT_TIMEOUT
       print "Cooldown (default: #{DEFAULT_COOLDOWN} mins): "
       h["cooldown"] = STDIN.gets.chomp.presence || DEFAULT_COOLDOWN
-      print "High CO2 level (default: #{DEFAULT_HIGH_LEVEL}): "
+      print "Ping timeout (default: #{DEFAULT_PING_TIMEOUT} mins): "
+      h["ping_timeout"] = STDIN.gets.chomp.presence || DEFAULT_PING_TIMEOUT
+      print "High CO₂ level (default: #{DEFAULT_HIGH_LEVEL}): "
       h["high_level"] = STDIN.gets.chomp.presence || DEFAULT_HIGH_LEVEL
-      print "Very High CO2 level (default: #{DEFAULT_VERY_HIGH_LEVEL}): "
+      print "Very High CO₂ level (default: #{DEFAULT_VERY_HIGH_LEVEL}): "
       h["very_high_level"] = STDIN.gets.chomp.presence || DEFAULT_VERY_HIGH_LEVEL
       print "Start time (default: #{DEFAULT_START_TIME}): "
       h["start_time"] = STDIN.gets.chomp.presence || DEFAULT_START_TIME

data/lib/co2-notify/hipchat_client.rb

@@ -8,6 +8,6 @@ class Co2Notify::HipchatClient
   end
 
   def send(status)
-    client[room].send("Co2 (#{location})", status.message, color: status.color, message_format: "text")
+    client[room].send("#{location}", status.message, color: status.color, message_format: "text")
   end
 end

data/lib/co2-notify/notifier.rb

@@ -9,7 +9,7 @@ class Co2Notify::Notifier
   def initialize(config)
     @config = config
     @client = Co2Notify::HipchatClient.new(config)
-    @status = Co2Notify::Status::Empty.new(config)
+    @status = Co2Notify::Status::Empty.new(config, Time.now)
   end
 
   def start
@@ -32,7 +32,7 @@ class Co2Notify::Notifier
   end
 
   def notify
-    new_status = Co2Notify::Status.build(get_data, config, status)
+    new_status = Co2Notify::Status.build(get_data, Time.now, config, status)
 
     if status.changed?(new_status)
       client.send(new_status)

data/lib/co2-notify/status.rb

@@ -1,10 +1,10 @@
 class Co2Notify::Status
   class Base
-    attr_reader :co2, :config, :previous
-    delegate :timeout, :cooldown, :mention, :user, to: :config
+    attr_reader :co2, :config, :previous, :time
+    delegate :timeout, :cooldown, :mention, :user, :ping_timeout, to: :config
 
-    def initialize(config, previous = nil, co2 = nil)
-      @config, @co2, @previous = config, co2, previous
+    def initialize(config, time, previous = nil, co2 = nil)
+      @config, @co2, @previous, @time = config, co2, previous, time
     end
 
     private
@@ -20,7 +20,7 @@ class Co2Notify::Status
 
   class VeryHigh < Base
     def message
-      "#{hc_mention}CO2 level is very high - #{co2}. Please open the windows!"
+      "#{hc_mention}CO₂ level is very high - #{co2}. Please open the windows!"
     end
 
     def color
@@ -28,7 +28,9 @@ class Co2Notify::Status
     end
 
     def changed?(new_status)
-      new_status.is_a?(Empty) || new_status.is_a?(Normal) || new_status.is_a?(VeryHigh)
+      new_status.is_a?(Empty) ||
+        new_status.is_a?(Normal) ||
+        (new_status.is_a?(VeryHigh) && new_status.co2 > co2)
     end
 
     def timeout
@@ -38,7 +40,7 @@ class Co2Notify::Status
 
   class High < Base
     def message
-      "#{hc_mention}CO2 level is high - #{co2}. Please open the windows!"
+      "#{hc_mention}CO₂ level is high - #{co2}. Please open the windows!"
     end
 
     def color
@@ -46,7 +48,10 @@ class Co2Notify::Status
     end
 
     def changed?(new_status)
-      new_status.is_a?(Empty) || new_status.is_a?(Normal) || new_status.is_a?(High) || new_status.is_a?(VeryHigh)
+      new_status.is_a?(Empty) ||
+        new_status.is_a?(Normal) ||
+        (new_status.is_a?(High) && new_status.co2 > co2)  ||
+        new_status.is_a?(VeryHigh)
     end
 
     def timeout
@@ -56,7 +61,11 @@ class Co2Notify::Status
 
   class Normal < Base
     def message
-      "#{hc_mention}CO2 level is normalized - #{co2}. You can close the windows."
+      if previous.is_a?(Normal) || previous.is_a?(Empty)
+        "CO₂ level is normal - #{co2}."
+      else
+        "#{hc_mention}CO₂ level is normalized - #{co2}. You can close the windows."
+      end
     end
 
     def color
@@ -64,7 +73,10 @@ class Co2Notify::Status
     end
 
     def changed?(new_status)
-      new_status.is_a?(Empty) || new_status.is_a?(High) || new_status.is_a?(VeryHigh)
+      new_status.is_a?(Empty) ||
+        new_status.is_a?(High) ||
+        new_status.is_a?(VeryHigh) ||
+        (new_status.is_a?(Normal) && new_status.time >= time + ping_timeout * 60)
     end
 
     def timeout
@@ -74,7 +86,7 @@ class Co2Notify::Status
 
   class Empty < Base
     def message
-      "#{hc_user}Please check that CO2 monitor is connected."
+      "#{hc_user}Please check that CO₂ monitor is connected."
     end
 
     def color
@@ -82,20 +94,23 @@ class Co2Notify::Status
     end
 
     def changed?(new_status)
-      new_status.is_a?(Empty) || new_status.is_a?(High) || new_status.is_a?(VeryHigh)
+      new_status.is_a?(Empty) ||
+        new_status.is_a?(High) ||
+        new_status.is_a?(VeryHigh) ||
+        new_status.is_a?(Normal)
     end
   end
 
-  def self.build(co2, config, previous = nil)
+  def self.build(co2, time, config, previous = nil)
     case co2
     when 1..config.high_level
-      Normal.new(config, previous, co2)
+      Normal.new(config, time, previous, co2)
     when config.high_level..config.very_high_level
-      High.new(config, previous, co2)
+      High.new(config, time, previous, co2)
     when proc { |n| n >= config.very_high_level }
-      VeryHigh.new(config, previous, co2)
+      VeryHigh.new(config, time, previous, co2)
     else
-      Empty.new(config)
+      Empty.new(config, time)
     end
   end
 end

data/lib/co2-notify/version.rb

@@ -1,3 +1,3 @@
 class Co2Notify
-  VERSION = "0.4.0"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: co2-notify
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.3
 platform: ruby
 authors:
 - Arkadiy Butermanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-13 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor