smartermeter 0.3.0 → 0.3.1

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.3.1 (March 15th, 2011)
+* Changed name from "Smartermeter" to "SmarterMeter"
+* Updated the .detect\_charset monkeypatch for the newer mechanize
+* Removed unnecessary gems from the Windows package.
+
 ## 0.3.0 (March 14th, 2011)
 * Added a Windows version of SmarterMeter which runs from the taskbar
   and provides a wizard for easy configuration.

data/README.md

@@ -1,9 +1,9 @@
-Smartermeter - the smarter way to read your PGE SmartMeter
+SmarterMeter - the smarter way to read your PG&E SmartMeter
 =========================================================
 
-So I have PGE 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.
+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.
 
 While making this library I discovered that PG&E doesn't even manage the
 software for the energy reporting. It's all done by energyguide.com. Not
@@ -18,8 +18,8 @@ Getting Started
 Google PowerMeter
 -----------------
 
-Once you've configured smartermeter once, you might want to use it with Google
-PowerMeter.
+Once you've configured SmarterMeter once, you might want to use it with
+Google PowerMeter.
 
 1. Visit: https://www.google.com/powermeter/device/activate?mfg=Ruby&model=SmarterMeter&did=PGE&dvars=1
 1. Then sign in with your desired Google Account.
@@ -39,8 +39,9 @@ To Build the Windows Installer
 --------
 
 In order to build the self contained binaries, you'll need Java 1.6 and
-(NSIS)[1], both are available as packages in Ubuntu.
+(NSIS)[1], both of which are available as packages in Ubuntu.
 
+    apt-get install nsis sun-java6-jre
     git clone git://github.com/mcolyer/smartermeter.git
     cd smartermeter
     bundle install --path vendor/gems --without test
@@ -53,9 +54,9 @@ Questions
 
 * How much lag is there?
 
-  It'll show you the last full day's worth of data. The PGE website claims that
-  data becomes available around 3-10pm on the following day. However my
-  experience says that it's sometimes available earlier.
+  It'll show you the last full day's worth of data. The PGE website
+  claims that data becomes available around 3-10pm on the following day.
+  However my experience says that it's sometimes available earlier.
 
 * How long is data saved for?
 
@@ -63,13 +64,14 @@ Questions
 
 * How can I help?
 
-  Make sure it works, make cool things with it or send me git pull requests.
+  Make sure it works, make cool things with it or send me git pull
+  requests.
 
 Sponsorship
 -----------
 
-I would like to thank [Brighter Planet][2] for including SmarterMeter as part
-of their [Fellowship Program][3]
+I would like to thank [Brighter Planet][2] for including SmarterMeter as
+part of their [Fellowship Program][3]
 
 [1]: http://nsis.sourceforge.net/
 [2]: http://brighterplanet.com/

data/Rakefile

@@ -120,6 +120,8 @@ end
 task :package_gems do
   specifications = Dir.glob(File.join(File.dirname(__FILE__), "vendor", "gems", "jruby", "1.8", "specifications", "*"))
   specifications.reject! { |s| s.include? "rspec" }
+  specifications.reject! { |s| s.include? "minitar" }
+  specifications.reject! { |s| s.include? "ruby-debug" }
   dest_dir = File.join(File.dirname(__FILE__), "pkg", "base", "gems", "specifications")
   FileUtils.rm_rf(dest_dir)
   FileUtils.mkdir_p(dest_dir)
@@ -127,6 +129,8 @@ task :package_gems do
 
   gems = Dir.glob(File.join(File.dirname(__FILE__), "vendor", "gems", "jruby", "1.8", "gems", "*"))
   gems.reject! { |s| s.include? "rspec" }
+  gems.reject! { |s| s.include? "minitar" }
+  gems.reject! { |s| s.include? "ruby-debug" }
   dest_dir = File.join(File.dirname(__FILE__), "pkg", "base", "gems", "gems")
   FileUtils.rm_rf(dest_dir)
   FileUtils.mkdir_p(dest_dir)

