keyrack 0.3.0 → 0.3.1

data/lib/keyrack.rb

@@ -1,5 +1,6 @@
 require 'openssl'
 require 'yaml'
+require 'json'
 require 'optparse'
 require 'securerandom'
 require 'net/scp'

data/lib/keyrack/database.rb

@@ -1,7 +1,7 @@
 module Keyrack
   class Database
     DEFAULT_ENCRYPT_OPTIONS = { :maxmem => 0, :maxmemfrac => 0.125, :maxtime => 5.0 }
-    DEFAULT_DECRYPT_OPTIONS = { :maxmem => 0, :maxmemfrac => 0.250, :maxtime => 10.0 }
+    DEFAULT_DECRYPT_OPTIONS = { :maxmem => 0, :maxmemfrac => 0.500, :maxtime => 20.0 }
     VERSION = 4
 
     def initialize(password, store, encrypt_options = {}, decrypt_options = {})
@@ -10,16 +10,16 @@ module Keyrack
       @decrypt_options = DEFAULT_DECRYPT_OPTIONS.merge(decrypt_options)
       @store = store
       @password = password_hash(password)
-      @database = decrypt(password)
+      @attributes = decrypt(password)
       setup_hooks
     end
 
     def version
-      @database['version']
+      @attributes['version']
     end
 
     def top_group
-      @database['groups']['top']
+      @attributes['groups']['top']
     end
 
     def dirty?
@@ -28,7 +28,7 @@ module Keyrack
 
     def save(password)
       if password_hash(password) == @password
-        @store.write(Scrypty.encrypt(@database.to_yaml, password,
+        @store.write(Scrypty.encrypt(JSON.generate(self.to_h), password,
           *@encrypt_options.values_at(:maxmem, :maxmemfrac, :maxtime)))
         @dirty = false
         true
@@ -46,6 +46,15 @@ module Keyrack
       end
     end
 
+    def to_h
+      hash = @attributes.dup
+      hash['groups'] = hash['groups'].inject({}) do |hash2, (key, value)|
+        hash2[key] = value.to_h
+        hash2
+      end
+      hash
+    end
+
     private
 
     def password_hash(password)
@@ -60,7 +69,15 @@ module Keyrack
       if data
         str = Scrypty.decrypt(data, password,
           *@decrypt_options.values_at(:maxmem, :maxmemfrac, :maxtime))
-        hash = YAML.load(str)
+
+        hash =
+          if str =~ /^---\s*\n/
+            @dirty = true
+            YAML.load(str.gsub(/!map:Keyrack::\w+/, "!map"))
+          else
+            JSON.parse(str)
+          end
+
         migrated_hash = Migrator.run(hash)
         if !migrated_hash.equal?(hash)
           hash = migrated_hash
@@ -78,7 +95,7 @@ module Keyrack
     end
 
     def setup_hooks
-      @database['groups'].each_pair do |group_name, group|
+      @attributes['groups'].each_pair do |group_name, group|
         add_group_hooks_for(group)
       end
     end

data/lib/keyrack/group.rb

@@ -1,11 +1,13 @@
 module Keyrack
-  class Group < Hash
+  class Group
     def initialize(arg = nil)
+      @attributes = {}
+
       case arg
       when String
-        self['name'] = arg
-        self['sites'] = []
-        self['groups'] = {}
+        @attributes['name'] = arg
+        @attributes['sites'] = []
+        @attributes['groups'] = {}
       when Hash
         load(arg)
       when nil
@@ -24,7 +26,7 @@ module Keyrack
       if !hash['name'].is_a?(String)
         raise ArgumentError, "name is not a String"
       end
-      self['name'] = hash['name']
+      @attributes['name'] = hash['name']
 
       if !hash.has_key?('sites')
         raise ArgumentError, "hash is missing the 'sites' key"
@@ -40,7 +42,7 @@ module Keyrack
         raise ArgumentError, "groups is not a Hash"
       end
 
-      self['sites'] = []
+      @attributes['sites'] = []
       hash['sites'].each_with_index do |site_hash, site_index|
         if !site_hash.is_a?(Hash)
           raise ArgumentError, "site #{site_index} is not a Hash"
@@ -54,7 +56,7 @@ module Keyrack
         end
       end
 
-      self['groups'] = {}
+      @attributes['groups'] = {}
       hash['groups'].each_pair do |group_name, group_hash|
         if !group_name.is_a?(String)
           raise ArgumentError, "group key is not a String"
@@ -82,15 +84,15 @@ module Keyrack
     def change_attribute(name, value)
       event = Event.new(self, 'change')
       event.attribute_name = name
-      event.previous_value = self[name]
+      event.previous_value = @attributes[name]
       event.new_value = value
 
-      self[name] = value
+      @attributes[name] = value
       trigger(event)
     end
 
     def name
-      self['name']
+      @attributes['name']
     end
 
     def name=(name)
@@ -98,11 +100,11 @@ module Keyrack
     end
 
     def sites
-      self['sites']
+      @attributes['sites']
     end
 
     def groups
-      self['groups']
+      @attributes['groups']
     end
 
     def add_site(site)
@@ -168,8 +170,14 @@ module Keyrack
       @after_event << block
     end
 
-    def encode_with(coder)
-      coder.represent_map(nil, self)
+    def to_h
+      hash = @attributes.dup
+      hash['sites'] = hash['sites'].collect(&:to_h)
+      hash['groups'] = hash['groups'].inject({}) do |hash2, (key, value)|
+        hash2[key] = value.to_h
+        hash2
+      end
+      hash
     end
 
     private
@@ -212,9 +220,9 @@ module Keyrack
     def add_group_hooks_for(group)
       group.after_event do |group_event|
         if group_event.name == 'change' && group_event.attribute_name == 'name'
-          key, value = self.groups.find { |(k, v)| v.equal?(group) }
+          key, value = groups.find { |(k, v)| v.equal?(group) }
           if key
-            self['groups'][group.name] = self['groups'].delete(key)
+            groups[group.name] = groups.delete(key)
           end
         end
 

data/lib/keyrack/site.rb

@@ -1,5 +1,5 @@
 module Keyrack
-  class Site < Hash
+  class Site
     def initialize(*args)
       if args[0].is_a?(Hash)
         hash = args[0]
@@ -21,12 +21,14 @@ module Keyrack
         if !hash['password'].is_a?(String)
           raise ArgumentError, "name is not a String"
         end
-        self.update(hash)
       else
-        self['name'] = args[0]
-        self['username'] = args[1]
-        self['password'] = args[2]
+        hash = {
+          'name' => args[0],
+          'username' => args[1],
+          'password' => args[2]
+        }
       end
+      @attributes = hash
 
       @event_hooks = []
     end
@@ -34,15 +36,15 @@ module Keyrack
     def change_attribute(name, value)
       event = Event.new(self, 'change')
       event.attribute_name = name
-      event.previous_value = self[name]
+      event.previous_value = @attributes[name]
       event.new_value = value
 
-      self[name] = value
+      @attributes[name] = value
       trigger(event)
     end
 
     def name
-      self['name']
+      @attributes['name']
     end
 
     def name=(name)
@@ -50,7 +52,7 @@ module Keyrack
     end
 
     def username
-      self['username']
+      @attributes['username']
     end
 
     def username=(username)
@@ -58,7 +60,7 @@ module Keyrack
     end
 
     def password
-      self['password']
+      @attributes['password']
     end
 
     def password=(password)
@@ -69,10 +71,6 @@ module Keyrack
       @event_hooks << block
     end
 
-    def encode_with(coder)
-      coder.represent_map(nil, self)
-    end
-
     def ==(other)
       if other.instance_of?(Site)
         other.name == name && other.username == username
@@ -81,6 +79,10 @@ module Keyrack
       end
     end
 
+    def to_h
+      @attributes.clone
+    end
+
     private
 
     def trigger(event)

data/lib/keyrack/version.rb

@@ -1,3 +1,3 @@
 module Keyrack
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/test/unit/test_database.rb

@@ -37,8 +37,8 @@ class TestDatabase < Test::Unit::TestCase
 
   test "encrypting database" do
     encrypted_data = File.read(@path)
-    yaml = decrypt(encrypted_data, @key)
-    data = YAML.load(yaml)
+    json = decrypt(encrypted_data, @key)
+    data = JSON.parse(json)
     expected = {
       'groups' => {
         'top' => {
@@ -64,6 +64,18 @@ class TestDatabase < Test::Unit::TestCase
     assert database.dirty?
   end
 
+  test "auto-converting from YAML to JSON" do
+    store = Keyrack::Store['filesystem'].new('path' => fixture_path('database-yaml.dat'))
+    database = Keyrack::Database.new('foobar', store)
+    assert database.dirty?
+  end
+
+  test "auto-converting from 1.9.2 YAML to JSON" do
+    store = Keyrack::Store['filesystem'].new('path' => fixture_path('database-yaml-192.dat'))
+    database = Keyrack::Database.new('foobar', store)
+    assert database.dirty?
+  end
+
   [true, false].each do |reload|
     database_test "database is dirty after adding site to top group", reload do
       assert !@database.dirty?

data/test/unit/test_group.rb

@@ -84,8 +84,11 @@ class TestGroup < Test::Unit::TestCase
     subgroup = new_group("Klingon")
     group.add_group(subgroup)
 
-    expected = {"Klingon" => {'name' => "Klingon", 'sites' => [], 'groups' => {}}}
-    assert_equal(expected, group.groups)
+    assert_equal 1, group.groups.length
+    group = group.group('Klingon')
+    assert_equal 'Klingon', group.name
+    assert_equal [], group.sites
+    assert_equal({}, group.groups)
   end
 
   test "adding already existing group raises error" do
@@ -143,16 +146,15 @@ class TestGroup < Test::Unit::TestCase
         }
       }
     }
-    group = new_group(hash)
-    assert_equal "Starships", group.name
-    assert_equal hash['sites'], group.sites
-    assert_equal hash['groups'], group.groups
-
-    group = Keyrack::Group.new
-    group.load(hash)
-    assert_equal "Starships", group.name
-    assert_equal hash['sites'], group.sites
-    assert_equal hash['groups'], group.groups
+    values = [new_group(hash), Keyrack::Group.new]
+    values[1].load(hash)
+    values.each do |group|
+      assert_equal "Starships", group.name
+      assert_equal 1, group.sites.length
+      assert_kind_of Keyrack::Site, group.site(0)
+      assert_equal 1, group.groups.length
+      assert_kind_of Keyrack::Group, group.group('Klingon')
+    end
   end
 
   test "loading group from hash with missing name" do
@@ -666,7 +668,7 @@ class TestGroup < Test::Unit::TestCase
     assert called
   end
 
-  test "to_yaml" do
+  test "to_h" do
     group = new_group("Starships")
     site = new_site("Enterprise", "picard", "livingston")
     group.add_site(site)
@@ -697,7 +699,7 @@ class TestGroup < Test::Unit::TestCase
           'groups' => {}
         }
       }
