wink_scheduler 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c4c103d9560e9ab6289aebb057cece51f4bd069
-  data.tar.gz: e0c716000fcf8b322943729abf78e3d15c9c39a1
+  metadata.gz: b2ff30735de7c01df6a4f32dcc45e31aea1cf011
+  data.tar.gz: 0c4974a6528f78eaddbec636fa168db779f88dd0
 SHA512:
-  metadata.gz: 87e299fc57d4d491b5fd276ca735df98c9485bf2e3402b773c222d2e5eef93e7a02ca00798f8f41322e764d203fbc7be89bde378b25b409a34133437627e8534
-  data.tar.gz: 2b3659bf153bab01ef4dd33483a9b0802ca694fb6a27be8e3cfc1745dd49e2f542affbb9750f9bb4a6b718dc4befa4e974b2bddd72af874741b00c48cbc25144
+  metadata.gz: 780e6e6635e9869a29398c3445f1a42fb515fb67dd4c3783b126588851f779e53b92883eece3bad0ca0b6a9966dc4df1a72f3276e059c9c3023b0f632af02df2
+  data.tar.gz: e254e9ff147d319d224d1b2e1805a33b34d6022eac26f6e13d0a43cab056ba0eaae40f550fdd4d7ee34e26e4baf127bbe0a267b610ec2211c8f4e9f7c0f693c6

data/bin/wink_scheduler

@@ -1,24 +1,28 @@
 #! /usr/bin/env ruby
 
 require 'wink_scheduler'
+require 'logger'
 
 $stdout.sync = true
 $stderr.sync = true
 
+logger = Logger.new(STDOUT)
+logger.level = Logger::INFO
+
 if ARGV[0]
   begin
     conf = YAML.load_file(ARGV[0])
-    w = WinkScheduler::Client.new(conf)
+    w = WinkScheduler::Client.new(conf, logger)
     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
   rescue SystemExit, Interrupt
     exit 1
+  rescue Psych::SyntaxError => e1
+    logger.fatal "Invalid configuration file #{e1.message}"
+    exit 2
+  rescue => e2
+    logger.fatal e2.message
+    exit 3
   end
 else
- $stderr.puts "ERROR: must provide configuration file"
+ logger.fatal "Configuration file must be provided."
 end

data/lib/wink_scheduler/client.rb

@@ -3,9 +3,10 @@ require 'wink_scheduler/schedule'
 
 module WinkScheduler
   class Client
-    def initialize(conf)
+    def initialize(conf, logger)
       @auth = conf["auth"]
       @schedules = conf["schedules"]
+      @logger = logger
 
       Winker.configure do |wink|
         wink.client_id     = @auth["client_id"]
@@ -25,9 +26,10 @@ module WinkScheduler
       threads = []
       devices = Winker.devices
       groups = Winker.groups
+      context = { :devices => devices, :groups => groups, :logger => @logger }
       @schedules.each do |s|
         threads << Thread.new do
-          w = WinkScheduler::Schedule.new(s, devices, groups)
+          w = WinkScheduler::Schedule.new(context, s)
           w.run
         end
       end

data/lib/wink_scheduler/schedule.rb

@@ -7,8 +7,13 @@ require 'rufus-scheduler'
 
 module WinkScheduler
   class Schedule
-    def initialize(opts, devices, groups)
+    def initialize(context, opts)
       @scheduler = Rufus::Scheduler.new
+
+      @logger = context[:logger]
+      devices = context[:devices]
+      groups = context[:groups]
+
       if opts["device"]
         @object = devices.select { |d| next if d == nil; d.name == opts["device"] }[0]
         raise "device \"#{opts["device"]}\" not found" unless @object
@@ -34,6 +39,25 @@ module WinkScheduler
         raise "Schedule must define 'method' option"
       end
 
+      if opts["method_args"]
+        arity = @object.method(@method).arity
+        if arity == 0
+          raise "#{@method} does not take arguments. 'method_args' must be nil"
+        elsif arity > 0
+          if opts["method_args"].length == arity
+            @method_args = opts["method_args"]
+          else
+            raise "#{@method} requires #{arity} argument(s). Invalid 'method_args' option"
+          end
+        elsif arity < 0
+          if opts["method_args"].length >= arity.abs
+            @method_args = opts["method_args"]
+          else
+            raise "#{@method} requires at least #{arity} argument(s). Invalid 'method_args' option"
+          end
+        end
+      end
+
       if opts["time"]
         @time = opts["time"]
       else
@@ -87,12 +111,16 @@ module WinkScheduler
 
     def execute
       next_time = get_next_time
-      puts "Scheduled \"#{@method}\" on #{@type} \"#{@object.name}\" at #{next_time}."
+      @logger.info "Scheduled \"#{@method}#{"(" + @method_args.join(",") + ")" if @method_args}\" on #{@type} \"#{@object.name}\" at #{next_time}."
       @scheduler.at next_time do
-        @object.send(@method)
+        if @method_args
+          @object.send(@method, *@method_args)
+        else
+          @object.send(@method)
+        end
       end
       @scheduler.join
-      puts "Executed \"#{@method}\" on #{@type} \"#{@object.name}\" at #{next_time}."
+      @logger.info "Executed \"#{@method}\" on #{@type} \"#{@object.name}\"."
     end
 
     def get_next_time

data/lib/wink_scheduler/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wink_scheduler
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Joe Lanford