tem_multi_updater 0.2 → 0.3

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.3. Added tem_multi_reset_fw which forces the update, resetting the TEM cards.
+
 v0.2. Complete test coverage.
 
 v0.1. Initial release.

data/Manifest

@@ -3,6 +3,7 @@ LICENSE
 Manifest
 README
 Rakefile
+bin/tem_multi_reset_fw
 bin/tem_multi_update_fw
 lib/tem_multi_updater.rb
 lib/tem_multi_updater/updater.rb

data/bin/tem_multi_reset_fw

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+#
+# Launcher for the multi-updater code with forced updating.
+#
+# Author:: Victor Costan
+# Copyright:: Copyright (C) 2009 Massachusetts Institute of Technology
+# License:: MIT
+#
+# Usage: tem_multi_reset_fw [host[:port]]
+# The host:port should point to the RPC port of the tem_multi_proxy server.
+# The default host is localhost, and the default port is 9000.
+
+require 'logger'
+require 'rubygems'
+require 'tem_multi_proxy'
+require 'tem_multi_updater'
+
+server_addr = ARGV[0] || 'localhost'
+logger = Logger.new STDERR
+logger.level = Logger::INFO
+updater = Tem::MultiUpdater::Updater.new logger, server_addr, :force => true
+updater.run

data/lib/tem_multi_updater/updater.rb

@@ -18,9 +18,10 @@ class Updater
   #   logger:: receives update progress notifications
   #   multiproxy_server_addr:: the address (host or host:port) of the
   #                            tem_multi_proxy RPC port
-  def initialize(logger, multiproxy_server_addr)
+  def initialize(logger, multiproxy_server_addr, options = {})
     @logger = logger
     @server_addr = multiproxy_server_addr
+    @options = options
     @pending = nil
     @pending_mx, @pending_cv = Mutex.new, ConditionVariable.new
   end
@@ -124,7 +125,9 @@ class Updater
   #
   # Args:
   #   transport_config:: smart-card transport connecting to the TEM card 
-  def needs_update?(transport)    
+  def needs_update?(transport)
+    return true if @options[:force]
+    
     begin
       tem = Tem::Session.new transport
       tem_version = tem.fw_version

data/tem_multi_updater.gemspec

@@ -2,17 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tem_multi_updater}
-  s.version = "0.2"
+  s.version = "0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
   s.date = %q{2009-11-10}
-  s.default_executable = %q{tem_multi_update_fw}
   s.description = %q{Updates the firmware on all TEMs connected to a tem_multi_proxy.}
   s.email = %q{victor@costan.us}
-  s.executables = ["tem_multi_update_fw"]
-  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "bin/tem_multi_update_fw", "lib/tem_multi_updater.rb", "lib/tem_multi_updater/updater.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "bin/tem_multi_update_fw", "lib/tem_multi_updater.rb", "lib/tem_multi_updater/updater.rb", "test/integration_test.rb", "test/updater_test.rb", "tem_multi_updater.gemspec"]
+  s.executables = ["tem_multi_reset_fw", "tem_multi_update_fw"]
+  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "bin/tem_multi_reset_fw", "bin/tem_multi_update_fw", "lib/tem_multi_updater.rb", "lib/tem_multi_updater/updater.rb"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "bin/tem_multi_reset_fw", "bin/tem_multi_update_fw", "lib/tem_multi_updater.rb", "lib/tem_multi_updater/updater.rb", "test/integration_test.rb", "test/updater_test.rb", "tem_multi_updater.gemspec"]
   s.homepage = %q{http://tem.rubyforge.org}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Tem_multi_updater", "--main", "README"]
   s.require_paths = ["lib"]

data/test/updater_test.rb

@@ -26,6 +26,13 @@ class UpdaterTest < Test::Unit::TestCase
     super
   end
   
+  def test_reset_switch
+    updater = Tem::MultiUpdater::Updater.new Logger.new(StringIO.new),
+                                             @server_addr, :force => true
+    flexmock(Tem::Session).should_receive(:new).never
+    assert_equal true, updater.needs_update?(:bogus_transport)
+  end
+  
   def test_dead_proxy
     flexmock(Tem::MultiProxy::Client).should_receive(:query_tems).
         with(@server_addr).and_return(nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tem_multi_updater
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: "0.3"
 platform: ruby
 authors: 
 - Victor Costan
@@ -65,6 +65,7 @@ dependencies:
 description: Updates the firmware on all TEMs connected to a tem_multi_proxy.
 email: victor@costan.us
 executables: 
+- tem_multi_reset_fw
 - tem_multi_update_fw
 extensions: []
 
@@ -72,6 +73,7 @@ extra_rdoc_files:
 - CHANGELOG
 - LICENSE
 - README
+- bin/tem_multi_reset_fw
 - bin/tem_multi_update_fw
 - lib/tem_multi_updater.rb
 - lib/tem_multi_updater/updater.rb
@@ -81,6 +83,7 @@ files:
 - Manifest
 - README
 - Rakefile
+- bin/tem_multi_reset_fw
 - bin/tem_multi_update_fw
 - lib/tem_multi_updater.rb
 - lib/tem_multi_updater/updater.rb