lifx_toys 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c038c4caa934ea7b44ef3025d046b5bc48168bc
-  data.tar.gz: de8871517e7b634e09184e5e4b7324ffea3c6abf
+  metadata.gz: bb81a9c174f6d6500406ea22b2e5a54f5c3b173d
+  data.tar.gz: 9c280ab0442764a220f1eea8256cd0fd46c4b571
 SHA512:
-  metadata.gz: baf5b2e3328cfd1393faf58fa551e1540a81a060b9dac131d16937b174645f4b4f47521e1519d21fab1fb0fa3fe5f8595bdcd1592543442b5cbb8ccd907151e6
-  data.tar.gz: 2d7a6f82db6bb3faa7e03ae217a9feff1380c09e4d7d3ab36eec63ab0e3945d67dc98d6e41f57222cb1e46da7e9a41c175bf49ff6bf3fb0e8ccacc47a5539736
+  metadata.gz: c592852db5a890a919e55177d06c0074138be9394aaf0fdcde8b2ba88c38524fbc3ff82581447762c1caf88917a496d9a8480f01bfe8e15c7676bae8275f3fbc
+  data.tar.gz: 416d666cbfe235a748a6adabe7e0315fdb1d9ad8374920577fcf52c5ecb61c2ff3cef2b82df32b7177d5aef1bda639ed780a00a7ed0963264a78d1108047f440

data/Rakefile

@@ -1,9 +1,5 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
-require "lifx_toys"
-require "lifx_toys/clouds"
-require "lifx_toys/colors"
-require "lifx_toys/sunrise"
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
@@ -12,39 +8,3 @@ Rake::TestTask.new(:test) do |t|
 end
 
 task :default => :test
-
-
-desc 'Cloud lighting simulation on all lights'
-task :clouds do
-  LifxToys::Clouds.new.run
-end
-
-desc 'Cycle random Hue, Saturation and brightness on all lights'
-task :colors do
-  LifxToys::Colors.new.run
-end
-
-desc '30 minute sunrise, 0-15M brightness:0-100% kelvin:2500, 15-30M kelvin:2500-9000'
-task :sunrise do
-  LifxToys::Sunrise.new.run
-end
-
-task :info do
-  puts all_lights.get_info
-end
-
-task :off do
-  puts all_lights.set_power_state 'off'
-end
-
-task :on do
-  puts all_lights.set_power_state 'on'
-end
-
-task :toggle do
-  puts all_lights.toggle
-end
-
-def all_lights
-  LifxToys::HttpApi.with_default_selector('all')
-end

data/exe/lifx_clouds

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative "../lib/lifx_toys/clouds"
+
+LifxToys::Clouds.new.run

data/exe/lifx_colors

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative "../lib/lifx_toys/colors"
+
+LifxToys::Colors.new.run

data/exe/lifx_rainbow

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative "../lib/lifx_toys/rainbow"
+
+LifxToys::Rainbow.new.run

data/exe/lifx_sunrise

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative "../lib/lifx_toys/sunrise"
+
+LifxToys::Sunrise.new.run

data/lib/lifx_toys.rb

@@ -1,6 +1,4 @@
 require "lifx_toys/version"
-require "lifx_toys/http_api"
-require "lifx_toys/lifx_light"
 
 module LifxToys
   # Your code goes here...

data/lib/lifx_toys/clouds.rb

@@ -1,4 +1,4 @@
-require_relative "lifx_light"
+require 'lifx_http'
 module LifxToys
   class Clouds
 
@@ -11,7 +11,7 @@ module LifxToys
     CYCLE_TIME = 5.0
 
     def initialize
-      @lights = LifxLight.get_lights.select{|x| x.connected }
+      @lights = LifxHttp::LifxLight.get_lights.select{|x| x.connected }
     end
 
     def run

data/lib/lifx_toys/colors.rb

@@ -1,4 +1,4 @@
-require_relative "lifx_light"
+require "lifx_http"
 
 module LifxToys
   class Colors
@@ -10,7 +10,7 @@ module LifxToys
     CYCLE_TIME = 10.0
 
     def initialize
-      @lights = LifxLight.get_lights.select{|x| x.connected }
+      @lights = LifxHttp::LifxLight.get_lights.select{|x| x.connected }
     end
 
     def run

data/lib/lifx_toys/rainbow.rb

@@ -0,0 +1,34 @@
+require "lifx_http"
+module LifxToys
+  class Rainbow
+
+    CYCLE_TIME = 1
+
+    def initialize
+      @lights = LifxHttp::LifxLight.get_lights.select{|x| x.connected }
+      puts "Running with #{light_count} lights..."
+    end
+
+    def light_count
+      @lights.count
+    end
+
+    def run
+      @lights.each{|x| x.set_color("saturation:1 brightness:1", duration: 0)}
+      while (true)
+        (0...36).each do |color|
+          @lights.each_with_index do |light, light_number|
+            light.set_color(color_for_light(color * 10, light_number), duration: CYCLE_TIME)
+          end
+          sleep(CYCLE_TIME)
+        end
+      end
+    end
+
+    def color_for_light(base_color, index)
+      offset = (360/light_count) * index
+      "hue:#{((base_color) + offset) % 360}"
+    end
+
+  end
+end

data/lib/lifx_toys/sunrise.rb

@@ -1,4 +1,4 @@
-require_relative "lifx_light"
+require "lifx_http"
 module LifxToys
   class Sunrise
 
@@ -30,7 +30,7 @@ module LifxToys
       @end_brightness = end_brightness
       @end_temperature = end_temperature
 
-      @lights = HttpApi.with_default_selector(selector)
+      @lights = LifxHttp::Api.with_default_selector(selector)
     end
 
     # warning: this method takes half the sunrise time to execute

data/lib/lifx_toys/version.rb

