webrelay_scheduler 0.6.2 → 0.7.0

data/bin/webrelay

@@ -11,8 +11,9 @@ Escort::App.create do |app|
   app.config_file ".webrelay_scheduler", :autocreate => true
   app.options do |opts|
     opts.opt :ip, "The ip address of the relay to control. This argument can be used multiple times to control more than one relay at a time, eg. '... --ip 10.0.0.1 --ip 10.0.0.2'", :short => '-i', :long => '--ip', :type => :string, :multi => true
-    opts.opt :power, "Sets the power on the relays. Accepts either ON or OFF", :short => '-p', :long => '--power', :type => :string, :default => "ON"
+    opts.opt :power, "Sets the power on the relays. Accepts either ON or OFF", :long => '--power', :type => :string, :default => "ON"
     opts.opt :delay, "The delay between sending commands to each relay", :short => '-d', :long => '--delay', :type => :integer, :default => 5
+    opts.opt :password, "The password to use when authenticating with the webrelay", :short => '-p', :long => '--password', :type => :string
     opts.opt :timeout, "The maximum timeout (in seconds) when sending a command to a relay", :short => '-t', :long => '--timeout', :type => :integer, :default => 5
     opts.opt :skip_if_today_is_holiday, "Do not run the action if today is a holiday in the current locale", :short => :none, :long => '--skip-if-today-is-holiday', :type => :flag, :default => false
     opts.opt :skip_if_tomorrow_is_holiday, "Do not run the action if tomorrow is a holiday in the current locale", :short => :none, :long => '--skip-if-tomorrow-is-holiday', :type => :flag, :default => false

data/lib/webrelay_scheduler/command.rb

@@ -4,7 +4,7 @@ module WebrelayScheduler
   class Command < ::Escort::ActionCommand::Base
     def execute
       o = command_options
-      relays = o[:ip].collect{ |ip| Relay.new(ip, o[:timeout]) }
+      relays = o[:ip].collect{ |ip| Relay.new(ip, o[:timeout], o[:password]) }
       
       Holidays.load_all
       if o[:skip_if_today_is_holiday] and Date.today.holiday?(o[:locale_code])

data/lib/webrelay_scheduler/relay.rb

@@ -1,24 +1,48 @@
-require 'httpclient'
-require 'crack'
+require 'httparty'
 module WebrelayScheduler
+  
+  # Exception raised when there was an HTTP error 
+  # while communicating with the webrelay
+  class HTTPError < StandardError
+    def initialize(http_response)
+      super("HTTP #{http_response.code} #{http_response.message}")
+    end
+  end
+
+  # Exception raised when the return value
+  class ValueNotChangedError < StandardError
+    def initialize(msg = "Value does not match intended state")
+      super
+    end
+  end
+
   class Relay
     attr_accessor :ip_address
+    include HTTParty
+
+    def initialize(ip_address, timeout=5, password=nil)
+      self.class.basic_auth 'user', password unless password.nil?
+      self.class.default_timeout timeout
+      self.class.base_uri ip_address
 
-    def initialize(ip_address, timeout=5)
       @ip_address = ip_address
-      @client = HTTPClient.new
-      @client.receive_timeout = timeout * 1000
     end
 
     # Sets the specified relay to a value
     # Returns true if successful, or false if the value was not changed correctly
     def set(relay_identifier, value)
-      url = "http://#{ip_address}/state.xml?#{relay_identifier}State=#{value}"
-      response = @client.get url
-      parsed_response = Crack::XML.parse response.body
+      url = "/stateFull.xml?#{relay_identifier}State=#{value}"
+      request = self.class.get url
+      response = request.parsed_response
 
       # Check the response shows to see if the value successfully changed
-      parsed_response["datavalues"]["#{relay_identifier}state"] == value.to_s
+      if !request.success?
+        raise HTTPError, request
+      elsif response.fetch("datavalues",{}).fetch("#{relay_identifier}state") != value.to_s
+        raise ValueNotChangedError
+      end
+
+      true
     end
 
     # Close the relay

data/lib/webrelay_scheduler/version.rb

@@ -1,3 +1,3 @@
 module WebrelayScheduler
-  VERSION = "0.6.2"
+  VERSION = "0.7.0"
 end

data/webrelay_scheduler.gemspec

@@ -21,8 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "holidays"
   spec.add_dependency "escort"
-  spec.add_dependency "crack"
-  spec.add_dependency "httpclient"
+  spec.add_dependency "httparty"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webrelay_scheduler
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: holidays
@@ -45,23 +45,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: crack
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: httpclient
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -142,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4354468138948314233
+      hash: 4225319025533001504
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -151,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4354468138948314233
+      hash: 4225319025533001504
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23