rhc 1.5.13 → 1.6.8

data/lib/rhc/ssh_helpers.rb

@@ -122,7 +122,7 @@ module RHC
       error e.message
       nil
     rescue => e
-      error e.message
+      debug e.message
       nil
     end
 
@@ -135,13 +135,12 @@ module RHC
     # which is basically the space-separated list of the SSH public key content
     def ssh_key_triple_for(key)
       begin
-        file = File.open key
+        IO.read(key).chomp.split
       rescue Errno::ENOENT => e
         raise ::RHC::KeyFileNotExistentException.new("File '#{key}' does not exist.")
       rescue Errno::EACCES => e
         raise ::RHC::KeyFileAccessDeniedException.new("Access denied to '#{key}'.")
       end
-      file.gets.chomp.split
     end
     
     def ssh_key_triple_for_default_key

data/lib/rhc/wizard.rb

@@ -245,7 +245,7 @@ module RHC
         key_fingerprint = fingerprint_for_default_key
         unless key_fingerprint
           paragraph do
-            say "Your ssh public key at #{system_path(RHC::Config.ssh_pub_key_file_path)} is invalid or unreadable. "\
+            warn "Your ssh public key at #{system_path(RHC::Config.ssh_pub_key_file_path)} is invalid or unreadable. "\
                 "Setup can not continue until you manually remove or fix your "\
                 "public and private keys id_rsa keys."
           end
@@ -420,9 +420,8 @@ module RHC
     # Thus, we force an order with #sort to ensure spec passage on both.
     def setup_test_stage
       say "Checking common problems "
-      tests = private_methods.select {|m| m.to_s.start_with? 'test_'}
       failed = false
-      tests.sort.each do |test|
+      all_test_methods.sort.each do |test|
         begin
           send(test)
           print_dot unless failed
@@ -440,6 +439,10 @@ module RHC
       true
     end
 
+    def all_test_methods
+      private_methods.select {|m| m.to_s.start_with? 'test_'}
+    end
+
     # cached list of applications needed for test stage
     def applications
       @applications ||= rest_client.domains.map(&:applications).flatten

data/spec/rhc/assets/cert.crt

@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDoDCCAogCCQDzF8AJCHnrbjANBgkqhkiG9w0BAQUFADCBkTELMAkGA1UEBhMC
+VVMxCzAJBgNVBAgMAkNBMRIwEAYDVQQHDAlTdW5ueXZhbGUxDzANBgNVBAoMBnJl
+ZGhhdDESMBAGA1UECwwJb3BlbnNoaWZ0MRIwEAYDVQQDDAlvcGVuc2hpZnQxKDAm
+BgkqhkiG9w0BCQEWGWluZm9Ab3BlbnNoaWZ0LnJlZGhhdC5jb20wHhcNMTMwMjE5
+MjExMTQ4WhcNMTQwMjE5MjExMTQ4WjCBkTELMAkGA1UEBhMCVVMxCzAJBgNVBAgM
+AkNBMRIwEAYDVQQHDAlTdW5ueXZhbGUxDzANBgNVBAoMBnJlZGhhdDESMBAGA1UE
+CwwJb3BlbnNoaWZ0MRIwEAYDVQQDDAlvcGVuc2hpZnQxKDAmBgkqhkiG9w0BCQEW
+GWluZm9Ab3BlbnNoaWZ0LnJlZGhhdC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDAEbH4MCi3iIDP1HS+/Xwu8SjdSc5WJX6htV7hJpmFZ8HohV/8
+ba0v6aM9IJIIt+sIe2J62t/9G3leOdIHBxeACN4fV2l/iA/fvxvlnFKeD7sHm9Oc
+Yj1H6YYJ57sIOf/oLDpJl6l3Rw8VC3+3W0/lzlVpA8qt7fpkiW7XQJCPplUSrdVC
+3okQ2T5NAod5+wVIOqELgE5bLX1LRs5VPsjytHkJ7rKXs55FHR3kpsoImn5xD0Ky
+6lRn8cIMolQoyN5HIGr8f5P+07hrHibve8jje/DKTssb5yEUAEmh6iGHQsRAnsUW
+QoIEUOLqQCu9re2No4G52Kl2xQIjyJF7rCfxAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+ggEBAGHrya/ZkiAje2kHsOajXMlO2+y1iLfUDcRLuEWpUa8sI5EM4YtemQrsupFp
+8lVYG5C4Vh8476oF9t8Wex5eH3ocwbSvPIUqE07hdmrubiMq4wxFVRYq7g9lHAnx
+l+bABuN/orbAcPcGAGg7AkXVoAc3Fza/ZcgMcw7NOtDTEss70V9OdgCfQUJL0KdO
+hCO8bQ1EaEiq6zEh8RpZe8mu+f/GYATX1I+eJUc6F6cn83oJjE9bqAVzk7TzTHeK
+EBKN50C14wWtXeG7n2+ugaVO+0xnvHeUrQBLHSRyOHqxXrQQ5XmzcaBiyI0f2IQM
+Hst1BVXyX0n/L/ZoYYsv5juJmDo=
+-----END CERTIFICATE-----

data/spec/rhc/assets/cert_key_rsa

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEAwBGx+DAot4iAz9R0vv18LvEo3UnOViV+obVe4SaZhWfB6IVf
+/G2tL+mjPSCSCLfrCHtietrf/Rt5XjnSBwcXgAjeH1dpf4gP378b5ZxSng+7B5vT
+nGI9R+mGCee7CDn/6Cw6SZepd0cPFQt/t1tP5c5VaQPKre36ZIlu10CQj6ZVEq3V
+Qt6JENk+TQKHefsFSDqhC4BOWy19S0bOVT7I8rR5Ce6yl7OeRR0d5KbKCJp+cQ9C
+supUZ/HCDKJUKMjeRyBq/H+T/tO4ax4m73vI43vwyk7LG+chFABJoeohh0LEQJ7F
+FkKCBFDi6kArva3tjaOBudipdsUCI8iRe6wn8QIDAQABAoIBAG/on4JVRRQSw8LU
+LiWt+jI7ryyoOUH2XL8JtzuGSwLwvomlVJT2rmbxQXx3Qr8zsgziHzIn30RRQrkF
+BXu0xRuDjzBBtSVqeJ1Mc4uoNncEAVxgjb5bewswZDnXPCGB8bosMtX4OPRXgdEo
+PwTtfjMOsrMaU3hd5Xu4m81tQA2BvwOlx8aYDyH0jeTnervc5uRGbeTBQG4Bu40E
+rWNmXvgNq2EzTAwbbN6Ma97gw9KgXnM4Nlh29Fxb5TBeUU9lkzuTZAZIDXKIm7AG
+UwMbj/A038yAumYQtThTE/3e4W3rn7F2Vko900bC4aAC1KQOAzjIeQqzqkVxWTWq
+4SUFQAECgYEA/ODwifOTuI6hdZK6JRgc4wp6Rc0fkqHuxLzABXoIGuSVlWyimqIN
+ZySAkpo5EW6DNraRJxNCOBmWeGPEhHGrea+JPiPEwCK0F7SxvSmg3jzNzw3Es31T
+ecET7eDwuSOY9v4XDzLyiXXkEUUReD7Ng2hEYL+HaQrl5jWj4lxgq/ECgYEAwnCb
+Krz7FwX8AqtFAEi6uUrc12k1xYKQfrwSxbfdK2vBBUpgB71Iq/fqP+1BittEljDG
+8f4jEtMBFfEPhLzGIHaI3UiHUHXS4GetA77TRgR8lnKKpj1FcMIY2iKU479707O5
+Q08pgWRUDQ8BVg2ePgbo5QjLMc/rv7UF3AHvPAECgYB/auAIwqDGN6gHU/1TP4ke
+pWLi1O55tfpXSzv+BnUbB96PQgPUop7aP7xBIlBrBiI7aVZOOBf/qHT3CF421geu
+8tHWa7NxlIrl/vgn9lfGYyDYmXlpb1amXLEsBVGGF/e1TGZWFDe9J5fZU9HvosVu
+1xTNIvSZ6xHYI2MGZcGYIQKBgEYeebaV5C7PV6xWu1F46O19U9rS9DM//H/XryVi
+Qv4vo7IWuj7QQe7SPsXC98ntfPR0rqoCLf/R3ChfgGsr8H8wf/bc+v9HHj8S5E/f
+dy1e3Nccg2ej3PDm7jNsGSlwmmUkAQGHAL7KwYzcBm1UB+bycvZ1j2FtS+UckPpg
+MDgBAoGALD8PkxHb4U4DtbNFSYRrUdvS9heav/yph3lTMfifNkOir36io6v8RPgb
+D2bHKKZgmYlTgJrxD45Er9agC5jclJO35QRU/OfGf3GcnABkBI7vlvUKADAo65Sq
+weZkdJnbrIadcvLOHOzkKC9m+rxFTC9VoN1dwK2zwYvUXfa1VJA=
+-----END RSA PRIVATE KEY-----

data/spec/rhc/cli_spec.rb

@@ -95,6 +95,11 @@ describe RHC::CLI do
     context 'with --help' do
       before(:each){ @arguments = ['--help'] }
       it_should_behave_like 'a global help page'
+
+      context 'without a config file' do
+        before{ RHC::Wizard.stub(:has_configuration?).and_return(false) }
+        it_should_behave_like 'a global help page'
+      end
     end
 
     context 'with -h' do

data/spec/rhc/commands/account_spec.rb

@@ -23,14 +23,14 @@ describe RHC::Commands::Account do
     it('should show the maximum gears') { run_output.should =~ /Gears Allowed:\s*3/ }
     it { expect { run }.should exit_with_code(0) }
 
-    context 'with a freeshift plan' do
-      let(:user_plan_id){ 'freeshift' }
-      it('should show') { run_output.should =~ /Plan:\s*FreeShift/ }
+    context 'with a free plan' do
+      let(:user_plan_id){ 'free' }
+      it('should show') { run_output.should =~ /Plan:\s*Free/ }
     end
 
-    context 'with a megashift plan' do
-      let(:user_plan_id){ 'megashift' }
-      it('should show') { run_output.should =~ /Plan:\s*MegaShift/ }
+    context 'with a silver plan' do
+      let(:user_plan_id){ 'silver' }
+      it('should show') { run_output.should =~ /Plan:\s*Silver/ }
     end
 
     context 'with a arbitrary plan' do

data/spec/rhc/commands/alias_spec.rb

@@ -8,10 +8,13 @@ describe RHC::Commands::Alias do
   let(:domain_0_links) { mock_response_links(mock_domain_links('mock_domain_0')) }
   let(:domain_1_links) { mock_response_links(mock_domain_links('mock_domain_1')) }
   let(:app_0_links)    { mock_response_links(mock_app_links('mock_domain_0', 'mock_app_0')) }
+  let(:alias_0_links)  { mock_response_links(mock_alias_links('mock_domain_0', 'mock_app_0', 'www.foo.bar')) }
   let!(:rest_client){ MockRestClient.new }
   before(:each) do
     user_config
-    rest_client.add_domain("mock_domain_0").add_application("mock_app_0", "ruby-1.8.7")
+    domain = rest_client.add_domain("mock_domain_0")
+    domain.add_application("mock_app_0", "ruby-1.8.7").add_alias("www.foo.bar")
+    domain.add_application("mock_app_1", "ruby-1.8.7")
     stub_api_request(:any, client_links['LIST_DOMAINS']['relative']).
             to_return({ :body   => {
                           :type => 'domains',
@@ -74,6 +77,20 @@ describe RHC::Commands::Alias do
                         }.to_json,
                         :status => 200
                       })
+    stub_api_request(:any, app_0_links['LIST_ALIASES']['relative'], false).
+            to_return({ :body   => {
+                    :type => 'aliases',
+                    :data =>
+                    [{ :domain_id                   => 'mock_domain_0',
+                       :application_id              => 'mock_app_0',
+                       :id                          => 'www.foo.bar',
+                       :certificate_added_at        => nil,
+                       :has_private_ssl_certificate => false,
+                       :links                       => mock_response_links(mock_alias_links('mock_domain_0','mock_app_0', 'www.foo.bar')),
+                     }]
+                  }.to_json,
+                  :status => 200
+                })
 
   end
 
@@ -110,15 +127,172 @@ describe RHC::Commands::Alias do
     end
   end
 
+  describe 'alias update-cert --help' do
+    let(:arguments) { ['alias', 'update-cert', '--help'] }
+
+    context 'help is run' do
+      it "should display help" do
+        expect { run }.should exit_with_code(0)
+      end
+      it('should output usage') { run_output.should match("Usage: rhc alias update-cert <application> <alias> --certificate FILE --private-key FILE [--passphrase passphrase]") }
+    end
+  end
+
+  describe 'alias delete-cert --help' do
+    let(:arguments) { ['alias', 'delete-cert', '--help'] }
+
+    context 'help is run' do
+      it "should display help" do
+        expect { run }.should exit_with_code(0)
+      end
+      it('should output usage') { run_output.should match("Usage: rhc alias delete-cert <application> <alias>") }
+    end
+  end
+
+  describe 'alias list --help' do
+    let(:arguments) { ['alias', 'list', '--help'] }
+
+    context 'help is run' do
+      it "should display help" do
+        expect { run }.should exit_with_code(0)
+      end
+      it('should output usage') { run_output.should match("Usage: rhc alias list <application>") }
+    end
+  end
+
   describe 'add alias' do
     let(:arguments) { ['alias', 'add', 'mock_app_0', 'www.foo.bar' ] }
     it { expect { run }.should exit_with_code(0) }
-    it { run_output.should =~ /'add-alias' successful/m }
+    it { run_output.should =~ /Alias 'www.foo.bar' has been added/m }
   end
 
   describe 'remove alias' do
