pvoutput 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8eb79d223db909c8c4ecc34f018b3a8d952b5ebb
-  data.tar.gz: 975583f464c918aca3e9d61fe1992a3012d5e404
+SHA256:
+  metadata.gz: 8838c12458d732306134a95d095732b0601b943a57bd327591390893fde07197
+  data.tar.gz: b302c36decace96a670043a6642bbd19b1a1c8ab08266e8dde4b3c7f8f23f92a
 SHA512:
-  metadata.gz: db4f626c4f3851d09020c247beccd74e634d0b77a9ebb4d0c3b59f740047efe26d07a9d00cfebcf8fa5995d4113ba42c5f272e4347fe408d1faab82586430127
-  data.tar.gz: f0c80ce60a15525463babc44727a3dc2732216831787f1d3efcab134160a290ee55354a18a1fa108bb6b5536b29db8e9bf41df25d1c21e1d631cf7f4c0346b64
+  metadata.gz: 9b60f6fbe559f1fc9a15b9debcf5703eaa42aa95bbe35aa7ae3fd8016197d279ce8f3c62414a2c1faa05adfaf7efccbfe2dd9bd0044ec28f239855b0b1492080
+  data.tar.gz: 3e203a8ce6c1c1309ec1ad22f37267f94d74820b6c4a332b36a94c818c1bee9ae2442223b31d45c3b6c243a0887c4023a1e9b22c2f6deadf24c10022854d7f32

data/.github/dependabot.yml

@@ -0,0 +1,14 @@
+# Set update schedule for GitHub Actions
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "saturday"
+
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "saturday"

data/.github/workflows/gem-push.yaml

@@ -0,0 +1,25 @@
+name: Ruby Gem
+
+on:
+  release:
+    types: [ published ]
+
+jobs:
+  build:
+    name: Build + Publish
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby 2.7
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.7
+
+    - name: Install dependencies
+      run: bundle install
+    - name: Publish to RubyGems
+      run: |
+        rake release
+      env:
+        GEM_HOST_API_KEY: "${{secrets.GEM_HOST_API_KEY}}"

data/.github/workflows/ruby.yml

@@ -0,0 +1,30 @@
+name: Test
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+  schedule:
+    - cron: '0 1 * * SUN'
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: [ '2.5', '2.6', '2.7', '3.0', 'ruby-head' ]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Setup ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Install dependencies
+      run: bundle install
+    - name: Lint files
+      run: bundle exec rubocop
+    - name: Run tests
+      run: bundle exec rake

data/.gitignore

@@ -4,3 +4,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/vendor/bundle

data/.rubocop.yml

@@ -1,6 +1,9 @@
 require: rubocop-rspec
 
-HashSyntax:
+AllCops:
+  NewCops: enable
+
+Style/HashSyntax:
   EnforcedStyle: hash_rockets
 
 Style/Documentation:
@@ -9,14 +12,26 @@ Style/Documentation:
 Style/Lambda:
   Enabled: false
 
-Style/TrailingComma:
-  EnforcedStyleForMultiline: comma
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: consistent_comma
+
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: consistent_comma
+
+Metrics/MethodLength:
+  Max: 20
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 120
 
+RSpec/ExampleLength:
+  Max: 15
+
 Style/ModuleFunction:
   Enabled: false
 
-AlignHash:
+Layout/HashAlignment:
   EnforcedHashRocketStyle: table
+
+Style/OptionalBooleanParameter:
+  Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,32 @@
 # Changelog
 
+# 1.0.0 (2021-02-14)
+
+* Require a minimum of Ruby 2.5 (@jwillemsen)
+* Clean up ruby gem publish GitHub Action (@jwillemsen)
+
+# 0.6.0 (2021-02-06)
+
+This test has no code changes but tests the new release process.
+
+* Move tests from CircleCI to GitHub Actions (@johnf)
+* Keep an eye on dependencies with Dependabot (@jwillemsen)
+* Schedule regular tests against multiple rubys (@jwillemsen)
+
+# 0.5.0 (2020-09-20)
+
+* Add more detail to error messages (@jwillemsen)
+* Support debugging (@johnf)
+
+# 0.4.0 (20160911)
+
+* Add retries to batch_output (@jwillemsen)
+
+# 0.3.0 (20160229)
+
+* Add donation mode (@jwillemsen)
+* Add batch_output support (@jwillemsen)
+
 # 0.2.0 (20160227)
 
 * Fix typo in temperature (@jwillemsen)

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec

data/README.md

@@ -1,7 +1,9 @@
 # PVOutput
 
-[![Circle CI](https://circleci.com/gh/johnf/pvoutput.svg?style=svg)](https://circleci.com/gh/johnf/pvoutput)
+[![Actions Status](https://github.com/johnf/pvoutput/workflows/Test/badge.svg)](https://github.com/johnf/pvoutput/actions)
 [![Coverage Status](https://coveralls.io/repos/johnf/pvoutput/badge.svg?branch=master&service=github)](https://coveralls.io/github/johnf/pvoutput?branch=master)
+[![Gem Version](https://badge.fury.io/rb/pvoutput.svg)](http://badge.fury.io/rb/pvoutput)
+
 
 Ruby library for talking to the PVOutput API.
 
@@ -35,7 +37,13 @@ First step is to create a PVOutput client using your PVOutput assigned system_id
 pvoutput = PVOutput::Client.new(system_id, api_key)
 ```
 
-Now you can report your status to PVOutput using
+At the moment you [donate](http://pvoutput.org/donate.jsp) to PVOutput you can enable the donation mode by creating a PVOutput client using
+
+```ruby
+pvoutput = PVOutput::Client.new(system_id, api_key, true)
+```
+
+Now you can report your real time status to PVOutput using
 
 ```ruby
 pvoutput.add_status(
@@ -47,7 +55,7 @@ The add_status operation accepts the following options
 
 | Option           | PVOutput Parameter |
 | ---------------- | ------------------ |
-| energy_generated |v1 |
+| energy_generated | v1 |
 | power_generated  | v2 |
 | energy_consumed  | v3 |
 | power_consumed   | v4 |
@@ -67,11 +75,102 @@ client.add_status(
 )
 ```
 
+You can report your daily output to PVOutput using
+
+```ruby
+pvoutput.add_output(
+  options
+)
+```
+
+The add_output operation accepts the following options
+
+| Option                | PVOutput Parameter |
+| --------------------- | ------------------ |
+| output_date           | d |
+| energy_generated      | g |
+| peak_power            | pp |
+| peak_time             | pt |
+| condition             | cd |
+| min_temp              | tm |
+| max_temp              | tx |
+| comments              | cm |
+| import_peak           | ip |
+| import_off_peak       | io |
+| import_shoulder       | is |
+| import_high_shoulder  | ih |
+| consumption           | c |
+
+As example
+
+```ruby
+client.add_output(
+  :output_date      => '20160228'
+  :energy_generated  => 15000,
+  :max_temp      => 30
+)
+```
+
+You can report also a batch of daily output values to PVOutput using
+
+```ruby
+pvoutput.add_batch_output(
+  options
+)
+```
+
+The add_batch_output operation accepts a hash with the date as key and within that the following options
+
+| Option                | PVOutput Parameter |
+| --------------------- | ------------------ |
+| energy_generated      | g |
+| peak_power            | pp |
+| peak_time             | pt |
+| condition             | cd |
+| min_temp              | tm |
+| max_temp              | tx |
+| comments              | cm |
+| import_peak           | ip |
+| import_off_peak       | io |
+| import_shoulder       | is |
+| import_high_shoulder  | ih |
+| consumption           | c |
+
+As example
+
+```ruby
+client.add_output(
+  :'20150101' => {
+    :energy_generated => 1239, },
+  :'20150102' => {
+    :energy_generated => 1523 },
+  :'20150103' => {
+    :energy_generated => 2190 },
+)
+```
+
+## Debugging
+
+You can enable HTTParty debugging to see the requests by setting `PVOUTPUT_DEBUG=true`
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake rspec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`.
+
+## Release
+
+To release a new version:
+  * Create a branch for the release
+  * Update the version number in `version.rb`
+  * Update CHANGELOG.md
+  * git commit -pm 'Release 1.x.x'
+  * git tag v1.x.x
+  * git push
+  * git push --tags
+  * In GitHub add the Change Log section to the release and save it
+  * Check everything looks OK in GitHub Actions
 
 ## Contributing
 

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'

data/bin/console

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
-require 'jfy'
+require 'pvoutput/client'
 
 require 'pry'
 Pry.start

data/lib/pvoutput.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pvoutput/version'
 
 module PVOutput

data/lib/pvoutput/client.rb

@@ -1,19 +1,43 @@
+# frozen_string_literal: true
+
 require 'httparty'
 
 module PVOutput
   class Client
     include HTTParty
     base_uri 'pvoutput.org'
-    # debug_output $stdout
+    debug_output $stdout if ENV['PVOUTPUT_DEBUG']
 
-    def initialize(system_id, api_key)
+    def initialize(system_id, api_key, donation_mode = false)
       @system_id = system_id.to_s
       @api_key = api_key.to_s
+      # The batch operations have default limit of 30 sets of data in one request, when you
+      # are using the donation mode the limit is 100 sets
+      @batch_size = 30
+      @batch_size = 100 if donation_mode
 
       self.class.headers 'X-Pvoutput-Apikey' => @api_key, 'X-Pvoutput-SystemId' => @system_id
     end
 
-    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+    # Helper method to post batch request to pvoutput that retries at the moment we get
+    # a 400 error back with body containing 'Load in progress'
+    def post_request(path, options = {}, &block)
+      loop do
+        response = self.class.post(path, options, &block)
+
+        if response.code == 400 && response.body =~ /Load in progress/
+          # We can't send data too fast, when the previous request is still loaded we
+          # have to wait so sleep 10 seconds and try again
+          sleep(10)
+        elsif response.code == 200
+          return
+        else
+          raise("Bad Post: #{response.body}")
+        end
+      end
+    end
+
+    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     def add_status(options)
       time = options[:when] || Time.now
 
@@ -33,11 +57,11 @@ module PVOutput
 
       response = self.class.post('/service/r2/addstatus.jsp', :body => params)
 
-      fail('Bad Post') unless response.code == 200
+      raise('Bad Post') unless response.code == 200
     end
-    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
-    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     def add_output(options)
       params = {
       }
@@ -50,11 +74,37 @@ module PVOutput
       params[:tm] = options[:min_temp] if options[:min_temp]
       params[:tx] = options[:max_temp] if options[:max_temp]
       params[:cm] = options[:comments] if options[:comments]
+      params[:ip] = options[:import_peak] if options[:import_peak]
+      params[:io] = options[:import_off_peak] if options[:import_off_peak]
+      params[:is] = options[:import_shoulder] if options[:import_shoulder]
+      params[:ih] = options[:import_high_shoulder] if options[:import_high_shoulder]
+      params[:c] = options[:consumption] if options[:consumption]
 
       response = self.class.post('/service/r2/addoutput.jsp', :body => params)
 
-      fail('Bad Post') unless response.code == 200
+      raise('Bad Post') unless response.code == 200
+    end
+    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+
+    def add_batch_output(options)
+      keys = %i[energy_generated energy_export energy_used]
+      keys += %i[peak_power peak_time condition min_temp]
+      keys += %i[max_temp comments import_peak import_off_peak]
+      keys += %i[import_shoulder]
+
+      options.to_a.each_slice(@batch_size) do |slice|
+        data = ''
+        slice.each do |entry|
+          date, values = entry
+          data += "#{date},#{keys.map { |key| values[key] }.join(',')};"
+        end
+
+        params = {
+          :data => data.chop,
+        }
+
+        post_request('/service/r2/addbatchoutput.jsp', :body => params)
+      end
     end
-    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
   end
 end

data/lib/pvoutput/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PVOutput
-  VERSION = '0.2.0'
+  VERSION = '1.0.0'
 end

data/pvoutput.gemspec

@@ -1,5 +1,6 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'pvoutput/version'
 
@@ -18,16 +19,18 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
+  spec.required_ruby_version = '>= 2.5'
+
   spec.add_dependency 'httparty'
 
-  spec.add_development_dependency 'bundler', '~> 1.10'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler', '>= 2.1'
+  spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'webmock'
-  spec.add_development_dependency 'timecop'
+  spec.add_development_dependency 'rspec_junit_formatter'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'rubocop-rspec'
-  spec.add_development_dependency 'rspec_junit_formatter'
-  spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'timecop'
+  spec.add_development_dependency 'webmock'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pvoutput
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - John Ferlito
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2021-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -28,30 +28,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -67,21 +67,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec_junit_formatter
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -171,6 +171,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/gem-push.yaml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -182,7 +185,6 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- circle.yml
 - lib/pvoutput.rb
 - lib/pvoutput/client.rb
 - lib/pvoutput/version.rb
@@ -199,15 +201,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Library to speak to the PVOutput API

data/circle.yml

@@ -1,9 +0,0 @@
-test:
-  post:
-    - bundle exec rubocop
-machine:
-  ruby:
-    version: 2.2.3
-dependencies:
-  pre:
-    - gem install bundler --pre