atrea_control 2.1.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47dfda0eb6906708f68c4d43dae4a9ed7249492e32150fb40e244302158a2f10
-  data.tar.gz: dd16ffa80d5b61380a14814690058165d3fc8b2e8ab79f3ca17d4ccf8f218e7e
+  metadata.gz: 71385fed43dd965234a78cce1a5599e2ee5f18762d9c8350d303e6233df283e7
+  data.tar.gz: b761d15ac374618ec497c3fc7aac31053140ad36f75948d302fbcf1723824819
 SHA512:
-  metadata.gz: 109c78b115fc8652a5f2b113c5ac14972ae8e7a469ca4453365edf01a3c8898f3e25c78bf39a7da02947440868ddcdcfa8f9a2b5a3f0be997ece7f6bc3598319
-  data.tar.gz: 696a0c42c1fe2b4881247753f318290e52450299cebeab73c2faffee8e7b151f5f4000e8896fe42ef227184ae881a0a324306f02d49d1aba416061a3620f8e0b
+  metadata.gz: c2278513674f32c508b54a5e69001d94368733f90afbad3e8e808789047113d9b91f2db3c90b92c3ebfd53c0eff3777f3fcf8f236ca53d401fcbefbc803d3ca5
+  data.tar.gz: e7a1846465fcae8b60ec4a9ed09e24a500dd47d7c9a49093878e5ce001ba629258e44a89d932527db121ea07c8622b80878ea09ea57c83f2e2ffc4f23db88c12

data/.rubocop_todo.yml

@@ -1,101 +1,76 @@
 # This configuration was generated by
-# `rubocop --auto-gen-config --auto-gen-only-exclude`
-# on 2021-10-30 20:32:55 UTC using RuboCop version 1.22.2.
+# `rubocop --auto-gen-config`
+# on 2023-03-01 20:32:36 UTC using RuboCop version 1.47.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment, EnforcedStyleForExponentOperator.
-# SupportedStylesForExponentOperator: space, no_space
-Layout/SpaceAroundOperators:
-  Exclude:
-    - '_x.rb'
+# Offense count: 3
+# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
+Metrics/AbcSize:
+  Max: 34
 
 # Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
-# SupportedStyles: space, no_space, compact
-# SupportedStylesForEmptyBraces: space, no_space
-Layout/SpaceInsideHashLiteralBraces:
-  Exclude:
-    - '_x.rb'
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
+Metrics/MethodLength:
+  Max: 21
 
-# Offense count: 2
-# Configuration parameters: CountComments, Max, CountAsOne, ExcludedMethods, IgnoredMethods.
-# IgnoredMethods: refine
-Metrics/BlockLength:
+# Offense count: 1
+# Configuration parameters: Prefixes, AllowedPatterns.
+# Prefixes: when, with, without
+RSpec/ContextWording:
   Exclude:
-    - '**/*.gemspec'
-    - 'spec/atrea_control/duplex_spec.rb'
+    - 'spec/support/user_ctrl.rb'
 
 # Offense count: 1
-# Configuration parameters: CountComments, Max, CountAsOne.
-Metrics/ClassLength:
+RSpec/ExpectInHook:
   Exclude:
-    - 'lib/atrea_control/duplex.rb'
+    - 'spec/atrea_control/duplex/unit_spec.rb'
 
-# Offense count: 4
-# Configuration parameters: .
+# Offense count: 7
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: have_received, receive
 RSpec/MessageSpies:
-  EnforcedStyle: receive
-
-# Offense count: 1
-# Configuration parameters: Max.
-RSpec/MultipleExpectations:
   Exclude:
-    - 'spec/atrea_control/duplex_spec.rb'
+    - 'spec/atrea_control/duplex/login_spec.rb'
+    - 'spec/atrea_control/duplex/unit_spec.rb'
 
 # Offense count: 2
+RSpec/MultipleExpectations:
+  Max: 3
+
+# Offense count: 3
 RSpec/StubbedMock:
   Exclude:
-    - 'spec/atrea_control/duplex_spec.rb'
+    - 'spec/atrea_control/duplex/login_spec.rb'
+    - 'spec/atrea_control/duplex/unit_spec.rb'
 
 # Offense count: 6
 RSpec/SubjectStub:
   Exclude:
-    - 'spec/atrea_control/duplex_spec.rb'
-
-# Offense count: 1
-# Configuration parameters: AllowedConstants.
-Style/Documentation:
-  Exclude:
-    - 'spec/**/*'
-    - 'test/**/*'
-    - 'lib/atrea_control.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: always, always_true, never
-Style/FrozenStringLiteralComment:
-  Exclude:
-    - '_x.rb'
-    - 'spec/atrea_control/duplex_spec.rb'
+    - 'spec/atrea_control/duplex/login_spec.rb'
+    - 'spec/atrea_control/duplex/unit_spec.rb'
+    - 'spec/atrea_control/duplex/user_ctrl_spec.rb'
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
-# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
-Style/HashSyntax:
+# Offense count: 4
+# Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
+RSpec/VerifiedDoubles:
   Exclude:
-    - '_x.rb'
+    - 'spec/atrea_control/duplex/login_spec.rb'
+    - 'spec/atrea_control/duplex/unit_spec.rb'
+    - 'spec/atrea_control/duplex/user_ctrl_spec.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: literals, strict
-Style/MutableConstant:
+Security/Eval:
   Exclude:
-    - 'spec/atrea_control/duplex_spec.rb'
+    - 'lib/atrea_control/duplex/user_ctrl.rb'
 
 # Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Layout/LineLength:
+# Configuration parameters: AllowedConstants.
+Style/Documentation:
   Exclude:
-    - 'lib/atrea_control/duplex.rb'
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'lib/atrea_control.rb'
+    - 'lib/atrea_control/logger.rb'

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 ## [Unreleased]
 
+## [2.1.2] - 2023-02-03
+### Fixed
+- selenium-webdriver deprecations
+- some code-style/rubocop offenses
+## [2.1.1] - 2022-08-21
+### Fixed
+- override "schedule program" by "temporary"
+### Changed
+- dependencies update
+
 ## [2.1.0] - 2022-02-28
 ### Added
 - preheating  is ON ?

data/Gemfile.lock

@@ -1,21 +1,20 @@
 PATH
   remote: .
   specs:
-    atrea_control (2.1.0)
+    atrea_control (2.1.2)
       i18n (~> 1.8)
       nokogiri (~> 1.12)
       rest-client (~> 2.1)
-      selenium-webdriver (~> 4.1)
+      selenium-webdriver (~> 4.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
-    childprocess (4.1.0)
     coderay (1.1.3)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.2.2)
     crack (0.4.5)
       rexml
     diff-lcs (1.5.0)
@@ -24,69 +23,76 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     hashdiff (1.0.1)
     http-accept (1.7.0)
-    http-cookie (1.0.4)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
+    json (2.6.3)
     method_source (1.0.0)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
+    mime-types-data (3.2023.0218.1)
     netrc (0.11.0)
-    nokogiri (1.13.3-x86_64-darwin)
+    nokogiri (1.14.2-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.3-x86_64-linux)
+    nokogiri (1.14.2-x86_64-darwin)
       racc (~> 1.4)
-    parallel (1.21.0)
-    parser (3.1.1.0)
+    nokogiri (1.14.2-x86_64-linux)
+      racc (~> 1.4)
+    parallel (1.22.1)
+    parser (3.2.1.0)
       ast (~> 2.4.1)
-    pry (0.14.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.6)
-    racc (1.6.0)
+    public_suffix (5.0.1)
+    racc (1.6.2)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.2.1)
+    regexp_parser (2.7.0)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.1)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    rubocop (1.25.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.47.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.26.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.16.0)
-      parser (>= 3.1.1.0)
-    rubocop-rspec (2.9.0)
-      rubocop (~> 1.19)
-    ruby-progressbar (1.11.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.27.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.17.1)
+      rubocop (~> 1.41)
+    rubocop-rspec (2.18.1)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
+    ruby-progressbar (1.12.0)
     rubyzip (2.3.2)
-    selenium-webdriver (4.1.0)
-      childprocess (>= 0.5, < 5.0)
+    selenium-webdriver (4.8.1)
       rexml (~> 3.2, >= 3.2.5)
-      rubyzip (>= 1.2.2)
-    simplecov (0.21.2)
+      rubyzip (>= 1.2.2, < 3.0)
+      websocket (~> 1.0)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
@@ -94,15 +100,18 @@ GEM
     simplecov_json_formatter (0.1.4)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8)
-    unicode-display_width (2.1.0)
-    webmock (3.14.0)
+    unf_ext (0.0.8.2)
+    unicode-display_width (2.4.2)
+    webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    websocket (1.2.9)
 
 PLATFORMS
+  arm64-darwin-22
   x86_64-darwin-19
+  x86_64-darwin-20
   x86_64-linux
 
 DEPENDENCIES
@@ -116,4 +125,4 @@ DEPENDENCIES
   webmock (~> 3.14)
 
 BUNDLED WITH
-   2.2.17
+   2.4.6

data/atrea_control.gemspec

