ledenet_api 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7918b24531f9582d6bbe8bf87198a78472463a6a
-  data.tar.gz: cd52a094101c81a612479f9d213ec3d93e634b54
+  metadata.gz: 784967fa26bb47506ffea3842a1cbb919a8d12e1
+  data.tar.gz: 509d3fa070c8a72efd913aaf7bcda83f709e61a7
 SHA512:
-  metadata.gz: 70cac17c9a495647e21d7125fb8c7f6da5ba31e74c72d1db76a88df044efb1ccd2fe76c70a09ecd3f4bd9cc83621c004dca072b505255e81fc656ac833f97db5
-  data.tar.gz: cabc2360cce8d403085e2302391643000b577799ab8db67a39826886ae0a59098e8cc2f365f28ed49510ba5770992b57510963e46eae2ed78c53b337b49772f7
+  metadata.gz: ebe124461916180dd20440aedd240af67888d67b16dff70703012d489d410525611f5c8ea566d4841b4c34746d69dcb49a821d692939f026f475e92303e787be
+  data.tar.gz: 79a0575d4dd38f3dee97b3c1116fafb070ab55f7564f500b3b9bf526922aac9690e14b02ac7442b4741abbde351147f714358e852fdf4e7917f887f91e93453b

data/Gemfile.lock

@@ -1,14 +1,16 @@
 PATH
   remote: .
   specs:
