smartermeter 0.4.0 → 0.4.1

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.4.1 (February 5, 2012)
+* Fixed an issue with downloading multiple days at the same time.
+* Fixed an issue with detecting incomplete data.
+
 ## 0.4.0 (January 28, 2012)
 * Removed Google PowerMeter as it no longer exists
 * Rewrote PG&E scraper to work with OPower, their new web data provider.

data/lib/smartermeter/daemon.rb

@@ -182,10 +182,9 @@ module SmarterMeter
           next if data.empty?
 
           @ui.log.info("Verifying #{date}")
-          samples = Samples.parse_espi(data).values.first
-          first_sample = samples.first
+          samples = Samples.parse_espi(data).values
 
-          if first_sample.kwh
+          if samples.any?
             @ui.log.info("Saving #{date}")
             FileUtils.mkdir_p(File.dirname(data_file(date)))
             File.open(data_file(date), "w") do |f|

data/lib/smartermeter/service.rb

@@ -63,11 +63,9 @@ module SmarterMeter
 
       begin
         form = @data_page.forms.first
-        begin
-          form.radiobutton_with(:value => 'ESPI_INTERVAL').click
-          form.field_with(:name => 'from').value = date.strftime("%m/%d/%Y")
-          form.field_with(:name => 'to').value = date.strftime("%m/%d/%Y")
-        end
+        form.radiobutton_with(:name => 'exportFormat', :value => 'ESPI_INTERVAL').check
+        form['from'] = date.strftime("%m/%d/%Y")
+        form['to'] = date.strftime("%m/%d/%Y")
         espi_xml_zip = form.submit
 
         # This has to be one of the stupidest implementations I've seen

data/lib/smartermeter/services/pachube.rb

@@ -10,7 +10,7 @@ module SmarterMeter
         raise "The Pachube datastream id must be configured" unless @config[:datastream_id]
       end
 
-      # Public: Uploads an array of Samples to Google PowerMeter
+      # Public: Uploads an array of Samples to Pachube
       #
       # samples - An array of samples to upload
       #

data/lib/smartermeter.rb

@@ -7,5 +7,5 @@ require 'smartermeter/services/brighterplanet'
 require 'smartermeter/interfaces/cli'
 
 module SmarterMeter
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/smartermeter.gemspec

@@ -13,14 +13,14 @@ 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.4.0'
-  s.date              = '2012-01-28'
+  s.version           = '0.4.1'
+  s.date              = '2012-02-05'
   s.rubyforge_project = 'smartermeter'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.
   s.summary     = "Fetches SmartMeter data from PG&E"
-  s.description = "Fetches SmartMeter data from PG&E and can upload to Google PowerMeter"
+  s.description = "Fetches SmartMeter data from PG&E and can upload to Pachube"
 
   ## List the primary authors. If there are a bunch of authors, it's probably
   ## better to set the email to an email list or something. If you don't have

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartermeter
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-28 00:00:00.000000000 Z
+date: 2012-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &70260787107760 !ruby/object:Gem::Requirement
+  requirement: &70154877461120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70260787107760
+  version_requirements: *70154877461120
 - !ruby/object:Gem::Dependency
   name: crypt19
-  requirement: &70260787105640 !ruby/object:Gem::Requirement
+  requirement: &70154877459980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70260787105640
+  version_requirements: *70154877459980
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70260787101360 !ruby/object:Gem::Requirement
+  requirement: &70154877458400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70260787101360
+  version_requirements: *70154877458400
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &70260787100160 !ruby/object:Gem::Requirement
+  requirement: &70154877516580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 1.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *70260787100160
+  version_requirements: *70154877516580
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70260787141160 !ruby/object:Gem::Requirement
+  requirement: &70154877516080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.5
   type: :runtime
   prerelease: false
-  version_requirements: *70260787141160
+  version_requirements: *70154877516080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70260787136680 !ruby/object:Gem::Requirement
+  requirement: &70154877515320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70260787136680
+  version_requirements: *70154877515320
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70260787160520 !ruby/object:Gem::Requirement
+  requirement: &70154877514600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.11.3
   type: :development
   prerelease: false
-  version_requirements: *70260787160520
+  version_requirements: *70154877514600
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70260787157720 !ruby/object:Gem::Requirement
+  requirement: &70154877514060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.7.10
   type: :development
   prerelease: false
-  version_requirements: *70260787157720
+  version_requirements: *70154877514060
 - !ruby/object:Gem::Dependency
   name: minitar
-  requirement: &70260787156440 !ruby/object:Gem::Requirement
+  requirement: &70154877513500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,8 +109,8 @@ dependencies:
         version: 0.5.2
   type: :development
   prerelease: false
-  version_requirements: *70260787156440
-description: Fetches SmartMeter data from PG&E and can upload to Google PowerMeter
+  version_requirements: *70154877513500
+description: Fetches SmartMeter data from PG&E and can upload to Pachube
 email: matt.removethis@nospam.colyer.name
 executables:
 - smartermeter