-    let(:arguments) { ['alias', 'remove', 'mock_app_0', 'www.foo.bar' ] }
-    it { expect { run }.should exit_with_code(0) }
-    it { run_output.should =~ /'remove-alias' successful/m }
+    before do 
+      rest_client.stub(:api_version_negotiated).and_return(1.4)
+    end
+    context 'remove alias successfully' do
+      let(:arguments) { ['alias', 'remove', 'mock_app_0', 'www.foo.bar' ] }
+      it { expect { run }.should exit_with_code(0) }
+      it { run_output.should =~ /Alias 'www.foo.bar' has been removed/m }
+    end
+    context 'remove alias with server api <= 1.3' do
+      let(:arguments) { ['alias', 'remove', 'mock_app_0', 'www.foo.bar' ] }
+      before do 
+        rest_client.stub(:api_version_negotiated).and_return(1.3)
+      end
+      it { expect { run }.should exit_with_code(0) }
+      it { run_output.should =~ /Alias 'www.foo.bar' has been removed/m }
+    end
+  end
+
+  describe 'alias update-cert' do
+    before do 
+      rest_client.stub(:api_version_negotiated).and_return(1.4)
+    end
+    context 'add valid certificate with valid private key without pass phrase' do
+      let(:arguments) { ['alias', 'update-cert', 'mock_app_0', 'www.foo.bar', 
+        '--certificate', File.expand_path('../../assets/cert.crt', __FILE__),
+        '--private-key', File.expand_path('../../assets/cert_key_rsa', __FILE__) ] }
+      it { expect { run }.should exit_with_code(0) }
+      it { run_output.should =~ /SSL certificate successfully added/m }
+    end
+    context 'cert file not found' do
+      let(:arguments) { ['alias', 'update-cert', 'mock_app_0', 'www.foo.bar', 
+        '--certificate', File.expand_path('../../assets/nothing.foo', __FILE__),
+        '--private-key', File.expand_path('../../assets/cert_key_rsa', __FILE__) ] }
+      it { expect { run }.should exit_with_code(1) }
+      it { run_output.should =~ /Certificate file not found/m }
+    end
+    context 'private key file not found' do
+      let(:arguments) { ['alias', 'update-cert', 'mock_app_0', 'www.foo.bar', 
+        '--certificate', File.expand_path('../../assets/cert.crt', __FILE__),
+        '--private-key', File.expand_path('../../assets/nothing.foo', __FILE__) ] }
+      it { expect { run }.should exit_with_code(1) }
+      it { run_output.should =~ /Private key file not found/m }
+    end
+    context 'not existing certificate alias' do
+      let(:arguments) { ['alias', 'update-cert', 'mock_app_0', 'www.unicorns.com', 
+        '--certificate', File.expand_path('../../assets/cert.crt', __FILE__),
+        '--private-key', File.expand_path('../../assets/cert_key_rsa', __FILE__) ] }
+      it { expect { run }.should exit_with_code(156) }
+      it { run_output.should =~ /Alias www.unicorns.com can't be found in application/m }
+    end
+    context 'fails if server does not support' do
+      let(:arguments) { ['alias', 'update-cert', 'mock_app_0', 'www.foo.bar', 
+        '--certificate', File.expand_path('../../assets/cert.crt', __FILE__),
+        '--private-key', File.expand_path('../../assets/cert_key_rsa', __FILE__) ] }
+      before do 
+        rest_client.stub(:api_version_negotiated).and_return(1.3)
+      end
+      it { expect { run }.should exit_with_code(1) }
+      it { run_output.should =~ /The server does not support SSL certificates for custom aliases/m }
+    end
+    context 'invalid certificate file (empty)' do
+      let(:arguments) { ['alias', 'update-cert', 'mock_app_0', 'www.foo.bar', 
+        '--certificate', File.expand_path('../../assets/empty.txt', __FILE__),
+        '--private-key', File.expand_path('../../assets/cert_key_rsa', __FILE__) ] }
+      it { expect { run }.should exit_with_code(1) }
+      it { run_output.should =~ /Invalid certificate file/m }
+    end
+    context 'invalid private key file (empty)' do
+      let(:arguments) { ['alias', 'update-cert', 'mock_app_0', 'www.foo.bar', 
+        '--certificate', File.expand_path('../../assets/cert.crt', __FILE__),
+        '--private-key', File.expand_path('../../assets/empty.txt', __FILE__) ] }
+      it { expect { run }.should exit_with_code(1) }
+      it { run_output.should =~ /Invalid private key file/m }
+    end
   end
+
+  describe 'alias delete-cert' do
+    before do 
+      rest_client.stub(:api_version_negotiated).and_return(1.4)
+    end
+    context 'delete existing certificate' do
+      let(:arguments) { ['alias', 'delete-cert', 'mock_app_0', 'www.foo.bar', '--confirm'] }
+      it { expect { run }.should exit_with_code(0) }
+      it { run_output.should =~ /SSL certificate successfully deleted/m }
+    end
+    context 'delete not existing certificate' do
+      let(:arguments) { ['alias', 'delete-cert', 'mock_app_0', 'www.unicorns.com', '--confirm'] }
+      it { expect { run }.should exit_with_code(156) }
+      it { run_output.should =~ /Alias www.unicorns.com can't be found in application mock_app_0/m }
+    end
+    context 'fails if server does not support' do
+      let(:arguments) { ['alias', 'delete-cert', 'mock_app_0', 'www.foo.bar', '--confirm'] }
+      before do 
+        rest_client.stub(:api_version_negotiated).and_return(1.3)
+      end
+      it { expect { run }.should exit_with_code(1) }
+      it { run_output.should =~ /The server does not support SSL certificates for custom aliases/m }
+    end
+  end
+
+  describe 'alias list' do
+    before do 
+      rest_client.stub(:api_version_negotiated).and_return(1.4)
+    end
+    context 'list app with existing certificate' do
+      let(:arguments) { ['alias', 'list', 'mock_app_0'] }
+      it { expect { run }.should exit_with_code(0) }
+      it { run_output.should =~ /Has Certificate?/m }
+      it { run_output.should =~ /Certificate Added/m }
+      it { run_output.should =~ /www.foo.bar/m }
+    end
+    context 'list app without certificates' do
+      let(:arguments) { ['alias', 'list', 'mock_app_1'] }
+      it { expect { run }.should exit_with_code(0) }
+      it { run_output.should =~ /No aliases associated with the application mock_app_1/m }
+    end
+    context 'simple list is server does not support ssl certs' do
+      let(:arguments) { ['alias', 'list', 'mock_app_0'] }
+      before do 
+        rest_client.stub(:api_version_negotiated).and_return(1.3)
+      end
+      it { expect { run }.should exit_with_code(0) }
+      it { run_output.should =~ /no/m }
+      it { run_output.should =~ /-/m }
+      it { run_output.should =~ /www.foo.bar/m }
+    end
+  end
+
 end

data/spec/rhc/commands/app_spec.rb

@@ -74,7 +74,7 @@ describe RHC::Commands::App do
         Resolv::Hosts.should_receive(:new).and_return(resolver)
         resolver.should_receive(:getaddress).with('app1-mockdomain.fake.foo').and_raise(ArgumentError)
       end
-      
+
       it { expect { run }.should exit_with_code(0) }
       it { run_output.should match("Success") }
     end
@@ -109,6 +109,7 @@ describe RHC::Commands::App do
         it { expect { run }.should raise_error(RHC::CartridgeNotFoundException, "There are no cartridges that match 'nomatch_cart'.") }
       end
     end
+
   end
 
   describe 'cart matching behavior' do

data/spec/rhc/commands/authorization_spec.rb

@@ -42,6 +42,15 @@ describe RHC::Commands::Authorization do
 
     expect_an_unsupported_message
   end
+  
+  describe '#run' do
+    let(:arguments) { ['authorization', '--h']}
+    context 'given --h' do
+      it 'should not raise SystemStackError' do
+        expect{ run }.should_not raise_error(SystemStackError)
+      end
+    end
+  end
 
   describe "#delete" do
     let(:arguments) { ['authorization', 'delete', 'foo', 'bar'] }

data/spec/rhc/commands/cartridge_spec.rb

@@ -49,6 +49,7 @@ describe RHC::Commands::Cartridge do
       it{ run_output.should match /mock_standalone_cart\-1\s+Mock1 Cart\s+web/ }
       it{ run_output.should match /mock_standalone_cart\-2\s+web/ }
       it{ run_output.should match /mock_embedded_cart\-1\s+Mock1 Embedded Cart\s+addon/ }
+      it{ run_output.should match /premium_cart\-1 \(\*\)\s+Premium Cart\s+web/ }
       it{ expect{ run }.should exit_with_code(0) }
 
       context 'with verbose list' do
@@ -164,6 +165,17 @@ describe RHC::Commands::Cartridge do
         fail_with_code 155
       }
     end
+
+    context 'when cart is premium' do
+      let(:arguments) { ['cartridge', 'add', 'premium_cart', '-a', 'app1','--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
+      before(:each) do
+        domain = rest_client.add_domain("mock_domain")
+        app = domain.add_application("app1", "mock_type")
+      end
+      it {
+        succeed_with_message /This gear costs an additional \$0\.05 per gear after the first 3 gears\./
+      }
+    end
   end
 
   describe 'cartridge remove' do
@@ -306,6 +318,21 @@ describe RHC::Commands::Cartridge do
     end
   end
 
+  describe 'cartridge show' do
+    let(:arguments) { ['cartridge', 'show', 'premium_cart', '-a', 'app1', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
+
+    before(:each) do
+      @rc = MockRestClient.new
+      domain = @rc.add_domain("mock_domain")
+      app = domain.add_application("app1", "mock_type")
+      app.cartridges << @rc.cartridges.find {|c| c.name == 'premium_cart'}
+    end
+
+    context 'when run with a premium cartridge' do
+      it { run_output.should match(/This gear costs an additional \$0\.05 per gear after the first 3 gears./) }
+    end
+  end
+
   describe 'cartridge show scaled' do
     let!(:rest_client){ MockRestClient.new }
     let(:arguments) { ['cartridge', 'show', 'mock_type', '-a', 'app1', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }

data/spec/rhc/commands/setup_spec.rb

@@ -8,6 +8,8 @@ describe RHC::Commands::Setup do
   let(:instance){ subject.new }
   let!(:config){ base_config }
   before{ described_class.send(:public, *described_class.protected_instance_methods) }
+  before{ FakeFS::FileSystem.clear }
+  before{ RHC::Config.stub(:home_dir).and_return('/home/mock_user') }
 
   describe '#run' do
     it{ expects_running('setup').should call(:run).on(instance).with(no_args) }

data/spec/rhc/commands/sshkey_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'rest_spec_helper'
 require 'rhc/commands/sshkey'
 require 'rhc/config'
 
@@ -58,6 +59,24 @@ describe RHC::Commands::Sshkey do
           rest_client.sshkeys.length.should == num_keys
         end
       end
+
+      it "does not throw an error on an empty file" do
+        FakeFS do
+          keys = rest_client.sshkeys
+          num_keys = keys.length
+          File.open('id_rsa.pub', 'w') do |f|
+            f << ''
+          end
+          expect { run }.should exit_with_code(128)
+          expect { run_output.should match(/Name:.* mockkey/) }
+          rest_client.sshkeys.length.should == num_keys
+        end
+      end
+
+      it "exits with status code Errno::EACCES::Errno" do
+        IO.should_receive(:read).and_return("ssh_foo bar")
+        expect { run }.should exit_with_code(128)
+      end
     end
 
     context "when adding an invalid key with --confirm" do
@@ -99,7 +118,7 @@ describe RHC::Commands::Sshkey do
       #end
     
       it "exits with status code Errno::EACCES::Errno" do
-        File.should_receive(:open).and_raise(Errno::EACCES)
+        IO.should_receive(:read).and_raise(Errno::EACCES)
         expect { run }.should exit_with_code(128)
       end