-    ledenet_api (0.1.11)
-      bindata (>= 1.8)
+    ledenet_api (1.1.0)
+      bindata (>= 2.3)
+      ipaddress (>= 0.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
     bindata (2.3.0)
     diff-lcs (1.2.5)
+    ipaddress (0.8.3)
     rake (10.4.2)
     rspec (3.3.0)
       rspec-core (~> 3.3.0)

data/README.md

@@ -74,27 +74,34 @@ To turn the controller on and off:
 
 ```ruby
 api.on
-=> true
 api.off
-=> true
 ```
 
-### Color
+### Color / Warm White
 
-To get the current color setting (as an array of RGB values):
+To get the current color settings:
 
 ```ruby
-api.current_color
-=> [10, 10, 10]
+api.current_color_data
+#=> {:red=>255, :green=>255, :blue=>255, :warm_white=>255}
+api.current_rgb
+#=> [255, 255, 255]
+api.current_warm_white
+#=> 255
 ```
 
 To set the color:
 
 ```ruby
-api.update_color(255, 0, 255)
-=> true
+api.update_rgb(255, 0, 255)
+
+api.update_warm_white(100)
 ```
 
-### Warm White
+You can also update individual parameters:
+
+```ruby
+api.update_color_data(red: 100)
 
-This controller is also capable of controling Warm White (WW) LEDs. I didn't have a strip to test, but I'm pretty sure I found out how to control it. If this would be useful to you, please open an issue/pull request.
+api.update_color_data(blue: 255, warm_white: 0)
+```

data/bin/ledenet-ufo

@@ -0,0 +1,121 @@
+#!/usr/bin/ruby
+
+require 'optparse'
+require 'json'
+
+require 'ledenet_api'
+require 'ipaddress'
+
+options = {}
+
+banner = <<-BANNER
+  Usage: ledenet-ufo --list
+     OR: ledenet-ufo [IP|HW ADDR] [OPTIONS]
+
+BANNER
+
+if ARGV.count > 0 && !ARGV.first.start_with?('-')
+  arg = ARGV.shift
+
+  if IPAddress.valid?(arg)
+    options[:ip] = arg
+  elsif /^([0-9a-fA-F]{2}[:-]){5}[0-9a-fA-F]{2}$/i.match(arg)
+    options[:hw_addr] = arg
+  else
+    raise "Invalid device speicifier \"#{arg}\". Must be ip or mac address."
+  end
+end
+
+opts = OptionParser.new do |opts|
+  opts.banner = banner
+
+  opts.on("-r", "--red [VALUE]", Integer, "Set red to VALUE") do |v|
+    options[:red] = v
+  end
+
+  opts.on("-g", "--green [VALUE]", Integer, "Set green to VALUE") do |v|
+    options[:green] = v
+  end
+
+  opts.on("-b", "--blue [VALUE]", Integer, "Set blue to VALUE") do |v|
+    options[:blue] = v
+  end
+
+  opts.on("-w", "--warm-white [VALUE]", Integer, "Set warm white to VALUE") do |v|
+    options[:warm_white] = v
+  end
+
+  opts.on("--on", "Turn on the controller") do |v|
+    options[:on?] = true
+  end
+
+  opts.on("--off", "Turn off the controller") do
+    options[:on?] = false
+  end
+
+  opts.on("-l", "--list", Integer, "Prints a list of available devices and exists") do |v|
+    options[:list] = true
+  end
+
+  opts.on("-s", "--status", "Prints status as JSON") do |v|
+    options[:print_status?] = true
+  end
+
+  opts.on("-h", "--help", "Prints this help message") do
+    options[:print_help?] = true
+  end
+end
+
+opts.parse!
+
+if options[:print_help?]
+  puts opts
+  exit 0
+end
+
+begin
+  if options[:list]
+    if options.count > 1
+      warn "--list is incompatible with other options!\n\n"
+      warn opts
+      exit 1
+    end
+
+    devices = LEDENET.discover_devices(expected_devices: 1000)
+
+    row_format = "%16s %18s %20s\n"
+    printf row_format, "IP ADDRESS", "HW ADDRESS", "Model #"
+
+    LEDENET.discover_devices.each do |device|
+      printf row_format, device.ip, device.hw_addr, device.model
+    end
+  else
+    ip = nil
+    if options[:ip]
+      ip = options[:ip]
+    elsif options[:hw_addr]
+      r = LEDENET.discover_devices.select { |x| x.hw_addr == options[:hw_addr] }
+      if r.empty?
+        raise "Couldn't find device with mac addr: #{options[:hw_addr]}"
+      end
+      ip = r.first.ip
+    else
+      ip = LEDENET.discover_devices.first.ip
+    end
+
+    api = LEDENET::Api.new(ip)
+
+    api.set_power(options[:on?]) unless options[:on?].nil?
+    api.update_color_data(options.select { |k,_| %w{red green blue warm_white}.include?(k.to_s) })
+
+    if options[:print_status?]
+      status = api.current_color_data
+      status = status.merge(is_on: api.on?)
+
+      puts status.to_json
+    end
+  end
+rescue Exception => e
+  puts "Error: #{e}"
+  puts e.backtrace.join("\n")
+end

data/ledenet_api.gemspec

@@ -14,11 +14,12 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir        = "bin"
+  spec.executables   = ["ledenet-ufo"]
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'bindata', '>= 2.3'
+  spec.add_dependency 'ipaddress', '>= 0.8'
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/ledenet/api.rb

@@ -23,6 +23,10 @@ module LEDENET
       send_packet(LEDENET::Packets::SetPowerRequest.off_request)
     end
 
+    def set_power(v)
+      v ? on : off
+    end
+
     def on?
       status.on?
     end

data/lib/ledenet/version.rb

@@ -1,3 +1,3 @@
 module LEDENET
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: ledenet_api
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Christopher Mullins
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
 date: 2016-04-30 00:00:00.000000000 Z
 dependencies:
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: ipaddress
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -69,7 +83,8 @@ dependencies:
 description: 
 email:
 - chris@sidoh.org
-executables: []
+executables:
+- ledenet-ufo
 extensions: []
 extra_rdoc_files: []
 files:
@@ -79,6 +94,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/ledenet-ufo
 - ledenet_api.gemspec
 - lib/ledenet/api.rb
 - lib/ledenet/device_discovery.rb