home_io_meas_receiver 0.0.0 → 0.0.1

data/Gemfile

@@ -2,6 +2,7 @@ source "http://rubygems.org"
 
 gem "rufus-scheduler"
 gem "mean"
+gem 'colorize'
 
 group :development do
   gem "rspec", "~> 2.3.0"

data/Gemfile.lock

@@ -1,6 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    colorize (0.5.8)
     diff-lcs (1.1.3)
     git (1.2.5)
     jeweler (1.6.4)
@@ -8,8 +9,8 @@ GEM
       git (>= 1.2.5)
       rake
     mean (0.1.0)
-    multi_json (1.3.7)
-    rake (0.9.2.2)
+    multi_json (1.5.0)
+    rake (10.0.3)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
       rspec-expectations (~> 2.3.0)
@@ -24,13 +25,14 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    tzinfo (0.3.34)
+    tzinfo (0.3.35)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.0.0)
+  colorize
   jeweler (~> 1.6.4)
   mean
   rspec (~> 2.3.0)

data/Rakefile

@@ -42,16 +42,6 @@ end
 
 task :default => :spec
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "simple_metar_parser #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
 desc "Run RSpec with code coverage"
 task :coverage do
   `rake spec COVERAGE=true`

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.0.1

data/lib/meas_receiver.rb

@@ -1,7 +1,6 @@
 $:.unshift(File.dirname(__FILE__))
 
 require 'meas_receiver/comm_protocol'
-require 'meas_receiver/receiver'
 require 'meas_receiver/meas_type_receiver'
 
 module MeasReceiver

data/lib/meas_receiver/meas_type_buffer.rb

@@ -7,6 +7,9 @@ module MeasReceiver
   class MeasTypeBuffer
     def initialize(_meas_type)
       @meas_type = _meas_type
+      @logger = @meas_type.logger
+      @debug = @meas_type.debug
+      @name = @meas_type.name
 
       @coefficients = _meas_type.coefficients
       @storage = _meas_type.storage
@@ -22,8 +25,7 @@ module MeasReceiver
     end
 
     attr_accessor :buffer, :time_from, :time_to, :coefficients, :storage
-
-    attr_reader :storage_last_i, :storage_buffer, :size
+    attr_reader :storage_last_i, :storage_buffer, :size, :name
 
     # add raw value
     def add!(v)
@@ -32,6 +34,8 @@ module MeasReceiver
         @buffer << v
         @time_from ||= Time.now
         @time_to = Time.now
+
+        @logger.debug("Added #{v.to_s.yellow} to buffer, size #{@size.to_s.blue}") if @debug
       end
     end
 
@@ -98,6 +102,8 @@ module MeasReceiver
     # Executed by scheduler to store important values
     def perform_storage!
       @mutex.synchronize do
+        @logger.debug("Performing storage for #{self.name.red}") if @debug
+
         _range = storage_calculate_range
         _avg = storage_calculate_averaged(_range)
         _indexes = storage_get_ranges_to_store(_avg, _range)
@@ -110,10 +116,13 @@ module MeasReceiver
         end
 
         # call proc
+        @logger.debug("Storage buffer size is #{@storage_buffer.size.to_s.cyan}") if @debug
         if @storage[:proc]
           @storage[:proc].call(@storage_buffer)
         end
 
+        @logger.debug("Storage completed for #{self.name.red}") if @debug
+
         return @storage_buffer
       end
     end
@@ -124,6 +133,9 @@ module MeasReceiver
       _from = @storage_last_i
       # only check measurements up to
       _to = @buffer.size - 1
+
+      @logger.debug("Range to store #{_from.to_s.magenta}..#{_to.to_s.magenta}") if @debug
+      
       return _from.._to
     end
 

data/lib/meas_receiver/meas_type_receiver.rb

@@ -1,3 +1,5 @@
+require 'logger'
+require 'colorize'
 require 'rufus/scheduler'
 require 'meas_receiver/meas_type_buffer'
 
@@ -11,15 +13,23 @@ module MeasReceiver
     def initialize(_options)
       @options = _options
 
