smartermeter 0.4.2 → 0.4.3

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.4.3 (August 18, 2012)
+* Fixed an issue with downloading data from PG&E.
+
 ## 0.4.2 (February 9, 2012)
 * Fixed an issue with uploading data to pachube.
 * Fixed README to accurately reflect the new API.

data/bin/smartermeter

@@ -6,6 +6,11 @@ begin
 rescue Exception
 end
 require 'smartermeter'
+require 'trollop'
 
-interface = SmarterMeter::Interfaces::CLI.new
+options = Trollop::options do
+  opt :debug, "Enable debugging statements", :default => false
+end
+
+interface = SmarterMeter::Interfaces::CLI.new(options)
 SmarterMeter::Daemon.new(interface).start

data/lib/smartermeter.rb

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

data/lib/smartermeter/daemon.rb

@@ -208,7 +208,7 @@ module SmarterMeter
       case @config[:transport]
       when :pachube
         @ui.log.info("Uploading #{date} to Pachube")
-        transport = SmarterMeter::Services::Pachube.new(@config[:pachube])
+        transport = SmarterMeter::Services::Pachube.new(@ui, @config[:pachube])
         if transport.upload(samples)
           @ui.log.info("Upload for #{date} complete")
         else

data/lib/smartermeter/interfaces/cli.rb

@@ -3,11 +3,21 @@ require 'logger'
 module SmarterMeter
   module Interfaces
     class CLI
+      def initialize(options)
+        @options = options
+      end
+
       # Returns a logger like interface to log errors and warnings to.
       def log
         return @logger if @logger
         @logger = Logger.new STDOUT
-        @logger.level = Logger::INFO
+
+        if @options[:debug]
+          @logger.level = Logger::DEBUG
+        else
+          @logger.level = Logger::INFO
+        end
+
         @logger
       end
 

data/lib/smartermeter/service.rb

@@ -63,7 +63,7 @@ module SmarterMeter
 
       begin
         form = @data_page.forms.first
-        form.radiobutton_with(:name => 'exportFormat', :value => 'ESPI_INTERVAL').check
+        form.radiobutton_with(:name => 'exportFormat', :value => 'ESPI_AMI').check
         form['from'] = date.strftime("%m/%d/%Y")
         form['to'] = date.strftime("%m/%d/%Y")
         espi_xml_zip = form.submit

data/lib/smartermeter/services/pachube.rb

@@ -3,7 +3,8 @@ require 'net/https'
 module SmarterMeter
   module Services
     class Pachube
-      def initialize(config)
+      def initialize(ui, config)
+        @ui = ui
         @config = config
         raise "The Pachube token must be configured" unless @config[:api_key]
         raise "The Pachube feed id must be configured" unless @config[:feed_id]
@@ -22,6 +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}")
         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.2'
-  s.date              = '2012-02-09'
+  s.version           = '0.4.3'
+  s.date              = '2012-08-18'
   s.rubyforge_project = 'smartermeter'
 
   ## Make sure your summary is short. The description may be as long
@@ -53,6 +53,7 @@ Gem::Specification.new do |s|
   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"])
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartermeter
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,66 +9,107 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-09 00:00:00.000000000 Z
+date: 2012-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &70173616966840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70173616966840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: crypt19
-  requirement: &70173616966100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70173616966100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70173616965140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70173616965140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &70173616963860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *70173616963860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70173616962780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.9.5
   type: :runtime
   prerelease: false
-  version_requirements: *70173616962780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.5
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.16.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.16.2
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70173616961300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +117,15 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70173616961300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70173616976880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +133,15 @@ dependencies:
         version: 1.11.3
   type: :development
   prerelease: false
-  version_requirements: *70173616976880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.11.3
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70173616976160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +149,15 @@ dependencies:
         version: 1.7.10
   type: :development
   prerelease: false
-  version_requirements: *70173616976160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.10
 - !ruby/object:Gem::Dependency
   name: minitar
-  requirement: &70173616975180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +165,12 @@ dependencies:
         version: 0.5.2
   type: :development
   prerelease: false
-  version_requirements: *70173616975180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.2
 description: Fetches SmartMeter data from PG&E and can upload to Pachube
 email: matt.removethis@nospam.colyer.name
 executables:
@@ -162,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: smartermeter
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 2
 summary: Fetches SmartMeter data from PG&E