spare_keys 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee6d263bb19251d17f0bc7798c5654db62373f56
-  data.tar.gz: e744c90dad10884f4ff680ed7c2e090ff1b21fb4
+  metadata.gz: f5afd87fa0f30e31f7b04ca3784fed50c0c6f203
+  data.tar.gz: 276c8fc77052d05dc7c1ab39a76fe6677f98579e
 SHA512:
-  metadata.gz: ec1a1dbc6e74400ca1340175133be63d53f495abef63256b44118c287568df5a69993780186fdd1536c665bdf3ffdac30211fde17e1dede81aa89102b052a8b0
-  data.tar.gz: ccfe4b946b6e5409e1a9f91d5967fc5d65f2c69107e590dea2707d9c0883553abf72cd725644ac71c277216b664e6d963053d736184f304f24dd8f6a9a85d928
+  metadata.gz: f2c9c8de5ad759c5d9b2274d0fab1b7d2b09233c0c8009cff560d74c6285027b8b8b9889aa17a769e399e0fe52e3e15d4ec884d6bf354465aae0311af6bdb9e5
+  data.tar.gz: e3e5b6f81cc03542cea511477ae37dd5f797e665ccbd36c4c0e4e7ed739ec87df32002f6d28f40fa4260f0b08fa31a62af351474debf62988986a42c8c8d3c7c

data/lib/spare_keys.rb

