trustworthy 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc925ea8d2efecd58ea4c6a1e821c68a39d6934e
-  data.tar.gz: 40e0962287a78553690fce334db7721ad2775a53
+  metadata.gz: 0bb4a8a2dc975dae29a9fdc798baa2f38fc3368b
+  data.tar.gz: 87d2308517917931f4b5ebfe6e51d9b992d3e387
 SHA512:
-  metadata.gz: 43f7de2e9c4b1b20f18d81e973f85e32e692e13dc5f7a614c7a075fdcb3688b5eba18b0696257f7fdfecf3d55af49a6968d124efa574585f11cd1f0dfeba6e72
-  data.tar.gz: 267b8564a9787c5966d5fc81221a3904f1418083b3d3e835eeb4288a5be4e35a9e60bff9fd9083fbb81dd54823a5caa742e91a11f02510e7e98565a6350f5f18
+  metadata.gz: 99ccfc9b7e5df3ac5277a0e9a75b92963b8c5a98f9264eb5693a63bd0ec69ec7772099382b5d446aa2cc7a4476ff7e2d50fe1070ef598535fa2dd394e60ea6b3
+  data.tar.gz: e0afdedd53d39762b7c2c577224831e50315b1ffaff7e8971169fc9ce71bd1d0875a7b696e562be0588f1829c474a63d7654d8ec3d8694b8693f2663b4c8c0cb

data/lib/trustworthy/cli/add_key.rb

@@ -9,13 +9,15 @@ module Trustworthy
 
       def run(args)
         options = parse_options('add-key', args)
-        info 'Adding a new key to master key'
 
-        Trustworthy::Settings.open(options[:config_file]) do |settings|
-          master_key = unlock_master_key(settings)
-          username = add_key(settings, master_key)
-          info "Added #{username} to #{options[:config_file]}"
-        end
+        $terminal.say('Adding a new key to master key')
+
+        prompt = Trustworthy::Prompt.new(options[:config_file], $terminal)
+        master_key = prompt.unlock_master_key
+        key = master_key.create_key
+        username = prompt.add_user_key(key)
+
+        $terminal.say("Added #{username}")
       end
     end
   end

data/lib/trustworthy/cli/command.rb

@@ -1,8 +1,6 @@
 module Trustworthy
   class CLI
     module Command
-      include Trustworthy::CLI::Helpers
-
       def default_options
         { :config_file => 'trustworthy.yml' }
       end

data/lib/trustworthy/cli/decrypt.rb

@@ -22,26 +22,19 @@ module Trustworthy
       def run(args)
         options = parse_options(args)
 
-        unless options.has_key?(:input_file)
-          error 'Must provide an input file'
-          print_help
-          return
-        end
-
-        unless options.has_key?(:output_file)
-          error 'Must provide an output file'
+        unless options.has_key?(:input_file) && options.has_key?(:output_file)
           print_help
           return
         end
 
+        prompt = Trustworthy::Prompt.new(options[:config_file], $terminal)
         File.open(options[:input_file], 'rb') do |input_file|
           ciphertext = input_file.read
-          Trustworthy::Settings.open(options[:config_file]) do |settings|
-            master_key = unlock_master_key(settings)
-            plaintext = master_key.decrypt(ciphertext)
-            File.open(options[:output_file], 'wb+') do |output_file|
-              output_file.write(plaintext)
-            end
+
+          master_key = prompt.unlock_master_key
+          plaintext = master_key.decrypt(ciphertext)
+          File.open(options[:output_file], 'wb+') do |output_file|
+            output_file.write(plaintext)
           end
         end
 

data/lib/trustworthy/cli/encrypt.rb

@@ -22,30 +22,22 @@ module Trustworthy
       def run(args)
         options = parse_options(args)
 
-        unless options.has_key?(:input_file)
-          error 'Must provide an input file'
-          print_help
-          return
-        end
-
-        unless options.has_key?(:output_file)
-          error 'Must provide an output file'
+        unless options.has_key?(:input_file) && options.has_key?(:output_file)
           print_help
           return
         end
 
+        prompt = Trustworthy::Prompt.new(options[:config_file], $terminal)
         File.open(options[:input_file], 'rb') do |input_file|
           plaintext = input_file.read
-          Trustworthy::Settings.open(options[:config_file]) do |settings|
-            master_key = unlock_master_key(settings)
-            ciphertext = master_key.encrypt(plaintext)
-            File.open(options[:output_file], 'wb+') do |output_file|
-              output_file.write(ciphertext)
-            end
+          master_key = prompt.unlock_master_key
+          ciphertext = master_key.encrypt(plaintext)
+          File.open(options[:output_file], 'wb+') do |output_file|
+            output_file.write(ciphertext)
           end
         end
 
-        info "Encrypted #{options[:input_file]} to #{options[:output_file]}"
+        $terminal.say("Encrypted #{options[:input_file]} to #{options[:output_file]}")
       end
     end
   end

data/lib/trustworthy/cli/init.rb

@@ -23,27 +23,28 @@ module Trustworthy
         options = parse_options(args)
 
         if options[:keys] < 2
-          error "Must generate at least two keys"
           print_help
           return
         end
 
         Trustworthy::Settings.open(options[:config_file]) do |settings|
           unless settings.empty?
-            error "Config #{options[:config_file]} already exists"
+            $terminal.say("Config #{options[:config_file]} already exists")
             return
           end
+        end
 
-          info "Creating a new master key with #{options[:keys]} keys"
-
-          master_key = Trustworthy::MasterKey.create
-          options[:keys].times do
-            username = add_key(settings, master_key)
-            info "Key #{username} added"
-          end
+        $terminal.say("Creating a new master key with #{options[:keys]} keys")
 
-          info "Created #{options[:config_file]}"
+        master_key = Trustworthy::MasterKey.create
+        prompt = Trustworthy::Prompt.new(options[:config_file], $terminal)
+        options[:keys].times do
+          key = master_key.create_key
+          username = prompt.add_user_key(key)
+          $terminal.say("Key #{username} added")
         end
+
+        $terminal.say("Created #{options[:config_file]}")
       end
     end
   end

data/lib/trustworthy/cli.rb

@@ -1,19 +1,17 @@
 require 'highline/import'
 require 'optparse'
 
-require 'trustworthy/cli/helpers'
 require 'trustworthy/cli/command'
 require 'trustworthy/cli/add_key'
 require 'trustworthy/cli/init'
 require 'trustworthy/cli/decrypt'
 require 'trustworthy/cli/encrypt'
+require 'trustworthy/prompt'
 
 HighLine.color_scheme = HighLine::SampleColorScheme.new
 
 module Trustworthy
   class CLI
