keyrack 0.2.3 → 0.3.0.pre

data/Gemfile

@@ -14,4 +14,5 @@ group :development do
   gem "rcov", ">= 0"
   gem "mocha", :require => false
   gem "cucumber"
+  gem 'test-unit'
 end

data/Gemfile.lock

@@ -28,6 +28,7 @@ GEM
     rake (0.9.2.2)
     rcov (0.9.11)
     term-ansicolor (1.0.7)
+    test-unit (2.4.3)
 
 PLATFORMS
   ruby
@@ -41,3 +42,4 @@ DEPENDENCIES
   mocha
   net-scp
   rcov
+  test-unit

data/README.rdoc

@@ -26,16 +26,19 @@ Running keyrack will display a simple menu in your terminal, like this:
   === Keyrack Main Menu ===
   1. Twitter [foobar]
   2. Facebook [foobar@example.com]
-  n. Add new
-  d. Delete entry
-  g. New group
-  s. Save
-  q. Quit
+  Mode: copy
+  Commands: [n]ew [d]elete [g]roup [s]ave [m]ode [q]uit
 
 Selecting <b>1</b> in this case will copy the Twitter password for the foobar user
 to your clipboard.
 
-You can create groups to organize your sites.
+You can create groups (using the 'group' command) to organize your sites.
+
+There are two modes, <b>copy</b> (default) and <b>print</b>. In print mode,
+keyrack will print out your password instead of copying it to your clipboard.
+After printing, it will try to erase it after you hit a key (if you're on
+win32 or have either {termios}[https://github.com/arika/ruby-termios]
+or {ffi-ncurses}[http://rubygems.org/gems/ffi-ncurses] installed).
 
 == Contributing to keyrack
 

data/Rakefile

@@ -50,7 +50,7 @@ end
 
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
@@ -59,3 +59,5 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+task :build => :gemspec

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.3.0.pre

data/features/console.feature

@@ -12,11 +12,11 @@ Feature: Console runner
     * the output should contain "Choose storage type:"
     * I type "filesystem"
 
-    * the output should contain "g. New group"
+    * the output should contain "[g]roup"
     * I type "g" to add a new group
     * the output should contain "Group:"
     * I type "Social"
-    * the output should contain "n. New entry"
+    * the output should contain "[n]ew"
     * I type "n" to add a new entry
     * the output should contain "Label:"
     * I type "Twitter"
@@ -29,13 +29,13 @@ Feature: Console runner
     * the output should contain "Password (again):"
     * I type "kittens"
     * the output should contain "1. Twitter [dudeguy]"
-    * the output should also contain "s. Save"
+    * the output should also contain "[s]ave"
     * I type "s" to save the database
-    * the output should contain "t. Top level menu"
+    * the output should contain "[t]op"
     * I type "t"
     * the output should match /1\. .+Social.+/
 
-    * the output should also contain "n. New entry"
+    * the output should also contain "[n]ew"
     * I type "n" to add a new entry
     * the output should contain "Label:"
     * I type "Company X"
@@ -46,10 +46,20 @@ Feature: Console runner
     * 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"
+    * the output should also contain "[s]ave"
+    * I type "n" to add a new entry
+    * the output should contain "Label:"
+    * I type "Company X"
+    * the output should contain "Username:"
+    * I type "friendguy"
+    * 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 "3. Company X [friendguy]"
     * I type "s" to save the database
 
-    * the output should contain "q. Quit"
+    * the output should contain "[q]uit"
     * I type "q" to quit
     * I wait a few seconds
     * I run keyrack interactively again
@@ -59,21 +69,35 @@ Feature: Console runner
     * I wait a few seconds
     * the output should match /1\. .+Social.+/
     * the output should also contain "2. Company X [buddypal]"
+    * the output should also contain "3. Company X [friendguy]"
     * 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"
+    * the output should contain "[d]elete"
     * 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"
+    * the output should contain "[t]op"
     * I type "t"
 
+    * the output should contain "2. Company X [buddypal]"
+    * I type "2" for Company X (buddypal)
+    * my clipboard should match "^.{8}$"
+
+    * the output should contain "Main Menu"
+    * I type "d"
+    * the output should contain "1. Company X [buddypal]"
+    * I type "1"
+    * the output should contain "Company X [buddypal]"
+    * the output should also contain "Are you sure?"
+    * I type "y"
+
     * the output should contain "Main Menu"
+    * the output should also contain "2. Company X [friendguy]"
     * 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

@@ -21,7 +21,7 @@ Then /the output should contain "([^"]+)"/ do |expected|
     sleep 1
   end
   @output = @out.read_nonblock(255)
-  assert @output.include?(expected)
+  assert @output.include?(expected), "Output: #{@output.inspect}"
 end
 
 Then %r{the output should match /([^/]+)/} do |expected|
@@ -53,3 +53,9 @@ Then /my clipboard should contain "([^"]+)"/ do |expected|
   result = %x{xclip -selection clipboard -o}.chomp
   assert_equal expected, result
 end
