keystorage 0.4.1 → 0.4.2

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/keystorage.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{keystorage}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yoshihiro TAKAHARA"]

data/lib/keystorage.rb

@@ -2,6 +2,6 @@
 # -*- coding: utf-8 -*-
 require 'keystorage/manager'
 module Keystorage
-  DEFAULT_FILE = ENV["HOME"]+"/.keystore"
+  DEFAULT_FILE = ENV["HOME"]+"/.keystorage"
 end
 

data/lib/keystorage/manager.rb

@@ -12,8 +12,13 @@ module Keystorage
     end
     
     def get(group,name,file=nil)
-    Manager.new(file).get(group,name)
+      Manager.new(file).get(group,name)
     end
+
+    def delete(group,name=nil,file=nil)
+      Manager.new(file).delete(group,name)
+    end
+
   end
 
   class Manager
@@ -39,10 +44,16 @@ module Keystorage
       raise "missing group" unless group
       raise "missing name" unless name
 
-      File.open(@file,'r') do |f|
-        data=YAML.load(f)
-        raise "missing key" unless data[group][name]
-        return decode(data[group][name])
+      begin
+        File.open(@file,'r') do |f|
+          data=YAML.load(f)
+          raise "missing keystorage" unless data
+          raise "missing group "+group unless data.has_key?(group)
+          raise "missing group "+group+" name "+name unless data[group].has_key?(name)
+
+          return decode(data[group][name])
+        end
+      rescue =>e
       end
       false
     end
@@ -57,12 +68,25 @@ module Keystorage
       data = Hash.new unless data
       data[group] = Hash.new unless data.has_key?(group)
       data[group][key] = encode(value)
+      write(data)
+    end
 
+    def write(data)
       File.open(@file,'w',0600) do |f|
         YAML.dump(data,f)
       end
     end
 
+    def delete(group,name = nil)
+      data = all
+      if name
+        data[group].delete(name)
+      else
+        data.delete(group)
+      end
+      write(data)
+    end
+
     def encode(str,salt="3Qw9EtWE")
       enc = OpenSSL::Cipher::Cipher.new('aes256')
       enc.encrypt.pkcs5_keyivgen(salt)

data/test/test_keystorage.rb

@@ -1,7 +1,36 @@
 require 'helper'
+require 'fileutils'
 
 class TestKeystorage < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
+  @@file = ".testkey"
+  context "set / delete"  do
+    setup do
+      Keystorage.set("abc","def","ghi",@@file)
+      Keystorage.set("abc","123","456",@@file)
+    end
+    teardown do
+      FileUtils.rm(@@file)
+    end
+
+    should "file exists" do
+      assert File.exists?(@@file)
+    end
+
+    should "exist def and 123" do
+      assert_equal "ghi",Keystorage.get("abc","def",@@file)
+      assert_equal "456",Keystorage.get("abc","123",@@file)
+    end
+
+    should "delete only def" do
+      Keystorage.delete("abc","def",@@file)
+      assert_equal "456",Keystorage.get("abc","123",@@file)
+      assert_equal false,Keystorage.get("abc","def",@@file)
+    end
+
+    should "delete abc group" do
+      Keystorage.delete("abc",nil,@@file)
+      assert_equal false,Keystorage.get("abc","123",@@file)
+      assert_equal false,Keystorage.get("abc","def",@@file)
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: keystorage
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Yoshihiro TAKAHARA