-    include Trustworthy::CLI::Helpers
-
     Commands = {
       'add-key' => Trustworthy::CLI::AddKey,
       'init'    => Trustworthy::CLI::Init,
@@ -36,12 +34,12 @@ module Trustworthy
     end
 
     def _print_help
-      say "#{Trustworthy::CLI.banner}\n\n"
-      say 'Commands:'
+      $terminal.say("#{Trustworthy::CLI.banner}\n\n")
+      $terminal.say('Commands:')
       Commands.each do |name, klass|
-        say '  %-8s %s' % [name, klass.description]
+        $terminal.say('  %-8s %s' % [name, klass.description])
       end
-      say "\nSee 'trustworthy <command> --help' for more information on a specific command"
+      $terminal.say("\nSee 'trustworthy <command> --help' for more information on a specific command")
     end
   end
 end

data/lib/trustworthy/prompt.rb

@@ -0,0 +1,96 @@
+module Trustworthy
+  class Prompt
+    def initialize(config_file, terminal = HighLine.new)
+      @config_file = config_file
+      @terminal = terminal
+    end
+
+    def add_user_key(key)
+      Trustworthy::Settings.open(@config_file) do |settings|
+        username = nil
+        loop do
+          username = _ask('Username: ')
+          if settings.has_key?(username)
+            _error("Key #{username} is already in use")
+          else
+            break
+          end
+        end
+
+        loop do
+          password = _ask_password('Password: ')
+          password_confirm = _ask_password('Password (again): ')
+          if password == password_confirm
+            settings.add_key(key, username, password)
+            break
+          else
+            _error('Passwords do not match.')
+          end
+        end
+
+        username
+      end
+    end
+
+    def unlock_master_key
+      usernames_in_use = []
+      Trustworthy::Settings.open(@config_file) do |settings|
+        raise 'must have two keys to unlock master key' unless settings.recoverable?
+
+        username1, key1 = _unlock_key(settings, usernames_in_use)
+        usernames_in_use << username1
+
+        username2, key2 = _unlock_key(settings, usernames_in_use)
+
+        master_key = Trustworthy::MasterKey.create_from_keys(key1, key2)
+        _say('Reconstructed master key')
+
+        master_key
+      end
+    end
+
+    def _unlock_key(settings, usernames_in_use)
+      username = nil
+      loop do
+        username = _ask('Username: ')
+        if usernames_in_use.include?(username)
+          _error("Key #{username} is already in use")
+        elsif settings.find_key(username).nil?
+          _error("Key #{username} does not exist")
+        else
+          break
+        end
+      end
+
+      key = nil
+      begin
+        password = _ask_password('Password: ')
+        key = settings.unlock_key(username, password)
+      rescue ArgumentError
+        _error("Password incorrect for #{username}")
+        retry
+      end
+
+      _say("Unlocked #{username}")
+
+      [username, key]
+    end
+
+    def _ask(question)
+      @terminal.ask(question).to_s
+    end
+
+    def _ask_password(question)
+      @terminal.ask(question) { |q| q.echo = false }.to_s
+    end
+
+    def _say(message)
+      @terminal.say(message)
+    end
+
+    def _error(message)
+      colored_message = @terminal.color(message, :error)
+      _say(colored_message)
+    end
+  end
+end

data/lib/trustworthy/settings.rb

@@ -33,6 +33,14 @@ module Trustworthy
       @store[username]
     end
 
+    def has_key?(username)
+      @store.root?(username)
+    end
+
+    def recoverable?
+      @store.roots.count >= 2
+    end
+
     def unlock_key(username, password)
       key = find_key(username)
       salt = key['salt']

data/lib/trustworthy/version.rb

@@ -1,3 +1,3 @@
 module Trustworthy
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/trustworthy.rb

@@ -1,14 +1,17 @@
 require 'aead'
 require 'bigdecimal'
+require 'highline'
 require 'hkdf'
 require 'scrypt'
 require 'securerandom'
+require 'yaml/store'
+
 require 'trustworthy/key'
 require 'trustworthy/master_key'
+require 'trustworthy/prompt'
 require 'trustworthy/random'
 require 'trustworthy/settings'
 require 'trustworthy/version'
-require 'yaml/store'
 
 module Trustworthy
   CipherAlgorithm = 'AES-256-CBC-HMAC-SHA-256'

data/spec/trustworthy/cli/decrypt_spec.rb

@@ -40,7 +40,6 @@ describe Trustworthy::CLI::Decrypt do
         'password2'
       ) do
         decrypt = Trustworthy::CLI::Encrypt.new
-        decrypt.should_receive(:error).with('Must provide an input file')
         decrypt.should_receive(:print_help)
         decrypt.run([])
       end
@@ -54,7 +53,6 @@ describe Trustworthy::CLI::Decrypt do
         'password2'
       ) do
         decrypt = Trustworthy::CLI::Encrypt.new
-        decrypt.should_receive(:error).with('Must provide an output file')
         decrypt.should_receive(:print_help)
         decrypt.run(['-i', 'input.txt'])
       end

data/spec/trustworthy/cli/encrypt_spec.rb

