ruby-keychain 0.1.1 → 0.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6e04321838eb56846f4466e1445a61fc151e0277
+  data.tar.gz: e72847b0ff4e7ae119c5c28f73f3fa572fcc36b0
+SHA512:
+  metadata.gz: cdaddc9163798d7310dbb46112f5b70840243c16d1635736a4b7b15f0f9ee16166e72cce2cb2bbd6028e0be6b2d859f4aa61f4f5a8dfddf7443eeac6c1124a3a
+  data.tar.gz: 62e46ccd6d53e9d9e5b9f87b8818c25ac447d324086ee6435545281dc66138f5c7c3c545e8c37d5d4dff829c7fbcb3234ade5c13091457f26a93f6e049595598

data/README.markdown

@@ -1,4 +1,4 @@
-# @markup markdown
+[![Build Status](https://travis-ci.org/fcheung/keychain.png)](https://travis-ci.org/fcheung/keychain)
 
 A set of ruby bindings for the OS X keychain, written using ffi
 

data/lib/keychain.rb

@@ -54,6 +54,7 @@ module Keychain
     # @param [String] path Path to the keychain file
     # @return [Keychain::Keychain] a keychain object
     def open(path)
+      raise ArgumentError unless path
       out_buffer = FFI::MemoryPointer.new(:pointer)
       status = Sec.SecKeychainOpen(path,out_buffer);
       Sec.check_osstatus(status)

data/lib/keychain/item.rb

@@ -85,6 +85,7 @@ class Keychain::Item < Sec::Base
     return @unsaved_password if @unsaved_password
     out_buffer = FFI::MemoryPointer.new(:pointer)
     status = Sec.SecItemCopyMatching({Sec::Query::ITEM_LIST => CF::Array.immutable([self]),
+                              Sec::Query::SEARCH_LIST => [self.keychain],
                              Sec::Query::CLASS => klass, 
                              Sec::Query::RETURN_DATA => true}.to_cf, out_buffer)
     Sec.check_osstatus(status)
@@ -131,7 +132,7 @@ class Keychain::Item < Sec::Base
   end
 
   def update
-    status = Sec.SecItemUpdate({Sec::Query::ITEM_LIST => [self], Sec::INVERSE_ATTR_MAP[:klass] => klass}.to_cf, build_new_attributes);
+    status = Sec.SecItemUpdate({Sec::Query::SEARCH_LIST => [self.keychain], Sec::Query::ITEM_LIST => [self], Sec::INVERSE_ATTR_MAP[:klass] => klass}.to_cf, build_new_attributes);
     Sec.check_osstatus(status)
 
     result = FFI::MemoryPointer.new :pointer
@@ -167,6 +168,7 @@ class Keychain::Item < Sec::Base
 
   def build_refresh_query
     query = CF::Dictionary.mutable
+    query[Sec::Query::SEARCH_LIST] = CF::Array.immutable([self.keychain])
     query[Sec::Query::ITEM_LIST] = CF::Array.immutable([self])
     query[Sec::Query::RETURN_ATTRIBUTES] = CF::Boolean::TRUE
     query[Sec::Query::RETURN_REF] = CF::Boolean::TRUE

data/lib/keychain/keychain.rb

@@ -8,6 +8,9 @@ module Sec
   attach_function 'SecKeychainCreate', [:string, :uint32, :pointer, :char, :pointer, :pointer], :osstatus
   attach_function 'SecItemCopyMatching', [:pointer, :pointer], :osstatus
   
+  attach_function 'SecKeychainSetSearchList', [:pointer], :osstatus
+  attach_function 'SecKeychainCopySearchList', [:pointer], :osstatus
+
   #@private
   class KeychainSettings < FFI::Struct
     layout  :version, :uint32,
@@ -40,6 +43,19 @@ module Keychain
   class Keychain < Sec::Base
     register_type 'SecKeychain'
 
+    # Add the keychain to the default searchlist
+    #
+    #
+    def add_to_search_list
+      list = FFI::MemoryPointer.new(:pointer)
+      status = Sec.SecKeychainCopySearchList(list)
+      Sec.check_osstatus(status)
+      ruby_list = CF::Base.typecast(list.read_pointer).to_ruby
+      ruby_list << self unless ruby_list.include?(self)
+      status = Sec.SecKeychainSetSearchList(CF::Array.immutable(ruby_list))
+      Sec.check_osstatus(status)
+      self
+    end
     # Returns whether the keychain will be locked if the machine goes to sleep
     #
     # @return [Boolean]

data/lib/keychain/version.rb

@@ -1,4 +1,4 @@
 module Keychain
   # The current version string
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/spec/keychain_spec.rb

@@ -26,6 +26,10 @@ describe Keychain do
       keychain = Keychain.open(File.join(ENV['HOME'], 'Library','Keychains', 'login.keychain'))
       keychain.path.should == Keychain.default.path
     end
+
+    it 'should raise when passed a nil path' do
+      expect {Keychain.open(nil)}.to raise_error(ArgumentError)
+    end
   end
 
   describe 'create' do
@@ -106,10 +110,9 @@ describe Keychain do
   shared_examples_for 'item collection' do
 
     before(:each) do
-      @keychain_1 = Keychain.create(File.join(Dir.tmpdir, "other_keychain_spec_#{Time.now.to_i}_#{Time.now.usec}_#{rand(1000)}.keychain"), 'pass')
-      @keychain_2 = Keychain.create(File.join(Dir.tmpdir, "keychain_2_#{Time.now.to_i}_#{Time.now.usec}_#{rand(1000)}.keychain"), 'pass')
-      @keychain_3 = Keychain.create(File.join(Dir.tmpdir, "keychain_3_#{Time.now.to_i}_#{Time.now.usec}_#{rand(1000)}.keychain"), 'pass')
-
+      @keychain_1 = Keychain.create(File.join(Dir.tmpdir, "other_keychain_spec_#{Time.now.to_i}_#{Time.now.usec}_#{rand(1000)}.keychain"), 'pass').add_to_search_list
+      @keychain_2 = Keychain.create(File.join(Dir.tmpdir, "keychain_2_#{Time.now.to_i}_#{Time.now.usec}_#{rand(1000)}.keychain"), 'pass').add_to_search_list
+      @keychain_3 = Keychain.create(File.join(Dir.tmpdir, "keychain_3_#{Time.now.to_i}_#{Time.now.usec}_#{rand(1000)}.keychain"), 'pass').add_to_search_list
       add_fixtures
     end
 

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: ruby-keychain
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.1.2
 platform: ruby
 authors:
 - Frederick Cheung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-21 00:00:00.000000000 Z
+date: 2013-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: corefoundation
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,52 +55,46 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'Ruby wrapper for OS X''s keychain '
+description: 'Ruby wrapper for OS X''s keychain '
 email: frederick.cheung@gmail.com
 executables: []
 extensions: []
@@ -129,27 +116,26 @@ files:
 homepage: http://github.com/fcheung/keychain
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.1.9
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby wrapper for  OS X's keychain
 test_files: []
 has_rdoc: