co2-notify 0.4.3 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0898262a63f0164a54f0c5b7bbb08d347313804
-  data.tar.gz: e56659a2bd9e16205d9b822c3aa2d61b0e1cd877
+  metadata.gz: 70ad195a35d724e6055c48a83c79cc7b395571a5
+  data.tar.gz: e94fb1227b0a7d7526eaba95d554bbba5df3b5d8
 SHA512:
-  metadata.gz: 4d8227a661bc931192432f35448b1c7d8fb429231bdcf847b132b674fd63c086d5889f7533e8a3423ac5dc0fcc47513e269169bace208ad0e9de7289e1f9e4ae
-  data.tar.gz: 2beb06bb5b919344a9d8d2def12ea496e3cbcc0a6805211dfa3644df532e9e70b24a3faae468de7c07d151241fabd5eda8f3cf50d88c7b51b7098c48613550df
+  metadata.gz: 9f5f2a161e92ee1652e3a80c364be4c874f7e30d9588d5bacc03c1ff3cd1ee5da6317d71948c125d07001d9049bc4495401c665cb2d86dffc6fa114274ef84f1
+  data.tar.gz: a3e4cceb616b3aa00ea98b0b657bc05e564390c41f59b878f49d9859e4984a971dacaf72eacff69cd54cd2e0eca52a6621f9bcc906de3e154467900fdd76920d

data/co2-notify.gemspec

@@ -23,4 +23,5 @@ 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/config.rb

@@ -1,20 +1,26 @@
 require "yaml"
 
 class Co2Notify::Config < OpenStruct
-  CONFIG_FILE_NAME = ".co2-notify.yml".freeze
+  CONFIG_DIR = ".co2-notify".freeze
+  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
   DEFAULT_VERY_HIGH_LEVEL = 1200.freeze
   DEFAULT_START_TIME = "12:00".freeze
   DEFAULT_STOP_TIME = "19:00".freeze
-  DEFAULR_PING_TIMEOUT = 10.freeze
+  DEFAULT_PING_TIMEOUT = 60.freeze
 
   def self.get
     new YAML.load_file(config_file)
   end
 
   def self.set
+    FileUtils.mkdir_p(config_dir) unless File.directory?(config_dir)
+
     data = {}.tap do |h|
       print "Monitor location (required): "
       h["location"] = STDIN.gets.chomp
@@ -47,7 +53,23 @@ class Co2Notify::Config < OpenStruct
     end
   end
 
+  def self.config_dir
+    File.join(ENV['HOME'], CONFIG_DIR)
+  end
+
   def self.config_file
-    File.join(ENV['HOME'], CONFIG_FILE_NAME)
+    File.join(config_dir, CONFIG_FILE_NAME)
+  end
+
+  def self.output_path
+    File.join(config_dir, OUTPUT_FILE_NAME)
+  end
+
+  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/notifier.rb

@@ -6,6 +6,8 @@ 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)
@@ -37,6 +39,31 @@ class Co2Notify::Notifier
     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

@@ -7,6 +7,10 @@ class Co2Notify::Status
       @config, @co2, @previous, @time = config, co2, previous, time
     end
 
+    def type_changed?
+      self.class != previous.class
+    end
+
     private
 
     def hc_mention

data/lib/co2-notify/version.rb

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

data/lib/co2-notify.rb

@@ -2,6 +2,7 @@ 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"
 
@@ -37,7 +38,9 @@ class Co2Notify < Thor
         path,
         "go"
       ],
-      "RunAtLoad" => true
+      "RunAtLoad" => true,
+      "StandardOutPath" => Config.output_path,
+      "StandardErrorPath" => Config.error_path
     }
 
     File.open(plist_path, "w") do |f|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: co2-notify
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.9
 platform: ruby
 authors:
 - Arkadiy Butermanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -80,6 +80,20 @@ 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