@@ -1,110 +1,114 @@
-
-
-# Temporarily reconfigures the active keychain
-class SpareKeys
-
-    # Temporarily adds the specified keychain to the top of the search list, reverting it after the block is invoked.
-    #
-    # If no block is supplied, reverting the state becomes the responsibility of the caller.
-    # Params:
-    # +keychain_path+:: path to keychain to switch to
-    # +clear_list+:: when true, the search list will be initially cleared to prevent fallback to a different keychain
-    # +type+:: if specified, replaces default/login keychain ("default", "login", nil)
-    # +domain+:: if specified, performs keychain operations using the specified domain
-    def self.use_keychain(keychain_path, clear_list = false, type = nil, domain = nil)
-        domain_flag = "-d #{domain}" if domain
-
-        keychain_path = expand_keychain_path(keychain_path)
-
-        original_list = `security list-keychains #{domain_flag} | xargs`
-        original_keychain = `security #{type}-keychain #{domain_flag} | xargs` if type 
-
-        `security #{type}-keychain #{domain_flag} -s #{keychain_path}` if type
-
-        list_tail = original_list unless clear_list
-        `security list-keychains #{domain_flag} -s #{keychain_path} #{list_tail}`
-
-        if block_given?
-            begin
-                yield if block_given?
-            ensure
-                original_keychain = `security #{type}-keychain #{domain_flag} -s #{original_keychain}` if type
-                
-                unless clear_list
-                    # Grab the keychain list as it looks right now in case
-                    # another process has changed it
-                    current_list = `security list-keychains #{domain_flag}`
-                    current_list_as_array = current_list.scan(/"[^"]*"/).map { |item| item.gsub(/^"|"$/, "")}
-                    # Remove the supplied keychain
-                    original_list = (current_list_as_array.reject { |item| item == keychain_path }).join(" ")
-                end
-                
-                `security list-keychains #{domain_flag} -s #{original_list}`
-            end
-        end
-    end
-
-    # Creates a secure temporary keychain and adds it to the top of the 
-    # search list, reverting the list and deleting the keychain after the block is invoked.
-    #
-    # If no block is supplied, reverting the state becomes the responsibility of the caller.
-    # Params:
-    # +clear_list+:: when true, the search list will be initially cleared to prevent fallback to a different keychain
-    # +type+:: if specified, replaces default/login keychain ("default", "login", nil)
-    # +domain+:: if specified, performs keychain operations using the specified domain
-    def self.temp_keychain(clear_list = false, type = nil, domain = nil) # :yields: keychain_path
-        require 'tempfile'
-        require 'securerandom'
-
-        password = SecureRandom.hex
-
-        extension = keychain_extension()
-        temp_keychain = Dir::Tmpname.make_tmpname(['spare-keys-', extension], nil)
-
-        `security create-keychain -p "#{password}" #{temp_keychain}`
-        `security set-keychain-settings #{temp_keychain}`
-        `security unlock-keychain -p "#{password}" #{temp_keychain}`
-
-        if block_given?
-            begin
-                use_keychain(temp_keychain, clear_list, type) {
-                    yield temp_keychain, password
-                }
-            ensure
-                `security delete-keychain #{temp_keychain}`
-            end
-        else
-            use_keychain(temp_keychain, clear_list, type)
-        end
-    end
-
-private
-
-    def self.keychain_extension()
-        return is_sierra() ? '.keychain-db' : '.keychain' 
-    end
-
-    def self.is_sierra()
- 
-        osVersion = `sysctl -n kern.osrelease`
-    
-        majorOsVersion = Integer(osVersion.split('.')[0])
-    
-        return majorOsVersion >= 16 # Sierra
-    
-    end
-
-    def self.expand_keychain_path(path)
-
-        if (File.basename(path) == path)
-            default_keychain_path = File.expand_path("~/Library/Keychains")
-
-            path = File.join(default_keychain_path, path)
-        else
-            path = File.expand_path(path)
-        end
-
-        return path
-    end
-
+
+
+# Temporarily reconfigures the active keychain
+class SpareKeys
+
+    # Temporarily adds the specified keychain to the top of the search list, reverting it after the block is invoked.
+    #
+    # If no block is supplied, reverting the state becomes the responsibility of the caller.
+    # Params:
+    # +keychain_path+:: path to keychain to switch to
+    # +clear_list+:: when true, the search list will be initially cleared to prevent fallback to a different keychain
+    # +type+:: if specified, replaces default/login keychain ("default", "login", nil)
+    # +domain+:: if specified, performs keychain operations using the specified domain
+    def self.use_keychain(keychain_path, clear_list = false, type = nil, domain = nil)
+        domain_flag = "-d #{domain}" if domain
+
+        keychain_path = expand_keychain_path(keychain_path)
+
+        original_list = `security list-keychains #{domain_flag} | xargs`
+        original_keychain = `security #{type}-keychain #{domain_flag} | xargs` if type 
+
+        `security #{type}-keychain #{domain_flag} -s #{keychain_path}` if type
+
+        list_tail = original_list unless clear_list
+        `security list-keychains #{domain_flag} -s #{keychain_path} #{list_tail}`
+
+        if block_given?
+            begin
+                yield if block_given?
+            ensure
+                original_keychain = `security #{type}-keychain #{domain_flag} -s #{original_keychain}` if type
+                
+                unless clear_list
+                    # Grab the keychain list as it looks right now in case
+                    # another process has changed it
+                    current_list = `security list-keychains #{domain_flag}`
+                    current_list_as_array = current_list.scan(/"[^"]*"/).map { |item| item.gsub(/^"|"$/, "")}
+                    # Remove the supplied keychain
+                    original_list = (current_list_as_array.reject { |item| item == keychain_path }).join(" ")
+                end
+                
+                `security list-keychains #{domain_flag} -s #{original_list}`
+            end
+        end
+    end
+
+    # Creates a secure temporary keychain and adds it to the top of the 
+    # search list, reverting the list and deleting the keychain after the block is invoked.
+    #
+    # If no block is supplied, reverting the state becomes the responsibility of the caller.
+    # Params:
+    # +clear_list+:: when true, the search list will be initially cleared to prevent fallback to a different keychain
+    # +type+:: if specified, replaces default/login keychain ("default", "login", nil)
+    # +domain+:: if specified, performs keychain operations using the specified domain
+    def self.temp_keychain(clear_list = false, type = nil, domain = nil) # :yields: keychain_path
+        require 'tempfile'
+        require 'securerandom'
+
+        password = SecureRandom.hex
+        temp_keychain = temporary_keychain_name('spare-keys')
+
+        `security create-keychain -p "#{password}" #{temp_keychain}`
+        `security set-keychain-settings #{temp_keychain}`
+        `security unlock-keychain -p "#{password}" #{temp_keychain}`
+
+        if block_given?
+            begin
+                use_keychain(temp_keychain, clear_list, type) {
+                    yield temp_keychain, password
+                }
+            ensure
+                `security delete-keychain #{temp_keychain}`
+            end
+        else
+            use_keychain(temp_keychain, clear_list, type)
+        end
+    end
+
+private
+
+    def self.keychain_extension()
+        return is_sierra() ? '.keychain-db' : '.keychain' 
+    end
+
+    def self.is_sierra()
+ 
+        osVersion = `sysctl -n kern.osrelease`
+    
+        majorOsVersion = Integer(osVersion.split('.')[0])
+    
+        return majorOsVersion >= 16 # Sierra
+    
+    end
+
+    def self.expand_keychain_path(path)
+
+        if (File.basename(path) == path)
+            default_keychain_path = File.expand_path("~/Library/Keychains")
+
+            path = File.join(default_keychain_path, path)
+        else
+            path = File.expand_path(path)
+        end
+
+        return path
+    end
+
+    def self.temporary_keychain_name(prefix)
+        t = Time.now.strftime("%Y%m%d")
+        extension = keychain_extension()
+        "#{prefix}-#{t}-#{$$}-#{rand(0x100000000).to_s(36)}#{extension}"
+    end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spare_keys
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Richard Szalay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-16 00:00:00.000000000 Z
+date: 2019-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -85,9 +85,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Temporarily keychain switcher
 test_files: []
-has_rdoc: