ewelink 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21968b7bb562eb3c32f0011a501ea3978fabd5ba3cc50164854e7a544c607f09
-  data.tar.gz: cdedc7c05271d76f5f38317b3276bae9c24c7380877e97988c0aea9f048d88fa
+  metadata.gz: 9f2548dd14bcfce1ce4cacb1a2768687d88e15bb4dae14223cadccd61176ab3d
+  data.tar.gz: 995f4281dd22f168ffe90dc2f072209bd25b13487bb171d5dbcc4efc94380811
 SHA512:
-  metadata.gz: ddd38e7e100f20ce2a96edcf3e2c3a3ac1c2945c0ad49e93aeeb3ecf943d08db03756afb4847c28c55a7601f952a13abe1034858f66ba46ec8e6359523a2b696
-  data.tar.gz: fb913f0ae36bf7f72bb27c8af1e863deb55b8309f23a79dc799e677c2f5706671a7a7b2efdff1ad8a7bfeec46c6ffc23774564738a12ad4dc20ebf1f2f1fd2f8
+  metadata.gz: 74821997ef9c625b2506ebda9229ddac0605f7e4dda4ac836c60974fa6d17a2ebcb9cfd306947c60d958409e5277b6d2ebe1189effef32f91730bfa0be2a9883
+  data.tar.gz: 0d1999216c2006a5f70102190196a9c890ef9ab0c9aa6464402f8c843a51c8211852c560e62778d901eb91bf19f331f1008dd500b998cb59daf6ebe72477e5b1

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.3.0

data/lib/ewelink/api.rb

@@ -36,7 +36,7 @@ module Ewelink
           'ts' => Time.now.to_i,
           'version' => VERSION,
         }
-        http_request(:post, '/api/user/device/status', body: JSON.generate(params), headers: authentication_headers)
+        rest_request(:post, '/api/user/device/status', body: JSON.generate(params), headers: authentication_headers)
         true
       end
     end
@@ -90,7 +90,7 @@ module Ewelink
         'ts' => Time.now.to_i,
         'version' => VERSION,
       }
-      response = http_request(:get, '/api/user/device/status', headers: authentication_headers, query: params)
+      response = rest_request(:get, '/api/user/device/status', headers: authentication_headers, query: params)
       response['params']['switch'] == 'on'
     end
 
@@ -129,7 +129,7 @@ module Ewelink
         'ts' => Time.now.to_i,
         'version' => VERSION,
       }
-      http_request(:post, '/api/user/device/status', body: JSON.generate(params), headers: authentication_headers)
+      rest_request(:post, '/api/user/device/status', body: JSON.generate(params), headers: authentication_headers)
       true
     end
 
@@ -156,7 +156,7 @@ module Ewelink
             params['phoneNumber'] = phone_number
           end
           body = JSON.generate(params)
-          response = http_request(:post, '/api/user/login', { body: body, headers: { 'Authorization' => "Sign #{Base64.encode64(OpenSSL::HMAC.digest('SHA256', APP_SECRET, body))}" } })
+          response = rest_request(:post, '/api/user/login', { body: body, headers: { 'Authorization' => "Sign #{Base64.encode64(OpenSSL::HMAC.digest('SHA256', APP_SECRET, body))}" } })
           raise(Error.new('Authentication token not found')) if response['at'].blank?
           response['at'].tap { Ewelink.logger.debug(self.class.name) { 'Authentication token found' } }
         end
@@ -173,7 +173,7 @@ module Ewelink
             'ts' => Time.now.to_i,
             'version' => VERSION,
           }
-          response = http_request(:get, '/api/user/device', headers: authentication_headers, query: params)
+          response = rest_request(:get, '/api/user/device', headers: authentication_headers, query: params)
           response['devicelist'].tap { |devices| Ewelink.logger.debug(self.class.name) { "Found #{devices.size} device(s)" } }
         end
       end
@@ -195,7 +195,7 @@ module Ewelink
       @region ||= DEFAULT_REGION
     end
 
-    def http_request(method, path, options = {})
+    def rest_request(method, path, options = {})
       url = "#{URL.gsub('#{region}', region)}#{path}"
       method = method.to_s.upcase
       headers = (options[:headers] || {}).reverse_merge('Content-Type' => 'application/json')
@@ -205,7 +205,7 @@ module Ewelink
       if response['error'] == 301 && response['region'].present?
         @region = response['region']
         Ewelink.logger.debug(self.class.name) { "Switched to region #{region.inspect}" }
-        return http_request(method, path, options)
+        return rest_request(method, path, options)
       end
       remove_instance_variable(:@authentication_token) if instance_variable_defined?(:@authentication_token) && [401, 403].include?(response['error'])
       raise(Error.new("#{method} #{url}: #{response['error']} #{response['msg']}".strip)) if response['error'].present? && response['error'] != 0

data/lib/ewelink/runner.rb

@@ -9,13 +9,14 @@ module Ewelink
       options[:turn_switches_on_uuids].each { |uuid| api.turn_switch!(uuid, :on) }
       options[:turn_switches_off_uuids].each { |uuid| api.turn_switch!(uuid, :off) }
       options[:press_rf_bridge_buttons_uuids].each { |uuid| api.press_rf_bridge_button!(uuid) }
+      puts(JSON.pretty_generate(options[:switch_status_uuids].map { |uuid| [uuid, api.switch_on?(uuid) ? 'on' : 'off'] }.to_h))
     end
 
     private
 
     def options
       @options ||= begin
-        options = { press_rf_bridge_buttons_uuids: [], turn_switches_off_uuids: [], turn_switches_on_uuids: [] }
+        options = { press_rf_bridge_buttons_uuids: [], turn_switches_off_uuids: [], turn_switches_on_uuids: [], switch_status_uuids: [] }
         parser = OptionParser.new do |opts|
           opts.banner = 'Manage eWeLink smart home devices'
           opts.version = File.read(File.expand_path('../../VERSION', __dir__)).strip
@@ -46,6 +47,9 @@ module Ewelink
           opts.on('--press-rf-bridge-button BUTTON_UUID', 'Press RF 433MHz bridge button with specified UUID') do |uuid|
             options[:press_rf_bridge_buttons_uuids] << uuid
           end
+          opts.on('--switch-status SWITCH_UUID', 'Displays switch status of specified UUID') do |uuid|
+            options[:switch_status_uuids] << uuid
+          end
           opts.on('-v', '--verbose', 'Verbose mode') do
             Ewelink.logger.level = :debug
           end
@@ -61,7 +65,7 @@ module Ewelink
           STDERR.puts(parser.summarize)
           exit(1)
         end
-        if [:list_switches, :list_rf_bridge_buttons, :turn_switches_on_uuids, :turn_switches_off_uuids, :press_rf_bridge_buttons_uuids].map { |action| options[action] }.all?(&:blank?)
+        if [:list_switches, :list_rf_bridge_buttons, :turn_switches_on_uuids, :turn_switches_off_uuids, :press_rf_bridge_buttons_uuids, :switch_status_uuids].map { |action| options[action] }.all?(&:blank?)
           STDERR.puts('An action must be specified (listing switches, press RF bridge button, etc.)')
           STDERR.puts(parser.summarize)
           exit(1)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ewelink
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Alexis Toulotte
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-18 00:00:00.000000000 Z
+date: 2020-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -109,7 +109,7 @@ homepage: https://github.com/alexistoulotte/ewelink
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Manage eWeLink devices
 test_files: []