@@ -41,7 +41,6 @@ describe Trustworthy::CLI::Encrypt do
         'password2'
       ) do
         encrypt = Trustworthy::CLI::Encrypt.new
-        encrypt.should_receive(:error).with('Must provide an input file')
         encrypt.should_receive(:print_help)
         encrypt.run([])
       end
@@ -55,7 +54,6 @@ describe Trustworthy::CLI::Encrypt do
         'password2'
       ) do
         encrypt = Trustworthy::CLI::Encrypt.new
-        encrypt.should_receive(:error).with('Must provide an output file')
         encrypt.should_receive(:print_help)
         encrypt.run(['-i', 'input.txt'])
       end

data/spec/trustworthy/cli/init_spec.rb

@@ -15,7 +15,7 @@ describe Trustworthy::CLI::Init do
   describe 'run' do
     it 'should not allow any previous keys to exist' do
       create_config(TestValues::SettingsFile)
-      $terminal.should_receive(:say).with(/Config trustworthy\.yml already exists/)
+      $terminal.should_receive(:say).with('Config trustworthy.yml already exists')
       Trustworthy::CLI::Init.new.run([])
     end
 
@@ -37,26 +37,6 @@ describe Trustworthy::CLI::Init do
       subkeys.should have_key('user2')
     end
 
-    it 'should confirm passwords' do
-      HighLine::Simulate.with(
-        'user1',
-        'password1',
-        'password2',
-        'password1',
-        'password1',
-        'user2',
-        'password2',
-        'password2'
-      ) do
-        Trustworthy::CLI::Init.new.run([])
-      end
-
-      contents = File.read(TestValues::SettingsFile)
-      subkeys = YAML.load(contents)
-      subkeys.should have_key('user1')
-      subkeys.should have_key('user2')
-    end
-
     it 'should write to a specified file' do
       filename = 'test.yml'
       within_construct do |construct|
@@ -103,7 +83,6 @@ describe Trustworthy::CLI::Init do
 
     it 'should require two subkeys minimum' do
       init = Trustworthy::CLI::Init.new
-      init.should_receive(:error).with('Must generate at least two keys')
       init.should_receive(:print_help)
       init.run(['-k', '1'])
     end

data/spec/trustworthy/prompt_spec.rb

@@ -0,0 +1,158 @@
+require 'spec_helper'
+
+describe Trustworthy::Prompt do
+  let(:test_key) { Trustworthy::Key.new(BigDecimal.new('1'), BigDecimal.new('2')) }
+
+  before(:each) do
+    $terminal.stub(:say)
+  end
+
+  around(:each) do |example|
+    within_construct do |construct|
+      construct.file(TestValues::SettingsFile)
+      create_config(TestValues::SettingsFile)
+      example.run
+    end
+  end
+
+  describe 'add_user_key' do
+    it 'should prompt for two user keys' do
+      HighLine::Simulate.with(
+        'user3',
+        'password',
+        'password'
+      ) do
+        prompt = Trustworthy::Prompt.new(TestValues::SettingsFile, $terminal)
+        username = prompt.add_user_key(test_key)
+        username.should == 'user3'
+      end
+    end
+
+    it 'should confirm passwords' do
+      HighLine::Simulate.with(
+        'user3',
+        'password1',
+        'password2',
+        'password1',
+        'password1'
+      ) do
+        prompt = Trustworthy::Prompt.new(TestValues::SettingsFile, $terminal)
+        username = prompt.add_user_key(test_key)
+        username.should == 'user3'
+      end
+    end
+
+    it 'should require a unique username' do
+      create_config(TestValues::SettingsFile)
+
+      HighLine::Simulate.with(
+        'user1',
+        'user3',
+        'password',
+        'password'
+      ) do
+        prompt = Trustworthy::Prompt.new(TestValues::SettingsFile, $terminal)
+        prompt.should_receive(:_error).with('Key user1 is already in use')
+        username = prompt.add_user_key(test_key)
+        username.should == 'user3'
+      end
+    end
+  end
+
+  describe 'unlock_master_key' do
+    it 'should prompt for two user keys' do
+      HighLine::Simulate.with(
+        'user1',
+        'password1',
+        'user2',
+        'password2'
+      ) do
+        prompt = Trustworthy::Prompt.new(TestValues::SettingsFile, $terminal)
+        master_key = prompt.unlock_master_key
+        master_key.should == TestValues::MasterKey
+      end
+    end
+
+    it 'should raise an error if not recoverable' do
+      File.open(TestValues::SettingsFile, 'w') do |file|
+        file.write(YAML.dump({}))
+      end
+
+      expect do
+        prompt = Trustworthy::Prompt.new(TestValues::SettingsFile, $terminal)
+        master_key = prompt.unlock_master_key
+        master_key.should == TestValues::MasterKey
+      end.to raise_error('must have two keys to unlock master key')
+    end
+
+    it 'should require two distinct keys to unlock' do
+      HighLine::Simulate.with(
+        'user1',
+        'password1',
+        'user1',
+        'user2',
+        'password2'
+      ) do
+        prompt = Trustworthy::Prompt.new(TestValues::SettingsFile, $terminal)
+        prompt.should_receive(:_error).with('Key user1 is already in use')
+        prompt.unlock_master_key
+      end
+    end
+
+    it 'should required an existing user for the first key' do
+      HighLine::Simulate.with(
+        'missing',
+        'user1',
+        'password1',
+        'user2',
+        'password2'
+      ) do
+        prompt = Trustworthy::Prompt.new(TestValues::SettingsFile, $terminal)
+        prompt.should_receive(:_error).with('Key missing does not exist')
+        prompt.unlock_master_key
+      end
+    end
+
+    it 'should required an existing user for the second key' do
+      HighLine::Simulate.with(
+        'user1',
+        'password1',
+        'missing',
+        'user2',
+        'password2'
+      ) do
+        prompt = Trustworthy::Prompt.new(TestValues::SettingsFile, $terminal)
+        prompt.should_receive(:_error).with('Key missing does not exist')
+        prompt.unlock_master_key
+      end
+    end
+
+    it 'should prompt for the correct password for the first key' do
+      HighLine::Simulate.with(
+        'user1',
+        'bad_password',
+        'password1',
+        'user2',
+        'password2'
+      ) do
+        prompt = Trustworthy::Prompt.new(TestValues::SettingsFile, $terminal)
+        prompt.should_receive(:_error).with('Password incorrect for user1')
+        prompt.unlock_master_key
+      end
+    end
+
+    it 'should prompt for the correct password for the second key' do
+      HighLine::Simulate.with(
+        'user1',
+        'password1',
+        'user2',
+        'bad_password',
+        'password2'
+      ) do
+        prompt = Trustworthy::Prompt.new(TestValues::SettingsFile, $terminal)
+        prompt.should_receive(:_error).with('Password incorrect for user2')
+        prompt.unlock_master_key
+      end
+    end
+  end
+end

data/spec/trustworthy/settings_spec.rb

@@ -63,6 +63,48 @@ describe Trustworthy::Settings do
     end
   end
 
