mellon 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: def326c20e1ca30c9928c4832d30685545243fc0
-  data.tar.gz: 21b5882854d42a868ae1dd13238f230f4d2894b1
+  metadata.gz: d8678fd19fa9cfae39812816421a3909d45eaeb2
+  data.tar.gz: 03e80fc20be1c93f769f25fcd081e3166fe1deb4
 SHA512:
-  metadata.gz: 148f9e5dab12df775f0635d07f7f5da20b0d6f1c9361e8b8b757aa9a130f8a813634f48a2c5b9d4bbe5b2ef330c894fedc5d4fad7edf416e3fb355f124c108bd
-  data.tar.gz: 75c894dcf7e31e103c29d0c049d9adb4820cc1984b9a2c4d5a76a3fa5588d5cebfb0df892f668cd589ed168e4d0581a997797281ee8556b9f70e110a59b03dd7
+  metadata.gz: a8da897237648b63ee5b3c21d9ae0dfad9f90e6c24a9a70ab714de7d352deb997201250eeb1995e17c8eae6fce8b315b2890627182631c9d1b67b2a9e6128ec4
+  data.tar.gz: f1d71b5cd507568290b8aed46feafe6390eedb4481043e1391a527a86ab5af875a41b6ea8ca5812f83a2339d726e0d11ea98368ec6909e1efac9e1f78d9456ec

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 [HEAD][]
 --------
 
+[v1.1.1][]
+----------
+
+- Fix Mellon::Store for empty keychain entries (c3d1da52)
+- Fix mistaking error reading keychain from missing entry (782d2d82)
+- Show stderr and exit status when `mellon edit` fails (fd2eecee)
+
 [v1.1.0][]
 ----------
 
@@ -14,6 +21,7 @@
 
 Initial release!
 
-[HEAD]: https://github.com/elabs/mellon/compare/v1.1.0...HEAD
+[HEAD]: https://github.com/elabs/mellon/compare/v1.1.1...HEAD
+[v1.1.1]: https://github.com/elabs/mellon/compare/v1.1.0...v1.1.1
 [v1.1.0]: https://github.com/elabs/mellon/compare/v1.0.0...v1.1.0
 [v1.0.0]: https://github.com/elabs/mellon/compare/24b83977d...v1.0.0

data/bin/mellon

@@ -101,11 +101,20 @@ Slop.parse(strict: true, help: true) do
         exit false
       end
 
+      require "shellwords"
       require "tempfile"
       Tempfile.open([name, ".txt"]) do |io|
         File.write io.path, keychain[name]
-        system editor, io.path
-        keychain[name] = File.read(io.path)
+        stderr_r, stderr_w = IO.pipe
+        system("$EDITOR #{Shellwords.escape(io.path)}", :err => stderr_w)
+        status = $?
+        stderr_w.close
+
+        if status.success?
+          keychain[name] = File.read(io.path)
+        else
+          $stderr.puts "[#{status}] #{stderr_r.read}"
+        end
       end
     end
   end

data/lib/mellon/keychain.rb

@@ -3,6 +3,8 @@ require "plist"
 module Mellon
   # Keychain provides simple methods for reading and storing keychain entries.
   class Keychain
+    ENTRY_MISSING = /SecKeychainSearchCopyNext/.freeze
+
     class << self
       # Find the first keychain that contains the key.
       #
@@ -11,7 +13,8 @@ module Mellon
       def search(key)
         output = ShellUtils.security("find-generic-password", "-l", key)
         new(output[/keychain: "(.+)"/i, 1], ensure_exists: false)
-      rescue CommandError
+      rescue CommandError => e
+        raise unless e.message =~ ENTRY_MISSING
         nil
       end
 
@@ -140,6 +143,7 @@ module Mellon
         [Utils.parse_info(info), Utils.parse_contents(password_info)]
       end
     rescue CommandError => e
+      raise unless e.message =~ ENTRY_MISSING
       nil
     end
 

data/lib/mellon/store.rb

@@ -63,12 +63,8 @@ module Mellon
 
     def data
       config = @keychain[@project_name]
-
-      if config
-        @serializer.load(config)
-      else
-        {}
-      end
+      data = @serializer.load(config) if config
+      data or {}
     end
 
     def dump(hash)

data/lib/mellon/version.rb

@@ -1,3 +1,3 @@
 module Mellon
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/spec/mellon/keychain_spec.rb

@@ -86,6 +86,15 @@ describe Mellon::Keychain do
     it "returns nil when there is no entry with the given name" do
       keychain["nonexisting note"].should be_nil
     end
+
+    it "raises an error when command exits for a reason other than key missing" do
+      error = Mellon::CommandError.new(<<-ERROR)
+security find-generic-password -g -l unreadable /Users/dev/Projects/mellon/spec/temporary_keychain.keychain
+  security: SecKeychainItemCopyAccess: In dark wake, no UI possible
+ERROR
+      Mellon::ShellUtils.should_receive(:sh).and_raise(error)
+      expect { keychain["simple"] }.to raise_error(Mellon::CommandError, /dark wake/)
+    end
   end
 
   describe "#[]=" do

data/spec/mellon/store_spec.rb

@@ -50,6 +50,13 @@ describe Mellon::Store do
       store = Mellon::Store.new("missing project", keychain: keychain)
       store["some value"].should be_nil
     end
+
+    it "returns nil if keychain item is empty" do
+      store = Mellon::Store.new("empty", keychain: keychain)
+      store["some value"].should be_nil
+      store["some value"] = "New value"
+      store["some value"].should eq "New value"
+    end
   end
 
   describe "#[]=" do

data/spec/mellon_spec.rb

@@ -1,5 +1,5 @@
 describe Mellon do
   specify "VERSION" do
-    defined?(Mellon::VERSION).should be_true
+    defined?(Mellon::VERSION).should_not be_nil
   end
 end

data/spec/spec_helper.rb

@@ -6,6 +6,14 @@ keychain_path = File.expand_path("./temporary_keychain.keychain", __dir__)
 original_keychain_path = File.expand_path("./keychain.keychain", __dir__)
 
 RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = [:expect, :should]
+  end
+
+  config.mock_with :rspec do |c|
+    c.syntax = :should
+  end
+
   config.around do |example|
     FileUtils.cp(original_keychain_path, keychain_path)
     example.run

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: mellon
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Kim Burgestrand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -102,8 +102,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -133,17 +133,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: A command-line utility for managing secret application credentials via OSX