kasa 0.1.0 → 0.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +0 -8
  3. data/lib/kasa/devices.rb +10 -7
  4. data/lib/kasa/factory.rb +4 -2
  5. data/lib/kasa/protocol.rb +10 -2
  6. data/lib/kasa/version.rb +1 -1
  7. metadata +104 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 43b88d71bcfcf597efbc974a100df7386365bb90b5bb113ea1a07801a8bcf565
4
- data.tar.gz: 72be110483b25f002b025743c3f5896ccc690a69d9e0b1a2bfef5b92e79fd1db
3
+ metadata.gz: 25195b0def3dbeb1694fbc6ffead20ad21aa32e4d95721f5fdc698549474c96b
4
+ data.tar.gz: 326a7ccf19efefb2f1edf6dbe25ea644e5062bb600d18424020b90386900444e
5
5
  SHA512:
6
- metadata.gz: 7116bd99634440e8416ae926cde96814f9b56c209bcca52d22ab2d5f5b6393f5b2b4ad3c09a35d66cad6ab65c5d2aec59ad6f92701010a939438bcf2d8d990bd
7
- data.tar.gz: b996de906614906a8de6b19e5b46e4b6d0ab7aeb05f1f221e5af541d36bc2fe8208f3e626a6931d164a8078c251df20e9eddf8bc69f462de526a363cc8112a4d
6
+ metadata.gz: 7a44f2a6b231f50f3ca98ea0d484528cf445ba6d608b0f5211e72ab414e7ed9c9ae421834a4256fd290bbf4572dd52f9c39dbdf5f996126468d1c888614f08bf
7
+ data.tar.gz: a1c2a2911abb04bfc4f6aa961e5e5d714c5b9963ea258c7d79ff18229e2705b46cfbf706dd11c14947aa4bb00f7d02eebd255b949c9fe492d097f7551b963767
data/Gemfile CHANGED
@@ -4,11 +4,3 @@ source 'https://rubygems.org'
4
4
 
5
5
  # Specify your gem's dependencies in kasa.gemspec
6
6
  gemspec
7
-
8
- gem 'rake', '~> 13.0'
9
-
10
- gem 'rspec', '~> 3.0'
11
-
12
- gem 'rubocop', '~> 1.21'
13
-
14
- gem 'json', '~> 2.6'
data/lib/kasa/devices.rb CHANGED
@@ -6,12 +6,15 @@ class Kasa
6
6
  ON = 1
7
7
  OFF = 0
8
8
 
9
- attr_reader :ip
9
+ attr_reader :ip, :alias, :model, :dev_name, :mac
10
10
 
11
11
  # initialize
12
- def initialize(ip)
12
+ def initialize(ip, args)
13
13
  @ip = ip
14
- @sysinfo = sysinfo
14
+ @alias = args['alias']
15
+ @model = args['model']
16
+ @dev_name = args['dev_name']
17
+ @mac = args['mac']
15
18
  end
16
19
 
17
20
  # Get system information
@@ -70,8 +73,8 @@ class Kasa
70
73
  def brightness=(level)
71
74
  Kasa::Protocol.get(
72
75
  @ip,
73
- location: '/smartlife.iot.dimmer/set_brightness/brightness',
74
- value: level
76
+ location: '/smartlife.iot.dimmer/set_brightness',
77
+ value: { brightness: level }
75
78
  )
76
79
  end
77
80
  end
@@ -80,9 +83,9 @@ class Kasa
80
83
  class SmartStrip < NonDimmable
81
84
  attr_accessor :children
82
85
 
83
- def initialize(ip)
86
+ def initialize(ip, args)
84
87
  super
85
- @children = @sysinfo['children'].map { |c| c['id'] }
88
+ @children = args['children'].map { |c| c['id'] }
86
89
  end
87
90
 
88
91
  # Turn on light
data/lib/kasa/factory.rb CHANGED
@@ -11,6 +11,7 @@ class Kasa
11
11
  NonDimmable => [
12
12
  'HS200(US)',
13
13
  'HS105(US)',
14
+ 'HS103(US)',
14
15
  'HS210(US)'
15
16
  ],
16
17
  SmartStrip => [
@@ -24,13 +25,14 @@ class Kasa
24
25
  class Factory
25
26
  # Factory
26
27
  def self.new(ip)
27
- model = Kasa::Protocol.get(ip, location: '/system/get_sysinfo')['model']
28
+ sysinfo = Kasa::Protocol.get(ip, location: '/system/get_sysinfo')
29
+ model = sysinfo['model']
28
30
  begin
29
31
  object = DEVICE_TYPES.detect { |_k, v| v.include? model }.first.allocate
30
32
  rescue StandardError => _e
31
33
  raise "#{model} not supported"
32
34
  end
33
- object.send :initialize, ip
35
+ object.send :initialize, ip, sysinfo
34
36
  object
35
37
  end
36
38
  end
data/lib/kasa/protocol.rb CHANGED
@@ -19,13 +19,21 @@ class Kasa
19
19
  transport(ip, encode(request.to_json))
20
20
  end
21
21
 
22
- strip_location(location, decode(encoded_response))
22
+ response = JSON.parse decode(encoded_response)
23
+ response = strip_location(location, response)
24
+ validate response
25
+
26
+ response
27
+ end
28
+
29
+ # examine error code
30
+ def self.validate(response)
31
+ raise response.to_json if response.is_a?(Hash) && response['err_code']&.negative?
23
32
  end
24
33
 
25
34
  # strip away the request location from the response
26
35
  def self.strip_location(location, response)
27
36
  location = location.split('/').reject(&:empty?)
28
- response = JSON.parse response
29
37
  location.each do |j|
30
38
  response = (response[j] or response)
31
39
  end
data/lib/kasa/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  class Kasa
4
- VERSION = '0.1.0'
4
+ VERSION = '0.2.0'
5
5
  end
metadata CHANGED
@@ -1,15 +1,113 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: kasa
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0
4
+ version: 0.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Christopher Jenkins
8
- autorequire:
8
+ autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2022-02-19 00:00:00.000000000 Z
11
+ date: 2022-02-23 00:00:00.000000000 Z
12
12
  dependencies:
13
+ - !ruby/object:Gem::Dependency
14
+ name: json
15
+ requirement: !ruby/object:Gem::Requirement
16
+ requirements:
17
+ - - "~>"
18
+ - !ruby/object:Gem::Version
19
+ version: '2.6'
20
+ type: :runtime
21
+ prerelease: false
22
+ version_requirements: !ruby/object:Gem::Requirement
23
+ requirements:
24
+ - - "~>"
25
+ - !ruby/object:Gem::Version
26
+ version: '2.6'
27
+ - !ruby/object:Gem::Dependency
28
+ name: timeout
29
+ requirement: !ruby/object:Gem::Requirement
30
+ requirements:
31
+ - - "~>"
32
+ - !ruby/object:Gem::Version
33
+ version: '0.1'
34
+ type: :runtime
35
+ prerelease: false
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - "~>"
39
+ - !ruby/object:Gem::Version
40
+ version: '0.1'
41
+ - !ruby/object:Gem::Dependency
42
+ name: base64
43
+ requirement: !ruby/object:Gem::Requirement
44
+ requirements:
45
+ - - "~>"
46
+ - !ruby/object:Gem::Version
47
+ version: '0.1'
48
+ type: :runtime
49
+ prerelease: false
50
+ version_requirements: !ruby/object:Gem::Requirement
51
+ requirements:
52
+ - - "~>"
53
+ - !ruby/object:Gem::Version
54
+ version: '0.1'
55
+ - !ruby/object:Gem::Dependency
56
+ name: logger
57
+ requirement: !ruby/object:Gem::Requirement
58
+ requirements:
59
+ - - "~>"
60
+ - !ruby/object:Gem::Version
61
+ version: '1.4'
62
+ type: :runtime
63
+ prerelease: false
64
+ version_requirements: !ruby/object:Gem::Requirement
65
+ requirements:
66
+ - - "~>"
67
+ - !ruby/object:Gem::Version
68
+ version: '1.4'
69
+ - !ruby/object:Gem::Dependency
70
+ name: rake
71
+ requirement: !ruby/object:Gem::Requirement
72
+ requirements:
73
+ - - "~>"
74
+ - !ruby/object:Gem::Version
75
+ version: '13.0'
76
+ type: :development
77
+ prerelease: false
78
+ version_requirements: !ruby/object:Gem::Requirement
79
+ requirements:
80
+ - - "~>"
81
+ - !ruby/object:Gem::Version
82
+ version: '13.0'
83
+ - !ruby/object:Gem::Dependency
84
+ name: rspec
85
+ requirement: !ruby/object:Gem::Requirement
86
+ requirements:
87
+ - - "~>"
88
+ - !ruby/object:Gem::Version
89
+ version: '3.0'
90
+ type: :development
91
+ prerelease: false
92
+ version_requirements: !ruby/object:Gem::Requirement
93
+ requirements:
94
+ - - "~>"
95
+ - !ruby/object:Gem::Version
96
+ version: '3.0'
97
+ - !ruby/object:Gem::Dependency
98
+ name: rubocop
99
+ requirement: !ruby/object:Gem::Requirement
100
+ requirements:
101
+ - - "~>"
102
+ - !ruby/object:Gem::Version
103
+ version: '1.21'
104
+ type: :development
105
+ prerelease: false
106
+ version_requirements: !ruby/object:Gem::Requirement
107
+ requirements:
108
+ - - "~>"
109
+ - !ruby/object:Gem::Version
110
+ version: '1.21'
13
111
  - !ruby/object:Gem::Dependency
14
112
  name: rubocop-rspec
15
113
  requirement: !ruby/object:Gem::Requirement
@@ -77,7 +175,7 @@ licenses:
77
175
  metadata:
78
176
  homepage_uri: https://github.com/sevendials/ruby-kasa
79
177
  source_code_uri: https://github.com/sevendials/ruby-kasa
80
- post_install_message:
178
+ post_install_message:
81
179
  rdoc_options: []
82
180
  require_paths:
83
181
  - lib
@@ -92,8 +190,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
92
190
  - !ruby/object:Gem::Version
93
191
  version: '0'
94
192
  requirements: []
95
- rubygems_version: 3.2.22
96
- signing_key:
193
+ rubygems_version: 3.0.3.1
194
+ signing_key:
97
195
  specification_version: 4
98
196
  summary: TP-Link Kasa
99
197
  test_files: []