+  describe 'has_key?' do
+    it 'should be true if the key exists' do
+      Trustworthy::Settings.open(TestValues::SettingsFile) do |settings|
+        key = Trustworthy::Key.new(BigDecimal.new('2'), BigDecimal.new('3'))
+        settings.add_key(key, 'user', 'password1')
+        settings.should have_key('user')
+      end
+    end
+
+    it 'should be false if the key does exists' do
+      Trustworthy::Settings.open(TestValues::SettingsFile) do |settings|
+        settings.should_not have_key('missing')
+      end
+    end
+  end
+
+  describe 'recoverable?' do
+    it 'should not be recoverable with no user keys' do
+      Trustworthy::Settings.open(TestValues::SettingsFile) do |settings|
+        settings.should_not be_recoverable
+      end
+    end
+
+    it 'should not be recoverable with one user key' do
+      Trustworthy::Settings.open(TestValues::SettingsFile) do |settings|
+        key = Trustworthy::Key.new(BigDecimal.new('2'), BigDecimal.new('3'))
+        settings.add_key(key, 'user', 'password')
+        settings.should_not be_recoverable
+      end
+    end
+
+    it 'should be recoverable with two or more user keys' do
+      Trustworthy::Settings.open(TestValues::SettingsFile) do |settings|
+        key1 = Trustworthy::Key.new(BigDecimal.new('2'), BigDecimal.new('3'))
+        key2 = Trustworthy::Key.new(BigDecimal.new('3'), BigDecimal.new('4'))
+        settings.add_key(key1, 'user1', 'password')
+        settings.add_key(key2, 'user2', 'password')
+        settings.should be_recoverable
+      end
+    end
+  end
+
   describe 'unlock_key' do
     it 'should decrypt the key with the password' do
       Trustworthy::Settings.open(TestValues::SettingsFile) do |settings|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trustworthy
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - John Downey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aead
@@ -122,23 +122,23 @@ files:
 - lib/trustworthy/cli/command.rb
 - lib/trustworthy/cli/decrypt.rb
 - lib/trustworthy/cli/encrypt.rb
-- lib/trustworthy/cli/helpers.rb
 - lib/trustworthy/cli/init.rb
 - lib/trustworthy/cli.rb
 - lib/trustworthy/key.rb
 - lib/trustworthy/master_key.rb
+- lib/trustworthy/prompt.rb
 - lib/trustworthy/random.rb
 - lib/trustworthy/settings.rb
 - lib/trustworthy/version.rb
 - lib/trustworthy.rb
 - spec/spec_helper.rb
 - spec/trustworthy/cli/add_key_spec.rb
-- spec/trustworthy/cli/command_spec.rb
 - spec/trustworthy/cli/decrypt_spec.rb
 - spec/trustworthy/cli/encrypt_spec.rb
 - spec/trustworthy/cli/init_spec.rb
 - spec/trustworthy/key_spec.rb
 - spec/trustworthy/master_key_spec.rb
+- spec/trustworthy/prompt_spec.rb
 - spec/trustworthy/random_spec.rb
 - spec/trustworthy/settings_spec.rb
 - bin/trustworthy
@@ -170,11 +170,11 @@ summary: Encrypt and decrypt files with multiple key holders
 test_files:
 - spec/spec_helper.rb
 - spec/trustworthy/cli/add_key_spec.rb
-- spec/trustworthy/cli/command_spec.rb
 - spec/trustworthy/cli/decrypt_spec.rb
 - spec/trustworthy/cli/encrypt_spec.rb
 - spec/trustworthy/cli/init_spec.rb
 - spec/trustworthy/key_spec.rb
 - spec/trustworthy/master_key_spec.rb
+- spec/trustworthy/prompt_spec.rb
 - spec/trustworthy/random_spec.rb
 - spec/trustworthy/settings_spec.rb

data/lib/trustworthy/cli/helpers.rb

@@ -1,64 +0,0 @@
-module Trustworthy
-  class CLI
-    module Helpers
-      def add_key(settings, master_key)
-        key = master_key.create_key
-        username = ask('Username: ')
-
-        loop do
-          password = ask_password('Password: ')
-          password_confirm = ask_password('Password (again): ')
-          if password == password_confirm
-            settings.add_key(key, username, password)
-            break
-          else
-            error 'Passwords do not match.'
-          end
-        end
-
-        username
-      end
-
-      def unlock_master_key(settings)
-        usernames_in_use = []
-
-        username1, key1 = _unlock_key(settings, usernames_in_use)
-        usernames_in_use << username1
-
-        username2, key2 = _unlock_key(settings, usernames_in_use)
-
-        master_key = Trustworthy::MasterKey.create_from_keys(key1, key2)
-        info "Reconstructed master key"
-
-        master_key
-      end
-
-      def _unlock_key(settings, usernames_in_use)
-        username = nil
-        loop do
-          username = ask('Username: ')
-          if usernames_in_use.include?(username)
-            error "Key #{username} is already in use"
-          elsif settings.find_key(username).nil?
-            error "Key #{username} does not exist"
-          else
-            break
-          end
-        end
-
-        key = nil
-        begin
-          password = ask_password('Password: ')
-          key = settings.unlock_key(username, password)
-        rescue ArgumentError
-          error "Password incorrect for #{username}"
-          retry
-        end
-
-        info "Unlocked #{username}"
-
-        [username, key]
-      end
-    end
-  end
-end

