nature_remo 0.2.5 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 360f394618af476335ab3a635b7c69be2e5d4c5828e4168062d38ca248a6daac
-  data.tar.gz: cd671b9a1463f924844b7d0c2d728269971460c3b74125641dc098cf3508a4dc
+  metadata.gz: ca496be0b1ab840ebe82749f39a7fa179445076d085d2549bc931bbc8800094b
+  data.tar.gz: 9e984120722b6db2e67d9d8fd343b8f9f19a118368141830906284ab98cd0b73
 SHA512:
-  metadata.gz: 99d4f2351f697f06af4538b6362110e9f5268afe2a914c2481eae4e53cbe343232388ea961fb100b7005d16dfdd3da672361a45a82303eaeb5016cfa780187f2
-  data.tar.gz: e0ae51e8b018a35335e7e64f6fc5a912d876eb06cf5f5ef399cef6b0be2d1832523bb85fe0368d51dad4c56470ca1a1942ba882c65e6bc4c63944c7244fa99f7
+  metadata.gz: 92714ff39d4e2422588b99b9e2455b699aa9d26a9366fd7868bb516f58bf4c48ea7f9a125b6447e7ecb1069744d5ef2e17a949992a34a6a500fe228a4c031f9a
+  data.tar.gz: 3d5bf2385b0c483cd190d4f35567f185303aa7cb0c74193b06083f6581dd7b1485687f2b95522bd892d6970387608783a8e729be4eebfe1a5785cebe51543b3d

data/.travis.yml

@@ -2,4 +2,4 @@ sudo: false
 language: ruby
 rvm:
   - 2.5.0
-before_install: gem install bundler -v 1.16.1
+before_install: gem install bundler -v 2.0.2

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+## v0.5.1
+- https://github.com/ichi-t/nature_remo/pull/22
+
+## v0.4.0
+- make it possible to get **illumination** value
+
+## v0.3.0
+- Add multiple sending for #send_signal method

data/Gemfile.lock

@@ -0,0 +1,43 @@
+PATH
+  remote: .
+  specs:
+    nature_remo (0.5.1)
+      faraday (~> 0.17.0)
+      launchy (~> 2.4.3)
+      thor (~> 0.20.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    faraday (0.17.4)
+      multipart-post (>= 1.2, < 3)
+    hashdiff (1.0.0)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    minitest (5.13.0)
+    multipart-post (2.1.1)
+    public_suffix (4.0.1)
+    rake (13.0.1)
+    safe_yaml (1.0.5)
+    thor (0.20.3)
+    webmock (3.7.6)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 2.0.2)
+  minitest (~> 5.13.0)
+  nature_remo!
+  rake (~> 13.0.1)
+  webmock (~> 3.7.6)
+
+BUNDLED WITH
+   2.0.2

data/README.md

@@ -30,7 +30,7 @@ client = NatureRemo::Client.new(<token>)
 # show username
 client.users
 
-# get temperture
+# get temperature
 client.get_temp
 
 # show nature_remo device lists
@@ -41,6 +41,12 @@ client.appliances
 
 # send signal
 client.send_signal(<signal id>)
