secret_store 0.0.2 → 0.0.3

data/lib/secret_store/version.rb

@@ -1,3 +1,3 @@
 class SecretStore
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/secret_store.rb

@@ -3,33 +3,21 @@ require "yaml"
 require "secret_store/version"
 
 class SecretStore
-  attr_reader :file_path
-
   def initialize(password, file_path)
     self.password = password
-    self.file_path = file_path
+    @data = YamlBackend.new(file_path)
   end
 
-  def store(key, secret, reload_data = true)
-    load_data if reload_data
-
-    if @data[key.to_s]
-      raise "Key #{key} already stored"
-    end
-
-    @data.merge!(key.to_s => encrypt(secret))
-    store_data
-    load_data[key]
+  def store(key, secret)
+    @data.insert(key, encrypt(secret))
   end
 
   def store!(key, secret)
-    load_data
-    @data.delete(key.to_s)
-    store(key, secret, false)
+    @data.overwrite(key, encrypt(secret))
   end
 
   def get(key)
-    if ciphertext = @data[key.to_s]
+    if ciphertext = @data[key]
       cipher.decrypt(ciphertext)
     end
   end
@@ -46,17 +34,10 @@ class SecretStore
     decrypted = decrypted_data
     self.password = new_password
     replace_with_decrypted(decrypted)
-    store_data
   end
 
   private
 
-  def file_path=(file_path)
-    @file_path = file_path
-    load_data
-    @file_path
-  end
-
   def password=(password)
     @cipher = nil
     @password = password
@@ -66,22 +47,8 @@ class SecretStore
     @cipher ||= Gibberish::AES.new(@password)
   end
 
-  def load_data
-    begin
-      @data = YAML.load_file(file_path) || {}
-    rescue Errno::ENOENT
-      @data = {}
-    end
-  end
-
-  def store_data
-    File.open(@file_path, File::RDWR|File::CREAT|File::LOCK_EX, 0640) do |f|
-      f.puts YAML.dump @data
-    end
-  end
-
   def decrypted_data
-    @data.each_key.inject({}) do |decrypted_data, key|
+    @data.keys.inject({}) do |decrypted_data, key|
       decrypted_data[key] = get(key)
       decrypted_data
     end
@@ -89,7 +56,72 @@ class SecretStore
 
   def replace_with_decrypted(decrypted)
     decrypted.each do |key, plaintext|
-      @data[key] = encrypt(plaintext)
+      @data.overwrite(key, encrypt(plaintext))
+    end
+  end
+
+  class YamlBackend
+    SAVE_FLAGS = File::RDWR | File::CREAT | File::LOCK_EX
+    SAVE_PERMS = 0640
+
+    def initialize(file_path)
+      @file_path = file_path
+    end
+
+    def [](key)
+      data[key.to_s]
+    end
+
+    def keys
+      data.keys
+    end
+
+    def insert(key, value)
+      if self[key]
+        raise "Key #{key} already stored"
+      end
+
+      data[key.to_s] = value
+      save
+      value
+    end
+
+    def overwrite(key, value)
+      delete!(key.to_s)
+      insert(key, value)
+    end
+
+    def delete(key)
+      return unless self[key]
+      value = delete!(key)
+      save && value
+    end
+
+    def reload
+      @data = nil
+      data && true
+    end
+
+    private
+
+    def delete!(key)
+      data.delete(key.to_s)
+    end
+
+    def data
+      begin
+        @data ||= YAML.load_file(@file_path) || {}
+      rescue Errno::ENOENT
+        @data = {}
+      end
+    end
+
+    def save
+      File.open(@file_path, SAVE_FLAGS, SAVE_PERMS) do |f|
+        f.truncate(0)
+        f.puts YAML.dump(data)
+      end
+      true
     end
   end
 end

data/spec/secret_store_spec.rb

@@ -5,7 +5,6 @@ describe SecretStore, "initializing" do
 
   it "takes a password and file path" do
     subject = SecretStore.new("pass", tmpfile.path)
-    subject.file_path.should == tmpfile.path
   end
 end
 
@@ -82,11 +81,15 @@ describe SecretStore, "changing the password" do
   subject { SecretStore.new("the_pass", tmpfile.path) }
 
   it "resets the value for each secret key" do
-    tmpfile.puts YAML.dump("foo" => "bar", "fizz" => "buzz")
+    subject.store("foo", "bar")
+    subject.store("fizz", "buzz")
+    original_data = YAML.load_file(tmpfile.path)
+
     subject.change_password("new_password")
+
     data = YAML.load_file(tmpfile.path)
-    data["foo"].should_not == "bar"
-    data["fizz"].should_not == "buzz"
+    data["foo"].should_not == original_data["foo"]
+    data["fizz"].should_not == original_data["fizz"]
   end
 
   it "leaves you with the ability to get secrets using the new password" do
@@ -99,3 +102,62 @@ describe SecretStore, "changing the password" do
     subject.get("foo").should == "bar"
   end
 end
+
+describe SecretStore::YamlBackend do
+  let(:tmpfile) { Tempfile.new("secret_store") }
+  subject { SecretStore::YamlBackend.new(tmpfile) }
+
+  before do
+    tmpfile.puts YAML.dump("foo" => "bar", "fizz" => "buzz")
+    tmpfile.flush
+  end
+
+  it "reads indifferently from its data using []" do
+    subject["foo"].should == "bar"
+    subject["fizz"].should == "buzz"
+    subject[:fizz].should == "buzz"
+  end
+
+  it "can return the keys on data" do
+    subject.keys.should =~ %w[foo fizz]
+  end
+
+  it "can reload data on demand" do
+    File.open(tmpfile.path, 'w') do |f|
+      f.puts YAML.dump("foo" => "reloaded")
+    end
+
+    subject.reload
+    subject["foo"].should == "reloaded"
+  end
+
+  it "can insert a value for a non-existant key" do
+    subject.insert("new", "value")
+    subject.reload
+    subject["new"].should == "value"
+  end
+
+  it "will raise an error trying to insert for an existing key" do
+    lambda {
+      subject.insert("foo", "123")
+    }.should raise_error
+  end
+
+  it "can overwrite an existing key" do
+    subject.overwrite("foo", "123")
+    subject.reload
+    subject["foo"].should == "123"
+  end
+
+  it "can delete a key" do
+    subject.delete("foo").should == "bar"
+    subject.reload
+    subject.keys.should == ["fizz"]
+  end
+
+  it "can save the data" do
+    subject.overwrite("foo", "123")
+    data = SecretStore::YamlBackend.new(tmpfile)
+    data["foo"].should == "123"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: secret_store
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gibberish
-  requirement: &2152744720 !ruby/object:Gem::Requirement
+  requirement: &2153518960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152744720
+  version_requirements: *2153518960
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152744200 !ruby/object:Gem::Requirement
+  requirement: &2153518540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152744200
+  version_requirements: *2153518540
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152743740 !ruby/object:Gem::Requirement
+  requirement: &2153518120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152743740
+  version_requirements: *2153518120
 description: Store secrets for your app in a encrypted in a yaml file.
 email:
 - xternal1+github@gmail.com
@@ -74,7 +74,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2805007848849734124
+      hash: -2358538595218873167
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2805007848849734124
+      hash: -2358538595218873167
 requirements: []
 rubyforge_project: secret_store
 rubygems_version: 1.8.15