smartermeter 0.4.1 → 0.4.2

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.4.2 (February 9, 2012)
+* Fixed an issue with uploading data to pachube.
+* Fixed README to accurately reflect the new API.
+* Save files with the proper extension (ESPI)
+
 ## 0.4.1 (February 5, 2012)
 * Fixed an issue with downloading multiple days at the same time.
 * Fixed an issue with detecting incomplete data.

data/README.md

@@ -27,7 +27,7 @@ to manipulate it using ruby like so:
     config = YAML.load_file(File.expand_path("~/.smartermeter"))
     csv_file = Dir.glob(File.join(config[:data_dir], "*.csv")).last
 
-    samples = SmarterMeter::Samples.parse_csv(csv_file)
+    samples = SmarterMeter::Samples.parse_espi(csv_file)
     kwh_used = samples.total_kwh
     api = SmarterMeter::Services::BrighterPlanet.new
     puts api.calculate_kg_carbon(kwh_used)
@@ -48,11 +48,13 @@ Pachube, so you can visualize the results.
 1. Then append the following to your ~/.smartermeter file to
 automatically upload data as it's retrieved from PG&E.
 
-       :transport: :pachube
-       :pachube:
-         :api_key: "your-api-key"
-         :feed_id: "your-feed-id"
-         :datastream_id: "your-datastream-id"
+```
+    :transport: :pachube
+    :pachube:
+        :api_key: "your-api-key"
+        :feed_id: "your-feed-id"
+        :datastream_id: "your-datastream-id"
+```
 
 To Build the Windows Installer
 --------

data/lib/smartermeter/daemon.rb

@@ -31,7 +31,7 @@ module SmarterMeter
 
     # Returns a filename for the data belonging to the given date.
     def data_file(date)
-      File.expand_path(File.join(@config[:data_dir], date.strftime("%Y-%m-%d.csv")))
+      File.expand_path(File.join(@config[:data_dir], date.strftime("%Y-%m-%d.espi")))
     end
 
     # Loads the configuration and prompts for required settings if they are
@@ -182,7 +182,7 @@ module SmarterMeter
           next if data.empty?
 
           @ui.log.info("Verifying #{date}")
-          samples = Samples.parse_espi(data).values
+          samples = Samples.parse_espi(data)
 
           if samples.any?
             @ui.log.info("Saving #{date}")
@@ -191,7 +191,7 @@ module SmarterMeter
               f.write(data)
             end
 
-            upload(date, samples)
+            upload(date, samples[date])
 
             @ui.log.info("Completed #{date}")
             completed << date
@@ -220,7 +220,7 @@ module SmarterMeter
     # Returns an Array of Date objects containing all dates since start_date
     # missing power data.
     def dates_requiring_data
-      collected = Dir.glob(File.join(@config[:data_dir], "*-*-*.csv")).map { |f| File.basename(f, ".csv") }
+      collected = Dir.glob(File.join(@config[:data_dir], "*-*-*.{csv,espi}")).map { |f| File.basename(f).split(".")[0] }
       all_days = []
 
       count_of_days = (Date.today - @config[:start_date]).to_i

data/lib/smartermeter.rb

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

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.1'
-  s.date              = '2012-02-05'
+  s.version           = '0.4.2'
+  s.date              = '2012-02-09'
   s.rubyforge_project = 'smartermeter'
 
   ## Make sure your summary is short. The description may be as long

metadata

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