saj_collector 1.0.0 → 1.0.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (13) hide show
  1. checksums.yaml +4 -4
  2. data/.github/dependabot.yml +12 -0
  3. data/.github/workflows/ruby.yml +6 -9
  4. data/.rubocop.yml +6 -1
  5. data/Gemfile +2 -0
  6. data/README.md +3 -3
  7. data/Rakefile +2 -0
  8. data/exe/saj_collector +13 -12
  9. data/exe/saj_output_collector +1 -0
  10. data/lib/saj_collector/version.rb +3 -1
  11. data/lib/say_collector.rb +2 -0
  12. data/saj_collector.gemspec +7 -3
  13. metadata +11 -10
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: '02099a9a784416f8781be175eb5f16eaa1870b68f50fc7af7eecb670a085d281'
4
- data.tar.gz: 195b72840d17e3a25d4ce389c98b3307889f19432b72e293382bab831aba884d
3
+ metadata.gz: 8304d3b07d3aa1751eb21298b30d45c7e8ca55021943f158f9ae7efb520fbdac
4
+ data.tar.gz: 04d0d8405a6c6785387cd8a6ea5370683d943cbfb32ec7cfaf972f480309ce62
5
5
  SHA512:
6
- metadata.gz: 17feb85780f015d22a5aac70fe6ff9b6923448a3e459a795b2ff52c624fab3d0fd6c4c0accd1fd2796475dcc2f60713fcdd0846f435263682595e3bc6b6cb6f2
7
- data.tar.gz: bfd3123ef03d7ff5915f27ad7642f976b34a058ca2fce0769170a82df94521f08343eef6ee72078225fd3f380365e79b360b9b46b3101b4677a6f0c8e4e76a4e
6
+ metadata.gz: 17d4b2d147ac00f47fb250d1ce4e9711792b02ef4c96d636ef4d698fc66b5b27861372892dea0aaeb308bf3295617975247363e78166f2de034d77e87aad42c7
7
+ data.tar.gz: ecc1699e209baba815e5d8b47c897469aa7f9f4eca964077f1376e87ae800eac2d0ec0324ac2b645ce2c21311678f45b019052ef4e12c10e20e7c2e156d6f93b
data/.github/dependabot.yml ADDED
@@ -0,0 +1,12 @@
1
+ # Set update schedule for GitHub Actions
2
+ version: 2
3
+ updates:
4
+ - package-ecosystem: "github-actions"
5
+ directory: "/"
6
+ schedule:
7
+ interval: "weekly"
8
+
9
+ - package-ecosystem: bundler
10
+ directory: "/"
11
+ schedule:
12
+ interval: weekly
data/.github/workflows/ruby.yml CHANGED
@@ -13,22 +13,19 @@ jobs:
13
13
  runs-on: ubuntu-latest
14
14
  strategy:
15
15
  matrix:
16
- ruby-version: [ 2.4, 2.5, 2.6, 2.7, ruby-head ]
16
+ ruby-version: [ '2.4', '2.5', '2.6', '2.7', '3.0', 'ruby-head' ]
17
17
  name: ruby ${{ matrix.ruby-version }}
18
18
  steps:
19
- - uses: actions/checkout@v1
19
+ - uses: actions/checkout@v2
20
20
  - uses: ruby/setup-ruby@v1
21
21
  with:
22
22
  ruby-version: ${{ matrix.ruby-version }}
23
+ bundler-cache: true
23
24
  - name: Install dependencies
24
- run: |
25
- gem install bundler
26
- bundle install --jobs 4 --retry 3
25
+ run: bundle install
27
26
  - name: Lint files
28
- run: |
29
- bundle exec rubocop
27
+ run: bundle exec rubocop
30
28
  - name: Test with Rake
31
- run: |
32
- bundle exec rake
29
+ run: bundle exec rake
33
30
 
34
31
 
data/.rubocop.yml CHANGED
@@ -1,3 +1,8 @@
1
- Metrics/LineLength:
1
+ AllCops:
2
+ NewCops: enable
3
+
4
+ Layout/LineLength:
2
5
  Max: 120
3
6
 
7
+ Layout/HashAlignment:
8
+ EnforcedColonStyle: table
data/Gemfile CHANGED
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  source 'https://rubygems.org'
2
4
 
3
5
  gemspec
data/README.md CHANGED
@@ -2,16 +2,16 @@
2
2
 
3
3
  [![Actions Status](https://github.com/jwillemsen/saj_collector/workflows/ruby/badge.svg)](https://github.com/jwillemsen/saj_collector/actions)
4
4
  [![Codacy Badge](https://api.codacy.com/project/badge/Grade/fdb313b9a4b24614867b91e45a5505f9)](https://www.codacy.com/app/jwillemsen/saj_collector?utm_source=github.com&utm_medium=referral&utm_content=jwillemsen/saj_collector&utm_campaign=badger)
5
- [![Gem Version](https://badge.fury.io/rb/saj_collector.svg)](https://badge.fury.io/rb/saj_collector)
5
+ [![Gem Version](https://badge.fury.io/rb/saj_collector.svg)](https://rubygems.org/gems/saj_collector)
6
6
 
7
- Pull stats from SAJ Solar Inverter and push them to PVOutput. This
7
+ Pull statistics from [SAJ Solar Inverter](https://www.saj-electric.com/) and push them to [PVOutput](https://pvoutput.org/). This
8
8
  ruby gem is based on https://github.com/johnf/jfy_collector
9
9
 
10
10
  ## Installation
11
11
 
12
12
  First install [ruby](https://www.ruby-lang.org) on your system through your favorite package manager. On Windows download and install ruby from [Rubyinstaller](http://www.rubyinstaller.org).
13
13
 
14
- Install it by running the following command from a linux shell or windows command prompt
14
+ Install saj_collector by running the following command from a linux shell or windows command prompt
15
15
 
16
16
  gem install saj_collector
17
17
 
data/Rakefile CHANGED
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  require 'bundler/gem_tasks'
2
4
  require 'rspec/core/rake_task'
3
5
  require 'rubocop/rake_task'
data/exe/saj_collector CHANGED
@@ -1,4 +1,5 @@
1
1
  #!/usr/bin/env ruby
2
+ # frozen_string_literal: true
2
3
 
3
4
  require 'rexml/document'
4
5
  require 'net/http'
@@ -23,15 +24,15 @@ end
23
24
  c = Net::HTTP.get(sajcollector_config[:saj], '/real_time_data.xml')
24
25
 
25
26
  options = {
26
- 'temperature' => 0, # Temperature in celcius
27
- 'energy_generated' => 0, # Energy generation in watt hours
28
- 'power_generated' => 0, # Power generation in watts
29
- 'voltage' => 0, # Voltage in volts
30
- 'amperage' => 0, # Amperage
31
- 'power_today' => 0,
32
- 'power_all_time' => 0,
33
- 'runtime_today' => 0,
34
- 'runtime_all_time' => 0
27
+ temperature: 0, # Temperature in celcius
28
+ energy_generated: 0, # Energy generation in watt hours
29
+ power_generated: 0, # Power generation in watts
30
+ voltage: 0, # Voltage in volts
31
+ amperage: 0, # Amperage
32
+ power_today: 0,
33
+ power_all_time: 0,
34
+ runtime_today: 0,
35
+ runtime_all_time: 0
35
36
  }
36
37
 
37
38
  # Let REXML parse the XML site
@@ -96,7 +97,7 @@ puts " Run Time: #{options[:runtime_all_time]} Hours"
96
97
 
97
98
  pvoutput.add_status(
98
99
  energy_generated: options[:energy_generated],
99
- power_generated: options[:power_generated],
100
- temperature: options[:temperature],
101
- voltage: options[:voltage]
100
+ power_generated: options[:power_generated],
101
+ temperature: options[:temperature],
102
+ voltage: options[:voltage]
102
103
  )
data/exe/saj_output_collector CHANGED
@@ -1,4 +1,5 @@
1
1
  #!/usr/bin/env ruby
2
+ # frozen_string_literal: true
2
3
 
3
4
  require 'rexml/document'
4
5
  require 'net/http'
data/lib/saj_collector/version.rb CHANGED
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  module SAJCollector
2
- VERSION = '1.0.0'.freeze
4
+ VERSION = '1.0.1'
3
5
  end
data/lib/say_collector.rb CHANGED
@@ -1 +1,3 @@
1
+ # frozen_string_literal: true
2
+
1
3
  require 'saj_collector/version'
data/saj_collector.gemspec CHANGED
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  lib = File.expand_path('lib', __dir__)
2
4
  $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
3
5
  require 'saj_collector/version'
@@ -8,7 +10,7 @@ Gem::Specification.new do |spec|
8
10
  spec.authors = ['Johnny Willemsen']
9
11
  spec.email = ['jwillemsen@remedy.nl']
10
12
 
11
- spec.summary = 'Pull stats from SAJ Solar Inverter and push them to PVOutput'
13
+ spec.summary = 'Pull statistics from SAJ Solar Inverter and push them to PVOutput'
12
14
  spec.homepage = 'https://github.com/jwillemsen/saj_collector'
13
15
  spec.license = 'MIT'
14
16
 
@@ -17,12 +19,14 @@ Gem::Specification.new do |spec|
17
19
  spec.require_paths = ['lib']
18
20
  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
19
21
 
22
+ spec.required_ruby_version = '>= 2.4'
23
+
20
24
  spec.add_dependency 'ipaddress'
21
- spec.add_dependency 'pvoutput', '~> 0.5.0'
25
+ spec.add_dependency 'pvoutput', '>= 0.6'
22
26
 
23
27
  spec.add_development_dependency 'bundler'
24
28
  spec.add_development_dependency 'rake', '>= 12.3.3'
25
29
  spec.add_development_dependency 'rspec'
26
- spec.add_development_dependency 'rubocop', '~> 0.52.0'
30
+ spec.add_development_dependency 'rubocop', '~> 1.9.0'
27
31
  spec.add_development_dependency 'rubocop-rspec'
28
32
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: saj_collector
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0
4
+ version: 1.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Johnny Willemsen
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-09-21 00:00:00.000000000 Z
11
+ date: 2021-02-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: ipaddress
@@ -28,16 +28,16 @@ dependencies:
28
28
  name: pvoutput
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - "~>"
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
- version: 0.5.0
33
+ version: '0.6'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - "~>"
38
+ - - ">="
39
39
  - !ruby/object:Gem::Version
40
- version: 0.5.0
40
+ version: '0.6'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: bundler
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
86
86
  requirements:
87
87
  - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: 0.52.0
89
+ version: 1.9.0
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
94
  - - "~>"
95
95
  - !ruby/object:Gem::Version
96
- version: 0.52.0
96
+ version: 1.9.0
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: rubocop-rspec
99
99
  requirement: !ruby/object:Gem::Requirement
@@ -118,6 +118,7 @@ extensions: []
118
118
  extra_rdoc_files: []
119
119
  files:
120
120
  - ".github/FUNDING.yml"
121
+ - ".github/dependabot.yml"
121
122
  - ".github/workflows/ruby.yml"
122
123
  - ".rubocop.yml"
123
124
  - CODE_OF_CONDUCT.md
@@ -143,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
143
144
  requirements:
144
145
  - - ">="
145
146
  - !ruby/object:Gem::Version
146
- version: '0'
147
+ version: '2.4'
147
148
  required_rubygems_version: !ruby/object:Gem::Requirement
148
149
  requirements:
149
150
  - - ">="
@@ -153,5 +154,5 @@ requirements: []
153
154
  rubygems_version: 3.0.8
154
155
  signing_key:
155
156
  specification_version: 4
156
- summary: Pull stats from SAJ Solar Inverter and push them to PVOutput
157
+ summary: Pull statistics from SAJ Solar Inverter and push them to PVOutput
157
158
  test_files: []