keyrack 0.2.0 → 0.2.1

data/TODO

@@ -0,0 +1,4 @@
+- Break up runner tests into smaller pieces
+- Break up cucumber features into smaller pieces
+- Handle multiple usernames for the same site
+- Delete empty groups when last entry is deleted

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/features/console.feature

@@ -11,7 +11,12 @@ Feature: Console runner
     * I wait a few seconds
     * the output should contain "Choose storage type:"
     * I type "filesystem"
-    * the output should contain "n. Add new"
+
+    * the output should contain "g. New group"
+    * I type "g" to add a new group
+    * the output should contain "Group:"
+    * I type "Social"
+    * the output should contain "n. New entry"
     * I type "n" to add a new entry
     * the output should contain "Label:"
     * I type "Twitter"
@@ -23,9 +28,28 @@ Feature: Console runner
     * I type "kittens"
     * the output should contain "Password (again):"
     * I type "kittens"
-    * the output should contain "1. Twitter"
+    * the output should contain "1. Twitter [dudeguy]"
     * the output should also contain "s. Save"
     * I type "s" to save the database
+    * the output should contain "t. Top level menu"
+    * I type "t"
+    * the output should match /1\. .+Social.+/
+
+    * the output should also contain "n. New entry"
+    * I type "n" to add a new entry
+    * the output should contain "Label:"
+    * I type "Company X"
+    * the output should contain "Username:"
+    * I type "buddypal"
+    * the output should contain "Generate password?"
+    * I type "y" for yes
+    * the output should contain "Sound good? [yn]"
+    * I type "y" for yes
+    * the output should contain "2. Company X [buddypal]"
+    * the output should also contain "s. Save"
+    * I type "s" to save the database
+
+    * the output should contain "q. Quit"
     * I type "q" to quit
     * I wait a few seconds
     * I run keyrack interactively again
@@ -33,7 +57,23 @@ Feature: Console runner
     * the output should contain "Keyrack password:"
     * I type "secret"
     * I wait a few seconds
-    * the output should contain "1. Twitter"
+    * the output should match /1\. .+Social.+/
+    * the output should also contain "2. Company X [buddypal]"
+    * I type "1" for Social
+    * the output should contain "1. Twitter [dudeguy]"
     * I type "1" for Twitter
     * my clipboard should contain "kittens"
+
+    * the output should contain "d. Delete entry"
+    * I type "d"
+    * the output should contain "1. Twitter [dudeguy]"
+    * I type "1"
+    * the output should contain "Are you sure?"
+    * I type "y"
+    * the output should contain "t. Top level menu"
+    * I type "t"
+
+    * the output should contain "Main Menu"
     * I type "q" to quit
+    * the output should contain "Really quit?" (since the database is dirty)
+    * I type "y"

data/features/step_definitions/keyrack_steps.rb

@@ -25,6 +25,17 @@ Then /the output should contain "([^"]+)"/ do |expected|
   @output.should include(expected)
 end
 
+Then %r{the output should match /([^/]+)/} do |expected|
+  # This won't work for escaped backslashes
+  if @slept
+    @slept = false
+  else
+    sleep 1
+  end
+  @output = @out.read_nonblock(255)
+  @output.should match(Regexp.new(expected))
+end
+
 Then /the output should also contain "([^"]+)"/ do |expected|
   @output.should include(expected)
 end

data/lib/keyrack/database.rb

@@ -8,17 +8,28 @@ module Keyrack
       @dirty = false
     end
 
-    def add(site, username, password)
-      @data[site] = { :username => username, :password => password }
+    def add(site, username, password, options = {})
+      hash = options[:group] ? @data[options[:group]] ||= {} : @data
+      hash[site] = { :username => username, :password => password }
       @dirty = true
     end
 
-    def get(site)
-      @data[site]
+    def get(site, options = {})
+      (options[:group] ? @data[options[:group]] : @data)[site]
     end
 
-    def sites
-      @data.keys
+    def sites(options = {})
+      hash = options[:group] ? @data[options[:group]] : @data
+      if hash
+        hash.keys.select { |k| hash[k].keys.include?(:username) }.sort
+      else
+        # new groups are empty
+        []
+      end
+    end
+
+    def groups
+      @data.keys.reject { |k| @data[k].keys.include?(:username) }.sort
     end
 
     def dirty?
@@ -32,6 +43,12 @@ module Keyrack
       @dirty = false
     end
 
+    def delete(site, options = {})
+      hash = options[:group] ? @data[options[:group]] : @data
+      hash.delete(site)
+      @dirty = true
+    end
+
     private
       def decrypt
         data = @store.read

data/lib/keyrack/runner.rb

@@ -54,15 +54,26 @@ module Keyrack
     end
 
     def main_loop
+      options = {}
       loop do
-        case @ui.menu
+        choice = @ui.menu(options)
+
+        case choice
         when :new
           result = @ui.get_new_entry
-          @database.add(result[:site], result[:username], result[:password])
+          @database.add(result[:site], result[:username], result[:password], options)
+        when :delete
+          @ui.delete_entry(options)
+        when :new_group
+          options = @ui.get_new_group
         when :save
           @database.save
         when :quit
           break
+        when Hash
+          options = choice
+        when :top
+          options = {}
         end
       end
     end

data/lib/keyrack/ui/console.rb

@@ -10,40 +10,72 @@ module Keyrack
         @highline.ask("Keyrack password: ") { |q| q.echo = false }
       end
 
-      def menu
-        entries = []
-        choices = %w{n q}
-        @database.sites.each_with_index do |site, i|
-          entry = @database.get(site)
-          entries << entry
-          choices << "#{i+1}"
-          @highline.say("% 2d. %s [%s]" % [i+1, site, entry[:username]])
+      def menu(options = {})
+        choices = {'n' => :new, 'q' => :quit}
+        index = 1
+
+        if !options[:group]
+          # Can't have subgroups (yet?).
+          @highline.say("=== #{@highline.color("Keyrack Main Menu", :yellow)} ===")
+          @database.groups.each do |group|
+            choices[index.to_s] = {:group => group}
+            @highline.say("% 2d. %s" % [index, @highline.color(group, :green)])
+            index += 1
+          end
+        else
+          @highline.say("===== #{@highline.color(options[:group], :green)} =====")
+        end
+
+        sites = @database.sites(options)
+        sites.each do |site|
+          entry = @database.get(site, options)
+          choices[index.to_s] = entry
+          @highline.say("% 2d. %s [%s]" % [index, site, entry[:username]])
+          index += 1
+        end
+
+        @highline.say(" n. New entry")
+        if !sites.empty?
+          choices['d'] = :delete
+          @highline.say(" d. Delete entry")
+        end
+        if !options[:group]
+          choices['g'] = :new_group
+          @highline.say(" g. New group")
+        else
+          choices['t'] = :top
+          @highline.say(" t. Top level menu")
         end
-        @highline.say(" n. Add new")
         if @database.dirty?
+          choices['s'] = :save
           @highline.say(" s. Save")
-          choices << "s"
         end
         @highline.say(" q. Quit")
-        result = @highline.ask(" ?  ") { |q| q.in = choices }
+        answer = @highline.ask(" ?  ") { |q| q.in = choices.keys }
+        result = choices[answer]
         case result
-        when "n"
-          :new
-        when "s"
-          :save
-        when "q"
-          if @database.dirty? && !@highline.agree("Really quit?  You have unsaved changes! [yn] ")
+        when Symbol
+          if result == :quit && @database.dirty? && !@highline.agree("Really quit?  You have unsaved changes! [yn] ")
             nil
           else
-            :quit
+            result
+          end
+        when Hash
+          if result.has_key?(:group)
+            result
+          else
+            Copier(result[:password])
+            @highline.say("The password has been copied to your clipboard.")
+            nil
           end
-        else
-          Copier(entries[result.to_i - 1][:password])
-          @highline.say("The password has been copied to your clipboard.")
-          nil
         end
       end
 
+      def get_new_group
+        group = @highline.ask("Group: ") { |q| q.validate = /^\w[\w\s]*$/ }
+        {:group => group}
+      end
+
       def get_new_entry
         result = {}
         result[:site]     = @highline.ask("Label: ")
@@ -103,6 +135,28 @@ module Keyrack
 
         result
       end
+
+      def delete_entry(options = {})
+        choices = {'c' => :cancel}
+        index = 1
+        @highline.say("Choose entry to delete:")
+        @database.sites(options).each do |site|
+          entry = @database.get(site, options)
+          choices[index.to_s] = {:site => site, :username => entry[:username]}
+          @highline.say("% 2d. %s [%s]" % [index, site, entry[:username]])
+          index += 1
+        end
+        @highline.say(" c. Cancel")
+
+        answer = @highline.ask(" ?  ") { |q| q.in = choices.keys }
+        result = choices[answer]
+        if result != :cancel
+          entry = @highline.color("#{result[:site]} [#{result[:username]}]", :red)
+          if @highline.agree("You're about to delete #{entry}.  Are you sure? [yn] ")
+            @database.delete(result[:site], options)
+          end
+        end
+      end
     end
   end
 end

data/test/keyrack/test_database.rb

@@ -30,7 +30,16 @@ module Keyrack
     end
 
     def test_sites
+      @database.add('Blargh', 'dudeguy', 'secret', :group => "Junk")
       assert_equal(%w{Twitter}, @database.sites)
+      assert_equal(%w{Blargh}, @database.sites(:group => "Junk"))
+      assert_equal([], @database.sites(:group => "New group"))
+    end
+
+    def test_groups
+      assert_equal [], @database.groups
+      @database.add('Blargh', 'dudeguy', 'secret', :group => "Junk")
+      assert_equal %w{Junk}, @database.groups
     end
 
     def test_dirty
@@ -48,5 +57,24 @@ module Keyrack
       @database.save
       assert_equal 501, @database.sites.length
     end
+
+    def test_add_with_top_level_group
+      @database.add('Twitter', 'dudeguy', 'secret', :group => "Social")
+      expected = {:username => 'dudeguy', :password => 'secret'}
+      assert_equal expected, @database.get('Twitter', :group => "Social")
+    end
+
+    def test_delete
+      @database.delete('Twitter')
+      assert_equal [], @database.sites
+      assert @database.dirty?
+    end
+
+    def test_delete_group_entry
+      @database.add('Facebook', 'dudeguy', 'secret', :group => "Social")
+      @database.delete('Facebook', :group => 'Social')
+      assert_equal [], @database.sites(:group => 'Social')
+      assert_equal ['Twitter'], @database.sites
+    end
   end
 end

data/test/keyrack/test_runner.rb

@@ -5,7 +5,7 @@ module Keyrack
     def setup
       @console = stub('console', {
         :get_password => 'secret',
-        :database= => nil, :menu => nil,
+        :database= => nil, :menu => :quit,
         :get_new_entry => {:site => "Foo", :username => "bar", :password => "baz"}
       })
       UI::Console.stubs(:new).returns(@console)
@@ -40,10 +40,23 @@ module Keyrack
 
       @console.expects(:menu).returns(:new).in_sequence(seq)
       @console.expects(:get_new_entry).returns({:site => "Foo", :username => "bar", :password => "baz"}).in_sequence(seq)
-      @database.expects(:add).with("Foo", "bar", "baz")
+      @database.expects(:add).with("Foo", "bar", "baz", {})
       @console.expects(:menu).returns(nil).in_sequence(seq)
       @console.expects(:menu).returns(:save).in_sequence(seq)
       @database.expects(:save).in_sequence(seq)
+      @console.expects(:menu).returns(:delete).in_sequence(seq)
+      @console.expects(:delete_entry).with({}).in_sequence(seq)
+      @console.expects(:menu).returns(:new_group).in_sequence(seq)
+      @console.expects(:get_new_group).returns(:group => 'Blah').in_sequence(seq)
+      @console.expects(:menu).with(:group => 'Blah').returns(:top).in_sequence(seq)
+      @console.expects(:menu).returns(:group => 'Huge').in_sequence(seq)
+      @console.expects(:menu).with(:group => 'Huge').returns(nil).in_sequence(seq)
+      @console.expects(:menu).with(:group => 'Huge').returns(:new).in_sequence(seq)
+      @console.expects(:get_new_entry).returns({:site => "Bar", :username => "bar", :password => "baz"}).in_sequence(seq)
+      @database.expects(:add).with("Bar", "bar", "baz", :group => 'Huge')
+      @console.expects(:menu).with(:group => "Huge").returns(:delete).in_sequence(seq)
+      @console.expects(:delete_entry).with(:group => 'Huge').in_sequence(seq)
+      @console.expects(:menu).with(:group => 'Huge').returns(:top).in_sequence(seq)
       @console.expects(:menu).returns(:quit).in_sequence(seq)
 
       runner = Runner.new(["-d", keyrack_dir])
@@ -67,10 +80,9 @@ module Keyrack
       rsa.expects(:public_encrypt).with(dump).returns("encrypted dump")
 
       # Store setup
-      store_path = 'database'
-      @console.expects(:store_setup).returns('type' => 'filesystem', 'path' => store_path).in_sequence(seq)
+      @console.expects(:store_setup).returns('type' => 'filesystem', 'path' => 'database').in_sequence(seq)
       store = mock('filesystem store')
-      Store::Filesystem.expects(:new).with('path' => store_path).returns(store).in_sequence(seq)
+      Store::Filesystem.expects(:new).with('path' => File.join(keyrack_dir, 'database')).returns(store).in_sequence(seq)
 
       Database.expects(:new).with('foobar', 'barfoo', store).returns(@database).in_sequence(seq)
       @console.expects(:database=).with(@database).in_sequence(seq)
@@ -91,7 +103,7 @@ module Keyrack
       assert File.exist?(expected_config_file)
       expected_config = {
         'rsa' => expected_rsa_file, 'aes' => expected_aes_file,
-        'store' => { 'type' => 'filesystem', 'path' => store_path }
+        'store' => { 'type' => 'filesystem', 'path' => File.join(keyrack_dir, 'database') }
       }
       assert_equal expected_config, YAML.load_file(expected_config_file)
     end

data/test/keyrack/ui/test_console.rb

@@ -4,199 +4,246 @@ module Keyrack
   module UI
     class TestConsole < Test::Unit::TestCase
       def setup