+
+# send a signal at intervals
+#   [OPTIONAL]
+#   interval: How long do you want to wait to send next signal?(millisec)
+#   times: How many times do you want to send signals?
+client.send_signal(<signal id>, interval: 500, times: 10)
 ```
 
 ## CLI Usage
@@ -51,7 +57,8 @@ client.send_signal(<signal id>)
 	natureremo devices               # find all devices
 	natureremo help [COMMAND]        # Describe available commands or one specific command
 	natureremo me                    # print nickname
-	natureremo temp                  # Get temperture and humidity
+	natureremo temp                  # Get temperature and humidity
+	natureremo illu                  # Get illumination
 
 ### Example
 
@@ -77,7 +84,13 @@ Send signal
 	
 #### Control air conditioner
 
-	$ natureremo aircon [temperture] [mode] [options]
+	$ natureremo aircon [temperature] [mode] [options]
+
+	$ natureremo aircon_off
+	$ natureremo aircon_on
+
+	$ natureremo aircon_change_temperature +1
+	$ natureremo aircon_change_temperature -1
 
 <!-- ## Development -->
 

data/lib/nature_remo/cli.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 require 'thor'
 require 'json'
 
@@ -54,21 +55,81 @@ module NatureRemo
       end
     end
 
-    desc 'temp', 'Get temperture and humidity'
+    desc 'aircon_off', 'Turn off air conditioner'
+    def aircon_off()
+      aircon_id = []
+      appliances_body.each_with_index do |a, i|
+        aircon_id << get_appliance_id(i) if a['type'] == 'AC'
+      end
+
+      if aircon_id.length == 1
+        client.aircon_off aircon_id.first
+      else
+        puts 'This method supports only one air conditioner'
+      end
+    end
+
+    desc 'aircon_on', 'Turn on air conditioner'
+    def aircon_on()
+      aircon_id = []
+      appliances_body.each_with_index do |a, i|
+        aircon_id << get_appliance_id(i) if a['type'] == 'AC'
+      end
+
+      if aircon_id.length == 1
+        client.aircon_on aircon_id.first
+      else
+        puts 'This method supports only one air conditioner'
+      end
+    end
+
+    desc 'aircon_change_temperature', 'Change the temperature of the air conditioner'
+    def aircon_change_temperature(difference)
+      diff = difference.to_i
+      return if diff == 0
+
+      aircon_id = []
+      appliance = nil
+      appliances_body.each_with_index do |a, i|
+        appliance = a
+        aircon_id << get_appliance_id(i) if a['type'] == 'AC'
+      end
+
+      if aircon_id.length == 1
+        current_temperature = appliance["settings"]["temp"].to_i
+        if current_temperature != 0
+          client.aircon_setting aircon_id.first, current_temperature + diff
+
+          puts "Temperature set to #{current_temperature + diff}"
+        else
+          puts 'Could not retrieve the air conditioner currently set temperature'
+        end
+      else
+        puts 'This method supports only one air conditioner'
+      end
+    end
+
+    desc 'temp', 'Get temperature and humidity'
     def temp
       value = client.events
-      puts "Temperture: #{value['te']['val']}℃"
+      puts "Temperature: #{value['te']['val']}℃"
       puts "Humidity:   #{value['hu']['val']}%"
     end
 
+    desc 'illu', 'Get illumination'
+    def illu
+      value = client.events
+      puts "Illumination: #{value['il']['val']}"
+    end
+
     private
 
     def client
-      client ||= NatureRemo::Client.new
+      @client ||= NatureRemo::Client.new
     end
 
     def appliances_body
-      appliances ||= JSON.parse(client.appliances.body)
+      @appliances ||= JSON.parse(client.appliances.body)
     end
 
     def get_appliance_id(num)

data/lib/nature_remo/client.rb

@@ -34,10 +34,33 @@ module NatureRemo
       end
     end
 
-    def send_signal(signal)
+    def send_signal(signal, interval: 0, times: 1)
+      results = []
+      times.times do |time|
+        sleep(interval.to_f / 1000) if time != 0
+        results << @client.post do |req|
+          req.url "/1/signals/#{signal}/send"
+          req.body = { name: signal.to_s }
+        end
+      end
+      results
+    end
+
+    def aircon_on(appliance)
+      @client.post do |req|
+        req.url "/1/appliances/#{appliance}/aircon_settings"
+        req.body = {
+          button: ""
+        }
+      end
+    end
+
+    def aircon_off(appliance)
       @client.post do |req|
-        req.url "/1/signals/#{signal}/send"
-        req.body = { name: signal.to_s }
+        req.url "/1/appliances/#{appliance}/aircon_settings"
+        req.body = {
+          button: "power-off"
+        }
       end
     end
 
@@ -52,8 +75,12 @@ module NatureRemo
       end
     end
 
+    def remo
+      JSON.parse(devices.body).find { |device| device['firmware_version'].match(/Remo\/\d+\.\d+\.\d+-[a-z0-9]+/) }
+    end
+
     def events
-      JSON.parse(devices.body)[0]['newest_events']
+      remo['newest_events']
     end
 
     def get_temp
@@ -64,6 +91,10 @@ module NatureRemo
       events['hu']['val'].to_f
     end
 
+    def get_illu
+      events['il']['val'].to_f
+    end
+
     def get_token
       return ENV['NATURE_TOKEN'] if ENV['NATURE_TOKEN']
 

data/lib/nature_remo/version.rb

@@ -1,3 +1,3 @@
 module NatureRemo
-  VERSION = '0.2.5'.freeze
+  VERSION = '0.5.1'.freeze
 end

data/nature_remo.gemspec

@@ -29,11 +29,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'minitest', '~> 5.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'webmock', '~> 3.4.2'
-  spec.add_runtime_dependency 'faraday', '~> 0.14.0'
+  spec.add_development_dependency 'bundler', '~> 2.0.2'
+  spec.add_development_dependency 'minitest', '~> 5.13.0'
+  spec.add_development_dependency 'rake', '~> 13.0.1'
+  spec.add_development_dependency 'webmock', '~> 3.7.6'
+  spec.add_runtime_dependency 'faraday', '~> 0.17.0'
   spec.add_runtime_dependency 'launchy', '~> 2.4.3'
-  spec.add_runtime_dependency 'thor', '~> 0.20.0'
+  spec.add_runtime_dependency 'thor', '~> 0.20.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nature_remo
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.5.1
 platform: ruby
 authors:
 - ichi-t
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-25 00:00:00.000000000 Z
+date: 2021-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,70 +16,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.13.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: 3.7.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: 3.7.6
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.20.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.20.3
 description: 
 email:
 - taisuke_ichimura@icloud.com
@@ -119,8 +119,10 @@ files:
 - ".github/ISSUE_TEMPLATE/feature_request.md"
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -149,8 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Nature Remo API client written by Ruby