-    }.to_yaml
-    assert_equal expected, group.to_yaml
+    }
+    assert_equal expected, group.to_h
   end
 end

data/test/unit/test_site.rb

@@ -161,14 +161,14 @@ class TestSite < Test::Unit::TestCase
     assert called
   end
 
-  test "serializing to yaml" do
+  test "to_h" do
     site = new_site("Enterprise", "picard", "livingston")
     expected = {
       'name' => 'Enterprise',
       'username' => 'picard',
       'password' => 'livingston'
-    }.to_yaml
-    assert_equal expected, site.to_yaml
+    }
+    assert_equal expected, site.to_h
   end
 
   test "sites with same name and username are equal" do

metadata

@@ -1,111 +1,126 @@
 --- !ruby/object:Gem::Specification
 name: keyrack
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
+  prerelease: 
 platform: ruby
 authors:
 - Jeremy Stephens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-11 00:00:00.000000000 Z
+date: 2013-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: clipboard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: scrypty
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Simple password manager with local/remote database storage and scrypt
@@ -143,6 +158,8 @@ files:
 - lib/keyrack/utils.rb
 - lib/keyrack/version.rb
 - test/fixtures/database-3.dat
+- test/fixtures/database-yaml-192.dat
+- test/fixtures/database-yaml.dat
 - test/fixtures/foo.txt
 - test/helper.rb
 - test/integration/test_interactive_console.rb
@@ -159,29 +176,32 @@ files:
 - test/unit/ui/test_console.rb
 homepage: http://github.com/viking/keyrack
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Simple password manager
 test_files:
 - test/fixtures/database-3.dat
+- test/fixtures/database-yaml-192.dat
+- test/fixtures/database-yaml.dat
 - test/fixtures/foo.txt
 - test/helper.rb
 - test/integration/test_interactive_console.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: efd84a41e075f8edc77908a7bb71ea21a3590af2
-  data.tar.gz: 3714b2f53884956c10b480ba128efcb58e463727
-SHA512:
-  metadata.gz: d53d8a1ca8ce99b1147907d48d87a6e20a95efe4fcbe13af11d777e179ec294994b6aa903d4f189f27cda35bea060c7cb181e70d1f72f3ff9332b7fe799b9d85
-  data.tar.gz: e0d31fee61321d665a632ed2e59259778a37824ba19136834c3ece001ca3ef39798fcbe3605862e33a80bac26a1f6872cbbb2db1eb746cd9374c283f0cb9b56d