wink_scheduler 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 801d0b306b4c65b601fc2aeced74759dc63f14c3
-  data.tar.gz: 020cb77aa62adbb059bceadaeb282cad0819b458
+  metadata.gz: 257aa680bf39c29694d5f954c88670d252edb130
+  data.tar.gz: 1e29b204166b0dbcb921d2958340ccce33d00782
 SHA512:
-  metadata.gz: ad58b6216cb945341f08618a854e4b603880eedce3f4a76d062fc4950f14fc2589af2489b0fe2aba26f3b195bd43aecb985fd728caf815dd7a398320f34d044d
-  data.tar.gz: 1b9fab5079419db65764ccce18b6693c5bca1999fae5f95fe1f5dcbd773f57ac6dbafc990f541220b9a7c6efafe0c267bd7dee6d583ee90e3f83acdbada3fab3
+  metadata.gz: 14ee3c440801ac710d835e2a942ffaab1f3e198aed87fa2e34463c10ab4557c1c4679f4a082c3937c0baa82d6cb1e3d49356d431df93089d1fd074b0f5e7de96
+  data.tar.gz: b40f52c72e2fb94390d186f5a1560ab75230fc1279d870e7a083f5b3c587a7d9ef1a715a4147f57c47e9ecb8005b7e466dddc5913b0972191b91717154fb04cf

data/bin/wink_scheduler

@@ -3,9 +3,17 @@
 require 'wink_scheduler'
 
 if ARGV[0]
-  conf = YAML.load_file(ARGV[0])
-  w = WinkScheduler::Client.new(conf)
-  w.run
+  begin
+    conf = YAML.load_file(ARGV[0])
+    w = WinkScheduler::Client.new(conf)
+    w.run
+  rescue Psych::SyntaxError => e1
+    $stderr.puts "ERROR -- invalid configuration file #{e1.message}"
+    exit 1
+  rescue => e2
+    $stderr.puts "ERROR -- #{e2.message}"
+    exit 1
+  end
 else
  $stderr.puts "ERROR: must provide configuration file"
 end

data/lib/wink_scheduler/client.rb

@@ -23,9 +23,11 @@ module WinkScheduler
 
     def run
       threads = []
+      devices = Winker.devices
+      groups = Winker.groups
       @schedules.each do |s|
         threads << Thread.new do
-          w = WinkScheduler::Schedule.new(s)
+          w = WinkScheduler::Schedule.new(s, devices, groups)
           w.run
         end
       end

data/lib/wink_scheduler/schedule.rb

@@ -5,21 +5,53 @@ require 'time'
 
 module WinkScheduler
   class Schedule
-    def initialize(opts)
+    def initialize(opts, devices, groups)
       if opts["device"]
-        @object = Winker.devices.select { |d| next if d == nil; d.name == opts["device"] }[0]
+        @object = devices.select { |d| next if d == nil; d.name == opts["device"] }[0]
+        raise "device \"#{opts["device"]}\" not found" unless @object
         @type = :device
       elsif opts["group"]
-        @object = Winker.groups.select { |g| next if g == nil; g.name == opts["group"] }[0]
+        @object = groups.select { |g| next if g == nil; g.name == opts["group"] }[0]
+        raise "group \"#{opts["group"]}\" not found" unless @object
         @type = :group
       else
-        raise "device or group not defined"
+        raise "Schedule must define either a 'device' or a 'group' option"
       end
-      @days = get_days(opts["days"])
-      @method = opts["method"]
-      @time = opts["time"]
+
+      if opts["days"]
+        @days = get_days(opts["days"])
+      else
+        raise "Schedule must define 'days' option"
+      end
+
+      if opts["method"]
+        @method = opts["method"]
+        raise "#{@method} is not a supported function of #{@object.name}" unless @object.respond_to?(@method)
+      else
+        raise "Schedule must define 'method' option"
+      end
+
+      if opts["time"]
+        @time = opts["time"]
+      else
+        raise "Schedule must define 'time' option"
+      end
+
+      if opts["offset"]
+        @offset = opts["offset"] * 60
+      else
+        @offset = 0
+      end
+
       @window = opts["window"]
-      @location = opts["location"]
+
+      if (@time == :sunrise || @time == :sunset)
+        if opts["location"]
+          @location = opts["location"]
+        else
+          raise "Schedule must define 'location' option if time used is sunrise or sunset"
+        end
+      end
     end
 
     def run
@@ -34,20 +66,28 @@ module WinkScheduler
         map = { "Sunday" => 0, "Monday" => 1, "Tuesday" => 2, "Wednesday" => 3, "Thursday" => 4, "Friday" => 5, "Saturday" => 6,
                 "sunday" => 0, "monday" => 1, "tuesday" => 2, "wednesday" => 3, "thursday" => 4, "friday" => 5, "saturday" => 6,
                 :sunday  => 0, :monday  => 1, :tuesday  => 2, :wednesday  => 3, :thursday  => 4, :friday  => 5, :saturday  => 6 }
-        return days.map { |d| map[d] }.sort
+        if (days - map.keys).size > 0 || days.size == 0
+          raise "Schedule 'days' option is invalid"
+        else
+          days.map { |d| map[d] }.uniq.sort
+        end
       elsif days == :daily
         return (0..6).to_a
+      else
+        raise "Schedule 'days' option is invalid"
       end
     end
 
     def run_once
       cur_time = Time.now
-      next_time = get_next_time
-      randomness = rand(@window*60) - @window*60/2
-      puts "Scheduled \"#{@method}\" on #{@type} \"#{@object.name}\" at #{next_time + randomness}."
-      sleep next_time - cur_time + randomness
+      randomness = @window ? rand(@window*60) - @window*60/2 : 0
+      next_time = get_next_time + randomness
+      puts "Scheduled \"#{@method}\" on #{@type} \"#{@object.name}\" at #{next_time}."
+      while Time.now < next_time
+        sleep 1
+      end
       @object.send(@method)
-      puts "Executed \"#{@method}\" on #{@type} \"#{@object.name}\" at #{next_time + randomness}."
+      puts "Executed \"#{@method}\" on #{@type} \"#{@object.name}\" at #{next_time}."
     end
 
     def get_next_time
@@ -59,6 +99,7 @@ module WinkScheduler
       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]

data/lib/wink_scheduler/version.rb

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

data/wink_scheduler.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "weather-api", "~> 1.2"
-  spec.add_dependency "winker", "~> 0.0.14"
+  spec.add_dependency "winker", "~> 0.0", ">= 0.0.15"
 
   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.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Joe Lanford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-08 00:00:00.000000000 Z
+date: 2015-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: weather-api
@@ -30,14 +30,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.14
+        version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.14
+        version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.15
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement