smartermeter 0.4.3 → 0.4.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 03cc91b45b18c8f1cfeb5058ccfa2092c9ef7a99
+  data.tar.gz: 0640d4504f35dc79e9f7d21cd49241cd128722c2
+SHA512:
+  metadata.gz: a231a022e37106b9d242779de2df78aa0b912073a1efa0b37f4b35ed6a1ea1e1428c81d20d2ac35b46da8668c292831f7e041029be625471efd7de215593725c
+  data.tar.gz: 58240dac95f623ad466f29b7595459bb04afa4522b815d11a5d73e6fa203aeec30d969351e18d638ba4694b92e3094a5939dcfb761ddea3bb09682edb6829aee

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.4.4 (May 17, 2014)
+* Fixed an issue with downloading data from PG&E.
+
 ## 0.4.3 (August 18, 2012)
 * Fixed an issue with downloading data from PG&E.
 

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec
 
 # Used only in the Java client, which isn't distributed as a gem

data/README.md

@@ -1,6 +1,8 @@
 SmarterMeter - the smarter way to read your PG&E SmartMeter
 =========================================================
 
+[![Build Status](https://travis-ci.org/mcolyer/smartermeter.png?branch=master)](https://travis-ci.org/mcolyer/smartermeter)
+
 So I have PG&E SmartMeter and I like playing with data. However I didn't
 really want to jump through 37 hoops to see the data on PG&E's website.
 So I made this.

data/lib/smartermeter.rb

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

data/lib/smartermeter/daemon.rb

@@ -191,7 +191,7 @@ module SmarterMeter
               f.write(data)
             end
 
-            upload(date, samples[date])
+            upload(date, samples.on(date))
 
             @ui.log.info("Completed #{date}")
             completed << date

data/lib/smartermeter/samples.rb

@@ -5,34 +5,23 @@ require 'nokogiri'
 module SmarterMeter
   # Represents a collection of samples. In some cases it's useful to operate on
   # groups of samples and this class provides that functionality.
-  class Samples < Hash
+  class Samples < Array
     # Parses the XML returned by PG&E and creates a Samples collection.
     #
     # @param [String] data the string containing the XML returned by PG&E
     # @return [Samples] creates a Samples collection from the given data.
     def self.parse_espi(data)
       samples = Samples.new
-
       doc = Nokogiri::HTML(data)
 
       doc.xpath("//intervalreading").each do |reading|
-        # NOTE: This is a hack, the ESPI data seems to be assuming that
-        # all users live in the Eastern Time Zone. The timestamps
-        # returned in the ESPI should really be in UTC and not in local
-        # time. I'm going to assume all PG&E customers are in the
-        # pacific timezone and since the eastern timezone has the same
-        # daylight savings time rules then we can use a constant
-        # difference to correct the problem.
-        pacific_timezone_correction = 60*60*3
-
-        timestamp = Time.at(reading.xpath("./timeperiod/start").first.content.to_i + pacific_timezone_correction)
-        value = reading.xpath("./value").first.content.to_i / 900.0
+        timestamp = reading.xpath("./timeperiod/start").first.content.to_i
+        timestamp = Time.at(timestamp).utc
 
-        year = timestamp.year
-        month = timestamp.month
-        day = timestamp.day
+        value = reading.xpath("./value").first.content.to_i / 900.0
+        value = ((value * 100).truncate / 100.0)
 
-        (samples[Date.new(year, month, day)] ||= []) << Sample.new(timestamp, value)
+        samples << Sample.new(timestamp, value)
       end
 
       samples
@@ -42,20 +31,27 @@ module SmarterMeter
     #
     # @return [Float] the sum of kilowatt hours for all samples within this collection. If no samples are found 0 is  returned.
     def total_kwh
-      self.keys.reduce(0) { |sum, d| sum + total_kwh_on(d) }
+      map { |s| s.kwh || 0 }.reduce(:+) || 0
+    end
+
+    # Selects all samples starting from the given time until 24 hours into the future.
+    #
+    # @param [DateTime] date_time The start date of the samples to include within the total.
+    #
+    # @return [Samples] a sample collection containing only the selected samples. If none are found, a samples object with no samples is returned.
+    def on(date_time)
+      start_time = date_time.to_time
+      end_time = (date_time + 1).to_time
+      Samples.new(select { |s| start_time <= s.time && s.time < end_time })
     end
 
     # Calculates the total number of kilowatt hours
     #
-    # @param [Date] date The date of the samples to include within the total.
+    # @param [DateTime] date_time The start date of the samples to include within the total.
     #
     # @return [Float] the sum of kilowatt hours for samples made of the given day. If none are found 0 is returned.
-    def total_kwh_on(date)
-      if self[date]
-        self[date].reduce(0) { |sum, s| sum + (s.kwh or 0) }
-      else
-        0
-      end
+    def total_kwh_on(date_time)
+      on(date_time).total_kwh
     end
   end
 end

data/lib/smartermeter/service.rb

@@ -44,7 +44,7 @@ module SmarterMeter
           end.submit
           token = saml_page.form_with(:action => SAML_URL).submit
           usage_page = token.form_with(:action => MY_ENERGY_USE_URL).submit
-          @data_page = usage_page.link_with(:text => "Green Button").click
+          @data_page = usage_page.link_with(:text => "Green Button - Download my data").click
         end
         @authenticated = true
       rescue Exception => e

data/lib/smartermeter/services/pachube.rb

@@ -23,7 +23,7 @@ module SmarterMeter
         http.verify_mode = OpenSSL::SSL::VERIFY_PEER
         http.ca_file = File.join(File.dirname(__FILE__), "cacert.pem")
         res, body = http.post(url.path, request_body(samples), {"X-PachubeApiKey" => @config[:api_key], "Content-Type" => "text/csv"})
-        @ui.log.debug("Pacube Response: #{res}")
+        @ui.log.debug("Pachube Response: #{res}")
         case res
         when Net::HTTPSuccess
           true

data/smartermeter.gemspec

@@ -13,8 +13,8 @@ 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.3'
-  s.date              = '2012-08-18'
+  s.version           = '0.4.4'
+  s.date              = '2014-05-17'
   s.rubyforge_project = 'smartermeter'
 
   ## Make sure your summary is short. The description may be as long
@@ -48,19 +48,20 @@ Gem::Specification.new do |s|
 
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
-  s.add_dependency('mechanize', ["= 1.0.0"])
-  s.add_dependency('crypt19', ["= 1.2.1"])
-  s.add_dependency('rest-client', ["= 1.6.1"])
-  s.add_dependency('json_pure', ["= 1.5.1"])
-  s.add_dependency('rubyzip', ["= 0.9.5"])
-  s.add_dependency('trollop', ["= 1.16.2"])
+  s.add_dependency('mechanize', ["= 2.6.0"])
+  s.add_dependency('crypt19-rb', ["= 1.3.1"])
+  s.add_dependency('rest-client', ["= 1.6.7"])
+  s.add_dependency('json_pure', ["= 1.7.7"])
+  s.add_dependency('rubyzip', ["= 0.9.9"])
+  s.add_dependency('trollop', ["= 2.0"])
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
-  s.add_development_dependency('rspec', ["~> 2.8.0"])
-  s.add_development_dependency('vcr', ["~> 1.11.3"])
-  s.add_development_dependency('webmock', ["~> 1.7.10"])
-  s.add_development_dependency('minitar', ["~> 0.5.2"])
+  s.add_development_dependency('rake', ["~> 10.0.0"])
+  s.add_development_dependency('rspec', ["~> 2.13.0"])
+  s.add_development_dependency('vcr', ["~> 2.4.0"])
+  s.add_development_dependency('webmock', ["~> 1.9.0"])
+  s.add_development_dependency('minitar', ["~> 0.5.4"])
 
   ## Leave this section as-is. It will be automatically generated from the
   ## contents of your Git repository via the gemspec task. DO NOT REMOVE

metadata

@@ -1,176 +1,169 @@
 --- !ruby/object:Gem::Specification
 name: smartermeter
 version: !ruby/object:Gem::Version
-  version: 0.4.3
-  prerelease: 
+  version: 0.4.4
 platform: ruby
 authors:
 - Matt Colyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-18 00:00:00.000000000 Z
+date: 2014-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
-  name: crypt19
+  name: crypt19-rb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.6.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.6.7
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.7.7
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 0.9.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 0.9.9
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.16.2
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.16.2
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.11.3
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.11.3
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.10
+        version: 1.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.10
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.5.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.5.4
 description: Fetches SmartMeter data from PG&E and can upload to Pachube
 email: matt.removethis@nospam.colyer.name
 executables:
@@ -205,25 +198,24 @@ files:
 - smartermeter.gemspec
 homepage: http://github.com/mcolyer/smartermeter
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: smartermeter
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 2
 summary: Fetches SmartMeter data from PG&E