econfig-keychain 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 470f3d19f1db3d9779d0bf035cfe902f84fa90c5
-  data.tar.gz: c42eac479ba18c06ab08d9d79a38a3cb3ecd8be4
+  metadata.gz: a9b8fe1c242e214d2dc97c82da1637040c93c9bd
+  data.tar.gz: 6e771f89f497b0a6389a494d3d2df8458ab2f6e6
 SHA512:
-  metadata.gz: c55059239ed39bc3051103bdc747974bc41513411a9baadea0b7b7914aa139352bc8012c62d4823674b94e48afb8c7977214abb7efb6cc32cf9cc4d40c3403f2
-  data.tar.gz: 58d3947d41a0670dcb6c6f76b37bd1178fd23bd9b8b641e50cbf108d86fd31ccf8849cb3f1dde18e38f7912ccc73e9fda3905c69c2ff3f1de339753a5564617e
+  metadata.gz: 4bfacf6626c968062fb700717c88d6207d7ac622b70ce5caaf9098cb1e0de9ffaedbfd0d2b813c56348c1900aabf8188ce66aa90c6c4dd2f8837bb17707f02e7
+  data.tar.gz: 8901585893d58955310e22e6b99fa6bc4c2a7bb68fb602c27b542bfe1aac3a73d797ce4132b09a9fd5eeebf6441b44434f1114384e3fa8e8ed438163b2b569ef

data/econfig-keychain.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = "~> 2.0"
 
-  spec.add_dependency "econfig", "~> 1.0"
+  spec.add_dependency "econfig", "~> 2.0"
   spec.add_dependency "mellon", "~> 1.0"
 
   spec.add_development_dependency "bundler", "~> 1.6"

data/lib/econfig/keychain.rb

@@ -3,14 +3,16 @@ require "econfig"
 
 module Econfig
   class Keychain
-    def initialize(keychain, name: nil)
-      @init = { keychain: keychain, name: name }
+    attr_reader :store
+
+    def initialize(keychain, name)
+      @store = ::Mellon::Store.new(name, keychain: keychain)
     end
 
-    def init
-      project_name = @init[:name] || File.basename(Econfig.root)
-      @store = ::Mellon::Store.new(project_name, keychain: @init[:keychain])
-      @store.keychain[@store.project_name] ||= ""
+    def has_key?(key)
+      true if store.fetch(key)
+    rescue KeyError
+      false
     end
 
     def get(key)
@@ -20,11 +22,5 @@ module Econfig
     def set(key, value)
       store[key] = value
     end
-
-    private
-
-    def store
-      @store or raise Econfig::UninitializedError
-    end
   end
 end

data/lib/econfig/keychain/version.rb

@@ -1,5 +1,5 @@
 module Econfig
   class Keychain
-    VERSION = "2.0.0"
+    VERSION = "3.0.0"
   end
 end

data/spec/econfig/keychain_spec.rb

@@ -8,8 +8,8 @@ Econfig.env = "test"
 describe Econfig::Keychain do
   let(:keychain_path) { File.expand_path("./osx.temporary.keychain", __dir__) }
   let(:keychain) { Mellon::Keychain.new(keychain_path) }
-  let(:project_name) { File.basename(Econfig.root) }
-  let(:backend) { Econfig::Keychain.new(keychain) }
+  let(:item_name) { "econfig" }
+  let(:backend) { Econfig::Keychain.new(keychain, item_name) }
 
   around do |example|
     original_keychain_path = File.expand_path("./osx.keychain", __dir__)
@@ -18,47 +18,46 @@ describe Econfig::Keychain do
     FileUtils.rm(keychain_path)
   end
 
-  describe "#init" do
-    it "creates the note in the keychain if it does not exist" do
-      Econfig.stub(root: "different")
-      expect { backend.init }.to change { keychain[project_name] }
-        .from(nil).to("")
-    end
+  describe "#initialize" do
+    let(:item_name) { "other" }
 
-    it "does not overwrite existing data" do
-      backend.init
-      backend.get("i exist").should eq "this exist"
+    it "creates the keychain note if it does not exist" do
+      backend.set("foo", "bar")
+      YAML.load(keychain["other"])["foo"].should eq("bar")
     end
   end
 
-  context "before init" do
-    specify "#get raises an error" do
-      expect { backend.get("key") }.to raise_error(Econfig::UninitializedError)
+  describe "#has_key?" do
+    it "returns false if the option does not exist" do
+      backend.has_key?("does not exist").should eq false
     end
 
-    specify "#set raises an error" do
-      expect { backend.set("key", "value") }.to raise_error(Econfig::UninitializedError)
+    it "returns true if the option exists" do
+      backend.has_key?("i exist").should eq true
     end
   end
 
-  context "after init" do
-    before { backend.init }
+  describe "#get" do
+    it "fetches an option from the keychain" do
+      backend.get("i exist").should eq "this exist"
+    end
 
-    describe "#get" do
-      it "fetches an option from the keychain" do
-        backend.get("i exist").should eq "this exist"
-      end
+    it "returns nil if option does not exist" do
+      backend.get("does not exist").should be_nil
+    end
+  end
 
-      it "returns nil if option does not exist" do
-        backend.get("does not exist").should be_nil
-      end
+  describe "#set" do
+    it "sets an option in the keychain" do
+      backend.set("new key", "pub")
+      backend.get("new key").should eq "pub"
     end
 
-    describe "#set" do
-      it "sets an option in the keychain" do
-        backend.set("new key", "pub")
-        backend.get("new key").should eq "pub"
-      end
+    it "does not overwrite existing data" do
+      backend.set("a", "foo")
+      backend.set("b", "bar")
+      backend.get("a").should eq "foo"
+      backend.get("b").should eq "bar"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: econfig-keychain
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Kim Burgestrand
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-26 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: econfig
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: mellon
   requirement: !ruby/object:Gem::Requirement
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: An OSX keychain adapter for Econfig.