smartermeter 0.2.1 → 0.3.0

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.3.0 (March 14th, 2011)
+* Added a Windows version of SmarterMeter which runs from the taskbar
+  and provides a wizard for easy configuration.
+* Upgraded Mechanize to the latest released version.
+
 ## 0.2.1 (January 25th, 2011)
 * Fixed bugs in the sample parser
 

data/Gemfile

@@ -3,3 +3,4 @@ gemspec
 
 # Used only in the Java client, which isn't distributed as a gem
 gem "profligacy"
+gem "jruby-openssl"

data/LICENSE

@@ -0,0 +1,7 @@
+Copyright (c) 2009 - 2011: Matt Colyer
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -35,17 +35,18 @@ PowerMeter.
          :token: "your-token"
          :variable: "your-path-with.d1-appended"
 
-To Build
+To Build the Windows Installer
 --------
 
-In order to build the self contained binaries, you'll need a working jruby interpreter.
+In order to build the self contained binaries, you'll need Java 1.6 and
+(NSIS)[1], both are available as packages in Ubuntu.
 
     git clone git://github.com/mcolyer/smartermeter.git
     cd smartermeter
-    rake rawr:prepare
-    rake rawr:bundle:exe # builds a windows executable
-    rake rawr:bundle:app # builds an OSX executable
-    rake build # builds a ruby gem
+    bundle install --path vendor/gems --without test
+    rake package
+
+The installer will be generated in pkg/
 
 Questions
 ---------
@@ -63,3 +64,13 @@ Questions
 * How can I help?
 
   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]
+
+[1]: http://nsis.sourceforge.net/
+[2]: http://brighterplanet.com/
+[3]: http://brighterplanet.github.com/fellowship.html

data/Rakefile

@@ -48,7 +48,7 @@ task :default => :test
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
-  test.pattern = 'specs/*_spec.rb'
+  test.pattern = 'specs/**/*_spec.rb'
   test.verbose = true
 end
 
@@ -79,41 +79,90 @@ end
 #
 #############################################################################
 
-require 'rawr'
-
-namespace :rawr do
-  task :prepare do
-    dir = File.join(File.dirname(__FILE__), "vendor", "gems")
-    FileUtils.rm_rf(dir)
-    FileUtils.mkdir_p(dir)
-    ["nokogiri", "mechanize", "crypt", "profligacy"].each do |gem|
-      `gem unpack -t "#{dir}" #{gem}`
-    end
-
-    # Rawr can't handle folders with dashes in the name, so we'll remove the
-    # version numbers from the gems.
-    Dir.glob(File.join(dir, "*-*")).each do |gem|
-      no_version = File.basename(gem).split("-")[0] + ".old"
-      FileUtils.mv(gem, File.join(dir, no_version))
-    end
-
-    Dir.glob(File.join(dir, "nokogiri.old", "lib", "*")).each do |file|
-      FileUtils.mv(file, File.join(dir))
-    end
-    Dir.glob(File.join(dir, "profligacy.old", "lib", "*")).each do |file|
-      FileUtils.mv(file, File.join(dir))
-    end
-    FileUtils.mv(File.join(dir, "crypt.old", "crypt"), File.join(dir, "crypt"))
-    Dir.glob(File.join(dir, "mechanize.old", "lib", "*")).each do |file|
-      FileUtils.mv(file, File.join(dir))
-    end
-
-    Dir.glob(File.join(dir, "*.old")).each do |gem|
-      FileUtils.rm_rf(gem)
-    end
+task :fetch_jruby do
+  require 'net/http'
+  require 'uri'
+
+  dir = File.join(File.dirname(__FILE__), "pkg", "base")
+  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"
+    puts "Fetching JRuby"
+    File.open(jar_file, "wb") { |f| f.write(Net::HTTP.get(URI.parse(jruby_url))) }
+    puts "Fetched JRuby"
   end
 end
 
