ewelink 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 344143666abe75f11d9d3ccdb49116b6ded1579a609820dac2b26f97de27dcac
-  data.tar.gz: 05fcfdaa151396125266d0125d3e28124eaae6da5a607a531a4729a937425902
+  metadata.gz: aa2540d5e8dcf125b91c086731711b772516e28466e33b2bb668bd143abb5fe7
+  data.tar.gz: caf1bfa5d91d0edefc143f49230b0592aafecbbb40e7e80a7d5279f5c3685e0d
 SHA512:
-  metadata.gz: b83fe71850b9c0b1595df52687082452e3c8e0da75c896027d472fbfd1df2dc0c3688181f242db506b76bb415aee6a8f60055e51c8af8963c7062ce2e2a27996
-  data.tar.gz: 84577222fc03a3a20cb08eb5a8ad3243635b2694d33b4bee9bb52582bf9cc4ea8e2e404a7315206adf2bbce3e8ffdbb2b12792decf6ad24f17a844d4a24a6126
+  metadata.gz: c09430a4c2f0a31d62c20828f8e0591cff4f808e9660ae3d309c5fd67edde27aa750ba2d864b1c2d0ad99268b32cb8b05837c407afa268a74ae4d6254aac3859
+  data.tar.gz: 2a5d636f6a571ece7e7cf83cac4eae90b9457212e6260b946c1172dd773e1a438e4ecdf31dee531ada59810440fa4e7a1bfa0af996c974c133e52f61a644638d

data/README.mdown

@@ -40,24 +40,30 @@ api.rf_bridge_buttons.each do |button|
 end
 ```
 
-### Set switch on or off
+### Turn switch on or off
 
 ```ruby
 require 'ewelink'
 
 api = Ewelink::Api.new(phone_number: '+687 414243', password: 'secr$t')
-api.switch_on!(switch[:uuid])
-api.switch_off!(switch[:uuid])
+api.turn_switch!(switch[:uuid], :on)
+api.turn_switch!(switch[:uuid], :off)
 ```
 
-### Check if switch is on or off
+Or :
+
+```ruby
+api.turn_switch!(switch[:uuid], true)
+api.turn_switch!(switch[:uuid], false)
+```
+
+### Check if switch is on
 
 ```ruby
 require 'ewelink'
 
 api = Ewelink::Api.new(phone_number: '+687 414243', password: 'secr$t')
 puts api.switch_on?(switch[:uuid])
-puts api.switch_off?(switch[:uuid])
 ```
 
 ### Press RF bridge button

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.0

data/lib/ewelink/api.rb

@@ -77,18 +77,6 @@ module Ewelink
       end.tap { |buttons| Ewelink.logger.debug(self.class.name) { "Found #{buttons.size} RF 433MHz bridge button(s)" } }
     end
 
-    def switch_off!(uuid)
-      update_switch_on!(uuid, false)
-    end
-
-    def switch_off?(uuid)
-      !switch_on?(uuid)
-    end
-
-    def switch_on!(uuid)
-      update_switch_on!(uuid, true)
-    end
-
     def switch_on?(uuid)
       switch = find_switch!(uuid)
       params = {
@@ -118,6 +106,27 @@ module Ewelink
       end.tap { |switches| Ewelink.logger.debug(self.class.name) { "Found #{switches.size} switch(es)" } }
     end
 
+    def turn_switch!(uuid, on)
+      if ['on', :on, 'true'].include?(on)
+        on = true
+      elsif ['off', :off, 'false'].include?(on)
+        on = false
+      end
+      switch = find_switch!(uuid)
+      params = {
+        'appid' => APP_ID,
+        'deviceid' => switch[:device_id],
+        'nonce' => nonce,
+        'params' => {
+          'switch' => on ? 'on' : 'off',
+        },
+        'ts' => Time.now.to_i,
+        'version' => VERSION,
+      }
+      http_request(:post, '/api/user/device/status', body: JSON.generate(params), headers: authentication_headers)
+      true
+    end
+
     private
 
     def authentication_headers
@@ -203,22 +212,6 @@ module Ewelink
       (@mutexs[name] ||= Mutex.new).synchronize(&block)
     end
 
-    def update_switch_on!(uuid, on)
-      switch = find_switch!(uuid)
-      params = {
-        'appid' => APP_ID,
-        'deviceid' => switch[:device_id],
-        'nonce' => nonce,
-        'params' => {
-          'switch' => on ? 'on' : 'off',
-        },
-        'ts' => Time.now.to_i,
-        'version' => VERSION,
-      }
-      http_request(:post, '/api/user/device/status', body: JSON.generate(params), headers: authentication_headers)
-      true
-    end
-
   end
 
 end

data/lib/ewelink/runner.rb

@@ -6,8 +6,8 @@ module Ewelink
       api = Api.new(options.slice(:email, :password, :phone_number))
       puts(JSON.pretty_generate(api.switches)) if options[:list_switches]
       puts(JSON.pretty_generate(api.rf_bridge_buttons)) if options[:list_rf_bridge_buttons]
-      options[:switches_on_uuids].each { |uuid| api.switch_on!(uuid) }
-      options[:switches_off_uuids].each { |uuid| api.switch_off!(uuid) }
+      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) }
     end
 
@@ -15,7 +15,7 @@ module Ewelink
 
     def options
       @options ||= begin
-        options = { press_rf_bridge_buttons_uuids: [], switches_off_uuids: [], switches_on_uuids: [] }
+        options = { press_rf_bridge_buttons_uuids: [], turn_switches_off_uuids: [], turn_switches_on_uuids: [] }
         parser = OptionParser.new do |opts|
           opts.banner = 'Manage eWeLink smart home devices'
           opts.version = File.read(File.expand_path('../../VERSION', __dir__)).strip
@@ -37,11 +37,11 @@ module Ewelink
           opts.on('--list-rf-bridge-buttons', 'List all RF 433MHz bridge buttons in JSON format') do
             options[:list_rf_bridge_buttons] = true
           end
-          opts.on('--switch-on SWITCH_UUID', 'Set the switch with specified UUID on') do |uuid|
-            options[:switches_on_uuids] << uuid
+          opts.on('--turn-switch-on SWITCH_UUID', 'Turn the switch with specified UUID on') do |uuid|
+            options[:turn_switches_on_uuids] << uuid
           end
-          opts.on('--switch-off SWITCH_UUID', 'Set the switch with specified UUID off') do |uuid|
-            options[:switches_off_uuids] << uuid
+          opts.on('--turn-switch-off SWITCH_UUID', 'Turn the switch with specified UUID off') do |uuid|
+            options[:turn_switches_off_uuids] << uuid
           end
           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
@@ -61,7 +61,7 @@ module Ewelink
           STDERR.puts(parser.summarize)
           exit(1)
         end
-        if [:list_switches, :list_rf_bridge_buttons, :switches_on_uuids, :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].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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ewelink
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Alexis Toulotte