lightwaverf 0.6.1 → 0.6.2

data/lib/lightwaverf.rb

@@ -30,11 +30,12 @@ class LightWaveRF
   # Display usage info
   def usage room = nil
     rooms = self.class.get_rooms self.get_config
-    config = 'usage: lightwaverf ' + rooms.values.first['name'] + ' ' + rooms.values.first['device'].keys.first.to_s + ' on # where "' + rooms.keys.first + '" is a room in ' + self.get_config_file
+    config = 'usage: lightwaverf ' + rooms.values.first['name'].to_s + ' ' + rooms.values.first['device'].keys.first.to_s + ' on'
+    config += ' # where "' + rooms.keys.first.to_s + '" is a room in ' + self.get_config_file.to_s
     if room and rooms[room]
-      config += "\ntry: lightwaverf " + rooms[room]['name'] + ' all on'
+      config += "\ntry: lightwaverf " + rooms[room]['name'].to_s + ' all on'
       rooms[room]['device'].each do | device |
-        config += "\ntry: lightwaverf " + rooms[room]['name'] + ' ' + device.first.to_s + ' on'
+        config += "\ntry: lightwaverf " + rooms[room]['name'].to_s + ' ' + device.first.to_s + ' on'
       end
     end
     config
@@ -45,8 +46,8 @@ class LightWaveRF
     help = self.usage + "\n"
     help += "your rooms, devices, and sequences, as defined in " + self.get_config_file + ":\n\n"
     help += YAML.dump self.get_config['room']
-    room = self.get_config['room'].last['name']
-    device = self.get_config['room'].last['device'].last
+    room = self.get_config['room'].last['name'].to_s
+    device = self.get_config['room'].last['device'].last.to_s
     help += "\n\nso to turn on " + room + " " + device + " type \"lightwaverf " + room + " " + device + " on\"\n"
   end
 
@@ -609,15 +610,21 @@ class LightWaveRF
     # url = LightWaveRF.new.get_config['calendar']
     url = self.get_config['calendar']
 
-    url += '?ctz=' + Time.new.zone
-    # url += '?ctz=UTC'
-    if Time.new.zone != 'UTC'
+    ctz = 'UTC'
+    case Time.new.zone
+    when 'BST'
+      ctz = 'Europe/London'
+    else
       p 'time zone is ' + Time.new.zone + ' so look out...'
     end
+    url += '?ctz=' + ctz
+    if ctz != 'UTC'
+      p 'using time zone is ' + ctz + ' so look out...'
+    end
 
     url += '&singleevents=true'
-    url += '&start-min=' + query_start.strftime( '%FT%T%:z' ).sub('+', '%2B')
-    url += '&start-max=' + query_end.strftime( '%FT%T%:z' ).sub('+', '%2B')
+    url += '&start-min=' + query_start.strftime( '%FT%T%:z' ).sub( '+', '%2B' )
+    url += '&start-max=' + query_end.strftime( '%FT%T%:z' ).sub( '+', '%2B' )
     debug and ( p url )
     parsed_url = URI.parse url
     http = Net::HTTP.new parsed_url.host, parsed_url.port
@@ -749,7 +756,7 @@ class LightWaveRF
             end_date = start_date
           end
 
-          time_modifier += self.class.variance e.elements['title'].text
+          time_modifier += self.class.variance( e.elements['title'].text ).to_i
           event['annotate'] = ! ( /do not annotate/.match e.elements['title'].text )
 
           debug and ( p 'Start date: ' + start_date )
@@ -843,8 +850,8 @@ class LightWaveRF
       debug and ( p 'randomness is ' + n.to_s )
       return rand( n ) - ( n / 2 )
     end
-    debug and ( p 'no randomness return 0' )
-    return 0
+    debug and ( p 'no randomness return nil' )
+    return nil
   end
 
   # Convert a string to seconds, assume it is in minutes

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lightwaverf
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-04 00:00:00.000000000 Z
+date: 2013-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities