smartermeter 0.2.0 → 0.2.1

data/CHANGELOG.md

@@ -1,4 +1,13 @@
 # Changelog
 
+## 0.2.1 (January 25th, 2011)
+* Fixed bugs in the sample parser
+
+## 0.2.0 (January 25th, 2011)
+* Abstracted the UI so that a GUI based client could be built.
+* Made the fetcher more robust to allow for network errors while transferring
+  data.
+* Added compatibility with JRuby
+
 ## 0.1.0 (January 8th, 2011)
 * First public release

data/lib/smartermeter/sample.rb

@@ -1,3 +1,4 @@
+require 'date'
 require 'time'
 
 module SmarterMeter
@@ -16,7 +17,7 @@ module SmarterMeter
       # Apparently they felt the need to put a = outside of the correct place
       data = data.gsub('=','')
 
-      hour_increment = 1/24.0
+      hour_increment = 60*60
       CSV.parse(data) do |row|
         next unless row.length > 0 and date_re.match row[0]
 
@@ -25,7 +26,8 @@ module SmarterMeter
         day = day.to_i
         year = year.to_i
 
-        timestamp = Time.local(year, month, day, 0) - hour_increment + 1/(24.0*60)
+        timestamp = Time.local(year, month, day, 0) - hour_increment
+        next if row[1].include? "$"
         hourly_samples = row[1..24].map do |v|
           if v == "-"
             kwh = nil

data/lib/smartermeter.rb

@@ -5,5 +5,5 @@ require 'smartermeter/transports/google_powermeter'
 require 'smartermeter/interfaces/cli'
 
 module SmarterMeter
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/smartermeter.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'smartermeter'
-  s.version           = '0.2.0'
+  s.version           = '0.2.1'
   s.date              = '2011-01-25'
   s.rubyforge_project = 'smartermeter'
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 2
-    - 0
-  version: 0.2.0
+    - 1
+  version: 0.2.1
 platform: ruby
 authors: 
   - Matt Colyer