nature_remo 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44486974bfab637d8b7483fe472ae5de4185d031b3ea86163d28de7bdba0229d
-  data.tar.gz: dbff1084e523d3fcfe0f2e45f6a323296cd79d324758c50cba0da538338d40c5
+  metadata.gz: 4a2498fa3a0977e7536cbb2e0b871a01fa5e3d9232a2656788fd2eeb2ba1a212
+  data.tar.gz: d57445310f1c6fa51ab8099dfecb1e50d7223d573bbd09e26e23c8bad6fb9b8f
 SHA512:
-  metadata.gz: 000e64d4bddeaa1abf2e0803da4d44131097d36be43e17bf7a5e74aa73663d47bc15559b1c57db52ba3ca8652f38c84009629668b4af139829c4d14b5ddbc929
-  data.tar.gz: 8e5049dac89ee5b8d306a8fa3ad7376fbad50af65abafec6a3e79c1aa607607e42970a360c73b6b4db6d35b47480addb580c3f48a4315e7992ef68cca56d14af
+  metadata.gz: 365f29ea209b8fc46d515042b6a7eb615b910f063d296b30d218e0854e3baecf73f5d79c1f3fa6a2c4e74bd875f1f9c0770d83830f11427ef4042e73bb9ac840
+  data.tar.gz: 9eed5762c6cd38633888b9fee0374dda6ddceda3da0db14b6f8c7f60791e85facf0cffd146a31e6f10baf991b7c543697869bc381bce5c6ef51c37868866b6fa

data/Gemfile

@@ -1,6 +1,6 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in nature_remo.gemspec
 gemspec

data/README.md

@@ -20,6 +20,26 @@ Or install it yourself as:
 
     $ gem install nature_remo
 	
+## Usage
+	
+```ruby
+require 'nature_remo'
+
+client = NatureRemo::Client.new(<token>)
+
+# show username
+client.users
+
+# show nature_remo device lists
+client.devices
+
+# show appliances and signal lists
+client.appliances
+
+# send signal
+client.send_signal(<signal id>)
+```
+
 ## CLI Usage
 
 	Commands:

data/Rakefile

@@ -1,10 +1,10 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.test_files = FileList['test/**/*_test.rb']
 end
 
-task :default => :test
+task default: :test

data/bin/natureremo

@@ -1,12 +1,12 @@
 #!/usr/bin/env ruby
 
-lib = File.expand_path('../../lib', __FILE__)
+lib = File.expand_path('../lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'nature_remo'
 
 begin
   NatureRemo::Cli.start
-rescue => e
+rescue StandardError => e
   p e
 end

data/lib/nature_remo.rb

@@ -1,6 +1,6 @@
-require "nature_remo/version"
-require "nature_remo/client"
-require "nature_remo/cli"
+require 'nature_remo/version'
+require 'nature_remo/client'
+require 'nature_remo/cli'
 
 module NatureRemo
   # Your code goes here...

data/lib/nature_remo/cli.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 require 'thor'
 require 'json'
 
@@ -11,12 +10,11 @@ module NatureRemo
 
     desc 'me', 'print nickname'
     def me
-      puts JSON.parse(client.users.body)["nickname"]
+      puts JSON.parse(client.users.body)['nickname']
     end
 
     desc 'appliances ID SIGNAL', 'Access a appliance'
-    def appliances appliance_num = nil, action = nil
-
+    def appliances(appliance_num = nil, action = nil)
       if appliance_num && action
         id = get_appliance_id(appliance_num.to_i)
         signal = get_signal_id(id, action.to_i)
@@ -24,46 +22,47 @@ module NatureRemo
         client.send_signal(signal)
         puts 'done'
       elsif appliance_num
-        if appliances_body[appliance_num.to_i]["type"] == "AC"
+        if appliances_body[appliance_num.to_i]['type'] == 'AC'
           puts "Use 'aircon' command."
         end
-        appliances_body[appliance_num.to_i]["signals"].each_with_index do |signal,i|
-          puts "#{i}: #{signal["name"]}"
+        appliances_body[appliance_num.to_i]['signals'].each_with_index do |signal, i|
+          puts "#{i}: #{signal['name']}"
         end
       else
         appliances_body.each_with_index do |appliance, i|
-          puts "#{i}: #{appliance["nickname"]}" 
+          puts "#{i}: #{appliance['nickname']}"
         end
       end
     end
 
     desc 'aircon TEMP MODE', 'Control Air conditioner'
-    def aircon temp = nil, mode = nil, volume = nil
-      if temp.match /[a-z]/
+    def aircon(temp = nil, mode = nil, volume = nil)
+      if temp =~ /[a-z]/
         mode = temp
         temp = nil
       end
 
       aircon_id = []
       appliances_body.each_with_index do |a, i|
-        aircon_id << get_appliance_id(i) if a["type"] == "AC"
+        aircon_id << get_appliance_id(i) if a['type'] == 'AC'
       end
 
       if aircon_id.length == 1
         client.aircon_setting aircon_id.first, temp, mode, volume
       else
-        puts "This method supports only one air conditioner"
+        puts 'This method supports only one air conditioner'
       end
     end
 
     desc 'temp', 'Get temperture and humidity'
     def temp
       value = client.events
-      puts "Temperture: #{value["te"]["val"]}℃"
-      puts "Humidity:   #{value["hu"]["val"]}%"
+      puts "Temperture: #{value['te']['val']}℃"
+      puts "Humidity:   #{value['hu']['val']}%"
     end
 
     private
+
     def client
       client ||= NatureRemo::Client.new
     end
@@ -72,13 +71,12 @@ module NatureRemo
       appliances ||= JSON.parse(client.appliances.body)
     end
 
-    def get_appliance_id num
-      appliances_body[num]["id"]
+    def get_appliance_id(num)
+      appliances_body[num]['id']
     end
 
-    def get_signal_id id, num
-      JSON.parse(client.appliances(id).body)[num]["id"]
+    def get_signal_id(id, num)
+      JSON.parse(client.appliances(id).body)[num]['id']
     end
-
   end
 end

data/lib/nature_remo/client.rb

@@ -6,11 +6,10 @@ module NatureRemo
   class Client
     # nature-remo api http client
 
-    def initialize token = nil
+    def initialize(token = nil)
       @token = token || get_token
-      @client = Faraday.new :url => 'https://api.nature.global'
+      @client = Faraday.new url: 'https://api.nature.global'
       @client.headers['Authorization'] = "Bearer #{@token}"
-      
     end
 
     def users
@@ -25,7 +24,7 @@ module NatureRemo
       end
     end
 
-    def appliances appliance = nil
+    def appliances(appliance = nil)
       @client.get do |req|
         if appliance.nil?
           req.url '/1/appliances'
@@ -35,34 +34,34 @@ module NatureRemo
       end
     end
 
-    def send_signal signal
+    def send_signal(signal)
       @client.post do |req|
         req.url "/1/signals/#{signal}/send"
-        req.body = { :name => "#{signal}" }
+        req.body = { name: signal.to_s }
       end
     end
 
-    def aircon_setting appliance, temp = nil, mode = nil, volume = nil
+    def aircon_setting(appliance, temp = nil, mode = nil, volume = nil)
       @client.post do |req|
         req.url "/1/appliances/#{appliance}/aircon_settings"
         req.body = {
-          :temperature => "#{temp}",
-          :operation_mode => "#{mode}",
-          :air_volume => "#{volume}"
+          temperature: temp.to_s,
+          operation_mode: mode.to_s,
+          air_volume: volume.to_s
         }
       end
     end
 
     def events
-      JSON.parse(self.devices.body)[0]["newest_events"]
+      JSON.parse(devices.body)[0]['newest_events']
     end
 
     def get_temp
-      self.events["te"]["val"].to_i
+      events['te']['val'].to_i
     end
 
     def get_humi
-      self.events["hu"]["val"].to_i
+      events['hu']['val'].to_i
     end
 
     def get_token
@@ -71,7 +70,7 @@ module NatureRemo
       begin
         json = JSON(File.read(File.expand_path('~/.nature')))
         return json['token']
-      rescue => e
+      rescue StandardError => e
         set_token
       end
     end
@@ -80,11 +79,10 @@ module NatureRemo
       Launchy.open 'https://home.nature.global'
       print 'input your token:'
       token = STDIN.gets.to_s.chomp
-      raise "Invalid Token" unless token.length == 87
+      raise 'Invalid Token' unless token.length == 87
       puts 'your token >> ~/.nature'
-      File.write(File.expand_path('~/.nature'), JSON.dump({token: token}))
-      return token
+      File.write(File.expand_path('~/.nature'), JSON.dump(token: token))
+      token
     end
-
   end
 end

data/lib/nature_remo/version.rb

@@ -1,3 +1,3 @@
 module NatureRemo
-  VERSION = "0.2.3"
+  VERSION = '0.2.4'.freeze
 end

data/nature_remo.gemspec

@@ -1,38 +1,39 @@
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "nature_remo/version"
+require 'nature_remo/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "nature_remo"
+  spec.name          = 'nature_remo'
   spec.version       = NatureRemo::VERSION
-  spec.authors       = ["ichi-t"]
-  spec.email         = ["taisuke_ichimura@icloud.com"]
+  spec.authors       = ['ichi-t']
+  spec.email         = ['taisuke_ichimura@icloud.com']
 
-  spec.summary       = %q{Nature Remo API client written by Ruby}
+  spec.summary       = 'Nature Remo API client written by Ruby'
   # spec.description   = %q{TODO: Write a longer description or delete this line.}
-  spec.homepage      = "https://github.com/ichi-t/nature_remo"
-  spec.license       = "MIT"
+  spec.homepage      = 'https://github.com/ichi-t/nature_remo'
+  spec.license       = 'MIT'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   if spec.respond_to?(:metadata)
     # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
   else
-    raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
+    raise 'RubyGems 2.0 or newer is required to protect against ' \
+      'public gem pushes.'
   end
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "bin"
+  spec.bindir        = 'bin'
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_runtime_dependency "faraday", "~> 0.14.0"
-  spec.add_runtime_dependency "thor", "~> 0.20.0"
-  spec.add_runtime_dependency "launchy", "~> 2.4.3"
+  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_runtime_dependency 'launchy', '~> 2.4.3'
+  spec.add_runtime_dependency 'thor', '~> 0.20.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nature_remo
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - ichi-t
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-10 00:00:00.000000000 Z
+date: 2018-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -39,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 3.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 3.4.2
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -67,33 +81,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.14.0
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 2.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 2.4.3
 - !ruby/object:Gem::Dependency
-  name: launchy
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.3
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.3
+        version: 0.20.0
 description: 
 email:
 - taisuke_ichimura@icloud.com