smartcard 0.2.3 → 0.3.1

data/CHANGELOG

@@ -1,25 +1,29 @@
-v0.2.3 Fixed minor bug in error string for PCSC::Card.transmit 
+v0.3.1. Fixed documentation for the new PcscException class.
 
-v0.2.2 Fixed APDU exchange bugs on Windows
+v0.3.0. Added PcscException class used to wrap PC/SC exceptions.
+
+v0.2.3. Fixed minor bug in error string for PCSC::Card.transmit 
+
+v0.2.2. Fixed APDU exchange bugs on Windows
 	Restructured PCSC::IoRequest to allow PCI_ consts
 	Added PCI_ consts
 	Changed test suite to reflect proper way to do transmits
 
-v0.2.1 Added OSX Tiger support
+v0.2.1. Added OSX Tiger support
 	Many workarounds for Tiger's buggy/incomplete PC/SC.
 	Small bugfixes for PC/SC status constants.
 
-v0.2.0 Added automatic builds
+v0.2.0. Added automatic builds
 	Rakefile for auto builds using echoe
 	extconf.rb: hack to fix Windows makefiles 
 
-v0.1.2 Added Windows compatibility
+v0.1.2. Added Windows compatibility
 	*.c: restructured code so VC2005 likes it
 	(variable declarations before function body)
 	docs: license, readme, and what the gem is
 
-v0.1.1 Added support for Ubuntu 7.10
+v0.1.1. Added support for Ubuntu 7.10
 	ext/smartcard_pcsc/extconf.rb: better header
 	detection
 
-v0.1.0 Initial release for OSX Leopard
+v0.1.0. Initial release for OSX Leopard

data/Manifest

@@ -1,20 +1,23 @@
-BUILD
-CHANGELOG
-ext/smartcard_pcsc/extconf.rb
-ext/smartcard_pcsc/pcsc.h
-ext/smartcard_pcsc/pcsc_card.c
-ext/smartcard_pcsc/pcsc_constants.c
-ext/smartcard_pcsc/pcsc_context.c
-ext/smartcard_pcsc/pcsc_io_request.c
-ext/smartcard_pcsc/pcsc_main.c
-ext/smartcard_pcsc/pcsc_multi_strings.c
-ext/smartcard_pcsc/pcsc_namespace.c
-ext/smartcard_pcsc/pcsc_reader_states.c
-ext/smartcard_pcsc/pcsc_surrogate_reader.h
-ext/smartcard_pcsc/pcsc_surrogate_wintypes.h
-lib/smartcard.rb
-LICENSE
-Manifest
-README
-test/test_all.rb
-tests/ts_pcsc_ext.rb
+BUILD
+CHANGELOG
+ext/smartcard_pcsc/extconf.rb
+ext/smartcard_pcsc/pcsc.h
+ext/smartcard_pcsc/pcsc_card.c
+ext/smartcard_pcsc/pcsc_constants.c
+ext/smartcard_pcsc/pcsc_context.c
+ext/smartcard_pcsc/pcsc_exception.c
+ext/smartcard_pcsc/pcsc_io_request.c
+ext/smartcard_pcsc/pcsc_main.c
+ext/smartcard_pcsc/pcsc_multi_strings.c
+ext/smartcard_pcsc/pcsc_namespace.c
+ext/smartcard_pcsc/pcsc_reader_states.c
+ext/smartcard_pcsc/pcsc_surrogate_reader.h
+ext/smartcard_pcsc/pcsc_surrogate_wintypes.h
+lib/smartcard/pcsc_exception.rb
+lib/smartcard.rb
+LICENSE
+Manifest
+README
+test/test_containers.rb
+test/test_smoke.rb
+tests/ts_pcsc_ext.rb

data/ext/smartcard_pcsc/extconf.rb

@@ -12,9 +12,11 @@ if RUBY_PLATFORM =~ /darwin/
     pcsc_defines.push 'RB_SMARTCARD_OSX_TIGER_HACK'
   end
 elsif RUBY_PLATFORM =~ /win/
+  
   have_library('winscard')
+  pcsc_defines << 'PCSC_SURROGATE_SCARD_IS_VALID_CONTEXT' unless have_library('winscard', 'SCardIsValidContext')
 else
-  # pcsc is retarded and uses stuff like '#include <wintypes.h>'
+  # pcsclite is retarded and uses stuff like '#include <wintypes.h>'
   $CFLAGS += ' -I /usr/include/PCSC -I /usr/local/include/PCSC'
   have_library('pcsclite')
 end
@@ -37,6 +39,17 @@ end
 create_makefile('smartcard/pcsc')
 
 def win32_hack(mf_name)
+  # get the version of MSVC
+  Kernel.system `cl 2> msvc_version.txt`
+  msvc_logo = File.open('msvc_version.txt') { |f| f.read }
+  print msvc_logo
+  File.delete 'msvc_version.txt'
+  if msvc_logo =~ /Optimizing Compiler Version (\d+)/
+    msvc_ver = $1.to_i  
+    # for MSVC 6.0, no manifest BS is needed -- straight-up compilation is good
+    return if msvc_ver == 12
+  end
+    
   # evil, evil, evil -- hack the makefile to embed the manifest in the extension dll
   make_contents = File.open(mf_name, 'r') { |f| f.read }
   make_rules = make_contents.split(/(\n|\r)(\n|\r)+/)

data/ext/smartcard_pcsc/pcsc.h

@@ -19,7 +19,7 @@ int _PCSC_ReaderStates_lowlevel_get(VALUE rbReaderStates, SCARD_READERSTATE **re
 extern VALUE cPcscIoRequest;
 void Init_PCSC_IoRequest();
 int _PCSC_IoRequest_lowlevel_get(VALUE rbIoRequest, SCARD_IO_REQUEST **io_request);
-VALUE _PCSC_IoRequest_lowlevel_new(SCARD_IO_REQUEST *io_request);
+VALUE _PCSC_IoRequest_lowlevel_new(const SCARD_IO_REQUEST *io_request);
 
 /* Class Smartcard::PCSC::Context */
 extern VALUE cPcscContext;
@@ -31,6 +31,11 @@ extern VALUE cPcscCard;
 void Init_PCSC_Card();
 int _PCSC_Card_lowlevel_get(VALUE rbCard, SCARDHANDLE *card_handle);
 
+/* Class Smartcard::PCSC::Exception */
+extern VALUE ePcscException;
+void Init_PCSC_Exception();
+void _PCSC_Exception_raise(DWORD pcsc_error, char *pcsc_function);
+
 /* Constants in Smartcard::PCSC */
 void Init_PCSC_Consts();
 

data/ext/smartcard_pcsc/pcsc_card.c

@@ -65,7 +65,7 @@ static VALUE PCSC_Card_initialize(VALUE self, VALUE rbContext, VALUE rbReaderNam
 	
 	card->pcsc_error = SCardConnect(context, RSTRING(rbFinalReaderName)->ptr, share_mode, preferred_protocols, &card->card_handle, &active_protocol);	
 	if(card->pcsc_error != SCARD_S_SUCCESS)
-		rb_raise(rb_eRuntimeError, "SCardConnect: %s", pcsc_stringify_error(card->pcsc_error));
+		_PCSC_Exception_raise(card->pcsc_error, "SCardConnect");
 	else
 		card->released = 0;
 	return self;
@@ -95,7 +95,7 @@ static VALUE PCSC_Card_reconnect(VALUE self, VALUE rbShareMode, VALUE rbPreferre
 	
 	card->pcsc_error = SCardReconnect(card->card_handle, share_mode, preferred_protocols, initialization, &active_protocol);
 	if(card->pcsc_error != SCARD_S_SUCCESS)
-		rb_raise(rb_eRuntimeError, "SCardReconnect: %s", pcsc_stringify_error(card->pcsc_error));
+		_PCSC_Exception_raise(card->pcsc_error, "SCardReconnect");		
 
 	return self;
 }
@@ -121,7 +121,7 @@ static VALUE PCSC_Card_disconnect(VALUE self, VALUE rbDisposition) {
 		card->pcsc_error = SCardDisconnect(card->card_handle, disposition);		
 		card->released = 1;
 		if(card->pcsc_error != SCARD_S_SUCCESS)
-			rb_raise(rb_eRuntimeError, "SCardDisconnect: %s", pcsc_stringify_error(card->pcsc_error));
+			_PCSC_Exception_raise(card->pcsc_error, "SCardDisconnect");		
 	}
 	return self;
 }
@@ -141,7 +141,7 @@ static VALUE PCSC_Card_begin_transaction(VALUE self) {
 	
 	card->pcsc_error = SCardBeginTransaction(card->card_handle);
 	if(card->pcsc_error != SCARD_S_SUCCESS)
-		rb_raise(rb_eRuntimeError, "SCardBeginTransaction: %s", pcsc_stringify_error(card->pcsc_error));	
+		_PCSC_Exception_raise(card->pcsc_error, "SCardBeginTransaction");		
 	return self;
 }
 
@@ -164,7 +164,7 @@ static VALUE PCSC_Card_end_transaction(VALUE self, VALUE rbDisposition) {
 	disposition = NUM2UINT(rbDisposition);
 	card->pcsc_error = SCardEndTransaction(card->card_handle, disposition);
 	if(card->pcsc_error != SCARD_S_SUCCESS)
-		rb_raise(rb_eRuntimeError, "SCardEndTransaction: %s", pcsc_stringify_error(card->pcsc_error));	
+		_PCSC_Exception_raise(card->pcsc_error, "SCardEndTransaction");		
 	return self;
 }
 
@@ -209,7 +209,7 @@ static VALUE PCSC_Card_get_attribute(VALUE self, VALUE rbAttributeId) {
 		}
 	}
 	if(card->pcsc_error != SCARD_S_SUCCESS)
-		rb_raise(rb_eRuntimeError, "SCardGetAttrib: %s", pcsc_stringify_error(card->pcsc_error));	
+		_PCSC_Exception_raise(card->pcsc_error, "SCardGetAttrib");		
 #endif
 	return Qnil;
 }
@@ -248,7 +248,7 @@ static VALUE PCSC_Card_set_attribute(VALUE self, VALUE rbAttributeId, VALUE rbAt
 #else
 	card->pcsc_error = SCardSetAttrib(card->card_handle, attribute_id, (LPSTR)RSTRING(rbFinalAttributeValue)->ptr, RSTRING(rbFinalAttributeValue)->len);
 	if(card->pcsc_error != SCARD_S_SUCCESS)
-		rb_raise(rb_eRuntimeError, "SCardSetAttrib: %s", pcsc_stringify_error(card->pcsc_error));	
+		_PCSC_Exception_raise(card->pcsc_error, "SCardSetAttrib");		
 #endif
 	return self;
 }
@@ -306,7 +306,7 @@ static VALUE PCSC_Card_transmit(VALUE self, VALUE rbSendData, VALUE rbSendIoRequ
 			recv_io_request, (LPSTR)recv_buffer, &recv_length);	
 	if(card->pcsc_error != SCARD_S_SUCCESS) {
 		xfree(recv_buffer);
-		rb_raise(rb_eRuntimeError, "SCardTransmit: %s", pcsc_stringify_error(card->pcsc_error));
+		_PCSC_Exception_raise(card->pcsc_error, "SCardTransmit");		
 		return Qnil;
 	}
 
@@ -366,7 +366,7 @@ static VALUE PCSC_Card_control(VALUE self, VALUE rbControlCode, VALUE rbSendData
 #endif
 	if(card->pcsc_error != SCARD_S_SUCCESS) {
 		xfree(recv_buffer);
-		rb_raise(rb_eRuntimeError, "SCardControl: %s", pcsc_stringify_error(card->pcsc_error));
+		_PCSC_Exception_raise(card->pcsc_error, "SCardControl");		
 		return Qnil;
 	}
 
@@ -412,7 +412,7 @@ static VALUE PCSC_Card_status(VALUE self) {
 	card->pcsc_error = SCardStatus(card->card_handle, reader_names_buffer, &reader_names_length, &state, &protocol, (LPSTR)atr_buffer, &atr_length);
 	if(card->pcsc_error != SCARD_S_SUCCESS) {
 		xfree(reader_names_buffer); xfree(atr_buffer);
-		rb_raise(rb_eRuntimeError, "SCardStatus: %s", pcsc_stringify_error(card->pcsc_error));
+		_PCSC_Exception_raise(card->pcsc_error, "SCardStatus");		
 		return Qnil;
 	}
 	

data/ext/smartcard_pcsc/pcsc_context.c

@@ -45,7 +45,7 @@ static VALUE PCSC_Context_initialize(VALUE self, VALUE scope) {
 	
 	context->pcsc_error = SCardEstablishContext(NUM2INT(scope), NULL, NULL, &context->pcsc_context);
 	if(context->pcsc_error != SCARD_S_SUCCESS)
-		rb_raise(rb_eRuntimeError, "SCardEstablishContext: %s", pcsc_stringify_error(context->pcsc_error));
+		_PCSC_Exception_raise(context->pcsc_error, "SCardEstablishContext");
 	else
 		context->released = 0;
 	return self;
@@ -69,7 +69,7 @@ static VALUE PCSC_Context_release(VALUE self) {
 		context->pcsc_error = SCardReleaseContext(context->pcsc_context);		
 		context->released = 1;
 		if(context->pcsc_error != SCARD_S_SUCCESS)
-			rb_raise(rb_eRuntimeError, "SCardReleaseContext: %s", pcsc_stringify_error(context->pcsc_error));
+			_PCSC_Exception_raise(context->pcsc_error, "SCardReleaseContext");
 	}
 	return self;
 }
@@ -89,7 +89,7 @@ static VALUE PCSC_Context_is_valid(VALUE self) {
 	Data_Get_Struct(self, struct SCardContextEx, context);
 	if(context == NULL) return self;
 
-#if defined(RB_SMARTCARD_OSX_TIGER_HACK)	
+#if defined(RB_SMARTCARD_OSX_TIGER_HACK) || defined(PCSC_SURROGATE_SCARD_IS_VALID_CONTEXT)	
 	return Qtrue;
 #else
 	context->pcsc_error = SCardIsValidContext(context->pcsc_context);
@@ -130,7 +130,7 @@ static VALUE PCSC_Context_list_reader_groups(VALUE self) {
 		}
 	}
 	if(context->pcsc_error != SCARD_S_SUCCESS)
-		rb_raise(rb_eRuntimeError, "SCardListReaderGroups: %s", pcsc_stringify_error(context->pcsc_error));	
+		_PCSC_Exception_raise(context->pcsc_error, "SCardListReaderGroups");
 	return Qnil;
 }
 
@@ -176,8 +176,8 @@ static VALUE PCSC_Context_list_readers(VALUE self, VALUE rbGroups) {
 	}
 	if(groups != NULL) xfree(groups);	
 	if(context->pcsc_error != SCARD_S_SUCCESS)
-		rb_raise(rb_eRuntimeError, "SCardListReaders: %s", pcsc_stringify_error(context->pcsc_error));	
-	return Qnil;	
+		_PCSC_Exception_raise(context->pcsc_error, "SCardListReaders");
+	return Qnil;
 }
 
 /* :Document-method: cancel
@@ -195,7 +195,7 @@ static VALUE PCSC_Context_cancel(VALUE self) {
 	
 	context->pcsc_error = SCardCancel(context->pcsc_context);
 	if(context->pcsc_error != SCARD_S_SUCCESS)
-		rb_raise(rb_eRuntimeError, "SCardCancel: %s", pcsc_stringify_error(context->pcsc_error));	
+		_PCSC_Exception_raise(context->pcsc_error, "SCardCancel");
 	return self;
 }
 
@@ -232,7 +232,7 @@ static VALUE PCSC_Context_get_status_change(VALUE self, VALUE rbReaderStates, VA
 	else {
 		context->pcsc_error = SCardGetStatusChange(context->pcsc_context, timeout, reader_states, reader_states_count);
 		if(context->pcsc_error != SCARD_S_SUCCESS)
-			rb_raise(rb_eRuntimeError, "SCardCancel: %s", pcsc_stringify_error(context->pcsc_error));
+			_PCSC_Exception_raise(context->pcsc_error, "SCardGetStatusChange");
 	}
 	return self;
 }

data/ext/smartcard_pcsc/pcsc_exception.c

@@ -0,0 +1,39 @@
+#include "pcsc.h"
+
+VALUE ePcscException;
+
+#if defined(WIN32)
+static char scard_error_buffer[128];
+
+/* Produces a string for an error code yielded by the SCard* PC/SC functions. Returns a static global buffer. */
+static char *pcsc_stringify_error(DWORD scard_error) {
+	FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+		NULL, scard_error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+        scard_error_buffer, sizeof(scard_error_buffer), NULL );
+	return scard_error_buffer;
+}
+#endif
+
+
+#ifdef MAKE_RDOC_HAPPY
+	mSmartcard = rb_define_module("Smartcard");
+	mPcsc = rb_define_module_under(mSmartcard, "PCSC");
+#endif
+
+/* :Document-class: Smartcard::PCSC::Exception
+ * Contains information about an exception at the PC/SC layer.
+ */
+void Init_PCSC_Exception() {
+	ePcscException = rb_define_class_under(mPcsc, "PcscException", rb_eRuntimeError);
+}
+
+/* Raises a PC/SC error. */
+void _PCSC_Exception_raise(DWORD pcsc_error, char *pcsc_function) {
+	char buf[BUFSIZ];
+	VALUE exception;
+	
+	sprintf(buf, "%s: %s", pcsc_function, pcsc_stringify_error(pcsc_error));
+	exception = rb_exc_new2(ePcscException, buf);
+	rb_iv_set(exception, "@errno", INT2NUM(pcsc_error));
+	rb_exc_raise(exception);
+}

data/ext/smartcard_pcsc/pcsc_io_request.c

@@ -119,7 +119,7 @@ int _PCSC_IoRequest_lowlevel_get(VALUE rbIoRequest, SCARD_IO_REQUEST **io_reques
 }
 
 /* Creates a Smartcard::PCSC::IoRequest instance wrapping a given SCARD_IO_REQUEST. */
-VALUE _PCSC_IoRequest_lowlevel_new(SCARD_IO_REQUEST *io_request) {
+VALUE _PCSC_IoRequest_lowlevel_new(const SCARD_IO_REQUEST *io_request) {
 	struct SCardIoRequestEx *request;
 	
 	VALUE rbIoRequest = Data_Make_Struct(cPcscIoRequest, struct SCardIoRequestEx, NULL, PCSC_IoRequest_free, request);

data/ext/smartcard_pcsc/pcsc_main.c

@@ -7,4 +7,5 @@ void Init_pcsc() {
 	Init_PCSC_Context();
 	Init_PCSC_Card();
 	Init_PCSC_Consts();
+	Init_PCSC_Exception();
 }

data/ext/smartcard_pcsc/pcsc_multi_strings.c

@@ -68,15 +68,3 @@ int PCSC_Internal_ruby_strings_to_multistring(VALUE rbStrings, char **strings) {
 	
 	return 0;
 }
-
-#if defined(WIN32)
-char scard_error_buffer[128];
-
-/* Produces a string for an error code yielded by the SCard* PC/SC functions. Returns a static global buffer. */
-char *pcsc_stringify_error(DWORD scard_error) {
-	FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
-		NULL, scard_error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-        scard_error_buffer, sizeof(scard_error_buffer), NULL );
-	return scard_error_buffer;
-}
-#endif

data/lib/smartcard/pcsc_exception.rb

@@ -0,0 +1,5 @@
+# Contains information about an exception at the PC/SC layer.
+class Smartcard::PCSC::Exception  
+  # The error number returned by the failed PC/SC function call. Should be one of the Smartcard::PCSC::SCARD_E_ constants.
+  attr_reader :errno
+end

data/smartcard.gemspec

@@ -1,27 +1,29 @@
 
-# Gem::Specification for Smartcard-0.2.3
+# Gem::Specification for Smartcard-0.3.1
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{smartcard}
-  s.version = "0.2.3"
+  s.version = "0.3.1"
 
   s.specification_version = 2 if s.respond_to? :specification_version=
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
-  s.date = %q{2008-01-10}
+  s.date = %q{2008-05-01}
   s.description = %q{Interface with ISO 7816 smart cards.}
   s.email = %q{victor@costan.us}
   s.extensions = ["ext/smartcard_pcsc/extconf.rb"]
-  s.files = ["BUILD", "CHANGELOG", "ext/smartcard_pcsc/extconf.rb", "ext/smartcard_pcsc/pcsc.h", "ext/smartcard_pcsc/pcsc_card.c", "ext/smartcard_pcsc/pcsc_constants.c", "ext/smartcard_pcsc/pcsc_context.c", "ext/smartcard_pcsc/pcsc_io_request.c", "ext/smartcard_pcsc/pcsc_main.c", "ext/smartcard_pcsc/pcsc_multi_strings.c", "ext/smartcard_pcsc/pcsc_namespace.c", "ext/smartcard_pcsc/pcsc_reader_states.c", "ext/smartcard_pcsc/pcsc_surrogate_reader.h", "ext/smartcard_pcsc/pcsc_surrogate_wintypes.h", "lib/smartcard.rb", "LICENSE", "Manifest", "README", "test/test_all.rb", "tests/ts_pcsc_ext.rb", "smartcard.gemspec"]
+  s.extra_rdoc_files = ["BUILD", "CHANGELOG", "ext/smartcard_pcsc/extconf.rb", "ext/smartcard_pcsc/pcsc.h", "ext/smartcard_pcsc/pcsc_card.c", "ext/smartcard_pcsc/pcsc_constants.c", "ext/smartcard_pcsc/pcsc_context.c", "ext/smartcard_pcsc/pcsc_exception.c", "ext/smartcard_pcsc/pcsc_io_request.c", "ext/smartcard_pcsc/pcsc_main.c", "ext/smartcard_pcsc/pcsc_multi_strings.c", "ext/smartcard_pcsc/pcsc_namespace.c", "ext/smartcard_pcsc/pcsc_reader_states.c", "ext/smartcard_pcsc/pcsc_surrogate_reader.h", "ext/smartcard_pcsc/pcsc_surrogate_wintypes.h", "lib/smartcard/pcsc_exception.rb", "lib/smartcard.rb", "LICENSE", "README"]
+  s.files = ["BUILD", "CHANGELOG", "ext/smartcard_pcsc/extconf.rb", "ext/smartcard_pcsc/pcsc.h", "ext/smartcard_pcsc/pcsc_card.c", "ext/smartcard_pcsc/pcsc_constants.c", "ext/smartcard_pcsc/pcsc_context.c", "ext/smartcard_pcsc/pcsc_exception.c", "ext/smartcard_pcsc/pcsc_io_request.c", "ext/smartcard_pcsc/pcsc_main.c", "ext/smartcard_pcsc/pcsc_multi_strings.c", "ext/smartcard_pcsc/pcsc_namespace.c", "ext/smartcard_pcsc/pcsc_reader_states.c", "ext/smartcard_pcsc/pcsc_surrogate_reader.h", "ext/smartcard_pcsc/pcsc_surrogate_wintypes.h", "lib/smartcard/pcsc_exception.rb", "lib/smartcard.rb", "LICENSE", "Manifest", "README", "test/test_containers.rb", "test/test_smoke.rb", "tests/ts_pcsc_ext.rb", "smartcard.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://www.costan.us/smartcard}
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Smartcard", "--main", "README"]
   s.require_paths = ["lib", "ext"]
   s.rubyforge_project = %q{smartcard}
-  s.rubygems_version = %q{1.0.1}
+  s.rubygems_version = %q{1.1.1}
   s.summary = %q{Interface with ISO 7816 smart cards.}
-  s.test_files = ["test/test_all.rb"]
+  s.test_files = ["test/test_containers.rb", "test/test_smoke.rb"]
 end
 
 
@@ -44,10 +46,9 @@ end
 #   p.rdoc_pattern = /^(lib|bin|tasks|ext)|^BUILD|^README|^CHANGELOG|^TODO|^LICENSE|^COPYING$/
 #   
 #   p.eval = proc do |p|
-#     case RUBY_PLATFORM
-#     when /mswin/
+#     if Platform.windows?
 #       p.files += ['lib/smartcard/pcsc.so']
-#       p.platform = Gem::Platform::WIN32
+#       p.platform = Gem::Platform::CURRENT
 # 
 #       # take out the extension info from the gemspec
 #       task :postcompile_hacks => [:compile] do

data/test/test_containers.rb

@@ -0,0 +1,53 @@
+require 'test/unit'
+require 'smartcard'
+
+class ContainersTest < Test::Unit::TestCase
+  def setup
+    
+  end
+  
+  def teardown
+    
+  end
+  
+  # tests the SmartCard::PCSC::ReaderStates container
+  def test_reader_states
+    reader_states = Smartcard::PCSC::ReaderStates.new(2)
+    reader_states.set_current_state_of!(1, Smartcard::PCSC::STATE_ATRMATCH)
+    reader_states.set_current_state_of!(0, Smartcard::PCSC::STATE_CHANGED)
+    reader_states.set_event_state_of!(0, Smartcard::PCSC::STATE_IGNORE)
+    reader_states.set_event_state_of!(1, Smartcard::PCSC::STATE_PRESENT)
+    reader_states.set_atr_of!(1, "Ruby\0rocks!")
+    reader_states.set_atr_of!(0, "grreat success")
+    reader_states.set_reader_name_of!(0, "PC/SC Reader 0")
+    reader_states.set_reader_name_of!(1, "CCID Reader 1")
+    
+    assert_equal Smartcard::PCSC::STATE_ATRMATCH, reader_states.current_state_of(1), 'ReaderStates.set_current_state_of! / current_state_of mismatch'
+    assert_equal Smartcard::PCSC::STATE_CHANGED, reader_states.current_state_of(0), 'ReaderStates.set_current_state_of! / current_state_of mismatch'
+
+    assert_equal Smartcard::PCSC::STATE_IGNORE, reader_states.event_state_of(0), 'ReaderStates.set_event_state_of! / event_state_of mismatch'
+    assert_equal Smartcard::PCSC::STATE_PRESENT, reader_states.event_state_of(1), 'ReaderStates.set_event_state_of! / event_state_of mismatch' 
+
+    assert_equal "Ruby\0rocks!", reader_states.atr_of(1), 'ReaderStates.set_atr_of! / atr_of mismatch'
+    assert_equal "grreat success", reader_states.atr_of(0), 'ReaderStates.set_atr_of! / atr_of mismatch' 
+    
+    assert_equal "PC/SC Reader 0", reader_states.reader_name_of(0)
+    assert_equal "CCID Reader 1", reader_states.reader_name_of(1)
+    
+    [[5, IndexError], [2, IndexError], [nil, TypeError]].each do |bad_index_test|
+      assert_raise bad_index_test[1] do
+        reader_states.current_state_of(bad_index_test[0])
+      end
+    end
+  end
+
+  # tests the SmartCard::PCSC::IoRequest container
+  def test_io_request
+    io_request = Smartcard::PCSC::IoRequest.new
+    [Smartcard::PCSC::PROTOCOL_T0, Smartcard::PCSC::PROTOCOL_T1, Smartcard::PCSC::PROTOCOL_RAW].each do |t_protocol|
+      io_request.protocol = t_protocol
+      r_protocol = io_request.protocol
+      assert_equal r_protocol, t_protocol, 'IoRequest.protocol= / protocol mismatch'
+    end
+  end  
+end

data/test/test_smoke.rb

@@ -0,0 +1,22 @@
+require 'test/unit'
+require 'smartcard'
+
+class SmokeTest < Test::Unit::TestCase
+  def setup
+  end
+
+  def teardown    
+  end
+
+  # smoke-test to ensure that the extension loads and can call into the PC/SC library
+  def test_smoke
+    context = Smartcard::PCSC::Context.new(Smartcard::PCSC::SCOPE_SYSTEM)
+
+    reader_groups = context.list_reader_groups
+    readers1 = context.list_readers reader_groups
+    readers2 = context.list_readers reader_groups.first
+    readers3 = context.list_readers nil
+
+    context.release
+  end
+end

data/tests/ts_pcsc_ext.rb

@@ -1,77 +1,7 @@
-require 'rubygems'
-gem 'smartcard', '>= 0.2.1'
 require 'smartcard'
 require 'pp'
 
-def test_reader_states
-  reader_states = Smartcard::PCSC::ReaderStates.new(2)
-  reader_states.set_current_state_of!(1, Smartcard::PCSC::STATE_ATRMATCH)
-  reader_states.set_current_state_of!(0, Smartcard::PCSC::STATE_CHANGED)
-  reader_states.set_event_state_of!(0, Smartcard::PCSC::STATE_IGNORE)
-  reader_states.set_event_state_of!(1, Smartcard::PCSC::STATE_PRESENT)
-  reader_states.set_atr_of!(1, "Ruby\0rocks!")
-  reader_states.set_atr_of!(0, "grreat success")
-  reader_states.set_reader_name_of!(0, "PC/SC Reader 0")
-  reader_states.set_reader_name_of!(1, "CCID Reader 1")
-  
-  test_state1, test_state0 = reader_states.current_state_of(1), reader_states.current_state_of(0) 
-  if (test_state1 != Smartcard::PCSC::STATE_ATRMATCH) or (test_state0 != Smartcard::PCSC::STATE_CHANGED) 
-    puts "FAILED: ReaderStates.set_current_state_of! / current_state_of returned #{test_state1},#{test_state0} instead of #{Smartcard::PCSC::STATE_ATRMATCH},#{Smartcard::PCSC::STATE_CHANGED}\n"
-    return false
-  end
-  test_state0, test_state1 = reader_states.event_state_of(0), reader_states.event_state_of(1) 
-  if (test_state0 != Smartcard::PCSC::STATE_IGNORE) or (test_state1 != Smartcard::PCSC::STATE_PRESENT) 
-    puts "FAILED: ReaderStates.set_event_state_of! / event_state_of returned #{test_state0},#{test_state1} instead of #{Smartcard::PCSC::STATE_IGNORE},#{Smartcard::PCSC::STATE_PRESENT}\n"
-    return false
-  end
-  test_atr1, test_atr0 = reader_states.atr_of(1), reader_states.atr_of(0)
-  if (test_atr1 != "Ruby\0rocks!") or (test_atr0 != "grreat success") 
-    puts "FAILED: ReaderStates.set_atr_of! / atr_of returned '#{test_atr1}','#{test_atr0}' instead of 'Ruby\\0rocks!','grreat success'\n"
-    return false
-  end
-  test_reader0, test_reader1 = reader_states.reader_name_of(0), reader_states.reader_name_of(1)
-  if (test_reader0 != "PC/SC Reader 0") or (test_reader1 != "CCID Reader 1") 
-    puts "FAILED: ReaderStates.set_reader_name_of! / reader_name_of returned '#{test_reader0}','#{test_reader1}' instead of 'PC/SC Reader 0','CCID Reader 1'\n"
-    return false
-  end
-  
-  [5, 2, nil].each do |bad_index|
-    exception_thrown = false
-    begin
-      reader_states.current_state_of(bad_index)
-    rescue IndexError => e
-      puts "(expected) exception thrown: #{e}\n"
-      exception_thrown = e
-    rescue TypeError => e
-      puts "(expected) exception thrown: #{e}\n"
-      exception_thrown = e
-    end
-    unless exception_thrown
-      puts "FAILED: ReaderStates.current_state_of responded for bad index #{bad_index}\n"
-      return false
-    end
-  end
-  
-  return true
-end
-
-def test_io_request
-  io_request = Smartcard::PCSC::IoRequest.new
-  [Smartcard::PCSC::PROTOCOL_T0, Smartcard::PCSC::PROTOCOL_T1, Smartcard::PCSC::PROTOCOL_RAW].each do |t_protocol|
-    io_request.protocol = t_protocol
-    r_protocol = io_request.protocol
-    if r_protocol != t_protocol
-      puts "FAILED: IoRequest.protocol= / protocol failed for protocol #{t_protocol} (got #{r_protocol} instead)\n"
-      return false
-    end     
-  end
-end
-
-test_reader_states
-test_io_request
-
-
-context = Smartcard::PCSC::Context.new(Smartcard::PCSC::SCOPE_SYSTEM);
+context = Smartcard::PCSC::Context.new(Smartcard::PCSC::SCOPE_SYSTEM)
 
 reader_groups = context.list_reader_groups
 pp reader_groups

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: smartcard
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.3.1
 platform: ruby
 authors: 
 - Victor Costan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-10 00:00:00 -05:00
+date: 2008-05-01 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -19,8 +19,26 @@ executables: []
 
 extensions: 
 - ext/smartcard_pcsc/extconf.rb
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- BUILD
+- CHANGELOG
+- ext/smartcard_pcsc/extconf.rb
+- ext/smartcard_pcsc/pcsc.h
+- ext/smartcard_pcsc/pcsc_card.c
+- ext/smartcard_pcsc/pcsc_constants.c
+- ext/smartcard_pcsc/pcsc_context.c
+- ext/smartcard_pcsc/pcsc_exception.c
+- ext/smartcard_pcsc/pcsc_io_request.c
+- ext/smartcard_pcsc/pcsc_main.c
+- ext/smartcard_pcsc/pcsc_multi_strings.c
+- ext/smartcard_pcsc/pcsc_namespace.c
+- ext/smartcard_pcsc/pcsc_reader_states.c
+- ext/smartcard_pcsc/pcsc_surrogate_reader.h
+- ext/smartcard_pcsc/pcsc_surrogate_wintypes.h
+- lib/smartcard/pcsc_exception.rb
+- lib/smartcard.rb
+- LICENSE
+- README
 files: 
 - BUILD
 - CHANGELOG
@@ -29,6 +47,7 @@ files:
 - ext/smartcard_pcsc/pcsc_card.c
 - ext/smartcard_pcsc/pcsc_constants.c
 - ext/smartcard_pcsc/pcsc_context.c
+- ext/smartcard_pcsc/pcsc_exception.c
 - ext/smartcard_pcsc/pcsc_io_request.c
 - ext/smartcard_pcsc/pcsc_main.c
 - ext/smartcard_pcsc/pcsc_multi_strings.c
@@ -36,18 +55,25 @@ files:
 - ext/smartcard_pcsc/pcsc_reader_states.c
 - ext/smartcard_pcsc/pcsc_surrogate_reader.h
 - ext/smartcard_pcsc/pcsc_surrogate_wintypes.h
+- lib/smartcard/pcsc_exception.rb
 - lib/smartcard.rb
 - LICENSE
 - Manifest
 - README
-- test/test_all.rb
+- test/test_containers.rb
+- test/test_smoke.rb
 - tests/ts_pcsc_ext.rb
 - smartcard.gemspec
 has_rdoc: true
 homepage: http://www.costan.us/smartcard
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --line-numbers
+- --inline-source
+- --title
+- Smartcard
+- --main
+- README
 require_paths: 
 - lib
 - ext
@@ -66,9 +92,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: smartcard
-rubygems_version: 1.0.1
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: Interface with ISO 7816 smart cards.
 test_files: 
-- test/test_all.rb
+- test/test_containers.rb
+- test/test_smoke.rb