security 0.1.1 → 0.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    security (0.1.1)
+    security (0.1.2)
 
 GEM
   remote: http://rubygems.org/

data/lib/security.rb

@@ -1,7 +1,9 @@
 module Security
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end
 
+require 'shellwords'
+
 require 'security/keychain'
 require 'security/certificate'
 require 'security/password'

data/lib/security/keychain.rb

@@ -9,19 +9,19 @@ module Security
     end
 
     def info
-      system %{security show-keychain-info "#{@filename}"}
+      system %{security show-keychain-info #{@filename.shellescape}}
     end
 
     def lock
-      system %{security lock-keychain "#{@filename}"}
+      system %{security lock-keychain #{@filename.shellescape}}
     end
 
     def unlock(password)
-      system %{security unlock-keychain -p #{password} "#{@filename}"}
+      system %{security unlock-keychain -p #{password.shellescape} #{@filename.shellescape}}
     end
 
     def delete
-      system %{security delete-keychain "#{@filename}"}
+      system %{security delete-keychain #{@filename.shellescape}}
     end
 
     class << self
@@ -32,7 +32,7 @@ module Security
       def list(domain = :user)
         raise ArgumentError "Invalid domain #{domain}, expected one of: #{DOMAINS}" unless DOMAINS.include?(domain)
 
-        keychains_from_command('list-keychains', domain)
+        keychains_from_output(`security list-keychains -d #{domain}`)
       end
 
       def lock
@@ -40,21 +40,21 @@ module Security
       end
 
       def unlock(password)
-        system %{security unlock-keychain -p #{password}}
+        system %{security unlock-keychain -p #{password.shellescape}}
       end
 
       def default_keychain
-        keychains_from_command('default-keychain').first
+        keychains_from_output(`security default-keychain`).first
       end
 
       def login_keychain
-        keychains_from_command('login-keychain').first
+        keychains_from_output(`security login-keychain`).first
       end
 
       private
 
-      def keychains_from_command(command, *args)
-        `security #{[command, *args].compact.join(' ')}`.split(/\n/).collect{|line| new(line.strip.gsub(/^\"|\"$/, ""))}
+      def keychains_from_output(output)
+        output.split(/\n/).collect{|line| new(line.strip.gsub(/^\"|\"$/, ""))}
       end
     end    
   end

data/lib/security/password.rb

@@ -40,7 +40,7 @@ module Security
         flags[:G] ||= options.delete(:value)
         flags[:j] ||= options.delete(:comment)
 
-        flags.delete_if{|k,v| v.nil?}.collect{|k, v| "-#{k} #{v}".strip}.join(" ")
+        flags.delete_if{|k,v| v.nil?}.collect{|k, v| "-#{k} #{v.shellescape}".strip}.join(" ")
       end
     end
   end
@@ -56,9 +56,7 @@ module Security
       end
 
       def find(options)
-        options[:g] = ''
-
-        password_from_output(`security 2>&1 find-generic-password #{flags_for_options(options)}`)
+        password_from_output(`security 2>&1 find-generic-password -g #{flags_for_options(options)}`)
       end
 
       def delete(options)
@@ -85,9 +83,7 @@ module Security
       end
 
       def find(options)
-        options[:g] = ''
-
-        password_from_output(`security 2>&1 find-internet-password #{flags_for_options(options)}`)
+        password_from_output(`security 2>&1 find-internet-password -g #{flags_for_options(options)}`)
       end
 
       def delete(options)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: security
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-07-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70207242870160 !ruby/object:Gem::Requirement
+  requirement: &70304035253220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *70207242870160
+  version_requirements: *70304035253220
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70207242867600 !ruby/object:Gem::Requirement
+  requirement: &70304035252680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70207242867600
+  version_requirements: *70304035252680
 description: Library for interacting with the Mac OS X Keychain
 email: m@mattt.me
 executables: []
@@ -49,6 +49,7 @@ files:
 - ./Rakefile
 - ./README.md
 - ./security-0.1.0.gem
+- ./security-0.1.1.gem
 - ./security.gemspec
 homepage: http://mattt.me
 licenses: []
@@ -64,7 +65,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 940231964905790783
+      hash: -1161416136524147904
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -73,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 940231964905790783
+      hash: -1161416136524147904
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15