smartermeter 0.3.2 → 0.3.3

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.3.3 (April 20, 2011)
+* Fixed a bug which prevent the proper Google PowerMeter authentication
+  information to be sent.
+* Fixed a bug in exception handling to make it a bit more resilient.
+* Fixed up some development nitpicks.
+
 ## 0.3.2 (March 29, 2011)
 * Added support for Brighter Planet's Electricity API.
 * Fixed encryption of passwords that had lengths other than multiples of

data/Gemfile

@@ -3,5 +3,6 @@ gemspec
 
 # Used only in the Java client, which isn't distributed as a gem
 gem "nokogiri", ">= 1.4.4", :platforms => :jruby
+gem "nokogiri", ">= 1.4.4", :platforms => :ruby
 gem "profligacy", :platforms => :jruby
 gem "jruby-openssl", :platforms => :jruby

data/Rakefile

@@ -87,7 +87,7 @@ task :fetch_jruby do
   jar_file = File.join(dir, "jruby-complete.jar")
   FileUtils.mkdir_p(dir)
   unless File.exists?(jar_file)
-    jruby_url = "http://jruby.org.s3.amazonaws.com/downloads/1.6.0.RC2/jruby-complete-1.6.0.RC2.jar"
+    jruby_url = "http://jruby.org.s3.amazonaws.com/downloads/1.6.1/jruby-complete-1.6.1.jar"
     puts "Fetching JRuby"
     File.open(jar_file, "wb") { |f| f.write(Net::HTTP.get(URI.parse(jruby_url))) }
     puts "Fetched JRuby"
@@ -173,7 +173,7 @@ task :nsis_installer do
 end
 
 desc "Package all required files into pkg/base"
-task :package => [:fetch_jruby, :fetch_launch4j, :package_gems, :create_launcher, :copy_smartermeter, :nsis_installer]
+task :package => [:build, :fetch_jruby, :fetch_launch4j, :package_gems, :create_launcher, :copy_smartermeter, :nsis_installer]
 
 #############################################################################
 #

data/lib/smartermeter/service.rb

@@ -108,7 +108,7 @@ module SmarterMeter
         end.submit
 
         hourly_csv.body
-      rescue Timeout::Error => e
+      rescue Exception => e
         @last_exception = e
         return ""
       end

data/lib/smartermeter/services/google_powermeter.rb

@@ -21,7 +21,7 @@ module SmarterMeter
         http.use_ssl = true
         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), {"Authorization" => 'AuthSub token="CMCc9puFFRDKivjpAhjgiZLuAg"', "Content-Type" => "application/atom+xml"})
+        res, body = http.post(url.path, request_body(samples), {"Authorization" => "AuthSub token=\"#{@config[:token]}\"", "Content-Type" => "application/atom+xml"})
         case res
         when Net::HTTPSuccess
           true

data/lib/smartermeter.rb

@@ -7,5 +7,5 @@ require 'smartermeter/services/brighterplanet'
 require 'smartermeter/interfaces/cli'
 
 module SmarterMeter
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 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.3.2'
-  s.date              = '2011-03-29'
+  s.version           = '0.3.3'
+  s.date              = '2011-04-21'
   s.rubyforge_project = 'smartermeter'
 
   ## Make sure your summary is short. The description may be as long

metadata

@@ -2,7 +2,7 @@
 name: smartermeter
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
   - Matt Colyer
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 -07:00
+date: 2011-04-21 00:00:00 -07:00
 default_executable: smartermeter
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: smartermeter
-rubygems_version: 1.5.0
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 2
 summary: Fetches SmartMeter data from PG&E