google-api_client-keychain_store 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dcc4cab89e2bc6306128a244ba7c8a0bce1eae1
-  data.tar.gz: 2972ede2a57db2fd49d61f0b9ce0b88c9135f8dc
+  metadata.gz: 12e995bfbb1b769087b59dfa4af5f174bd06e88d
+  data.tar.gz: 9a0f9ac235f8f23c50fc5c6b773044c05f918fc8
 SHA512:
-  metadata.gz: c39f7a67f8175159ab601ed3b71bbf0b9def246ca7af612a98106a5ee063b8e104f9cbfde35b34c0459075902b2ee81213e14e1ecb73c57eff82409b79569c97
-  data.tar.gz: ade695b06280b50fd34a6f3cdd3806fc97af5ceac0ec57e6a798f41c0cd6e7040487263db2020bbfa4e9dfadead9383b62e080e515f7b7934a9ede26e5430589
+  metadata.gz: 924ddd2bbddd33f85d824d09229571d220b744f8c8f064f9b354678eeeea4debe99b61ee9a28f3140f3ffd6f3f56198c52642aac6a6bb37fedab35395a35e2bd
+  data.tar.gz: 6c8bb1b922c4e60756dac9a1a84ba0c9945a5e49808c2f07337d19c53e06abe7f3ae48ce36bcab0f4f22932a3f50e923b623814981942595a443588f1aa0759a

data/google-api_client-keychain_store.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'google-api-client'
-  spec.add_dependency 'ruby-keychain'
+  spec.add_dependency 'security'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'google_drive-persistent_session', '~> 0.1.2'

data/lib/google/api_client/keychain_store.rb

@@ -1,5 +1,12 @@
 require 'google/api_client'
-require 'keychain'
+
+require 'security'
+
+class Security::GenericPassword
+  def self.delete(options)
+    system "security delete-generic-password #{flags_for_options(options)} > /dev/null 2> /dev/null"
+  end
+end
 
 require 'google/api_client/keychain_store/version'
 require 'google/api_client/keychain_store/keychain_store'

data/lib/google/api_client/keychain_store/keychain_store.rb

@@ -15,32 +15,23 @@ class Google::APIClient::KeychainStore
   end
 
   def delete_credentials
-    items.where(:service => @service).all.each(&:delete)
+    if Security::GenericPassword.find(:service => @service)
+      Security::GenericPassword.delete(:service => @service)
+    end
+
     nil
   end
 
   private
 
   def credentials
-    item = items.where(:service => @service).first
+    item = Security::GenericPassword.find(:service => @service)
     item ? item.password : nil
   end
 
   def credentials=(json)
-    item = items.where(:service => @service).first
-
-    if item
-      item.password = json
-      item.save!
-    else
-      item = items.create(:service => @service, :account => @service, :password => json)
-    end
-
+    delete_credentials
+    Security::GenericPassword.add(@service, @service, json)
     json
   end
-
-
-  def items
-    Keychain.default.generic_passwords
-  end
 end

data/lib/google/api_client/keychain_store/version.rb

@@ -1,7 +1,7 @@
 module Google
   class APIClient
     class KeychainStore
-      VERSION = '0.1.0'
+      VERSION = '0.1.1'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-api_client-keychain_store
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-21 00:00:00.000000000 Z
+date: 2015-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-keychain
+  name: security
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='