smartcard 0.5.4 → 0.5.5

data/smartcard.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "smartcard"
-  s.version = "0.5.4"
+  s.version = "0.5.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
-  s.date = "2012-02-09"
+  s.date = "2012-12-18"
   s.description = "Interface with ISO 7816 smart cards."
   s.email = "victor@costan.us"
   s.extra_rdoc_files = ["BUILD", "CHANGELOG", "LICENSE", "README", "lib/smartcard.rb", "lib/smartcard/gp/asn1_ber.rb", "lib/smartcard/gp/cap_loader.rb", "lib/smartcard/gp/des.rb", "lib/smartcard/gp/gp_card_mixin.rb", "lib/smartcard/iso/apdu_error.rb", "lib/smartcard/iso/auto_configurator.rb", "lib/smartcard/iso/iso_card_mixin.rb", "lib/smartcard/iso/jcop_remote_protocol.rb", "lib/smartcard/iso/jcop_remote_server.rb", "lib/smartcard/iso/jcop_remote_transport.rb", "lib/smartcard/iso/pcsc_transport.rb", "lib/smartcard/iso/transport.rb", "lib/smartcard/pcsc/card.rb", "lib/smartcard/pcsc/context.rb", "lib/smartcard/pcsc/exception.rb", "lib/smartcard/pcsc/ffi_autogen.rb", "lib/smartcard/pcsc/ffi_functions.rb", "lib/smartcard/pcsc/ffi_lib.rb", "lib/smartcard/pcsc/ffi_structs.rb", "lib/smartcard/pcsc/reader_state_queries.rb", "tasks/ffi_codegen.rb"]
@@ -15,31 +15,31 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Smartcard", "--main", "README"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "smartcard"
-  s.rubygems_version = "1.8.15"
+  s.rubygems_version = "1.8.24"
   s.summary = "Interface with ISO 7816 smart cards."
-  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_compat_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/card_test.rb", "test/pcsc/context_test.rb", "test/pcsc/exception_test.rb", "test/pcsc/reader_state_queries_test.rb"]
+  s.test_files = ["test/iso/jcop_remote_test.rb", "test/iso/auto_configurator_test.rb", "test/iso/iso_card_mixin_test.rb", "test/iso/iso_exception_test.rb", "test/gp/des_test.rb", "test/gp/gp_card_mixin_compat_test.rb", "test/gp/gp_card_mixin_test.rb", "test/gp/asn1_ber_test.rb", "test/gp/cap_loader_test.rb", "test/pcsc/card_test.rb", "test/pcsc/exception_test.rb", "test/pcsc/reader_state_queries_test.rb", "test/pcsc/context_test.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ffi>, [">= 0.5.3"])
-      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"])
+      s.add_runtime_dependency(%q<ffi>, [">= 1.2.0"])
+      s.add_runtime_dependency(%q<rubyzip>, [">= 0.9.9"])
+      s.add_runtime_dependency(%q<zerg_support>, [">= 0.1.6"])
+      s.add_development_dependency(%q<echoe>, [">= 4.6.3"])
+      s.add_development_dependency(%q<flexmock>, [">= 1.2.0"])
     else
-      s.add_dependency(%q<ffi>, [">= 0.5.3"])
-      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"])
+      s.add_dependency(%q<ffi>, [">= 1.2.0"])
+      s.add_dependency(%q<rubyzip>, [">= 0.9.9"])
+      s.add_dependency(%q<zerg_support>, [">= 0.1.6"])
+      s.add_dependency(%q<echoe>, [">= 4.6.3"])
+      s.add_dependency(%q<flexmock>, [">= 1.2.0"])
     end
   else
-    s.add_dependency(%q<ffi>, [">= 0.5.3"])
-    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"])
+    s.add_dependency(%q<ffi>, [">= 1.2.0"])
+    s.add_dependency(%q<rubyzip>, [">= 0.9.9"])
+    s.add_dependency(%q<zerg_support>, [">= 0.1.6"])
+    s.add_dependency(%q<echoe>, [">= 4.6.3"])
+    s.add_dependency(%q<flexmock>, [">= 1.2.0"])
   end
 end

data/tasks/ffi_codegen.rb

@@ -16,16 +16,16 @@ end
 
 # :nodoc: namespace
 module Smartcard
-  
-module Tasks  
-  def self.resolve_constants(pattern, format)    
+
+module Tasks
+  def self.resolve_constants(pattern, format)
     if FFI::Platform.mac?
       header_path = '/System/Library/Frameworks/PCSC.framework/Headers/'
     else
       header_path = '/usr/include/PCSC/'
     end
     headers = Dir.glob(header_path + '*.h').map { |f| File.basename f }
-    
+
     consts = Set.new
     headers.each do |header|
       File.read("#{header_path}#{header}").each_line do |line|
@@ -35,38 +35,39 @@ module Tasks
         consts << tokens[1] if pattern =~ tokens[1]
       end
     end
-  
+    p consts
+
     const_gen = FFI::ConstGenerator.new(nil,
-        :cppflags => "-w -I#{header_path}") do |g|  
+        :cppflags => "-w -I#{header_path}") do |g|
       headers.each { |header| g.include header }
       consts.each { |const| g.const const, format }
     end
-  
+
     const_gen.constants
   end
-  
+
   def self.output_constants(constants, f)
     constants.each do |name, const|
       f.write "    #{const.to_ruby}\n"
     end
   end
-  
+
   def self.output_enum(enum_name, constants, name_regexp, f)
     f.write "  #{enum_name} = enum [\n"
-    
+
     re = Regexp.new('^' + name_regexp + '$')
     constants.each do |name, const|
       ruby_name = re.match(name)[1]
-      f.write "    :#{ruby_name.downcase}, Consts::#{name},\n"    
+      f.write "    :#{ruby_name.downcase}, Consts::#{name},\n"
     end
-  
+
     f.write "  ]\n"
   end
 
   def self.generate_ffi_header
     File.open('lib/smartcard/pcsc/ffi_autogen.rb', 'w') do |f|
       f.write "# Automatically generated by tasks/ffi_codegen.rb\n\n"
-      
+
       # Return codes.
       stat_consts = resolve_constants(/^SCARD_(E|S|W)_.*$/, '0x%08X')
       # Context scopes.
@@ -85,12 +86,12 @@ module Tasks
       reader_state_consts = resolve_constants(/^SCARD_[^_]*$/, '0x%08X')
       # Misc constants.
       misc_consts = resolve_constants(/^MAX_ATR_SIZE|INFINITE$/, '0x%08X')
-      
+
       f.write "# :nodoc: namespace\n"
       f.write "module Smartcard::PCSC\n\n"
       f.write "# :nodoc: auto-generated\n"
       f.write "module FFILib\n"
-    
+
       f.write "  # Constant values extracted from headers.\n"
       f.write "  module Consts\n"
       output_constants stat_consts, f
@@ -103,40 +104,40 @@ module Tasks
       output_constants reader_state_consts, f
       output_constants misc_consts, f
       f.write "  end  # module Smartcard::PCSC::FFILib::Consts\n\n"
-    
+
       f.write "  # Error codes returned by the PCSC functions.\n"
       output_enum 'Status', stat_consts, 'SCARD_._(.*)', f
       f.write "\n"
-    
+
       f.write "  # Values for the context's scope.\n"
       output_enum 'Scope', scope_consts, 'SCARD_SCOPE_(.*)', f
       f.write "\n"
-    
+
       f.write "  # Smart-card communication protocols.\n"
       output_enum 'Protocol', proto_consts, 'SCARD_PROTOCOL_(.*)', f
       f.write "\n"
-      
+
       f.write "  # Smart-card sharing modes.\n"
       output_enum 'Share', share_consts, 'SCARD_SHARE_(.*)', f
       f.write "\n"
-    
+
       f.write "  # Smart-card dispositions.\n"
       output_enum 'Disposition', disp_consts, 'SCARD_(.*)_CARD', f
       f.write "\n"
-    
+
       f.write "  # Smart-card reader attributes.\n"
       output_enum 'Attribute', attr_consts, 'SCARD_ATTR_(.*)', f
       f.write "\n"
-    
+
       f.write "  # Smart-card states.\n"
       output_enum 'CardState', card_state_consts, 'SCARD_STATE_(.*)', f
       f.write "\n"
-    
+
       f.write "  # Smart-card reader states.\n"
       output_enum 'State', reader_state_consts, 'SCARD_(.*)', f
       f.write "\n"
-    
-    
+
+
       f.write "end  # module Smartcard::PCSC::FFILib\n"
       f.write "end  # namespace Smartcard::PCSC\n"
     end

metadata

@@ -1,108 +1,101 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: smartcard
-version: !ruby/object:Gem::Version 
-  hash: 3
+version: !ruby/object:Gem::Version
+  version: 0.5.5
   prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 4
-  version: 0.5.4
 platform: ruby
-authors: 
+authors:
 - Victor Costan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-09 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-12-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ffi
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 5
-        - 3
-        version: 0.5.3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rubyzip
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 57
-        segments: 
-        - 0
-        - 9
-        - 1
-        version: 0.9.1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.9
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: zerg_support
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.9
+- !ruby/object:Gem::Dependency
+  name: zerg_support
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 0
-        - 1
-        - 5
-        version: 0.1.5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.6
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: echoe
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 2
-        version: "3.2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.6
+- !ruby/object:Gem::Dependency
+  name: echoe
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 4.6.3
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: flexmock
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 51
-        segments: 
-        - 0
-        - 8
-        - 6
-        version: 0.8.6
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 4.6.3
+- !ruby/object:Gem::Dependency
+  name: flexmock
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 description: Interface with ISO 7816 smart cards.
 email: victor@costan.us
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - BUILD
 - CHANGELOG
 - LICENSE
@@ -129,7 +122,7 @@ extra_rdoc_files:
 - lib/smartcard/pcsc/ffi_structs.rb
 - lib/smartcard/pcsc/reader_state_queries.rb
 - tasks/ffi_codegen.rb
-files: 
+files:
 - BUILD
 - CHANGELOG
 - LICENSE
@@ -176,54 +169,45 @@ files:
 - smartcard.gemspec
 homepage: http://www.costan.us/smartcard
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
 - Smartcard
 - --main
 - README
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 11
-      segments: 
-      - 1
-      - 2
-      version: "1.2"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '1.2'
 requirements: []
-
 rubyforge_project: smartcard
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Interface with ISO 7816 smart cards.
-test_files: 
-- test/gp/asn1_ber_test.rb
-- test/gp/cap_loader_test.rb
-- test/gp/des_test.rb
-- test/gp/gp_card_mixin_compat_test.rb
-- test/gp/gp_card_mixin_test.rb
+test_files:
+- test/iso/jcop_remote_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/gp/des_test.rb
+- test/gp/gp_card_mixin_compat_test.rb
+- test/gp/gp_card_mixin_test.rb
+- test/gp/asn1_ber_test.rb
+- test/gp/cap_loader_test.rb
 - test/pcsc/card_test.rb
-- test/pcsc/context_test.rb
 - test/pcsc/exception_test.rb
 - test/pcsc/reader_state_queries_test.rb
+- test/pcsc/context_test.rb