+task :fetch_launch4j do
+  require 'net/http'
+  require 'uri'
+  require 'zlib'
+  require 'bundler'
+  Bundler.setup
+  require 'archive/tar/minitar'
+
+  dir = File.join(File.dirname(__FILE__), "installer")
+  tgz_file = File.join(dir, "launch4j-3.0.2-linux.tgz")
+  FileUtils.mkdir_p(dir)
+  unless File.exists?(tgz_file)
+    launch4j_url = "http://softlayer.dl.sourceforge.net/project/launch4j/launch4j-3/3.0.2/launch4j-3.0.2-linux.tgz"
+    puts "Fetching Launch4J"
+    File.open(tgz_file, "wb") { |f| f.write(Net::HTTP.get(URI.parse(launch4j_url))) }
+    puts "Fetched Launch4J"
+    puts "Extracting Launch4J"
+    tgz = Zlib::GzipReader.new(File.open(tgz_file, 'rb'))
+    Archive::Tar::Minitar.unpack(tgz, dir)
+    puts "Extracted Launch4J"
+  end
+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" }
+  dest_dir = File.join(File.dirname(__FILE__), "pkg", "base", "gems", "specifications")
+  FileUtils.rm_rf(dest_dir)
+  FileUtils.mkdir_p(dest_dir)
+  FileUtils.cp_r(specifications, dest_dir)
+
+  gems = Dir.glob(File.join(File.dirname(__FILE__), "vendor", "gems", "jruby", "1.8", "gems", "*"))
+  gems.reject! { |s| s.include? "rspec" }
+  dest_dir = File.join(File.dirname(__FILE__), "pkg", "base", "gems", "gems")
+  FileUtils.rm_rf(dest_dir)
+  FileUtils.mkdir_p(dest_dir)
+  FileUtils.cp_r(gems, dest_dir)
+end
+
+task :create_launcher do
+  configuration = File.join(File.dirname(__FILE__), "installer", "launch4j.xml")
+  `installer/launch4j/launch4j #{configuration}`
+end
+
+task :copy_smartermeter do
+  src_dir = File.join(File.dirname(__FILE__), "lib")
+  dest_dir = File.join(File.dirname(__FILE__), "pkg", "base", "gems", "gems", "smartermeter-#{version}")
+  FileUtils.mkdir_p(dest_dir)
+  FileUtils.cp_r(src_dir, dest_dir)
+
+  dest = File.join(File.dirname(__FILE__), "pkg", "base", "gems", "specifications", "smartermeter-#{version}.gemspec")
+  FileUtils.cp(File.join(File.dirname(__FILE__), "smartermeter.gemspec"), dest)
+
+  dest_dir = File.join(File.dirname(__FILE__), "pkg", "base")
+  FileUtils.cp(File.join(File.dirname(__FILE__), "installer", "main.rb"), dest_dir)
+
+  dest_dir = File.join(File.dirname(__FILE__), "pkg", "base", "icons")
+  FileUtils.mkdir_p(dest_dir)
+  FileUtils.cp(Dir.glob(File.join(File.dirname(__FILE__), "icons", "*.png")), dest_dir)
+end
+
+task :nsis_installer do
+  nsis_file = File.join(File.dirname(__FILE__), "installer", "nsis.nsi")
+  `makensis -DVERSION=#{version} #{nsis_file}`
+end
+
+desc "Package all required files into pkg/base"
+task :package => [:fetch_jruby, :fetch_launch4j, :package_gems, :create_launcher, :copy_smartermeter, :nsis_installer]
+
 #############################################################################
 #
 # Packaging tasks
@@ -159,7 +208,6 @@ task :gemspec => :validate do
     sort.
     reject { |file| file =~ /^\./ }.
     reject { |file| file =~ /^(rdoc|pkg)/ }.
-    reject { |file| file =~ /^rawr/ }.
     reject { |file| file =~ /\.jar$/ }.
     map { |file| "    #{file}" }.
     join("\n")