data/installer/launch4j.xml

@@ -1,6 +1,6 @@
 <launch4jConfig>
   <dontWrapJar>true</dontWrapJar>
-  <headerType>console</headerType>
+  <headerType>gui</headerType>
   <jar>jruby-complete.jar</jar>
   <outfile>../pkg/base/smartermeter.exe</outfile>
   <errTitle></errTitle>
@@ -16,7 +16,7 @@
   <var>GEM_HOME=gems</var>
   <singleInstance>
     <mutexName>smartermeter</mutexName>
-    <windowTitle>Smartermeter</windowTitle>
+    <windowTitle>SmarterMeter</windowTitle>
   </singleInstance>
   <jre>
     <path></path>

data/installer/main.rb

@@ -11,12 +11,10 @@ require 'smartermeter/interfaces/swing'
 
 # Force character sets of all retrieved documents so that we don't have to have
 # charsets.jar in the JRE
-module WWW
-  class Mechanize
-    class Util
-      def self.detect_charset(src)
-        "ISO-8859-1"
-      end
+class Mechanize
+  class Util
+    def self.detect_charset(src)
+      "ISO-8859-1"
     end
   end
 end

data/installer/nsis.nsi

@@ -7,14 +7,14 @@
 ;General
 
   ;Name and file
-  Name "Smartermeter (${VERSION})"
+  Name "SmarterMeter (${VERSION})"
   OutFile "../pkg/smartermeter-${VERSION}.exe"
 
   ;Default installation folder
-  InstallDir "$PROGRAMFILES\Smartermeter"
+  InstallDir "$PROGRAMFILES\SmarterMeter"
 
   ;Get installation folder from registry if available
-  InstallDirRegKey HKCU "Software\Smartermeter" ""
+  InstallDirRegKey HKCU "Software\SmarterMeter" ""
 
   ;Request application privileges for Windows Vista
   RequestExecutionLevel user
@@ -48,19 +48,19 @@
 ;--------------------------------
 ;Installer Sections
 
-Section "Smartermeter Base" SecBase
+Section "SmarterMeter Base" SecBase
 
   SetOutPath "$INSTDIR"
 
   ;ADD YOUR OWN FILES HERE...
   File /r "../pkg/base/*"
 
-  CreateDirectory "$SMPROGRAMS\Smartermeter"
-  CreateShortCut "$SMPROGRAMS\Smartermeter\Smartermeter.lnk" "$INSTDIR\smartermeter.exe"
-  CreateShortCut "$SMPROGRAMS\Smartermeter\Uninstall.lnk" "$INSTDIR\uninstall.exe"
+  CreateDirectory "$SMPROGRAMS\SmarterMeter"
+  CreateShortCut "$SMPROGRAMS\SmarterMeter\SmarterMeter.lnk" "$INSTDIR\smartermeter.exe"
+  CreateShortCut "$SMPROGRAMS\SmarterMeter\Uninstall.lnk" "$INSTDIR\uninstall.exe"
 
   ;Store installation folder
-  WriteRegStr HKCU "Software\Smartermeter" "" $INSTDIR
+  WriteRegStr HKCU "Software\SmarterMeter" "" $INSTDIR
 
   ;Create uninstaller
   WriteUninstaller "$INSTDIR\uninstall.exe"
@@ -70,7 +70,7 @@ SectionEnd
 ;Descriptions
 
   ;Language strings
-  LangString DESC_SecBase ${LANG_ENGLISH} "The smartermeter application."
+  LangString DESC_SecBase ${LANG_ENGLISH} "The SmarterMeter application."
 
   ;Assign language strings to sections
   !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
@@ -91,12 +91,12 @@ Section "Uninstall"
   RMDIR  /r "$INSTDIR\icons"
   RMDIR  /r "$INSTDIR\smartermeter"
 