@@ -39,6 +39,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "i18n", "~> 1.8"
   spec.add_dependency "nokogiri", "~> 1.12"
   spec.add_dependency "rest-client", "~> 2.1"
-  spec.add_dependency "selenium-webdriver", "~> 4.1"
-
+  spec.add_dependency "selenium-webdriver", "~> 4.8"
 end

data/lib/atrea_control/duplex/login.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "digest"
 require "rest-client"
 require "selenium-webdriver"
@@ -6,7 +8,6 @@ module AtreaControl
   module Duplex
     # Process login into RD5 with selenium to get `sid` ( auth_token ) for direct API communication
     class Login
-
       include AtreaControl::Logger
 
       # @return [Hash] - user_id, unit_id, sid
@@ -52,9 +53,12 @@ module AtreaControl
       def driver
         return @driver if defined?(@driver)
 
+        # options = Selenium::WebDriver::Firefox::Options.new
+        # options.headless! unless ENV["NO_HEADLESS"]
+        # @driver ||= Selenium::WebDriver.for :firefox, capabilities: [options]
         options = Selenium::WebDriver::Firefox::Options.new
-        options.headless! unless ENV["NO_HEADLESS"]
-        @driver ||= Selenium::WebDriver.for :firefox, capabilities: [options]
+        options.add_argument "-headless" unless ENV["NO_HEADLESS"]
+        @driver ||= Selenium::WebDriver::Firefox::Driver.new options: options
       end
 
       # Login into control
@@ -95,7 +99,11 @@ module AtreaControl
 
       # quit selenium browser
       def close
-        driver.quit rescue nil
+        begin
+          driver.quit
+        rescue StandardError
+          nil
+        end
         logger.debug "driver closed & destroyed"
       ensure
         remove_instance_variable :@driver
@@ -114,7 +122,6 @@ module AtreaControl
         File.write("/tmp/failed_login-#{@login}.html", driver.page_source)
         raise AtreaControl::Error, "unable to login"
       end
-
     end
   end
 end

data/lib/atrea_control/duplex/request.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rest-client"
 
 module AtreaControl
@@ -24,7 +26,6 @@ module AtreaControl
       def call(params)
         RestClient.get "#{AtreaControl::Duplex::CONTROL_URI}/comm/sw/unit.php", params: @params.merge(params)
       end
-
     end
   end
 end

data/lib/atrea_control/duplex/unit.rb

@@ -49,8 +49,10 @@ module AtreaControl
       end
 
       def power=(value)
-        v = parser.input(@user_ctrl.sensors["power_input"], value.to_s)
-        write(v)
+        v = [parser.input(@user_ctrl.sensors["power_input"], value.to_s)]
+        # overtake schedule control
+        v << "H1070000002" if value.to_i.positive?
+        write(*v)
       end
 
       def parsed

data/lib/atrea_control/duplex/user_ctrl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "nokogiri"
 
 module AtreaControl

data/lib/atrea_control/duplex.rb

@@ -10,6 +10,5 @@ module AtreaControl
     autoload :Request, "atrea_control/duplex/request"
     autoload :Unit, "atrea_control/duplex/unit"
     autoload :UserCtrl, "atrea_control/duplex/user_ctrl"
-
   end
 end

data/lib/atrea_control/logger.rb

@@ -1,11 +1,11 @@
+# frozen_string_literal: true
+
 require "logger"
 
 module AtreaControl
   module Logger
-
     def logger
       @logger ||= ::Logger.new($stdout)
     end
-
   end
 end

data/lib/atrea_control/sensor_parser.rb

@@ -56,7 +56,7 @@ module AtreaControl
         "outdoor_temperature" => values["outdoor_temperature"].to_f / 10.0,
         "preheat_temperature" => values["preheat_temperature"].to_f / 10.0,
         "input_temperature" => values["input_temperature"].to_f / 10.0,
-        "preheating" => !!values["preheating"],
+        "preheating" => !values["preheating"].nil?,
         "valid_for" => Time.now,
       }
     end

data/lib/atrea_control/version.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
 module AtreaControl
-
-  VERSION = "2.1.0"
-
+  VERSION = "2.1.2"
 end

data/lib/atrea_control.rb

@@ -13,5 +13,4 @@ module AtreaControl
 
   I18n.load_path.concat Dir["#{File.expand_path("../config/locales", __dir__)}/*.yml"]
   I18n.default_locale = :cs
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atrea_control
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.2
 platform: ruby
 authors:
 - Lukáš Pokorný
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-28 00:00:00.000000000 Z
+date: 2023-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.8'
 description: Read data from web controller of RD5 duplex by Atrea.
 email:
 - pokorny@luk4s.cz
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Get data control.atrea.eu