-        @database = stub('database', :sites => %w{Twitter}, :dirty? => false) do
-          stubs(:get).with('Twitter').returns({
+        @database = stub('database', :sites => %w{Twitter}, :groups => [], :dirty? => false) do
+          stubs(:get).with('Twitter', {}).returns({
             :username => 'username', :password => 'password'
           })
         end
+        @highline = stub('highline')
+        @highline.stubs(:color).with("Keyrack Main Menu", :yellow).returns("yellowKeyrack Main Menu")
+        @highline.stubs(:say)
+        HighLine.expects(:new).returns(@highline)
+        @console = Console.new
       end
 
       def test_select_entry_from_menu
-        highline = mock('highline')
-        HighLine.expects(:new).returns(highline)
-        console = Console.new
-        console.database = @database
-
-        highline.expects(:say).with(" 1. Twitter [username]")
-        highline.expects(:say).with(" n. Add new")
-        highline.expects(:say).with(" q. Quit")
+        @console.database = @database
+        @highline.expects(:say).with("=== yellowKeyrack Main Menu ===")
+        @highline.expects(:say).with(" 1. Twitter [username]")
+        @highline.expects(:say).with(" n. New entry")
+        @highline.expects(:say).with(" d. Delete entry")
+        @highline.expects(:say).with(" g. New group")
+        @highline.expects(:say).with(" q. Quit")
 
         question = mock('question')
-        question.expects(:in=).with(%w{n q 1})
-        highline.expects(:ask).yields(question).returns('1')
-        console.expects(:Copier).with('password')
-        highline.expects(:say).with("The password has been copied to your clipboard.")
-        assert_nil console.menu
+        @highline.expects(:ask).yields(mock { expects(:in=).with(%w{n q 1 d g}) }).returns('1')
+        @console.expects(:Copier).with('password')
+        @highline.expects(:say).with("The password has been copied to your clipboard.")
+        assert_nil @console.menu
       end
 
       def test_select_new_from_menu
-        highline = mock('highline')
-        HighLine.expects(:new).returns(highline)
-        console = Console.new
-        console.database = @database
+        @console.database = @database
+
+        # === yellowKeyrack Main Menu ===
+        #  1. Twitter [username]
+        #  n. New entry
+        #  d. Delete entry
+        #  g. New group
+        #  q. Quit
+
+        @highline.expects(:ask).yields(mock { expects(:in=).with(%w{n q 1 d g}) }).returns('n')
+        assert_equal :new, @console.menu
+      end
 
-        highline.expects(:say).with(" 1. Twitter [username]")
-        highline.expects(:say).with(" n. Add new")
-        highline.expects(:say).with(" q. Quit")
+      def test_select_delete_from_menu
+        @console.database = @database
+
+        # === yellowKeyrack Main Menu ===
+        #  1. Twitter [username]
+        #  n. New entry
+        #  d. Delete entry
+        #  g. New group
+        #  q. Quit
 
         question = mock('question')
-        question.expects(:in=).with(%w{n q 1})
-        highline.expects(:ask).yields(question).returns('n')
-        assert_equal :new, console.menu
+        question.expects(:in=).with(%w{n q 1 d g})
+        @highline.expects(:ask).yields(question).returns('d')
+        assert_equal :delete, @console.menu
       end
 
       def test_select_quit_from_menu
-        highline = mock('highline')
-        HighLine.expects(:new).returns(highline)
-        console = Console.new
-        console.database = @database
+        @console.database = @database
 
-        highline.expects(:say).with(" 1. Twitter [username]")
-        highline.expects(:say).with(" n. Add new")
-        highline.expects(:say).with(" q. Quit")
+        # === yellowKeyrack Main Menu ===
+        #  1. Twitter [username]
+        #  n. New entry
+        #  d. Delete entry
+        #  g. New group
+        #  q. Quit
 
-        question = mock('question')
-        question.expects(:in=).with(%w{n q 1})
-        highline.expects(:ask).yields(question).returns('q')
-        assert_equal :quit, console.menu
+        @highline.expects(:ask).yields(mock { expects(:in=).with(%w{n q 1 d g}) }).returns('q')
+        assert_equal :quit, @console.menu
       end
 
       def test_select_quit_from_menu_when_database_is_dirty
-        highline = mock('highline')
-        HighLine.expects(:new).returns(highline)
-        console = Console.new
-        console.database = @database
+        @console.database = @database
         @database.stubs(:dirty?).returns(true)
 
-        highline.expects(:say).with(" 1. Twitter [username]")
-        highline.expects(:say).with(" n. Add new")
-        highline.expects(:say).with(" s. Save")
-        highline.expects(:say).with(" q. Quit")
-
-        question = mock('question', :in= => nil)
-        highline.expects(:ask).yields(question).returns('q')
-        highline.expects(:agree).with("Really quit?  You have unsaved changes! [yn] ").returns(false)
-        assert_equal nil, console.menu
+        @highline.expects(:ask).yields(mock { expects(:in=).with(%w{n q 1 d g s}) }).returns('q')
+        @highline.expects(:agree).with("Really quit?  You have unsaved changes! [yn] ").returns(false)
+        assert_equal nil, @console.menu
       end
 
       def test_select_save_from_menu
-        highline = mock('highline')
-        HighLine.expects(:new).returns(highline)
-        console = Console.new
-        console.database = @database
+        @console.database = @database
         @database.stubs(:dirty?).returns(true)
 
-        highline.expects(:say).with(" 1. Twitter [username]")
-        highline.expects(:say).with(" n. Add new")
-        highline.expects(:say).with(" s. Save")
-        highline.expects(:say).with(" q. Quit")
+        @highline.expects(:say).with(" s. Save")
+        @highline.expects(:ask).yields(mock { expects(:in=).with(%w{n q 1 d g s}) }).returns('s')
+        assert_equal :save, @console.menu
+      end
 
-        question = mock('question')
-        question.expects(:in=).with(%w{n q 1 s})
-        highline.expects(:ask).yields(question).returns('s')
-        assert_equal :save, console.menu
+      def test_select_group_from_menu
+        @console.database = @database
+        @database.stubs(:groups).returns(["Blargh"])
+
+        @highline.expects(:color).with('Blargh', :green).returns('greenBlargh')
+        @highline.expects(:say).with(" 1. greenBlargh")
+        @highline.expects(:ask).yields(mock { expects(:in=).with(%w{n q 1 2 d g}) }).returns('1')
+        assert_equal({:group => 'Blargh'}, @console.menu)
       end
 
-      def test_get_password
-        highline = mock('highline')
-        HighLine.expects(:new).returns(highline)
-        console = Console.new
+      def test_select_entry_from_group_menu
+        @console.database = @database
+        @database.expects(:sites).with(:group => "Foo").returns(["Facebook"])
+        @database.expects(:get).with('Facebook', :group => "Foo").returns({:username => 'username', :password => 'password'})
+
+        @highline.expects(:color).with("Foo", :green).returns("greenFoo")
+        @highline.expects(:say).with("===== greenFoo =====")
+        @highline.expects(:say).with(" 1. Facebook [username]")
+        @highline.expects(:say).with(" n. New entry")
+        @highline.expects(:say).with(" d. Delete entry")
+        @highline.expects(:say).with(" t. Top level menu")
+        @highline.expects(:say).with(" q. Quit")
+
+        @highline.expects(:ask).yields(mock { expects(:in=).with(%w{n q 1 d t}) }).returns('1')
+        @console.expects(:Copier).with('password')
+        @highline.expects(:say).with("The password has been copied to your clipboard.")
+        assert_nil @console.menu(:group => 'Foo')
+      end
 
+      def test_get_password
         question = mock('question')
         question.expects(:echo=).with(false)
-        highline.expects(:ask).with("Keyrack password: ").yields(question).returns("foobar")
-        assert_equal "foobar", console.get_password
+        @highline.expects(:ask).with("Keyrack password: ").yields(question).returns("foobar")
+        assert_equal "foobar", @console.get_password
       end
 
       def test_get_new_entry_with_manual_password
-        highline = mock('highline')
-        HighLine.expects(:new).returns(highline)
-        console = Console.new
-
         seq = sequence("new entry")
-        highline.expects(:ask).with("Label: ").returns("Foo").in_sequence(seq)
-        highline.expects(:ask).with("Username: ").returns("bar").in_sequence(seq)
-        highline.expects(:agree).with("Generate password? [yn] ").returns(false).in_sequence(seq)
-        highline.expects(:ask).with("Password: ").yields(mock { expects(:echo=).with(false) }).returns("baz").in_sequence(seq)
-        highline.expects(:ask).with("Password (again): ").yields(mock { expects(:echo=).with(false) }).returns("bar").in_sequence(seq)
-        highline.expects(:say).with("Passwords didn't match.  Try again!").in_sequence(seq)
-        highline.expects(:ask).with("Password: ").yields(mock { expects(:echo=).with(false) }).returns("baz").in_sequence(seq)
-        highline.expects(:ask).with("Password (again): ").yields(mock { expects(:echo=).with(false) }).returns("baz").in_sequence(seq)
-        assert_equal({:site => "Foo", :username => "bar", :password => "baz"}, console.get_new_entry)
+        @highline.expects(:ask).with("Label: ").returns("Foo").in_sequence(seq)
+        @highline.expects(:ask).with("Username: ").returns("bar").in_sequence(seq)
+        @highline.expects(:agree).with("Generate password? [yn] ").returns(false).in_sequence(seq)
+        @highline.expects(:ask).with("Password: ").yields(mock { expects(:echo=).with(false) }).returns("baz").in_sequence(seq)
+        @highline.expects(:ask).with("Password (again): ").yields(mock { expects(:echo=).with(false) }).returns("bar").in_sequence(seq)
+        @highline.expects(:say).with("Passwords didn't match.  Try again!").in_sequence(seq)
+        @highline.expects(:ask).with("Password: ").yields(mock { expects(:echo=).with(false) }).returns("baz").in_sequence(seq)
+        @highline.expects(:ask).with("Password (again): ").yields(mock { expects(:echo=).with(false) }).returns("baz").in_sequence(seq)
+        assert_equal({:site => "Foo", :username => "bar", :password => "baz"}, @console.get_new_entry)
       end
 
       def test_get_new_entry_generated_password
-        highline = mock('highline')
-        HighLine.expects(:new).returns(highline)
-        console = Console.new
-
         seq = sequence("new entry")
-        highline.expects(:ask).with("Label: ").returns("Foo").in_sequence(seq)
-        highline.expects(:ask).with("Username: ").returns("bar").in_sequence(seq)
-        highline.expects(:agree).with("Generate password? [yn] ").returns(true).in_sequence(seq)
+        @highline.expects(:ask).with("Label: ").returns("Foo").in_sequence(seq)
+        @highline.expects(:ask).with("Username: ").returns("bar").in_sequence(seq)
+        @highline.expects(:agree).with("Generate password? [yn] ").returns(true).in_sequence(seq)
         Utils.expects(:generate_password).returns('foobar').in_sequence(seq)
-        highline.expects(:color).with('foobar', :blue).returns('bluefoobar').in_sequence(seq)
-        highline.expects(:agree).with("Generated bluefoobar.  Sound good? [yn] ").returns(false).in_sequence(seq)
+        @highline.expects(:color).with('foobar', :blue).returns('bluefoobar').in_sequence(seq)
+        @highline.expects(:agree).with("Generated bluefoobar.  Sound good? [yn] ").returns(false).in_sequence(seq)
         Utils.expects(:generate_password).returns('foobar').in_sequence(seq)
-        highline.expects(:color).with('foobar', :blue).returns('bluefoobar').in_sequence(seq)
-        highline.expects(:agree).with("Generated bluefoobar.  Sound good? [yn] ").returns(true).in_sequence(seq)
-        assert_equal({:site => "Foo", :username => "bar", :password => "foobar"}, console.get_new_entry)
+        @highline.expects(:color).with('foobar', :blue).returns('bluefoobar').in_sequence(seq)
+        @highline.expects(:agree).with("Generated bluefoobar.  Sound good? [yn] ").returns(true).in_sequence(seq)
+        assert_equal({:site => "Foo", :username => "bar", :password => "foobar"}, @console.get_new_entry)
       end
 
       def test_display_first_time_notice
-        highline = mock('highline')
-        HighLine.expects(:new).returns(highline)
-        console = Console.new
-
-        highline.expects(:say).with("This looks like your first time using Keyrack.  I'll need to ask you a few questions first.")
-        console.display_first_time_notice
+        @highline.expects(:say).with("This looks like your first time using Keyrack.  I'll need to ask you a few questions first.")
+        @console.display_first_time_notice
       end
 
       def test_rsa_setup
-        highline = mock('highline')
-        HighLine.expects(:new).returns(highline)
-        console = Console.new
-
         seq = sequence("rsa setup")
-        highline.expects(:ask).with("New passphrase: ").yields(mock{expects(:echo=).with(false)}).returns('huge').in_sequence(seq)
-        highline.expects(:ask).with("Confirm passphrase: ").yields(mock{expects(:echo=).with(false)}).returns('small').in_sequence(seq)
-        highline.expects(:say).with("Passphrases didn't match.").in_sequence(seq)
-        highline.expects(:ask).with("New passphrase: ").yields(mock{expects(:echo=).with(false)}).returns('huge').in_sequence(seq)
-        highline.expects(:ask).with("Confirm passphrase: ").yields(mock{expects(:echo=).with(false)}).returns('huge').in_sequence(seq)
+        @highline.expects(:ask).with("New passphrase: ").yields(mock{expects(:echo=).with(false)}).returns('huge').in_sequence(seq)
+        @highline.expects(:ask).with("Confirm passphrase: ").yields(mock{expects(:echo=).with(false)}).returns('small').in_sequence(seq)
+        @highline.expects(:say).with("Passphrases didn't match.").in_sequence(seq)
+        @highline.expects(:ask).with("New passphrase: ").yields(mock{expects(:echo=).with(false)}).returns('huge').in_sequence(seq)
+        @highline.expects(:ask).with("Confirm passphrase: ").yields(mock{expects(:echo=).with(false)}).returns('huge').in_sequence(seq)
         expected = {'password' => 'huge', 'path' => 'rsa'}
-        assert_equal expected, console.rsa_setup
+        assert_equal expected, @console.rsa_setup
       end
 
       def test_store_setup_for_filesystem
-        highline = mock('highline')
-        HighLine.expects(:new).returns(highline)
-        console = Console.new
-
-        highline.expects(:choose).yields(mock {
+        @highline.expects(:choose).yields(mock {
           expects(:header=).with("Choose storage type:")
           expects(:choices).with("filesystem", "ssh")
         }).returns("filesystem")
 
         expected = {'type' => 'filesystem', 'path' => 'database'}
-        assert_equal expected, console.store_setup
+        assert_equal expected, @console.store_setup
       end
 
       def test_store_setup_for_ssh
-        highline = mock('highline')
-        HighLine.expects(:new).returns(highline)
-        console = Console.new
-
         seq = sequence("store setup")
-        highline.expects(:choose).yields(mock {
+        @highline.expects(:choose).yields(mock {
           expects(:header=).with("Choose storage type:")
           expects(:choices).with("filesystem", "ssh")
         }).returns("ssh").in_sequence(seq)
-        highline.expects(:ask).with("Host: ").returns("example.com").in_sequence(seq)
-        highline.expects(:ask).with("User: ").returns("dudeguy").in_sequence(seq)
-        highline.expects(:ask).with("Remote path: ").returns(".keyrack/database").in_sequence(seq)
+        @highline.expects(:ask).with("Host: ").returns("example.com").in_sequence(seq)
+        @highline.expects(:ask).with("User: ").returns("dudeguy").in_sequence(seq)
+        @highline.expects(:ask).with("Remote path: ").returns(".keyrack/database").in_sequence(seq)
 
         expected = {'type' => 'ssh', 'host' => 'example.com', 'user' => 'dudeguy', 'path' => '.keyrack/database'}
-        assert_equal expected, console.store_setup
+        assert_equal expected, @console.store_setup
+      end
+
+      def test_get_new_group
+        @highline.expects(:ask).with("Group: ").yields(mock {
+          expects(:validate=).with(/^\w[\w\s]*$/)
+        }).returns("Foo")
+        assert_equal({:group => "Foo"}, @console.get_new_group)
+      end
+
+      def test_delete_entry
+        @console.database = @database
+        @database.stubs(:sites).returns(%w{Twitter Facebook})
+        @database.stubs(:get).with('Facebook', {}).returns({
+          :username => 'username', :password => 'password'
+        })
+
+        seq = sequence("deleting")
+        @highline.expects(:say).with("Choose entry to delete:").in_sequence(seq)
+        @highline.expects(:say).with(" 1. Twitter [username]").in_sequence(seq)
+        @highline.expects(:say).with(" 2. Facebook [username]").in_sequence(seq)
+        @highline.expects(:say).with(" c. Cancel").in_sequence(seq)
+        @highline.expects(:ask).yields(mock {
+          expects(:in=).with(%w{c 1 2})
+        }).returns('1').in_sequence(seq)
+        @highline.expects(:color).with("Twitter [username]", :red).returns("redTwitter").in_sequence(seq)
+        @highline.expects(:agree).with("You're about to delete redTwitter.  Are you sure? [yn] ").returns(true).in_sequence(seq)
+        @database.expects(:delete).with("Twitter", {}).in_sequence(seq)
+        @console.delete_entry
+      end
+
+      def test_delete_group_entry
+        @console.database = @database
+        @database.stubs(:sites).returns(%w{Quora Foursquare})
+        @database.stubs(:get).with(kind_of(String), {:group => 'Social'}).returns({
+          :username => 'username', :password => 'password'
+        })
+
+        seq = sequence("deleting")
+        @highline.expects(:say).with("Choose entry to delete:").in_sequence(seq)
+        @highline.expects(:say).with(" 1. Quora [username]").in_sequence(seq)
+        @highline.expects(:say).with(" 2. Foursquare [username]").in_sequence(seq)
+        @highline.expects(:say).with(" c. Cancel").in_sequence(seq)
+        @highline.expects(:ask).yields(mock {
+          expects(:in=).with(%w{c 1 2})
+        }).returns('2').in_sequence(seq)
+        @highline.expects(:color).with("Foursquare [username]", :red).returns("redFoursquare").in_sequence(seq)
+        @highline.expects(:agree).with("You're about to delete redFoursquare.  Are you sure? [yn] ").returns(true).in_sequence(seq)
+        @database.expects(:delete).with("Foursquare", :group => 'Social').in_sequence(seq)
+        @console.delete_entry(:group => 'Social')
       end
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Jeremy Stephens
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-04 00:00:00 -06:00
+date: 2011-01-05 00:00:00 -06:00
 default_executable: keyrack
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -134,6 +134,7 @@ extensions: []
 extra_rdoc_files: 
 - LICENSE.txt
 - README.rdoc
+- TODO
 files: 
 - .document
 - .rvmrc
@@ -143,6 +144,7 @@ files:
 - LICENSE.txt
 - README.rdoc
 - Rakefile
+- TODO
 - VERSION
 - bin/keyrack
 - features/console.feature
@@ -184,7 +186,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -415657060610893124
+      hash: -45771557779572669
       segments: 
       - 0
       version: "0"