smartcard 0.4.8 → 0.4.9

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.4.9. Disabled Nagle's algorithm in the remote JCOP transport.
+
 v0.4.8. Gem dependencies.
 
 v0.4.7. Custom exception class for APDU responses with error codes.

data/Rakefile

@@ -9,7 +9,8 @@ Echoe.new('smartcard') do |p|
   p.email = 'victor@costan.us'
   p.summary = 'Interface with ISO 7816 smart cards.'
   p.url = 'http://www.costan.us/smartcard'
-  p.dependencies = ['rubyzip >=0.9.1']
+  p.dependencies = ['rubyzip >=0.9.1',
+                    'zerg_support >=0.1.5']
   p.development_dependencies = ['echoe >=3.2',
                                 'flexmock >=0.8.6']
   

data/lib/smartcard/iso/jcop_remote_server.rb

@@ -66,8 +66,6 @@ class JcopRemoteServer
   # The options hash supports the following keys:
   #   port:: the port to serve on
   #   ip:: the IP of the interface to serve on (defaults to all interfaces)
-  #   reusable:: if set, the serving port can be shared with another
-  #              application (REUSEADDR flag will be set on the socket)
   #
   # If the |serving_logic| parameter is nil, a serving logic implementation
   # must be provided when calling JcopRemoteServer#run. The server will crash
@@ -126,13 +124,12 @@ class JcopRemoteServer
     end
     
     # TODO(costan): figure out a way to let serving logic reach this directly.
-  end
-  
+  end  
   
   # Creates a socket listening to incoming connections to this server.
   # 
   # :call-seq:
-  #   server.establish_socket(options) -> Socket
+  #   server.serving_socket(options) -> Socket
   #
   # The |options| parameter supports the same keys as the options parameter
   # of JcopRemoteServer#new.
@@ -141,17 +138,9 @@ class JcopRemoteServer
   def serving_socket(options)
     port = options[:port] || 0
     interface_ip = options[:ip] || '0.0.0.0'
-    serving_address = Socket.pack_sockaddr_in port, interface_ip
-    
-    socket = Socket.new Socket::AF_INET, Socket::SOCK_STREAM,
-                        Socket::PF_UNSPEC
-    
-    if options[:reusable]
-      socket.setsockopt Socket::SOL_SOCKET, Socket::SO_REUSEADDR, true
-    end
-    socket.setsockopt Socket::IPPROTO_TCP, Socket::TCP_NODELAY, true      
-    socket.bind serving_address
-    socket.listen 5
+    socket = Zerg::Support::SocketFactory.socket :in_addr => interface_ip,
+        :in_port => port, :no_delay => true, :reuse_addr => true
+    socket.listen
     socket
   end
   private :serving_socket

data/lib/smartcard/iso/jcop_remote_transport.rb

@@ -4,7 +4,7 @@
 # Copyright:: Copyright (C) 2008 Massachusetts Institute of Technology
 # License:: MIT
 
-require 'socket'
+require 'zerg_support'
 
 # :nodoc: namespace
 module Smartcard::Iso
@@ -43,16 +43,8 @@ class JcopRemoteTransport
   # Makes a transport-level connection to the TEM.
   def connect
     begin
-      Socket.getaddrinfo(@host, @port, Socket::AF_INET,
-                         Socket::SOCK_STREAM).each do |addr_info|
-        begin
-          @socket = Socket.new(addr_info[4], addr_info[5], addr_info[6])
-          @socket.connect Socket.pack_sockaddr_in(addr_info[1], addr_info[3])
-          break
-        rescue
-          @socket = nil
-        end
-      end  
+      @socket = Zerg::Support::SocketFactory.socket :out_addr => @host,
+          :out_port => @port, :no_delay => true
       raise 'Connection refused' unless @socket
       
       # Wait for the card to be inserted.

data/smartcard.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{smartcard}
-  s.version = "0.4.8"
+  s.version = "0.4.9"
 
   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.date = %q{2009-11-11}
   s.description = %q{Interface with ISO 7816 smart cards.}
   s.email = %q{victor@costan.us}
   s.extensions = ["ext/smartcard_pcsc/extconf.rb"]
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = %q{smartcard}
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Interface with ISO 7816 smart cards.}
-  s.test_files = ["test/pcsc/containers_test.rb", "test/pcsc/smoke_test.rb", "test/gp/cap_loader_test.rb", "test/gp/gp_card_mixin_test.rb", "test/gp/des_test.rb", "test/gp/asn1_ber_test.rb", "test/iso/jcop_remote_test.rb", "test/iso/iso_card_mixin_test.rb", "test/iso/iso_exception_test.rb", "test/iso/auto_configurator_test.rb"]
+  s.test_files = ["test/gp/asn1_ber_test.rb", "test/gp/cap_loader_test.rb", "test/gp/des_test.rb", "test/gp/gp_card_mixin_test.rb", "test/iso/auto_configurator_test.rb", "test/iso/iso_card_mixin_test.rb", "test/iso/iso_exception_test.rb", "test/iso/jcop_remote_test.rb", "test/pcsc/containers_test.rb", "test/pcsc/smoke_test.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
@@ -26,15 +26,18 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rubyzip>, [">= 0.9.1"])
+      s.add_runtime_dependency(%q<zerg_support>, [">= 0.1.5"])
       s.add_development_dependency(%q<echoe>, [">= 3.2"])
       s.add_development_dependency(%q<flexmock>, [">= 0.8.6"])
     else
       s.add_dependency(%q<rubyzip>, [">= 0.9.1"])
+      s.add_dependency(%q<zerg_support>, [">= 0.1.5"])
       s.add_dependency(%q<echoe>, [">= 3.2"])
       s.add_dependency(%q<flexmock>, [">= 0.8.6"])
     end
   else
     s.add_dependency(%q<rubyzip>, [">= 0.9.1"])
+    s.add_dependency(%q<zerg_support>, [">= 0.1.5"])
     s.add_dependency(%q<echoe>, [">= 3.2"])
     s.add_dependency(%q<flexmock>, [">= 0.8.6"])
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: smartcard
 version: !ruby/object:Gem::Version 
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors: 
 - Victor Costan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-10 00:00:00 -05:00
+date: 2009-11-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.9.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: zerg_support
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.1.5
+    version: 
 - !ruby/object:Gem::Dependency 
   name: echoe
   type: :development
@@ -163,13 +173,13 @@ signing_key:
 specification_version: 3
 summary: Interface with ISO 7816 smart cards.
 test_files: 
-- test/pcsc/containers_test.rb
-- test/pcsc/smoke_test.rb
+- test/gp/asn1_ber_test.rb
 - test/gp/cap_loader_test.rb
-- test/gp/gp_card_mixin_test.rb
 - test/gp/des_test.rb
-- test/gp/asn1_ber_test.rb
-- test/iso/jcop_remote_test.rb
+- test/gp/gp_card_mixin_test.rb
+- test/iso/auto_configurator_test.rb
 - test/iso/iso_card_mixin_test.rb
 - test/iso/iso_exception_test.rb
-- test/iso/auto_configurator_test.rb
+- test/iso/jcop_remote_test.rb
+- test/pcsc/containers_test.rb
+- test/pcsc/smoke_test.rb