+
+Then /my clipboard should match "([^"]+)"/ do |expected|
+  sleep 1
+  result = %x{xclip -selection clipboard -o}.chomp
+  assert_match Regexp.new(expected), result
+end

data/keyrack.gemspec

@@ -4,19 +4,19 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{keyrack}
-  s.version = "0.1.1"
+  s.name = "keyrack"
+  s.version = "0.3.0.pre"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Stephens"]
-  s.date = %q{2010-12-12}
-  s.default_executable = %q{keyrack}
-  s.description = %q{Simple password manager with local/remote database storage and RSA encryption.}
-  s.email = %q{viking@pillageandplunder.net}
+  s.date = "2012-01-11"
+  s.description = "Simple password manager with local/remote database storage and RSA encryption."
+  s.email = "viking@pillageandplunder.net"
   s.executables = ["keyrack"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
-    "README.rdoc"
+    "README.rdoc",
+    "TODO"
   ]
   s.files = [
     ".document",
@@ -26,8 +26,13 @@ Gem::Specification.new do |s|
     "LICENSE.txt",
     "README.rdoc",
     "Rakefile",
+    "TODO",
     "VERSION",
     "bin/keyrack",
+    "features/console.feature",
+    "features/step_definitions/keyrack_steps.rb",
+    "features/support/env.rb",
+    "keyrack.gemspec",
     "lib/keyrack.rb",
     "lib/keyrack/database.rb",
     "lib/keyrack/runner.rb",
@@ -36,23 +41,25 @@ Gem::Specification.new do |s|
     "lib/keyrack/store/ssh.rb",
     "lib/keyrack/ui.rb",
     "lib/keyrack/ui/console.rb",
+    "lib/keyrack/utils.rb",
+    "test/fixtures/aes",
     "test/fixtures/config.yml",
     "test/fixtures/foo.txt",
     "test/fixtures/id_rsa",
-    "test/fixtures/id_rsa.pub",
     "test/helper.rb",
     "test/keyrack/store/test_filesystem.rb",
     "test/keyrack/store/test_ssh.rb",
     "test/keyrack/test_database.rb",
     "test/keyrack/test_runner.rb",
     "test/keyrack/test_store.rb",
+    "test/keyrack/test_utils.rb",
     "test/keyrack/ui/test_console.rb"
   ]