+      @options[:logger] ||= Hash.new
+      @options[:logger][:output] ||= STDOUT
+      @options[:logger][:level] ||= Logger::INFO
+      @logger = Logger.new(@options[:logger][:output])
+      @logger.level = @options[:logger][:level]
+      @debug = (@options[:logger][:level] == Logger::DEBUG)
+
       @fetch_interval = _options[:fetch_interval] || DEFAULT_FETCH_INTERVAL
       @fetch_interval = MIN_FETCH_INTERVAL if @fetch_interval < MIN_FETCH_INTERVAL
 
-      @command = _options[:command]
-      @response_size = _options[:response_size]
-      @coefficients = _options[:coefficients] || Hash.new
+      @name = @options[:name]
+      @command = @options[:command]
+      @response_size = @options[:response_size]
+      @coefficients = @options[:coefficients] || Hash.new
       @coefficients[:linear] ||= 1.0
       @coefficients[:offset] ||= 0.0
-      @storage = _options[:storage] || Hash.new
+      @storage = @options[:storage] || Hash.new
       @storage[:min_time_interval] ||= @fetch_interval
       @storage[:min_unit_interval] = (@storage[:min_time_interval] / @fetch_interval).floor
       @storage[:max_time_interval] ||= 3600
@@ -30,9 +40,11 @@ module MeasReceiver
       @meas_buffer = MeasTypeBuffer.new(self)
     end
 
-    attr_reader :fetch_interval, :command, :response_size, :coefficients, :storage
+    attr_reader :fetch_interval, :command, :response_size, :coefficients, :storage, :name, :logger, :debug
 
     def start
+      @logger.debug("MeasReceiver started for #{self.name.red}") if @debug
+
       @scheduler = Rufus::Scheduler.start_new(frequency: SCH_MIN_INTERVAL)
       @scheduler.every "#{@fetch_interval}s" do
         fetch
@@ -45,12 +57,15 @@ module MeasReceiver
 
     def stop
       @scheduler.stop
+      @logger.debug("MeasReceiver stopped for #{self.name.red}") if @debug
     end
 
     def fetch
       v = @comm_object.g
-      puts v
       @meas_buffer.add!(v)
+
+      @logger.debug("Fetched #{self.name.red} = #{v.to_s.yellow}") if @debug
+
       return v
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: home_io_meas_receiver
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-04 00:00:00.000000000Z
+date: 2012-12-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &23002300 !ruby/object:Gem::Requirement
+  requirement: &15527060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23002300
+  version_requirements: *15527060
 - !ruby/object:Gem::Dependency
   name: mean
-  requirement: &23001820 !ruby/object:Gem::Requirement
+  requirement: &15558520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23001820
+  version_requirements: *15558520
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: &15557820 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *15557820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &23001260 !ruby/object:Gem::Requirement
+  requirement: &15557180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +54,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *23001260
+  version_requirements: *15557180
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &23000780 !ruby/object:Gem::Requirement
+  requirement: &15556540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *23000780
+  version_requirements: *15556540
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &22947700 !ruby/object:Gem::Requirement
+  requirement: &15555820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *22947700
+  version_requirements: *15555820
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &22945600 !ruby/object:Gem::Requirement
+  requirement: &15555060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22945600
+  version_requirements: *15555060
 description: Receive measurements from IoServer (part if HomeIO).
 email: bobikx@poczta.fm
 executables: []
@@ -95,7 +106,6 @@ files:
 - lib/meas_receiver/comm_protocol.rb
 - lib/meas_receiver/meas_type_buffer.rb
 - lib/meas_receiver/meas_type_receiver.rb
-- lib/meas_receiver/receiver.rb
 homepage: http://github.com/akwiatkowski/meas_receiver
 licenses:
 - LGPLv3
@@ -111,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1437030628123017691
+      hash: 2619819358904249746
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/meas_receiver/receiver.rb

@@ -1,8 +0,0 @@
-module MeasReceiver
-  class Receiver
-    def initialize
-      #
-      @meases = Array.new
-    end
-  end
-end