saj_collector 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 370630fb07fea199502ce6a8a421ce7d0e4a8253fec109baac95597ed8d0e225
-  data.tar.gz: 319651b7846f4ece02d5d8d725873291cf490d3a20e3dbfbb9e6775f622f9ea7
+  metadata.gz: 142b2785eb3f49663f7e3c58cbb68e5396cbab7851725d5c2b50c1be75ca6bf4
+  data.tar.gz: 520737a4c49879ef23781f4cac71dfa9652cd6602953f2dff913e270d1647cad
 SHA512:
-  metadata.gz: 9c27ed515b65a42606a847f52edd54e35df6d794f53d999e3f24219599bc766b6932e2f226a4efc6db1c0b4c8f2891e2f68b04952bd33305937ea2e00d7eb7a6
-  data.tar.gz: 814743887fe0821186275a9ac7bc6a15650db9d4dddeb5166c1c7acccbe3f06e3e4a8bb32a47b0d90b0f8d8680b6fda5e52ff7bdacb4c9badde1912ff20c7a33
+  metadata.gz: 3b03aaa0f7c6907c5d0d6cebcae134e00c145e33e760c53693d551dc35823f1a9b61149eabdc8534e051906d8d0fc2f5ac488328d459847e6f5dfea65ab2835b
+  data.tar.gz: 02ea3bc2079243b2ccfb217381158d0a049d4332e80afc5c37176c7d6b69ea774bf899177336a60b92339e4143131d104500f733ce3dfd5d8b9698400e21ff40

data/.github/workflows/ruby.yml

@@ -1,18 +1,39 @@
 name: Ruby
 
-on: [push]
+on:
+  push:
+  pull_request:
+    branches:
+      - master
+  schedule:
+    - cron: '0 7 * * SUN'
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
+    strategy:
+      matrix:
+        name: [
+          Ruby24,
+          Ruby25,
+          Ruby26,
+          Ruby27
+        ]
+        include:
+          - name: Ruby24
+            RubyVersion: 2.4
+          - name: Ruby25
+            RubyVersion: 2.5
+          - name: Ruby26
+            RubyVersion: 2.6
+          - name: Ruby27
+            RubyVersion: 2.7
     steps:
     - uses: actions/checkout@v1
     - name: Set up Ruby 2.6
       uses: actions/setup-ruby@v1
       with:
-        ruby-version: 2.6.x
+        ruby-version: ${{ matrix.RubyVersion }}
     - name: Build and test with Rake
       run: |
         gem install bundler

data/README.md

@@ -23,6 +23,10 @@ PVOutput system id (```system_id```) and PVOutput API key (```api_key```). These
 system id and API key can be found on your
 [PVOutput account page](https://pvoutput.org/account.jsp).
 
+Some SAJ Solar Inverters provide the generation of each day with a granularity of 0.1kWh and some with
+a granularity of 0.01kWh. In case of the last you have to change the ```day_trend_multiplication_factor```
+within your ```saj_collector.yaml``` to 10.
+
 ``` yaml
 :saj: a.b.c.d
 :system_id: 123456
@@ -30,27 +34,24 @@ system id and API key can be found on your
 :day_trend_multiplication_factor: 100
 ```
 
-Run the SAJ Collector in a screen or via init of some sort
+Run the SAJ Collector from the command prompt or shell
 
     saj_collector
 
 This will run the current power generation frm the SAJ Collector and push the
-data once to PVOutput. You can add
-``saj_collector`` to your crontab or a custom script to let it automatically push with
-a certain frequency.
+data once to PVOutput.
 
 The SAJ Output Collector will retrieve the generation of each day of the current month and
 push the data once to PVOutput.
-Run the SAJ Output Collector in a screen or via init of some sort
+
+Run the SAJ Output Collector from the command prompt or shell
 
     saj_output_collector
 
-You can add ``saj_output_collector`` to your crontab or a custom script to let it automatically push with
-a certain frequency.
+## Scheduling the collecor
 
-Some SAJ Solar Inverters provide the generation of each day with a granularity of 0.1kWh and some with
-a granularity of 0.01kWh. In case of the last you have to change the ```day_trend_multiplication_factor```
-within your ```saj_collector.yaml``` to 10.
+On Linux you can add ``saj_collector`` and ``saj_output_collector`` to your crontab to let it automatically push with
+a certain frequency.
 
 At the moment you add any of these to your crontab you have to make sure
 that the ``saj_collector.yaml`` file can be found. For example when you put the ``saj_collector.yaml`` file
@@ -59,6 +60,9 @@ add to your crontab
 
     */5 6-21 * * * cd /usr/local/bin && ruby /usr/local/bin/saj_collector
 
+On Windows you can create a task using the Task Scheduler. Make sure that for the Action you specific the path
+of the ``saj_collector.yaml`` file as ``Start in``.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies.

data/exe/saj_collector

@@ -6,15 +6,17 @@ require 'pvoutput/client'
 require 'yaml'
 require 'ipaddress'
 
+yaml_file = 'saj_collector.yaml'
+
 # Load the configuration from the yaml file
-sajcollector_config = YAML.load_file('saj_collector.yaml')
+sajcollector_config = YAML.load_file(yaml_file)
 
 # Create a pvoutput with the configured system_id and api_key which both
 # can be obtained from the pvoutput website
 pvoutput = PVOutput::Client.new(sajcollector_config[:system_id], sajcollector_config[:api_key])
 
 unless IPAddress.valid?(sajcollector_config[:saj])
-  raise ("[#{sajcollector_config[:saj]}] is not a valid IP address")
+  raise ("[#{sajcollector_config[:saj]}] is not a valid IP address, please correct your #{yaml_file} file")
 end
 
 # Get the current realtime data from the SAJ device

data/exe/saj_output_collector

@@ -6,15 +6,17 @@ require 'pvoutput/client'
 require 'yaml'
 require 'ipaddress'
 
+yaml_file = 'saj_collector.yaml'
+
 # Load the configuration from the yaml file
-sajcollector_config = YAML.load_file('saj_collector.yaml')
+sajcollector_config = YAML.load_file(yaml_file)
 
 # Create a pvoutput with the configured system_id and api_key which both
 # can be obtained from the pvoutput website
 pvoutput = PVOutput::Client.new(sajcollector_config[:system_id], sajcollector_config[:api_key])
 
 unless IPAddress.valid?(sajcollector_config[:saj])
-  raise ("[#{sajcollector_config[:saj]}] is not a valid IP address")
+  raise ("[#{sajcollector_config[:saj]}] is not a valid IP address, please correct your #{yaml_file} file")
 end
 
 # Get the current day trend data from the SAJ device

data/lib/saj_collector/version.rb

@@ -1,3 +1,3 @@
 module SAJCollector
-  VERSION = '0.5.6'.freeze
+  VERSION = '0.5.7'.freeze
 end

data/saj_collector.gemspec

@@ -17,11 +17,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.4.0'
   spec.add_dependency 'ipaddress'
+  spec.add_dependency 'pvoutput', '~> 0.4.0'
 
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop', '~> 0.52.0'
   spec.add_development_dependency 'rubocop-rspec'

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: saj_collector
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - Johnny Willemsen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-14 00:00:00.000000000 Z
+date: 2020-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: pvoutput
+  name: ipaddress
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: ipaddress
+  name: pvoutput
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -152,8 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Pull stats from SAJ Solar Inverter and push them to PVOutput