lifx-http 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 865b3dc88e318a175a2150d10de44183d9ea9c39
-  data.tar.gz: 2b34e96d9020ddd814fa3b7ebee607784e3e5296
+  metadata.gz: 4e29919953e3e6acd75b01192501cbe27b9ea8a5
+  data.tar.gz: 02eb463c51e547216c7595d29d3d5a9cc2a64a87
 SHA512:
-  metadata.gz: 7cee8f7b1766ab4ed48ddeefb97a2e12f7aaf2d86ab6ad183ed14c508c509ab048dc6d0cbb020d64153a0646df5ae22a61f6835c9ac8b4ed614edfaf59fcbbe4
-  data.tar.gz: 5296e1ca15be060808e0beac32416e329ce592a2a7e599c448af18cd436409e7ad1b86ce77e17902c88c45c587b32c21120a107e3c70ee3ee1f1e1f69c0c739a
+  metadata.gz: 8c094f36d028a0d47238a28f95ce763a958e40123cd1f63d7a3df132fa382521fce1d4e14110a39dfa70e3486c7bf4446652e48508238e954d99919991172a0b
+  data.tar.gz: a0da9499d9e0a7dc75e01bb27a697a33cf591106c9805d9dbe664b9a220e6151947f9be0d3280b79405ef4febaf64bdcc097366eec26f1027062a280bd8ce56a

data/Gemfile.lock

@@ -6,6 +6,7 @@ PATH
       grape-entity (~> 0.4)
       grape-swagger (~> 0.7)
       lifx (= 0.4.5)
+      mdns (>= 0.1.1)
       rack (~> 1.5)
       rack-cors (~> 0.2)
 
@@ -57,9 +58,12 @@ GEM
       configatron (~> 3.0)
       timers (~> 1.0)
       yell (~> 2.0)
+    mdns (0.1.1)
+      net-dns (~> 0.8)
     minitest (4.7.5)
     multi_json (1.9.2)
     multi_xml (0.5.5)
+    net-dns (0.8.0)
     rack (1.5.2)
     rack-accept (0.4.5)
       rack (>= 0.4)

data/README.md

@@ -4,6 +4,11 @@
 
 This is an **unofficial** JSON RESTful API service for controlling LIFX devices. This API adds some reliability that the [LIFX gem](https://github.com/LIFX/lifx-gem) does not include.
 
+## Features
+
+* Mostly synchronous, apart from setting colour
+* Supports MDNS
+
 ## Requirements
 
 * Ruby 2.0+
@@ -19,7 +24,8 @@ This is an **unofficial** JSON RESTful API service for controlling LIFX devices.
   * URL params: `curl -XPUT http://localhost:56780/lights/all/color?hue=120&saturation=1&brightness=1&duration=2 -d ''`
   * JSON body: `curl -XPUT http://localhost:56780/lights/all/color -H "Content-Type: application/json" -d '{"hue": 120, "saturation": 1, "brightness": 1, "duration":2}'`
   * Override method by setting `_method`: `curl http://localhost:56780/lights/all/color?hue=120&saturation=1&brightness=1&duration=2&_method=put`
-
+* Start a slow sunrise effect:
+  * `curl -XPUT http://localhost:56780/lights/all/color?hue=35&saturation=0.37&brightness=0.65&duration=10m -d ''`
 
 ## API
 
@@ -46,6 +52,17 @@ To view documentation and play with the API, start the API server locally, then
 You should see something like this:
 ![Swagger screenshot](doc.png)
 
+## Changelog
+
+#### 0.2.1
+
+- Duration now supports minute and hour suffixes e.g. "12h" for 12 hours thanks to @Bluebie
+- MDNS support! Enables easy discovery of a LIFX HTTP instance on the LAN.
+
+#### 0.2.0
+
+- First gem release
+
 ## License
 
 MIT. See [LICENSE](LICENSE)

data/bin/lifx-http

@@ -1,19 +1,32 @@
 #!/usr/bin/env ruby
+$LOAD_PATH << File.join(File.dirname(__FILE__), "..", "lib")
 require "lifx-http"
 require "rack/cors"
 require "lifx-http/method_override"
 require "webrick"
 require "optparse"
+require "mdns"
 
 options = {
-  port: 56780
+  port: 56780,
+  mdns_host: "lifx-http",
+  mdns_ip: begin
+    Socket.ip_address_list.find { |ip| ip.ipv4_private? }.ip_address
+  end
 }
+
 OptionParser.new do |parser|
   parser.banner = "Usage: lifx-http [options]"
   parser.version = LIFXHTTP::VERSION
   parser.on("-p PORT", "--port PORT", "Specify the port to run lifx-http on. Defaults to #{options[:port]}") do |port|
     options[:port] = port.to_i
   end
+  parser.on("--hostname HOSTNAME", "Specify the host the MDNS broadcast should use. Defaults to #{options[:mdns_host]}") do |host|
+    options[:mdns_host] = host
+  end
+  parser.on("--ip MDNS_IP", "Specify the IP the MDNS record should resolve to. Defaults to #{options[:mdns_ip]}") do |ip|
+    options[:mdns_ip] = ip
+  end
 end.parse!
 
 app = Rack::Builder.new do
@@ -28,4 +41,10 @@ app = Rack::Builder.new do
   run LIFXHTTP::API
 end
 
+if options[:mdns_ip]
+  MDNS.add_record("#{options[:mdns_host]}.local. 120 A #{options[:mdns_ip]}")
+  MDNS.start
+  puts "LIFX HTTP can be reached at http://#{options[:mdns_host]}:#{options[:port]}/"
+end
+
 Rack::Handler::WEBrick.run(app, Port: options[:port])

data/lib/lifx-http.rb

@@ -133,7 +133,7 @@ module LIFXHTTP
           requires :saturation, type: Float, desc: "Saturation: 0-1"
           requires :brightness, type: Float, desc: "Brightness: 0-1"
           optional :kelvin, type: Integer, default: 3_500, desc: "Kelvin: 2500-10000. Defaults to 3500"
-          optional :duration, type: Float, default: 1, desc: "Duration in seconds. Defaults to 1.0"
+          optional :duration, type: String, default: '1', desc: "Duration in seconds. Defaults to 1.0. Suffix with m or h to specify minutes or hours. For example, 10m"
         end
         put :color do
           color = LIFX::Color.hsbk(
@@ -142,7 +142,18 @@ module LIFXHTTP
             params[:brightness],
             params[:kelvin]
           )
-          lifx.sync { 3.times { @target.set_color(color, duration: params[:duration]) } } # Retry 
+          
+          # parse minute and hour duration forms
+          duration = case params[:duration]
+          when /m$/i # Minutes
+            params[:duration].to_f * 60
+          when /h$/i # Hours
+            params[:duration].to_f * 60 * 60
+          else
+            params[:duration].to_f
+          end
+
+          lifx.sync { 3.times { @target.set_color(color, duration: duration) } } # Retry 
           present_target(@target)
         end
       end

data/lib/lifx-http/version.rb

@@ -1,3 +1,3 @@
 module LIFXHTTP
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lifx-http.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rack", "~> 1.5"
   spec.add_dependency "rack-cors", "~> 0.2"
   spec.add_dependency "lifx", "= 0.4.5"
+  spec.add_dependency "mdns", ">= 0.1.1"
   spec.add_dependency "grape", "~> 0.6"
   spec.add_dependency "grape-entity", "~> 0.4"
   spec.add_dependency "grape-swagger", "~> 0.7"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lifx-http
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Jack Chen (chendo)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2014-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -52,6 +52,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.4.5
+- !ruby/object:Gem::Dependency
+  name: mdns
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement