co2-notify 0.4.9 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70ad195a35d724e6055c48a83c79cc7b395571a5
-  data.tar.gz: e94fb1227b0a7d7526eaba95d554bbba5df3b5d8
+  metadata.gz: 065abc8840072d9e343b09fd447661fad0a3ee1d
+  data.tar.gz: 93b77b9e0c84592dc4a6bb8a5be7123528aceefb
 SHA512:
-  metadata.gz: 9f5f2a161e92ee1652e3a80c364be4c874f7e30d9588d5bacc03c1ff3cd1ee5da6317d71948c125d07001d9049bc4495401c665cb2d86dffc6fa114274ef84f1
-  data.tar.gz: a3e4cceb616b3aa00ea98b0b657bc05e564390c41f59b878f49d9859e4984a971dacaf72eacff69cd54cd2e0eca52a6621f9bcc906de3e154467900fdd76920d
+  metadata.gz: 5523bfdb502d0d76f16d701f5ba0fc359faa6cf8ab0e1261380b4ec933a9fe21b4bb4f4df53484bd2a5eef23cc1647a5c3e25ca82ae42f6d0adc4d7c76f9f96d
+  data.tar.gz: 60e17f5aec5a814029398ca7258eef3fb9edc1c27da80c89d78784bc81931a414ecc7f6beab2349caedc5dd7c3c8ab13e833a6b177c7a740a88f4012bbd169b2

data/co2-notify.gemspec

@@ -23,5 +23,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport"
   spec.add_dependency "co2mon"
   spec.add_dependency "plist"
-  spec.add_dependency "ruby-fann"
 end

data/lib/co2-notify.rb

@@ -2,7 +2,6 @@ require "thor"
 require "co2mon"
 require "hipchat"
 require "plist"
-require "ruby-fann"
 require "active_support/core_ext/object/blank"
 require "active_support/core_ext/module/delegation"
 

data/lib/co2-notify/config.rb

@@ -5,7 +5,6 @@ class Co2Notify::Config < OpenStruct
   CONFIG_FILE_NAME = "config.yml".freeze
   OUTPUT_FILE_NAME = "output.log".freeze
   ERROR_FILE_NAME = "error.log".freeze
-  FANN_FILE_NAME = "co2.net".freeze
   DEFAULT_TIMEOUT = 5.freeze
   DEFAULT_COOLDOWN = 15.freeze
   DEFAULT_HIGH_LEVEL = 800.freeze
@@ -68,8 +67,4 @@ class Co2Notify::Config < OpenStruct
   def self.error_path
     File.join(config_dir, ERROR_FILE_NAME)
   end
-
-  def self.fann_path
-    File.join(config_dir, FANN_FILE_NAME)
-  end
 end

data/lib/co2-notify/hipchat_client.rb

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

data/lib/co2-notify/notifier.rb

@@ -6,8 +6,6 @@ class Co2Notify::Notifier
   attr_reader :config, :client, :status
   delegate :timeout, to: :status
 
-  NORMALIZATION_CONSTANT = 10000.0.freeze
-
   def initialize(config)
     @config = config
     @client = Co2Notify::HipchatClient.new(config)
@@ -36,34 +34,11 @@ class Co2Notify::Notifier
   def notify
     new_status = Co2Notify::Status.build(get_data, Time.now, config, status)
 
+    puts "Status: #{new_status}"
+
     if status.changed?(new_status)
       client.send(new_status)
       @status = new_status
-
-      if status.type_changed?
-        fann = if File.exist?(Co2Notify::Config.fann_path)
-          RubyFann::Standard.new(filename: Co2Notify::Config.fann_path)
-        else
-          RubyFann::Shortcut.new(num_inputs: 2, num_outputs: 1)
-        end
-
-        train = RubyFann::TrainData.new(
-          inputs: [
-            [
-              (status.co2 - (status.previous.co2 || 0)) / NORMALIZATION_CONSTANT,
-              status.time.hour / 100.0
-            ]
-          ],
-          desired_outputs: [
-            [
-              (status.time - status.previous.time) / NORMALIZATION_CONSTANT
-            ]
-          ]
-        )
-
-        fann.train_on_data(train, 1000, 10, 0.01)
-        fann.save(Co2Notify::Config.fann_path)
-      end
     end
   end
 

data/lib/co2-notify/status.rb

@@ -3,14 +3,12 @@ class Co2Notify::Status
     attr_reader :co2, :config, :previous, :time
     delegate :timeout, :cooldown, :mention, :user, :ping_timeout, to: :config
 
+    SAFE_RANGE = 100.freeze
+
     def initialize(config, time, previous = nil, co2 = nil)
       @config, @co2, @previous, @time = config, co2, previous, time
     end
 
-    def type_changed?
-      self.class != previous.class
-    end
-
     private
 
     def hc_mention
@@ -33,7 +31,7 @@ class Co2Notify::Status
 
     def changed?(new_status)
       new_status.is_a?(Empty) ||
-        new_status.is_a?(Normal) ||
+        (new_status.is_a?(Normal) && new_status.co2 <= config.high_level - SAFE_RANGE) ||
         (new_status.is_a?(VeryHigh) && new_status.co2 > co2)
     end
 
@@ -53,7 +51,7 @@ class Co2Notify::Status
 
     def changed?(new_status)
       new_status.is_a?(Empty) ||
-        new_status.is_a?(Normal) ||
+        (new_status.is_a?(Normal) && new_status.co2 <= config.high_level - SAFE_RANGE) ||
         (new_status.is_a?(High) && new_status.co2 > co2)  ||
         new_status.is_a?(VeryHigh)
     end

data/lib/co2-notify/version.rb

@@ -1,3 +1,3 @@
 class Co2Notify
-  VERSION = "0.4.9"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: co2-notify
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.5.0
 platform: ruby
 authors:
 - Arkadiy Butermanov
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-fann
-  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: 
 email:
 - arkadiy.butermanov@flatstack.com