-  s.homepage = %q{http://github.com/viking/keyrack}
+  s.homepage = "http://github.com/viking/keyrack"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Simple password manager}
+  s.rubygems_version = "1.8.11"
+  s.summary = "Simple password manager"
   s.test_files = [
     "test/helper.rb",
     "test/keyrack/store/test_filesystem.rb",
@@ -60,38 +67,44 @@ Gem::Specification.new do |s|
     "test/keyrack/test_database.rb",
     "test/keyrack/test_runner.rb",
     "test/keyrack/test_store.rb",
+    "test/keyrack/test_utils.rb",
     "test/keyrack/ui/test_console.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<net-scp>, [">= 0"])
       s.add_runtime_dependency(%q<highline>, [">= 0"])
-      s.add_runtime_dependency(%q<clipboard>, [">= 0"])
+      s.add_runtime_dependency(%q<copier>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
+      s.add_development_dependency(%q<cucumber>, [">= 0"])
+      s.add_development_dependency(%q<test-unit>, [">= 0"])
     else
       s.add_dependency(%q<net-scp>, [">= 0"])
       s.add_dependency(%q<highline>, [">= 0"])
-      s.add_dependency(%q<clipboard>, [">= 0"])
+      s.add_dependency(%q<copier>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
+      s.add_dependency(%q<cucumber>, [">= 0"])
+      s.add_dependency(%q<test-unit>, [">= 0"])
     end
   else
     s.add_dependency(%q<net-scp>, [">= 0"])
     s.add_dependency(%q<highline>, [">= 0"])
-    s.add_dependency(%q<clipboard>, [">= 0"])
+    s.add_dependency(%q<copier>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
+    s.add_dependency(%q<cucumber>, [">= 0"])
+    s.add_dependency(%q<test-unit>, [">= 0"])
   end
 end
 

data/lib/keyrack/database.rb

@@ -10,18 +10,56 @@ module Keyrack
 
     def add(site, username, password, options = {})
       hash = options[:group] ? @data[options[:group]] ||= {} : @data
-      hash[site] = { :username => username, :password => password }
+      if hash.has_key?(site)
+        site_entry = hash[site]
+        if site_entry.is_a?(Array)
+          # Multiple entries for this site
+          user_entry = site_entry.detect { |e| e[:username] == username }
+          if user_entry
+            # Update existing entry
+            user_entry[:password] = password
+          else
+            # Add new entry
+            site_entry.push({:username => username, :password => password})
+          end
+        elsif site_entry[:username] == username
+          # Update existing entry
+          site_entry[:password] = password
+        else
+          # Convert single entry into an array, then add new entry
+          hash[site] = [site_entry, {:username => username, :password => password}]
+        end
+      else
+        hash[site] = { :username => username, :password => password }
+      end
       @dirty = true
     end
 
-    def get(site, options = {})
-      (options[:group] ? @data[options[:group]] : @data)[site]
+    def get(*args)
+      options = args.last.is_a?(Hash) ? args.pop : {}
+      site, username = args
+
+      site_entry = (options[:group] ? @data[options[:group]] : @data)[site]
+      if username
+        if site_entry.is_a?(Array)
+          site_entry.find { |e| e[:username] == username }
+        elsif site_entry[:username] == username
+          site_entry
+        else
+          nil
+        end
+      else
+        site_entry
+      end
     end
 
     def sites(options = {})
       hash = options[:group] ? @data[options[:group]] : @data
       if hash
-        hash.keys.select { |k| hash[k].keys.include?(:username) }.sort
+        hash.keys.select do |key|
+          val = hash[key]
+          val.is_a?(Array) || (val.is_a?(Hash) && val.has_key?(:username))
+        end.sort
       else
         # new groups are empty
         []
@@ -29,7 +67,10 @@ module Keyrack
     end
 
     def groups
-      @data.keys.reject { |k| @data[k].keys.include?(:username) }.sort
+      @data.keys.reject do |key|
+        val = @data[key]
+        val.is_a?(Array) || (val.is_a?(Hash) && val.has_key?(:username))
+      end.sort
     end
 
     def dirty?
@@ -43,10 +84,31 @@ module Keyrack
       @dirty = false
     end
 
-    def delete(site, options = {})
+    def delete(site, username, options = {})
       hash = options[:group] ? @data[options[:group]] : @data
-      hash.delete(site)
-      @dirty = true
+      site_entry = hash[site]
+
+      if site_entry.is_a?(Array)
+        site_entry.each_with_index do |entry, i|
+          if entry[:username] == username
+            case site_entry.length
+            when 2
+              site_entry.delete_at(i)
+              hash[site] = site_entry[0]
+            when 1
+              hash.delete(site)
+            else
+              site_entry.delete_at(i)
+            end
+
+            @dirty = true
+            break
+          end
+        end
+      elsif site_entry[:username] == username
+        hash.delete(site)
+        @dirty = true
+      end
     end
 
     private

data/lib/keyrack/runner.rb

@@ -13,8 +13,8 @@ module Keyrack
       if Dir.exist?(@config_path)
         @options = YAML.load_file(File.join(@config_path, "config"))
         password = @ui.get_password
-        rsa_key = Utils.open_rsa_key(@options['rsa'], password)
-        aes_data = Utils.open_aes_data(@options['aes'], rsa_key)
+        rsa_key = Utils.open_rsa_key(File.expand_path(@options['rsa'], @config_path), password)
+        aes_data = Utils.open_aes_data(File.expand_path(@options['aes'], @config_path), rsa_key)
       else
         Dir.mkdir(@config_path)
         @options = {}

data/lib/keyrack/ui/console.rb

@@ -1,9 +1,11 @@
 module Keyrack
   module UI
     class Console
-      attr_accessor :database
+      attr_accessor :database, :mode
+
       def initialize
         @highline = HighLine.new
+        @mode = :copy
       end
 
       def get_password
@@ -11,52 +13,64 @@ module Keyrack
       end
 
       def menu(options = {})
-        choices = {'n' => :new, 'q' => :quit}
+        choices = {'n' => :new, 'q' => :quit, 'm' => :mode}
         index = 1
 
+        sites = @database.sites(options)
+        count = sites.length
+        count += @database.groups.length  if !options[:group]
+        width = count / 10
+
         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)])
+            @highline.say(" %#{width}d. %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
+          site_entry = @database.get(site, options)
+          site_entry = [site_entry] unless site_entry.is_a?(Array)
+          site_entry.each do |entry|
+            choices[index.to_s] = entry
+            @highline.say(" %#{width}d. %s [%s]" % [index, site, entry[:username]])
+            index += 1
+          end
         end
 
-        @highline.say(" n. New entry")
+        @highline.say("Mode: #{mode}")
+        commands = "Commands: [n]ew"
         if !sites.empty?
           choices['d'] = :delete
-          @highline.say(" d. Delete entry")
+          commands << " [d]elete"
         end
         if !options[:group]
           choices['g'] = :new_group
-          @highline.say(" g. New group")
+          commands << " [g]roup"
         else
           choices['t'] = :top
-          @highline.say(" t. Top level menu")
+          commands << " [t]op"
         end
         if @database.dirty?
           choices['s'] = :save
-          @highline.say(" s. Save")
+          commands << " [s]ave"
         end
-        @highline.say(" q. Quit")
-        answer = @highline.ask(" ?  ") { |q| q.in = choices.keys }
+        commands << " [m]ode [q]uit"
+        @highline.say(commands)
+        answer = @highline.ask(" ? ") { |q| q.in = choices.keys }
         result = choices[answer]
         case result
         when Symbol
           if result == :quit && @database.dirty? && !@highline.agree("Really quit?  You have unsaved changes! [yn] ")
             nil
+          elsif result == :mode
+            @mode = @mode == :copy ? :print : :copy
+            nil
           else
             result
           end
@@ -64,8 +78,19 @@ module Keyrack
           if result.has_key?(:group)
             result
           else
-            Copier(result[:password])
-            @highline.say("The password has been copied to your clipboard.")
+            if mode == :copy
+              Copier(result[:password])
+              @highline.say("The password has been copied to your clipboard.")
+            elsif mode == :print
+              password = @highline.color(result[:password], :cyan)
+              @highline.ask("Here you go: #{password}. Done? ") do |question|
+                question.echo = false
+                if HighLine::SystemExtensions::CHARACTER_MODE != 'stty'
+                  question.character = true
+                  question.overwrite = true
+                end
+              end
+            end
             nil
           end
         end
@@ -83,7 +108,7 @@ module Keyrack
         if @highline.agree("Generate password? [yn] ")
           loop do
             password = Utils.generate_password
-            if @highline.agree("Generated #{@highline.color(password, :blue)}.  Sound good? [yn] ")
+            if @highline.agree("Generated #{@highline.color(password, :cyan)}.  Sound good? [yn] ")
               result[:password] = password
               break
             end
@@ -96,7 +121,7 @@ module Keyrack
               result[:password] = password
               break
             end
-            @highline.say("Passwords didn't match.  Try again!")
+            @highline.say("Passwords didn't match. Try again!")
           end
         end
         result
@@ -120,7 +145,7 @@ module Keyrack
       def store_setup
         result = {}
         result['type'] = @highline.choose do |menu|
-          menu.header = "Choose storage type:"
+          menu.header = "Choose storage type"
           menu.choices("filesystem", "ssh")
         end
 
@@ -141,10 +166,13 @@ module Keyrack
         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
+          site_entry = @database.get(site, options)
+          site_entry = [site_entry] unless site_entry.is_a?(Array)
+          site_entry.each do |entry|
+            choices[index.to_s] = {:site => site, :username => entry[:username]}
+            @highline.say("% 2d. %s [%s]" % [index, site, entry[:username]])
+            index += 1
+          end
         end
         @highline.say(" c. Cancel")
 
@@ -153,7 +181,7 @@ module Keyrack
         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)
+            @database.delete(result[:site], result[:username], options)
           end
         end
       end

data/test/keyrack/test_database.rb

@@ -26,7 +26,7 @@ module Keyrack
     def test_reading_existing_database
       database = Keyrack::Database.new(@key, @iv, @store)
       expected = {:username => 'username', :password => 'password'}
-      assert_equal(expected, database.get('Twitter'))
+      assert_equal(expected, database.get('Twitter', 'username'))
     end
 
     def test_sites
@@ -61,20 +61,51 @@ module Keyrack
     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")
+      assert_equal expected, @database.get('Twitter', 'dudeguy', :group => "Social")
     end
 
     def test_delete
-      @database.delete('Twitter')
+      @database.delete('Twitter', 'username')
       assert_equal [], @database.sites
       assert @database.dirty?
     end
 
+    def test_delete_non_existant_entry
+      @database.delete('Twitter', 'foobar')
+      assert_equal ['Twitter'], @database.sites
+      assert !@database.dirty?
+    end
+
     def test_delete_group_entry
       @database.add('Facebook', 'dudeguy', 'secret', :group => "Social")
-      @database.delete('Facebook', :group => 'Social')
+      @database.delete('Facebook', 'dudeguy', :group => 'Social')
       assert_equal [], @database.sites(:group => 'Social')
       assert_equal ['Twitter'], @database.sites
     end
+
+    def test_multiple_entries_with_the_same_site
+      @database.add('Facebook', 'dudeguy', 'secret')
+      @database.add('Facebook', 'foobar', 'secret')
+
+      expected_1 = {:username => 'dudeguy', :password => 'secret'}
+      assert_equal expected_1, @database.get('Facebook', 'dudeguy')
+      expected_2 = {:username => 'foobar', :password => 'secret'}
+      assert_equal expected_2, @database.get('Facebook', 'foobar')
+      assert_equal [expected_1, expected_2], @database.get('Facebook')
+      assert_equal ['Facebook', 'Twitter'], @database.sites
+    end
+
+    def test_get_missing_entry_by_site_and_username
+      @database.add('Facebook', 'dudeguy', 'secret')
+      assert_nil @database.get('Facebook', 'foobar')
+    end
+
+    def test_deleting_one_of_two_entries_with_the_same_site
+      @database.add('Facebook', 'dudeguy', 'secret')
+      @database.add('Facebook', 'foobar', 'secret')
+      @database.delete('Facebook', 'dudeguy')
+      assert_nil @database.get('Facebook', 'dudeguy')
+      assert_equal({:username => 'foobar', :password => 'secret'}, @database.get('Facebook', 'foobar'))
+    end
   end
 end

data/test/keyrack/test_runner.rb

@@ -30,9 +30,9 @@ module Keyrack
       seq = sequence('ui sequence')
       @console.expects(:get_password).returns('secret').in_sequence(seq)
       rsa = mock("rsa key")
-      Utils.expects(:open_rsa_key).with(rsa_path, 'secret').returns(rsa).in_sequence(seq)
+      Utils.expects(:open_rsa_key).with(File.expand_path(rsa_path, keyrack_dir), 'secret').returns(rsa).in_sequence(seq)
       aes = {'key' => '12345', 'iv' => '54321'}
-      Utils.expects(:open_aes_data).with(aes_path, rsa).returns(aes).in_sequence(seq)
+      Utils.expects(:open_aes_data).with(File.expand_path(aes_path, keyrack_dir), rsa).returns(aes).in_sequence(seq)
       store = mock('filesystem store')
       Store::Filesystem.expects(:new).with('path' => store_path).returns(store).in_sequence(seq)
       Database.expects(:new).with('12345', '54321', store).returns(@database).in_sequence(seq)

data/test/keyrack/test_utils.rb

@@ -4,7 +4,7 @@ module Keyrack
   class TestUtils < Test::Unit::TestCase
     def test_generate_password
       result = Utils.generate_password
-      assert_match result, /^[!-~]{8}$/
+      assert_match /^[!-~]{8}$/, result
     end
 
     def test_generate_rsa_key

data/test/keyrack/ui/test_console.rb

@@ -4,10 +4,14 @@ module Keyrack
   module UI
     class TestConsole < Test::Unit::TestCase
       def setup
-        @database = stub('database', :sites => %w{Twitter}, :groups => [], :dirty? => false) do
+        @database = stub('database', :sites => %w{Twitter Google}, :groups => [], :dirty? => false) do
           stubs(:get).with('Twitter', {}).returns({
             :username => 'username', :password => 'password'
           })
+          stubs(:get).with('Google', {}).returns([
+            { :username => 'username_1', :password => 'password' },
+            { :username => 'username_2', :password => 'password' }
+          ])
         end
         @highline = stub('highline')
         @highline.stubs(:color).with("Keyrack Main Menu", :yellow).returns("yellowKeyrack Main Menu")
@@ -17,21 +21,50 @@ module Keyrack
       end
 
       def test_select_entry_from_menu
+        seq = sequence('say')
         @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")
+        @highline.expects(:say).with(" 2. Google [username_1]")
+        @highline.expects(:say).with(" 3. Google [username_2]")
+        @highline.expects(:say).with("Mode: copy")
+        @highline.expects(:say).with("Commands: [n]ew [d]elete [g]roup [m]ode [q]uit")
 
         question = mock('question')
-        @highline.expects(:ask).yields(mock { expects(:in=).with(%w{n q 1 d g}) }).returns('1')
+        @highline.expects(:ask).yields(mock { expects(:in=).with(%w{n q m 1 2 3 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_entry_from_menu_in_print_mode
+        seq = sequence('say')
+        @console.database = @database
+        @console.mode = :print
+        @highline.expects(:say).with("=== yellowKeyrack Main Menu ===")
+        @highline.expects(:say).with(" 1. Twitter [username]")
+        @highline.expects(:say).with(" 2. Google [username_1]")
+        @highline.expects(:say).with(" 3. Google [username_2]")
+        @highline.expects(:say).with("Mode: print")
+        @highline.expects(:say).with("Commands: [n]ew [d]elete [g]roup [m]ode [q]uit")
+
+        @highline.expects(:ask).yields(mock { expects(:in=).with(%w{n q m 1 2 3 d g}) }).returns('1')
+        @highline.expects(:color).with('password', :cyan).returns('cyan[password]').in_sequence(seq)
+        question = mock do
+          expects(:echo=).with(false)
+          if HighLine::SystemExtensions::CHARACTER_MODE != 'stty'
+            expects(:character=).with(true)
+            expects(:overwrite=).with(true)
+          end
+        end
+        @highline.expects(:ask).
+          with('Here you go: cyan[password]. Done? ').
+          yields(question).
+          returns('')
+
+        assert_nil @console.menu
+      end
+
       def test_select_new_from_menu
         @console.database = @database
 
@@ -42,7 +75,7 @@ module Keyrack
         #  g. New group
         #  q. Quit
 
-        @highline.expects(:ask).yields(mock { expects(:in=).with(%w{n q 1 d g}) }).returns('n')
+        @highline.expects(:ask).yields(mock { expects(:in=).with(%w{n q m 1 2 3 d g}) }).returns('n')
         assert_equal :new, @console.menu
       end
 
@@ -57,7 +90,7 @@ module Keyrack
         #  q. Quit
 
         question = mock('question')
-        question.expects(:in=).with(%w{n q 1 d g})
+        question.expects(:in=).with(%w{n q m 1 2 3 d g})
         @highline.expects(:ask).yields(question).returns('d')
         assert_equal :delete, @console.menu
       end
@@ -72,7 +105,7 @@ module Keyrack
         #  g. New group
         #  q. Quit
 
-        @highline.expects(:ask).yields(mock { expects(:in=).with(%w{n q 1 d g}) }).returns('q')
+        @highline.expects(:ask).yields(mock { expects(:in=).with(%w{n q m 1 2 3 d g}) }).returns('q')
         assert_equal :quit, @console.menu
       end
 
@@ -80,7 +113,7 @@ module Keyrack
         @console.database = @database
         @database.stubs(:dirty?).returns(true)
 
-        @highline.expects(:ask).yields(mock { expects(:in=).with(%w{n q 1 d g s}) }).returns('q')
+        @highline.expects(:ask).yields(mock { expects(:in=).with(%w{n q m 1 2 3 d g s}) }).returns('q')
         @highline.expects(:agree).with("Really quit?  You have unsaved changes! [yn] ").returns(false)
         assert_equal nil, @console.menu
       end
@@ -89,8 +122,8 @@ module Keyrack
         @console.database = @database
         @database.stubs(:dirty?).returns(true)
 
-        @highline.expects(:say).with(" s. Save")
-        @highline.expects(:ask).yields(mock { expects(:in=).with(%w{n q 1 d g s}) }).returns('s')
+        @highline.expects(:say).with { |string| string =~ /\[s\]ave/ }
+        @highline.expects(:ask).yields(mock { expects(:in=).with(%w{n q m 1 2 3 d g s}) }).returns('s')
         assert_equal :save, @console.menu
       end
 
@@ -100,7 +133,7 @@ module Keyrack
 
         @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')
+        @highline.expects(:ask).yields(mock { expects(:in=).with(%w{n q m 1 2 3 4 d g}) }).returns('1')
         assert_equal({:group => 'Blargh'}, @console.menu)
       end
 
@@ -112,12 +145,10 @@ module Keyrack
         @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(:say).with("Mode: copy")
+        @highline.expects(:say).with("Commands: [n]ew [d]elete [t]op [m]ode [q]uit")
 
-        @highline.expects(:ask).yields(mock { expects(:in=).with(%w{n q 1 d t}) }).returns('1')
+        @highline.expects(:ask).yields(mock { expects(:in=).with(%w{n q m 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')
@@ -137,7 +168,7 @@ module Keyrack
         @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(: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)
@@ -149,11 +180,11 @@ module Keyrack
         @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', :cyan).returns('cyanfoobar').in_sequence(seq)
+        @highline.expects(:agree).with("Generated cyanfoobar.  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)
+        @highline.expects(:color).with('foobar', :cyan).returns('cyanfoobar').in_sequence(seq)
+        @highline.expects(:agree).with("Generated cyanfoobar.  Sound good? [yn] ").returns(true).in_sequence(seq)
         assert_equal({:site => "Foo", :username => "bar", :password => "foobar"}, @console.get_new_entry)
       end
 
@@ -175,7 +206,7 @@ module Keyrack
 
       def test_store_setup_for_filesystem
         @highline.expects(:choose).yields(mock {
-          expects(:header=).with("Choose storage type:")
+          expects(:header=).with("Choose storage type")
           expects(:choices).with("filesystem", "ssh")
         }).returns("filesystem")
 
@@ -186,7 +217,7 @@ module Keyrack
       def test_store_setup_for_ssh
         seq = sequence("store setup")
         @highline.expects(:choose).yields(mock {
-          expects(:header=).with("Choose storage type:")
+          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)
@@ -221,7 +252,25 @@ module Keyrack
         }).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)
+        @database.expects(:delete).with("Twitter", 'username', {}).in_sequence(seq)
+        @console.delete_entry
+      end
+
+      def test_delete_one_entry_from_site_with_multiple_entries
+        @console.database = @database
+
+        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. Google [username_1]").in_sequence(seq)
+        @highline.expects(:say).with(" 3. Google [username_2]").in_sequence(seq)
+        @highline.expects(:say).with(" c. Cancel").in_sequence(seq)
+        @highline.expects(:ask).yields(mock {
+          expects(:in=).with(%w{c 1 2 3})
+        }).returns('3').in_sequence(seq)
+        @highline.expects(:color).with("Google [username_2]", :red).returns("redGoogle").in_sequence(seq)
+        @highline.expects(:agree).with("You're about to delete redGoogle.  Are you sure? [yn] ").returns(true).in_sequence(seq)
+        @database.expects(:delete).with("Google", 'username_2', {}).in_sequence(seq)
         @console.delete_entry
       end
 
@@ -242,9 +291,18 @@ module Keyrack
         }).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)
+        @database.expects(:delete).with("Foursquare", 'username', :group => 'Social').in_sequence(seq)
         @console.delete_entry(:group => 'Social')
       end
+
+      def test_switch_mode_from_menu
+        @console.database = @database
+        @console.mode = :copy
+
+        @highline.expects(:ask).yields(mock { expects(:in=).with(%w{n q m 1 2 3 d g}) }).returns('m')
+        assert_nil @console.menu
+        assert_equal :print, @console.mode
+      end
     end
   end
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: keyrack
 version: !ruby/object:Gem::Version
-  version: 0.2.3
-  prerelease: 
+  version: 0.3.0.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Jeremy Stephens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-01 00:00:00.000000000Z
+date: 2012-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
-  requirement: &28232780 !ruby/object:Gem::Requirement
+  requirement: &18759120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *28232780
+  version_requirements: *18759120
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &28231960 !ruby/object:Gem::Requirement
+  requirement: &18757080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *28231960
+  version_requirements: *18757080
 - !ruby/object:Gem::Dependency
   name: copier
-  requirement: &28231280 !ruby/object:Gem::Requirement
+  requirement: &18755860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *28231280
+  version_requirements: *18755860
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &28230680 !ruby/object:Gem::Requirement
+  requirement: &18755260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *28230680
+  version_requirements: *18755260
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &28230000 !ruby/object:Gem::Requirement
+  requirement: &18754600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.5.1
   type: :development
   prerelease: false
-  version_requirements: *28230000
+  version_requirements: *18754600
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &28229280 !ruby/object:Gem::Requirement
+  requirement: &18754000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *28229280
+  version_requirements: *18754000
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &28216480 !ruby/object:Gem::Requirement
+  requirement: &18753200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *28216480
+  version_requirements: *18753200
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &28215980 !ruby/object:Gem::Requirement
+  requirement: &18752620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *28215980
+  version_requirements: *18752620
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: &18751900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *18751900
 description: Simple password manager with local/remote database storage and RSA encryption.
 email: viking@pillageandplunder.net
 executables:
@@ -159,16 +170,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3699145682324095706
+      hash: -4508723743310181824
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Simple password manager