lights 0.8.20 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed21be0871e4741fd8aaf4b8903213fb4ef5dccf
-  data.tar.gz: 10d3beaa6edc33165857ee8560c7914be31ce096
+  metadata.gz: 7d6d774f2b47f0ba0dec8353e1476ec9ac3366e3
+  data.tar.gz: e84a70cc13a7a783bb993839618cffc15b9d243d
 SHA512:
-  metadata.gz: 3e101fafceaca481c85416c7552862c4a689047e36b258c4e2b6a47d0b4c1b4856f3b20faa50ae8277021a8777a6abadccf84f3204c0f121b00f92ca14d8b016
-  data.tar.gz: 850ced95840f4d312244f7bddf554e65cb72be6d424f3172b2faac7f030c494549c4dc7812ea83c7811092044ab98ecefc545d0a13a1fc7808ffaa14cc432f1f
+  metadata.gz: de9aca5aa3201622e69735a6625b104756165af6b951894adbe457a3503773896b5b12eb64110fae3366188027078c4b7d370bef6115157f278c7def134ea7fe
+  data.tar.gz: f73fa4c4d4284e7f12ec2e9c91a3d685d899db59c95a3d64bc125792b1c98c13cf516ed7262f13972ef21211f3a9007910c6955160d40a4aeffb3bd13bdc2538

data/README.md

@@ -16,7 +16,7 @@ Basic Usage
 ```ruby
 require 'lights'
 client = Lights.new( '192.168.x.x', 'username' )
-client.register_username
+client.register
 client.request_bulb_list
 ```
 See [lights-examples](https://github.com/turnerba/lights-examples) for more usage examples.
@@ -26,7 +26,6 @@ CLI Quick Setup
 
 ```
 lights discover -s
-lights config -f --user <username>
 lights register
 lights list
 lights on

data/bin/lights

@@ -18,18 +18,22 @@ class LightsCli
   def configured?
     @config["username"] && @config["bridge_ip"]
   end
+
+  def ip_configured?
+    @config["bridge_ip"]
+  end
   
   def config
     options = {}
     OptionParser.new do |opts|
-      opts.on("-u", "--user <username>", String, "Username"){|url| options[:user]=url}
       opts.on("-i", "--ip <bridge ip>", String, "Bridge ip address"){|ip| options[:ip]=ip}
       opts.on("-f", "--force", "Force write to config file"){|f| options[:force]=f}
       opts.on("-l", "--list", "List saved configuration settings") {|l| options[:list]=l}
     end.parse!
  
-    if !options[:user] && !options[:ip] && !options[:list]
-      puts "Must specify username and/or bridge IP: --user <username> --ip <IP addr. of bridge>"
+    unless options[:ip] || options[:list]
+      puts "usage:"
+      puts "  #{File.basename(__FILE__)} config (--ip <bridge IP> | --list)"
       exit 1
     end
  
@@ -52,7 +56,6 @@ class LightsCli
         end
       end
   
-      @config["username"] = options[:user] || @config["username"]
       @config["bridge_ip"] = options[:ip] || @config["bridge_ip"]
   
       write_config
@@ -263,7 +266,9 @@ class LightsCli
   
   def register
     lights = Lights.new @config["bridge_ip"], @config["username"]
-    response = lights.register_username
+    response = lights.register
+    @config["username"] = lights.username
+    write_config
   end
 
   def discover 
@@ -447,12 +452,14 @@ begin
     cli.config
   elsif command == "discover"
     cli.discover
+  elsif !cli.ip_configured?
+    puts "Please run 'lights discover -s' or 'lights config --ip <IP>' before using."
+  elsif command == "register"
+    cli.register
   elsif !cli.configured?
-    puts "Please run 'lights config' before using."
+    puts "Please run 'lights register' before using."
   elsif command == "list"
     cli.list
-  elsif command == "register"
-    cli.register
   elsif command == "on"
     cli.on
   elsif command == "off"

data/lib/lights.rb

@@ -12,8 +12,8 @@ require 'lights/loggerconfig'
 
 class Lights 
 
-  attr_reader :bulbs
-  def initialize(ip,username)
+  attr_reader :bulbs, :username
+  def initialize(ip,username=nil)
     @ip = ip 
     @username = username
     @http = Net::HTTP.new(ip,80)
@@ -40,16 +40,21 @@ class Lights
     @bridges
   end
 
-  def register_username
-    data = { "devicetype"=>"lights",
-              "username"=>@username }
+  def register
+    data = { "devicetype"=>"lights" }
     response = @http.post "/api", data.to_json
     result = JSON.parse(response.body).first
     if result.has_key? "error"
       process_error result
+    elsif result["success"]
+      @username = result["success"]["username"]
     end
+    result
   end
 
+  # backwards compatibility
+  alias_method :register_username, :register
+
   def request_config
     get "config"
   end
@@ -172,6 +177,7 @@ private
 
   def get( path )
     @logger.debug "==> GET: #{path}"
+    raise UsernameException unless @username
     request = Net::HTTP::Get.new( "/api/#{@username}/#{path}" )
     response = @http.request request
     result = JSON.parse( response.body )
@@ -185,6 +191,7 @@ private
 
   def put( path, data={} )
     @logger.debug "==> PUT: #{path}"
+    raise UsernameException unless @username
     @logger.debug data.to_json 
     response = @http.put( "/api/#{@username}/#{path}", data.to_json )
     result = JSON.parse( response.body )
@@ -198,6 +205,7 @@ private
 
   def post( path, data={} )
     @logger.debug "==> POST: #{path}"
+    raise UsernameException unless @username
     @logger.debug data.to_json
     response = @http.post( "/api/#{@username}/#{path}", data.to_json )
     result = JSON.parse( response.body )
@@ -211,6 +219,7 @@ private
 
   def delete( path )
     @logger.debug "==> DELETE: #{path}"
+    raise UsernameException unless @username
     request = Net::HTTP::Delete.new( "/api/#{@username}/#{path}" )
     response = @http.request request
     result = JSON.parse( response.body )

data/lib/lights/version.rb

@@ -1,3 +1,3 @@
 module LightsConst
-  VERSION = "0.8.20"
+  VERSION = "0.9.1"
 end

data/lights.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.summary       = "lights"
   s.homepage      = 'http://rubygems.org/gems/lights'
   s.license       = 'MIT'
-  s.date          = '2014-10-11'
+  s.date          = '2015-12-15'
 
   s.files         = `git ls-files`.split($/)
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lights
 version: !ruby/object:Gem::Version
-  version: 0.8.20
+  version: 0.9.1
 platform: ruby
 authors:
 - Brady Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-11 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simpletable