wink_scheduler 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 257aa680bf39c29694d5f954c88670d252edb130
-  data.tar.gz: 1e29b204166b0dbcb921d2958340ccce33d00782
+  metadata.gz: 8c4c103d9560e9ab6289aebb057cece51f4bd069
+  data.tar.gz: e0c716000fcf8b322943729abf78e3d15c9c39a1
 SHA512:
-  metadata.gz: 14ee3c440801ac710d835e2a942ffaab1f3e198aed87fa2e34463c10ab4557c1c4679f4a082c3937c0baa82d6cb1e3d49356d431df93089d1fd074b0f5e7de96
-  data.tar.gz: b40f52c72e2fb94390d186f5a1560ab75230fc1279d870e7a083f5b3c587a7d9ef1a715a4147f57c47e9ecb8005b7e466dddc5913b0972191b91717154fb04cf
+  metadata.gz: 87e299fc57d4d491b5fd276ca735df98c9485bf2e3402b773c222d2e5eef93e7a02ca00798f8f41322e764d203fbc7be89bde378b25b409a34133437627e8534
+  data.tar.gz: 2b3659bf153bab01ef4dd33483a9b0802ca694fb6a27be8e3cfc1745dd49e2f542affbb9750f9bb4a6b718dc4befa4e974b2bddd72af874741b00c48cbc25144

data/Dockerfile

@@ -0,0 +1,8 @@
+FROM ruby:2.1
+MAINTAINER Joe Lanford <joe.lanford@gmail.com>
+WORKDIR /wink_scheduler
+RUN git clone https://github.com/joelanford/wink_scheduler.git /wink_scheduler && \
+    git checkout v0.0.4 && \
+    bundle install
+
+CMD ["bundle", "exec", "bin/wink_scheduler", "/wink_scheduler/conf/schedule.yaml"]

data/Rakefile

@@ -1,2 +1,5 @@
 require "bundler/gem_tasks"
 
+task :docker do
+  system("docker build -t joelanford/wink_scheduler .")
+end

data/bin/wink_scheduler

@@ -2,6 +2,9 @@
 
 require 'wink_scheduler'
 
+$stdout.sync = true
+$stderr.sync = true
+
 if ARGV[0]
   begin
     conf = YAML.load_file(ARGV[0])
@@ -13,6 +16,8 @@ if ARGV[0]
   rescue => e2
     $stderr.puts "ERROR -- #{e2.message}"
     exit 1
+  rescue SystemExit, Interrupt
+    exit 1
   end
 else
  $stderr.puts "ERROR: must provide configuration file"

data/conf/schedule.yaml.sample

@@ -10,34 +10,31 @@ schedules:
     method: :on
     time: :sunset
     window: 2
-    location: 12765838
+    location: New York, NY
   - device: Lamp
     days: :daily
     method: :off
     time: 12:00 AM
     window: 10
-    location: 12765838
   - device: Family Room
     days: :daily
     method: :on
     time: :sunset
     window: 10
-    location: 12765838
+    location: New York, NY
   - device: Family Room
     days: :daily
     method: :off
     time: 12:00 AM
     window: 10
-    location: 12765838
   - group: My Group
     days: :daily
     method: :on
     time: :sunrise
     window: 10
-    location: 12765838
+    location: New York, NY
   - device: My Group
     days: :daily
     method: :off
     time: 8:00 AM
     window: 10
-    location: 12765838

data/lib/wink_scheduler/schedule.rb

@@ -1,11 +1,14 @@
 require 'winker'
 require 'weather-api'
+require 'httparty'
 require 'yaml'
 require 'time'
+require 'rufus-scheduler'
 
 module WinkScheduler
   class Schedule
     def initialize(opts, devices, groups)
+      @scheduler = Rufus::Scheduler.new
       if opts["device"]
         @object = devices.select { |d| next if d == nil; d.name == opts["device"] }[0]
         raise "device \"#{opts["device"]}\" not found" unless @object
@@ -47,7 +50,7 @@ module WinkScheduler
 
       if (@time == :sunrise || @time == :sunset)
         if opts["location"]
-          @location = opts["location"]
+          @woeid = get_woeid(opts["location"])
         else
           raise "Schedule must define 'location' option if time used is sunrise or sunset"
         end
@@ -56,7 +59,7 @@ module WinkScheduler
 
     def run
       while true
-        run_once
+        execute
       end
     end
 
@@ -78,31 +81,37 @@ module WinkScheduler
       end
     end
 
-    def run_once
-      cur_time = Time.now
-      randomness = @window ? rand(@window*60) - @window*60/2 : 0
-      next_time = get_next_time + randomness
+    def get_woeid(location)
+      HTTParty.get("http://where.yahooapis.com/v1/places.q('#{location}')?appid=dj0yJmk9V3pRYU83TjVYRVlNJmQ9WVdrOWEwVTNTM0oxTkdjbWNHbzlNQS0tJnM9Y29uc3VtZXJzZWNyZXQmeD05NQ--").parsed_response["places"]["place"]["woeid"]
+    end
+
+    def execute
+      next_time = get_next_time
       puts "Scheduled \"#{@method}\" on #{@type} \"#{@object.name}\" at #{next_time}."
-      while Time.now < next_time
-        sleep 1
+      @scheduler.at next_time do
+        @object.send(@method)
       end
-      @object.send(@method)
+      @scheduler.join
       puts "Executed \"#{@method}\" on #{@type} \"#{@object.name}\" at #{next_time}."
     end
 
     def get_next_time
+      now = Time.now
       time = case @time
       when :sunset
-        Weather.lookup(@location).astronomy.sunset
+        Weather.lookup(@woeid).astronomy.sunset
       when :sunrise
-        Weather.lookup(@location).astronomy.sunrise
+        Weather.lookup(@woeid).astronomy.sunrise
       else
         Time.parse(@time)
       end
       time += @offset
-      possible_next_times = 0.upto(6).collect{ |i| time + 3600*24*i }
-      cur_time = Time.now
-      possible_next_times.select{ |t| t > cur_time && @days.include?(t.wday) }[0]
+      randomness = @window ? rand(@window*60) - @window*60/2 : 0
+      adj_time = time + randomness
+      while adj_time < now || !@days.include?(adj_time.wday)
+        adj_time += 86400
+      end
+      return adj_time
     end
   end
 end

data/lib/wink_scheduler/version.rb

@@ -1,3 +1,3 @@
 module WinkScheduler
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/wink_scheduler.gemspec

@@ -20,6 +20,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "weather-api", "~> 1.2"
   spec.add_dependency "winker", "~> 0.0", ">= 0.0.15"
+  spec.add_dependency "httparty", "~> 0.13", ">= 0.13.7"
+  spec.add_dependency "rufus-scheduler", "~> 3.2"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wink_scheduler
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Joe Lanford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-26 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: weather-api
@@ -44,6 +44,40 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.15
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.13.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.13.7
+- !ruby/object:Gem::Dependency
+  name: rufus-scheduler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -82,6 +116,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- Dockerfile
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -113,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Schedule actions for Wink devices.