@@ -1,3 +1,3 @@
 module LifxToys
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lifx_toys.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["lparry@gmail.com"]
 
   spec.summary       = %q{Lucas's LIFX toys}
-  spec.description   = %q{ruby wrapper and toys for the LIFX cloud api}
+  spec.description   = %q{Toys for the LIFX bulbs}
   spec.homepage      = "https://github.com/lparry/lifx_toys"
   spec.license       = "MIT"
 
@@ -19,10 +19,20 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.post_install_message = <<-DOC
+==============================================================================
+  This gem no longer contains the Http Api code. Sorry!
+
+  On the freak chance you were already using it, that stuff is now in the \'lifx_http\' gem.
+==============================================================================
+  DOC
+
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.7"
   spec.add_development_dependency "pry", "~> 0.10"
   spec.add_dependency             "json", "~> 1.8"
   spec.add_dependency             "httparty", "~> 0.13"
+  spec.add_dependency             "lifx", "~> 0.4"
+  spec.add_dependency             "lifx_http", "~> 0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lifx_toys
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Lucas Parry
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2015-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,10 +94,42 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
-description: ruby wrapper and toys for the LIFX cloud api
+- !ruby/object:Gem::Dependency
+  name: lifx
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: lifx_http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+description: Toys for the LIFX bulbs
 email:
 - lparry@gmail.com
-executables: []
+executables:
+- lifx_clouds
+- lifx_colors
+- lifx_rainbow
+- lifx_sunrise
 extensions: []
 extra_rdoc_files: []
 files:
@@ -109,12 +141,14 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- exe/lifx_clouds
+- exe/lifx_colors
+- exe/lifx_rainbow
+- exe/lifx_sunrise
 - lib/lifx_toys.rb
 - lib/lifx_toys/clouds.rb
 - lib/lifx_toys/colors.rb
-- lib/lifx_toys/http_api.rb
-- lib/lifx_toys/http_api/with_default_selector.rb
-- lib/lifx_toys/lifx_light.rb
+- lib/lifx_toys/rainbow.rb
 - lib/lifx_toys/sunrise.rb
 - lib/lifx_toys/version.rb
 - lifx_toys.gemspec
@@ -122,7 +156,12 @@ homepage: https://github.com/lparry/lifx_toys
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: |
+  ==============================================================================
+    This gem no longer contains the Http Api code. Sorry!
+
+    On the freak chance you were already using it, that stuff is now in the 'lifx_http' gem.
+  ==============================================================================
 rdoc_options: []
 require_paths:
 - lib

data/lib/lifx_toys/http_api.rb

@@ -1,105 +0,0 @@
-require 'httparty'
-require_relative 'http_api/with_default_selector'
-
-module LifxToys
-  module HttpApi
-    class << self
-
-      def with_default_selector(selector)
-        WithDefaultSelector.new(selector)
-      end
-
-      def set_color(selector, color, options = { duration: 2.0,
-                                                 power_on: true})
-        HTTParty.put(color_url(selector),
-                     headers: authorization_headers,
-                     query: options.merge({
-                       color: color
-                     })).tap do |response|
-      if response.success?
-                       puts "info: set #{selector} to #{color}" if ENV["DEBUG"]
-        nil
-      else
-        puts "warning: light status - #{response}"
-        -1
-      end
-                     end
-      end
-
-      def get_info(selector)
-        HTTParty.get(info_url(selector),
-                     headers: authorization_headers)
-      end
-
-      def set_power_state(selector, state, options = {duration: 2})
-        HTTParty.put(power_url(selector),
-                     headers: authorization_headers,
-                     query: options.merge({
-                       state: state
-                     }))
-      end
-
-      def toggle_power_state(selector)
-        HTTParty.post(toggle_power_url(selector),
-                     headers: authorization_headers)
-      end
-
-      def breathe(selector, color, options =  {
-                                      period:     1.0,
-                                      cycles:     1.0,
-                                      persist:    false,
-                                      power_on:   true,
-                                      peak:       0.5 })
-        HTTParty.post(breathe_url(selector),
-                     headers: authorization_headers,
-                     query: options.merge({
-                       color: color
-                     }))
-      end
-
-      def pulse(selector, color, options = {
-                                    # from_color: current_bulb_color,
-                                      period:     1.0,
-                                      cycles:     1.0,
-                                      persist:    false,
-                                      power_on:   true,
-                                      peak:       1.0 })
-        HTTParty.post(pulse_url(selector),
-                     headers: authorization_headers,
-                     query: options.merge({
-                       color: color
-                     }))
-      end
-
-      private
-
-      def info_url(selector)
-        "https://api.lifx.com/v1beta1/lights/#{selector}"
-      end
-
-      def color_url(selector)
-        "#{info_url(selector)}/color"
-      end
-
-      def power_url(selector)
-        "#{info_url(selector)}/power"
-      end
-
-      def toggle_power_url(selector)
-        "#{info_url(selector)}/toggle"
-      end
-
-      def breathe_url(selector)
-        "#{info_url(selector)}/effects/breathe"
-      end
-
-      def pulse_url(selector)
-        "#{info_url(selector)}/effects/pulse"
-      end
-
-      def authorization_headers
-        {"Authorization" => "Bearer #{ENV["LIFX_TOKEN"]}"}
-      end
-    end
-  end
-end

data/lib/lifx_toys/http_api/with_default_selector.rb

@@ -1,30 +0,0 @@
-require_relative '../http_api'
-
-module LifxToys
-  module HttpApi
-
-    class WithDefaultSelector
-
-      attr_reader :selector
-
-      def initialize(selector)
-        @selector = selector
-      end
-
-      private
-
-      def method_missing(method_name, *args)
-        if ::LifxToys::HttpApi.respond_to? method_name
-          ::LifxToys::HttpApi.public_send(method_name, selector, *args)
-        else
-          raise
-        end
-      end
-
-      def make_request(method_name, *args)
-        HttpApi.public_send(method_name, selector, *args)
-      end
-    end
-
-  end
-end

data/lib/lifx_toys/lifx_light.rb

@@ -1,42 +0,0 @@
-require 'forwardable'
-require_relative 'http_api'
-
-module LifxToys
-  class LifxLight
-
-    extend Forwardable
-    def_delegators :@data, :label, :connected, :power, :color, :brightness, :product_name, :last_seen, :seconds_since_seen
-    def_delegators :@http_api, :set_color
-
-    attr_reader :light_id
-
-    def self.get_lights
-      @lights ||= HttpApi.with_default_selector("all").get_info.map do |data|
-        LifxLight.new(data)
-      end
-    end
-
-    def initialize(data)
-      @light_id = data["id"]
-      @data = OpenStruct.new(data)
-      @updated_at = Time.now
-      @http_api = HttpApi.with_default_selector(selector)
-    end
-
-    def update_info
-      @data ||= OpenStruct.new(@http_api.get_info)
-      @updated_at = Time.now
-    end
-
-    def inspect
-      "#<#{self.class.name} light_id=#{light_id.inspect} label=#{label.inspect} connected=#{connected.inspect} power=#{power.inspect} color=#{color.inspect} brightness=#{brightness.inspect} product_name=#{product_name.inspect} last_seen=#{last_seen.inspect} seconds_since_seen=#{seconds_since_seen.inspect} @updated_at=#{@updated_at}>"
-    end
-
-    private
-
-    def selector
-      "id:#{light_id}"
-    end
-
-  end
-end