saj_collector 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39d04599063647006f8f24f1a19c830ea9198fd8
-  data.tar.gz: 7e4966a4c373658f8a57dee8f51c3bc4e4bbecb8
+  metadata.gz: 6051e60be83878368fff7a972f99ce37590d75b5
+  data.tar.gz: 844b49249c038b790ab31afd297d064edf80601d
 SHA512:
-  metadata.gz: ee0354c0a008234f28290d7ec8ac016304f76b85d2e8f11b2fb9b984add47311a332bea8db6e673e5db6669e9555a9124286ff7ec89f335515a9aea317107689
-  data.tar.gz: 9dec42beb8eef437e4fb985db0c329dbc1ff2dee431b1c147ecdca14b2e08595ba33b5dfe1f839e026fcd1fecfa12700c880000f1e92b25ff437f3a12992b5f3
+  metadata.gz: 9dabb743328c6f2e7900ea34772e2ad12fc938f267d8d65bb6fd5ef63f535dd62ac07f1b6edf0aecfca58ef562973253d91a21f5208f42f239f6301787cababb
+  data.tar.gz: b03734bf6113c704391bbeb179a283ef8a1fcda02b13f1f96c5651f31aa1fb79c206eede289ffa5d7ee1062fb36b2bc7ce4fc24219b5b18291d74310b19947ee

data/Rakefile

@@ -1,4 +1,8 @@
 require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 
+RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new
+
+task :default => :spec

data/exe/saj_collector

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require "rexml/document"
+require 'rexml/document'
 require 'net/http'
 require 'pvoutput/client'
 require 'yaml'
@@ -13,15 +13,15 @@ sajcollector_config = YAML::load_file('/etc/saj_collector/saj_collector.yaml')
 pvoutput = PVOutput::Client.new(sajcollector_config[:system_id], sajcollector_config[:api_key])
 
 options = {
-  'temperature' => 0, # Temperature in celcius
+  'temperature'      => 0, # Temperature in celcius
   'energy_generated' => 0, # Energy generation in watt hours
-  'power_generated' => 0, # Power generation in watts
-  'voltage' => 0, # Voltage in volts
-  'amperage' => 0, # Amperage
-  'power_today' => 0,
-  'power_all_time' => 0,
-  'runtime_today' => 0,
-  'runtime_all_time' => 0
+  'power_generated'  => 0, # Power generation in watts
+  'voltage'          => 0, # Voltage in volts
+  'amperage'         => 0, # Amperage
+  'power_today'      => 0,
+  'power_all_time'   => 0,
+  'runtime_today'    => 0,
+  'runtime_all_time' => 0,
 }
 
 # Get the current realtime data from the SAJ device
@@ -31,39 +31,39 @@ c = Net::HTTP.get(sajcollector_config[:saj], '/real_time_data.xml')
 doc = REXML::Document.new c
 
 # Get the temperature
-doc.elements.each("real_time_data/temp"){
+doc.elements.each('real_time_data/temp'){
   |e| options[:temperature] = e.text
 }
 
 # e-today is in kWh where pvoutput is Wh
-doc.elements.each("real_time_data/e-today"){
+doc.elements.each('real_time_data/e-today'){
   |e| options[:energy_generated] = e.text.to_f * 1000
 }
 
 # Get the power generated
-doc.elements.each("real_time_data/p-ac"){
+doc.elements.each('real_time_data/p-ac'){
   |e| options[:power_generated] = e.text
 }
 
 # Get the current amperage
-doc.elements.each("real_time_data/i-grid"){
+doc.elements.each('real_time_data/i-grid'){
   |e| options[:amperage] = e.text
 }
 
 # Get the voltage
-doc.elements.each("real_time_data/v-grid"){
+doc.elements.each('real_time_data/v-grid'){
   |e| options[:voltage] = e.text
 }
-doc.elements.each("real_time_data/e-today"){
+doc.elements.each('real_time_data/e-today'){
   |e| options[:power_today] = e.text
 }
-doc.elements.each("real_time_data/e-total"){
+doc.elements.each('real_time_data/e-total'){
   |e| options[:power_all_time] = e.text
 }
-doc.elements.each("real_time_data/t-today"){
+doc.elements.each('real_time_data/t-today'){
   |e| options[:runtime_today] = e.text
 }
-doc.elements.each("real_time_data/t-total"){
+doc.elements.each('real_time_data/t-total'){
   |e| options[:runtime_all_time] = e.text
 }
 
@@ -85,7 +85,7 @@ puts "  Run Time: #{options[:runtime_all_time]} Hours"
 
 pvoutput.add_status(
   :energy_generated => options[:energy_generated],
-  :power_generated => options[:power_generated],
-  :temperature => options[:temperature],
-  :voltage => options[:voltage],
-  )
+  :power_generated  => options[:power_generated],
+  :temperature      => options[:temperature],
+  :voltage          => options[:voltage]
+)

data/exe/saj_output_collector

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require "rexml/document"
+require 'rexml/document'
 require 'net/http'
 require 'pvoutput/client'
 require 'yaml'
@@ -18,38 +18,33 @@ c = Net::HTTP.get(sajcollector_config[:saj], '/day_trend.xml')
 # Let REXML parse the XML file
 doc = REXML::Document.new c
 
-days = 0
-
-# Get the number of days of the current month
-doc.elements.each("day_trend/days"){
-  |e| days = e.text.to_i
-}
+# Get the current day number, we can't post data for future dates
+time = Time.now
+days = time.day
+m = time.strftime('%Y%m')
 
-puts "Number of days this month #{days}"
+puts "Number of days until now for this month #{days}"
 
 options = {
-  'output_date' => 0, # Day generated
-  'energy_generated' => 0 # Energy generation in watt hours
 }
 
-time = Time.now
-m = time.strftime('%Y%m')
 counter = 0
-current_day = "00"
+current_day = '00"'
 
 while counter < days
-  options[:output_date] = "#{m}#{current_day.next!}"
-
+  value = {
+    :energy_generated => 0 }
   # Get the power output of the day,
   doc.elements.each("day_trend/d#{counter}"){
-    |e| options[:energy_generated] = (e.text.to_i * 100).to_s
+    |e| value[:energy_generated] = (e.text.to_i * 100).to_s
   }
-  puts "Energy generated (#{options[:output_date]}) : #{options[:energy_generated]} WH"
-
-  pvoutput.add_output(
-    :output_date => options[:output_date],
-    :energy_generated => options[:energy_generated],
-    )
+  options[:"#{m}#{current_day.next!}"] = value
 
   counter += 1
 end
+
+options.each do |date, values|
+  puts "Energy generated #{date} :#{values[:energy_generated]} WH"
+end
+
+pvoutput.add_batch_output(options)

data/lib/saj_collector/version.rb

@@ -1,3 +1,3 @@
 module SAJCollector
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.0'.freeze
 end

data/saj_collector.gemspec

@@ -18,9 +18,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
-  spec.add_dependency 'pvoutput' , '~> 0.2.0'
+  spec.add_dependency 'pvoutput', '~> 0.3.0'
 
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-rspec'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saj_collector
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Johnny Willemsen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-27 00:00:00.000000000 Z
+date: 2016-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pvoutput
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - jwillemsen@remedy.nl