data/spec/trustworthy/cli/command_spec.rb

@@ -1,114 +0,0 @@
-require 'spec_helper'
-
-describe Trustworthy::CLI::Command do
-  def test_command
-    return @klass if @klass
-    @klass = Class.new
-    @klass.send(:include, Trustworthy::CLI::Command)
-    @klass
-  end
-
-  before(:each) do
-    $terminal.stub(:say)
-  end
-
-  around(:each) do |example|
-    within_construct do |construct|
-      construct.file(TestValues::SettingsFile)
-      create_config(TestValues::SettingsFile)
-      example.run
-    end
-  end
-
-  describe 'unlock_master_key' do
-    it 'should require two distinct keys to unlock' do
-      command = test_command.new
-      command.should_receive(:error).with('Key user1 is already in use')
-
-      HighLine::Simulate.with(
-        'user1',
-        'password1',
-        'user1',
-        'user2',
-        'password2'
-      ) do
-        Trustworthy::Settings.open(TestValues::SettingsFile) do |settings|
-          master_key = command.unlock_master_key(settings)
-          master_key.should == TestValues::MasterKey
-        end
-      end
-    end
-
-    it 'should required an existing user for the first key' do
-      command = test_command.new
-      command.should_receive(:error).with('Key missing does not exist')
-
-      HighLine::Simulate.with(
-        'missing',
-        'user1',
-        'password1',
-        'user2',
-        'password2'
-      ) do
-        Trustworthy::Settings.open(TestValues::SettingsFile) do |settings|
-          master_key = command.unlock_master_key(settings)
-          master_key.should == TestValues::MasterKey
-        end
-      end
-    end
-
-    it 'should required an existing user for the second key' do
-      command = test_command.new
-      command.should_receive(:error).with('Key missing does not exist')
-
-      HighLine::Simulate.with(
-        'user1',
-        'password1',
-        'missing',
-        'user2',
-        'password2'
-      ) do
-        Trustworthy::Settings.open(TestValues::SettingsFile) do |settings|
-          master_key = command.unlock_master_key(settings)
-          master_key.should == TestValues::MasterKey
-        end
-      end
-    end
-
-    it 'should prompt for the correct password for the first key' do
-      command = test_command.new
-      command.should_receive(:error).with('Password incorrect for user1')
-
-      HighLine::Simulate.with(
-        'user1',
-        'bad_password',
-        'password1',
-        'user2',
-        'password2'
-      ) do
-        Trustworthy::Settings.open(TestValues::SettingsFile) do |settings|
-          master_key = command.unlock_master_key(settings)
-          master_key.should == TestValues::MasterKey
-        end
-      end
-    end
-
-    it 'should prompt for the correct password for the second key' do
-      command = test_command.new
-      command.should_receive(:error).with('Password incorrect for user2')
-
-      HighLine::Simulate.with(
-        'user1',
-        'password1',
-        'user2',
-        'bad_password',
-        'password2'
-      ) do
-        Trustworthy::Settings.open(TestValues::SettingsFile) do |settings|
-          master_key = command.unlock_master_key(settings)
-          master_key.should == TestValues::MasterKey
-        end
-      end
-    end
-  end
-end