-  Delete "$SMPROGRAMS\Smartermeter\Smartermeter.lnk"
-  Delete "$SMPROGRAMS\Smartermeter\Uninstall.lnk"
-  RMDIR "$SMPROGRAMS\Smartermeter"
+  Delete "$SMPROGRAMS\SmarterMeter\SmarterMeter.lnk"
+  Delete "$SMPROGRAMS\SmarterMeter\Uninstall.lnk"
+  RMDIR "$SMPROGRAMS\SmarterMeter"
 
   RMDir "$INSTDIR"
 
-  DeleteRegKey /ifempty HKCU "Software\Smartermeter"
+  DeleteRegKey /ifempty HKCU "Software\SmarterMeter"
 
 SectionEnd

data/lib/smartermeter/interfaces/cli.rb

@@ -17,7 +17,7 @@ module SmarterMeter
       # Returns nothing
       def setup
         puts
-        puts "Smartermeter: Initial Configuration"
+        puts "SmarterMeter: Initial Configuration"
         puts "--------------------------------------------------------------------------------"
         puts "This program stores your PG&E account username and password on disk. The"
         puts "password is encrypted but could be retrieved fairly easily. If this makes you"

data/lib/smartermeter/interfaces/swing.rb

@@ -40,7 +40,7 @@ module SmarterMeter
         popup.add(exit_item)
 
         image = Toolkit::default_toolkit.get_image("icons/smartermeter-16x16.png")
-        tray_icon = TrayIcon.new(image, "Smartermeter", popup)
+        tray_icon = TrayIcon.new(image, "SmarterMeter", popup)
         tray_icon.image_auto_size = true
 
         tray = SystemTray::system_tray
@@ -96,7 +96,7 @@ module SmarterMeter
           }
         end
 
-        @frame = @ui.build(:args => "Smartermeter Settings")
+        @frame = @ui.build(:args => "SmarterMeter Settings")
         @frame.set_location_relative_to(nil)
         @frame.default_close_operation = JFrame::DISPOSE_ON_CLOSE
       end
@@ -141,7 +141,7 @@ module SmarterMeter
           end.build :auto_create_container_gaps => false
         end
 
-        @frame = @ui.build(:args => "Smartermeter Log")
+        @frame = @ui.build(:args => "SmarterMeter Log")
         @frame.set_location_relative_to(nil)
         @frame.default_close_operation = JFrame::DISPOSE_ON_CLOSE
       end

data/lib/smartermeter.rb

@@ -5,5 +5,5 @@ require 'smartermeter/transports/google_powermeter'
 require 'smartermeter/interfaces/cli'
 
 module SmarterMeter
-  VERSION = "0.3.0"
+  VERSION = "0.3.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.3.0'
-  s.date              = '2011-03-14'
+  s.version           = '0.3.1'
+  s.date              = '2011-03-15'
   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.summary     = "Fetches SmartMeter data from PG&E"
+  s.description = "Fetches SmartMeter data from PG&E and can upload to Google PowerMeter"
 
   ## 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

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 3
-    - 0
-  version: 0.3.0
+    - 1
+  version: 0.3.1
 platform: ruby
 authors: 
   - Matt Colyer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-14 00:00:00 -07:00
+date: 2011-03-15 00:00:00 -07:00
 default_executable: smartermeter
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -73,7 +73,7 @@ dependencies:
             version: 0.5.2
     type: :development
     version_requirements: *id004
-description: Fetches smartmeter data from PG&E and can upload to Google PowerMeter
+description: Fetches SmartMeter data from PG&E and can upload to Google PowerMeter
 email: matt.removethis@nospam.colyer.name
 executables: 
   - smartermeter
@@ -140,6 +140,6 @@ rubyforge_project: smartermeter
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 2
-summary: Fetches smartmeter data from PG&E
+summary: Fetches SmartMeter data from PG&E
 test_files: []