hueshift 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6096b52b63596c72088581e714eab8f7b8b9779f
-  data.tar.gz: 86ce9e4f8de24f3634d4b182ac8f6c328539b717
+  metadata.gz: 9ab7b3bd2f06c8c25f8f77194a05a6e24719c2bc
+  data.tar.gz: c2a14f439563fac888dff3ca6324c2d20c156708
 SHA512:
-  metadata.gz: f0732f971af7cae0a4f74760350dfa3304430c7013f711bed99cbc5a71cc7770aa3956835b5b8623aded6ed5101a7d6cf53a786d9016effea9da24a9d7392ad1
-  data.tar.gz: 7785a54fe3c9a4b2325d90c5933e03c64e567efb1220918efd8077e0d297b5837f718bffc45a3e95eef3c5924315386285a46eca24bb8bbc9bb96ba4934dd28e
+  metadata.gz: c47265ae42b37a9f1a0c35b30d3d22c0d6b6faaa4b953812940b0d6b2b28a20e766fb6da04f9c6d052f66fd195557bb24671925d574b5b91b352f350fca7fbb5
+  data.tar.gz: d48c3236243ff1ebadfa12eeefbd971c18fcf78fdd8c93d1e3fdadfd0db80aead42219aa25af40efe9cf220bedbc6f6f7704daeff309170a31ff38239c99fb20

data/bin/hueshift

@@ -2,10 +2,11 @@
 
 require_relative "../lib/hueshift"
 require "slop"
+require "filewatcher"
 
 include Hueshift
 
-load_user_settings
+is_user_settings_file = load_user_settings
 
 opts = Slop.parse do |o|
   o.on "-s", "--server", "continually update color temperature" do
@@ -16,7 +17,21 @@ opts = Slop.parse do |o|
       exit
     end
 
-    redshift_server
+    server = Server.new
+
+    if is_user_settings_file
+      server.start
+      filewatcher = FileWatcher.new USER_SETTINGS_PATH
+      fw_thread   = Thread.new(filewatcher) do |fw|
+        fw.watch do |file|
+          puts "Detected change to #{file}. Restarting with updated settings."
+          load_user_settings
+          server.restart
+        end
+      end.join
+    else
+      server.start.join
+    end
   end
   o.on "-v", "--version", "print the version" do
     puts Hueshift::VERSION

data/hueshift.gemspec

@@ -24,5 +24,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "hue", "~> 0.1"
   spec.add_dependency "slop", "~> 4.2"
-  spec.add_dependency "dotenv", "~> 2.0.0"
+  spec.add_dependency "dotenv", "~> 2.0"
+  spec.add_dependency "filewatcher", "~> 0.5"
 end

data/lib/hueshift.rb

@@ -1,5 +1,6 @@
 require_relative "hueshift/version"
 require_relative "hueshift/user_settings"
+require_relative "hueshift/server"
 require "hue"
 
 class Numeric

data/lib/hueshift/server.rb

@@ -0,0 +1,36 @@
+module Hueshift
+  class Server
+    DEFAULT_POLLING_INTERVAL = 30 # seconds
+
+    def start
+      polling_interval = (ENV.fetch "POLLING_INTERVAL", DEFAULT_POLLING_INTERVAL).to_i
+      @thread = Thread.new do
+        loop do
+          redshift_safe
+          sleep polling_interval
+        end
+      end
+    end
+
+    def stop
+      @thread.exit
+    end
+
+    def restart
+      stop
+      start
+    end
+
+    private ####################################################################
+
+    def redshift_safe
+      begin
+        redshift
+      rescue Exception => e
+        puts "#{Time.now}: Received #{e.class}: #{e.message}"
+        e.backtrace.each { |line| puts "\t#{line}" }
+      end
+    end
+
+  end
+end

data/lib/hueshift/user_settings.rb

@@ -1,11 +1,16 @@
 module Hueshift
   USER_SETTINGS_FILE = ".hueshift"
+  USER_SETTINGS_PATH = File.expand_path USER_SETTINGS_FILE, Dir.home
 
+  ##
+  # Load the settings in USER_SETTINGS_PATH, if it exists.
+  #
+  # @return whether USER_SETTINGS_PATH exists
   def load_user_settings
-    settings_file = File.expand_path USER_SETTINGS_FILE, Dir.home
-    if File.exist? settings_file
+    if (exists = File.exist? USER_SETTINGS_PATH)
       require "dotenv"
-      Dotenv.load settings_file
+      Dotenv.overload USER_SETTINGS_PATH
     end
+    exists
   end
 end

data/lib/hueshift/version.rb

@@ -1,3 +1,3 @@
 module Hueshift
-  VERSION = "0.3.1"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hueshift
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Justin Toniazzo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: filewatcher
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 description: 
 email:
 - jutonz42@gmail.com
@@ -114,6 +128,7 @@ files:
 - bin/setup
 - hueshift.gemspec
 - lib/hueshift.rb
+- lib/hueshift/server.rb
 - lib/hueshift/user_settings.rb
 - lib/hueshift/version.rb
 homepage: http://www.github.com/jutonz/hueshift