security 0.1.0 → 0.1.1

data/Gemfile.lock

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

data/lib/security.rb

@@ -1,5 +1,5 @@
 module Security
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end
 
 require 'security/keychain'

data/lib/security/password.rb

@@ -39,7 +39,6 @@ module Security
         flags[:D] ||= options.delete(:kind)
         flags[:G] ||= options.delete(:value)
         flags[:j] ||= options.delete(:comment)
-        flags[:s] ||= options.delete(:service) || options.delete(:server)
 
         flags.delete_if{|k,v| v.nil?}.collect{|k, v| "-#{k} #{v}".strip}.join(" ")
       end
@@ -65,6 +64,13 @@ module Security
       def delete(options)
         system "security delete-generic-password #{flags_for_options(options)}"
       end
+
+      private
+
+      def flags_for_options(options = {})
+        options[:s] ||= options.delete(:service)
+        super(options)
+      end
     end
   end
 
@@ -91,6 +97,7 @@ module Security
       private
 
       def flags_for_options(options = {})
+        options[:s] ||= options.delete(:server)
         options[:p] ||= options.delete(:path)
         options[:P] ||= options.delete(:port)
         options[:r] ||= options.delete(:protocol)

metadata

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