rhc 0.98.16 → 1.0.4

data/spec/rhc/commands/cartridge_spec.rb

@@ -0,0 +1,342 @@
+require 'spec_helper'
+require 'rest_spec_helper'
+require 'rhc/commands/cartridge'
+require 'rhc/config'
+
+describe RHC::Commands::Cartridge do
+
+  def exit_with_code_and_message(code, message = nil)
+    expect{ run }.should exit_with_code(code)
+    run_output.should match(message) if message
+  end
+
+  def succeed_with_message(message = "Success")
+    exit_with_code_and_message(0,message)
+  end
+
+  def fail_with_message(message,code = 1)
+    exit_with_code_and_message(code, message)
+  end
+
+  def fail_with_code(code = 1)
+    exit_with_code_and_message(code)
+  end
+
+
+  before(:each) do
+    RHC::Config.set_defaults
+  end
+
+  describe 'run' do
+    let(:arguments) { ['cartridge', '--trace', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
+
+    context 'when run' do
+      before(:each) do
+        @rc = MockRestClient.new
+      end
+      it {
+        succeed_with_message "mock_cart-1, mock_cart-2, unique_mock_cart-1"
+      }
+    end
+  end
+
+  describe 'alias app cartridge' do
+    let(:arguments) { ['app', 'cartridge', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
+
+    context 'when run' do
+      before(:each) do
+        @rc = MockRestClient.new
+      end
+      it {
+        succeed_with_message "mock_cart-1, mock_cart-2, unique_mock_cart-1"
+      }
+    end
+  end
+
+  describe 'cartridge add' do
+    let(:arguments) { ['cartridge', 'add', 'mock_cart-1', '--app', 'app1', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
+
+    context 'when run' do
+      before(:each) do
+        @rc = MockRestClient.new
+        domain = @rc.add_domain("mock_domain")
+        app = domain.add_application("app1", "mock_type")
+      end
+      it {
+        succeed_with_message
+      }
+    end
+  end
+
+  describe 'cartridge add with app context' do
+    let(:arguments) { ['cartridge', 'add', 'mock_cart-1', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
+
+    context 'when run' do
+      before(:each) do
+        @rc = MockRestClient.new
+        domain = @rc.add_domain("mock_domain")
+        app = domain.add_application("app1", "mock_type")
+        instance = RHC::Commands::Cartridge.new
+        instance.stub(:git_config_get) { |key| app.uuid if key == "rhc.app-uuid" }
+        RHC::Commands::Cartridge.stub(:new) { instance }
+      end
+      it {
+        succeed_with_message
+      }
+    end
+  end
+
+  describe 'cartridge add with no app context' do
+    let(:arguments) { ['cartridge', 'add', 'mock_cart-1', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
+
+    context 'when run' do
+      before(:each) do
+        @rc = MockRestClient.new
+        domain = @rc.add_domain("mock_domain")
+        app = domain.add_application("app1", "mock_type")
+        instance = RHC::Commands::Cartridge.new
+        instance.stub(:git_config_get) { |key| "" if key == "rhc.app-uuid" }
+        RHC::Commands::Cartridge.stub(:new) { instance }
+      end
+      it {
+        fail_with_code
+      }
+    end
+  end
+
+  describe 'alias app cartridge add' do
+    let(:arguments) { ['app', 'cartridge', 'add', 'unique_mock_cart', '--app', 'app1', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
+
+    context 'when run' do
+      before(:each) do
+        @rc = MockRestClient.new
+        domain = @rc.add_domain("mock_domain")
+        app = domain.add_application("app1", "mock_type")
+      end
+      it {
+        succeed_with_message
+      }
+    end
+  end
+
+  describe 'cartridge add no cart found error' do
+    let(:arguments) { ['cartridge', 'add', 'nomatch_cart', '--app', 'app1', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
+
+    context 'when run' do
+      before(:each) do
+        @rc = MockRestClient.new
+        domain = @rc.add_domain("mock_domain")
+        app = domain.add_application("app1", "mock_type")
+      end
+      it {
+        fail_with_code 154
+      }
+    end
+  end
+
+  describe 'cartridge add too many carts found error' do
+    let(:arguments) { ['cartridge', 'add', 'mock_cart', '-a', 'app1','--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
+
+    context 'when run' do
+      before(:each) do
+        @rc = MockRestClient.new
+        domain = @rc.add_domain("mock_domain")
+        app = domain.add_application("app1", "mock_type")
+      end
+      it {
+        fail_with_code 155
+      }
+    end
+  end
+
+  describe 'cartridge remove without confirming' do
+    let(:arguments) { ['cartridge', 'remove', 'mock_cart-1', '-a', 'app1', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
+
+    context 'when run' do
+      before(:each) do
+        @rc = MockRestClient.new
+        domain = @rc.add_domain("mock_domain")
+        app = domain.add_application("app1", "mock_type")
+        app.add_cartridge('mock_cart-1')
+      end
+      it {
+        fail_with_message "Removing a cartridge is a destructive operation"
+      }
+    end
+  end
+
+  describe 'cartridge remove' do
+    let(:arguments) { ['cartridge', 'remove', 'mock_cart-1', '--confirm', '--trace', '-a', 'app1', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
+
+    context 'when run' do
+      before(:each) do
+        @rc = MockRestClient.new
+        domain = @rc.add_domain("mock_domain")
+        @app = domain.add_application("app1", "mock_type")
+      end
+      it "should remove cartridge" do
+        @app.add_cartridge('mock_cart-1')
+        expect { run }.should exit_with_code(0)
+        # framework cart should be the only one listed
+        @app.cartridges.length.should == 1
+      end
+      it "should raise cartridge not found exception" do
+        expect { run }.should raise_error RHC::CartridgeNotFoundException
+      end
+    end
+  end
+
+  describe 'cartridge status' do
+    let(:arguments) { ['cartridge', 'status', 'mock_cart-1', '-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.add_cartridge('mock_cart-1')
+    end
+
+    context 'when run' do
+      it { run_output.should match('started') }
+    end
+
+    context 'when run with cart stopped' do
+      before(:each) { @app.find_cartridge('mock_cart-1').stop }
+      it { run_output.should match('stopped') }
+    end
+  end
+
+  describe 'cartridge start' do
+    let(:arguments) { ['cartridge', 'start', 'mock_cart-1', '-a', 'app1','--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
+
+    context 'when run' do
+      before(:each) do
+        @rc = MockRestClient.new
+        domain = @rc.add_domain("mock_domain")
+        app = domain.add_application("app1", "mock_type")
+        app.add_cartridge('mock_cart-1')
+      end
+      it { run_output.should match('start') }
+    end
+  end
+
+  describe 'cartridge stop' do
+    let(:arguments) { ['cartridge', 'stop', 'mock_cart-1', '-a', 'app1','--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
+
+    context 'when run' do
+      before(:each) do
+        @rc = MockRestClient.new
+        domain = @rc.add_domain("mock_domain")
+        app = domain.add_application("app1", "mock_type")
+        app.add_cartridge('mock_cart-1')
+      end
+      it { run_output.should match('stop') }
+    end
+  end
+
+  describe 'cartridge restart' do
+    let(:arguments) { ['cartridge', 'restart', 'mock_cart-1', '-a', 'app1','--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
+
+    context 'when run' do
+      before(:each) do
+        @rc = MockRestClient.new
+        domain = @rc.add_domain("mock_domain")
+        app = domain.add_application("app1", "mock_type")
+        app.add_cartridge('mock_cart-1')
+      end
+      it { run_output.should match('restart') }
+    end
+  end
+
+  describe 'cartridge reload' do
+    let(:arguments) { ['cartridge', 'reload', 'mock_cart-1', '-a', 'app1','--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
+
+    context 'when run' do
+      before(:each) do
+        @rc = MockRestClient.new
+        domain = @rc.add_domain("mock_domain")
+        app = domain.add_application("app1", "mock_type")
+        app.add_cartridge('mock_cart-1')
+      end
+      it { run_output.should match('reload') }
+    end
+  end
+
+  describe 'cartridge show' do
+    let(:arguments) { ['cartridge', 'show', 'mock_cart-1', '-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.add_cartridge('mock_cart-1')
+    end
+
+    context 'when run' do
+      it { run_output.should match('Connection URL = http://fake.url') }
+    end
+  end
+
+  describe 'cartridge show scaled' do
+    let(:arguments) { ['cartridge', 'show', 'mock_type', '-a', 'app1', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
+
+    context 'when run' do
+      before(:each) do
+        @rc = MockRestClient.new
+        domain = @rc.add_domain("mock_domain")
+        app = domain.add_application("app1", "mock_type", true)
+      end
+      it { run_output.should match('Scaling Info') }
+      it { run_output.should match('Current = 2') }
+      it { run_output.should match('Minimum = 2') }
+      it { run_output.should match('Maximum = available gears') }
+    end
+  end
+
+  describe 'cartridge scale' do
+    let(:arguments) { ['cartridge', 'scale', @cart_type || 'mock_type', '-a', 'app1', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] | (@extra_args || []) }
+
+    before(:each) do
+      @rc = MockRestClient.new
+      domain = @rc.add_domain("mock_domain")
+      app = domain.add_application("app1", "mock_type", scalable)
+    end
+
+    context 'when run with scalable app' do
+      let(:scalable){ true }
+
+      it "with no values" do
+        fail_with_message "Must provide either a min or max"
+      end
+
+      it "with a min value" do
+        @extra_args = ["--min","6"]
+        succeed_with_message "Minimum = 6"
+      end
+
+      it "with a max value" do
+        @extra_args = ["--max","3"]
+        succeed_with_message 'Maximum = 3'
+      end
+
+      it "with an invalid min value" do
+        @extra_args = ["--min","a"]
+        fail_with_message "invalid argument: --min"
+      end
+
+      it "with an invalid max value" do
+        @extra_args = ["--max","a"]
+        fail_with_message "invalid argument: --max"
+      end
+    end
+
+    context 'when run with a nonscalable app' do
+      let(:scalable){ false }
+
+      it "with a min value" do
+        @extra_args = ["--min","6"]
+        fail_with_message "Cartridge is not scalable"
+      end
+    end
+  end
+end

data/spec/rhc/commands/domain_spec.rb

@@ -39,8 +39,8 @@ describe RHC::Commands::Domain do
       it { expect { run }.should exit_with_code(0) }
       it "should match output" do
         output = run_output
-        output.should match(/Applications in onedomain\:/)
-        output.should match(/No applications.  You can use/)
+        output.should match(/Applications in onedomain/)
+        output.should match(/No applications. You can use/)
       end
     end
 
@@ -53,8 +53,8 @@ describe RHC::Commands::Domain do
       it { expect { run }.should exit_with_code(0) }
       it "should match output" do
         output = run_output
-        output.should match("Applications in firstdomain\:")
-        output.should_not match("Applications in seconddomain\:")
+        output.should match("Applications in firstdomain")
+        output.should_not match("Applications in seconddomain")
       end
     end
 
@@ -90,7 +90,7 @@ describe RHC::Commands::Domain do
       it "should match output" do
         output = run_output
         output.should match("app_no_carts")
-        output.should match("Cartridges: none")
+        output.should match(/Cartridges$\n\s+[=]*\s+None/)
       end
     end
   end
@@ -112,7 +112,7 @@ describe RHC::Commands::Domain do
   end
 
   describe 'update' do
-    let(:arguments) { ['domain', 'update', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password', 'alterednamespace'] }
+    let(:arguments) { ['domain', 'update', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password', 'olddomain', 'alterednamespace'] }
 
     context 'when no issues with ' do
       before(:each) do
@@ -136,12 +136,12 @@ describe RHC::Commands::Domain do
         expect { run }.should exit_with_code(127)
         @rc.domains.empty?.should be_true
       end
-      it { run_output.should match("No domains are registered to the user test@test.foo") }
+      it { run_output.should match("does not exist") }
     end
   end
 
   describe 'alter alias' do
-    let(:arguments) { ['domain', 'alter', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password', 'alterednamespace'] }
+    let(:arguments) { ['domain', 'alter', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password', 'olddomain', 'alterednamespace'] }
 
     context 'when no issues with ' do
       before(:each) do

data/spec/rhc/commands/setup_spec.rb

@@ -7,17 +7,15 @@ require 'webmock/rspec'
 # just test the command runner as we already have extensive wizard tests
 describe RHC::Commands::Setup do
 
-  before(:each) do
-    RHC::Config.set_defaults
-  end
+  before(:each) { RHC::Config.set_defaults }
 
   describe 'run' do
     let(:arguments) { ['setup', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
 
     before(:each) do
-        @wizard = mock('wizard')
-        @wizard.stub!(:run).and_return(true)
-        RHC::RerunWizard.stub!(:new) { @wizard }
+      @wizard = mock('wizard')
+      @wizard.stub!(:run).and_return(true)
+      RHC::RerunWizard.stub!(:new) { @wizard }
     end
 
     context 'when no issues' do
@@ -34,6 +32,19 @@ describe RHC::Commands::Setup do
     end
   end
 
+  context 'when -l is used to specify the user name' do
+    let(:arguments) { ['setup', '-l', 'test@test.foo'] }
+    # 'y' for the password prompt
+    let(:input) { ['', 'y', '', ''] }
+
+    before(:each){ @rc = MockRestClient.new }
+
+    it("succeeds"){ FakeFS{ expect { run input }.should exit_with_code 0 } }
+    it("sets the user name to the value given by the command line") do
+      FakeFS{ run_output( input ).should match 'test@test.foo' }
+    end
+  end
+
   describe 'help' do
     let(:arguments) { ['setup', '--help'] }
 

data/spec/rhc/commands/snapshot_spec.rb

@@ -0,0 +1,140 @@
+require 'spec_helper'
+require 'rest_spec_helper'
+require 'rhc/commands/snapshot'
+require 'rhc/config'
+
+describe RHC::Commands::Snapshot do
+
+  APP_NAME = 'mockapp'
+
+  before(:each) do
+    RHC::Config.set_defaults
+    @rc = MockRestClient.new
+    @app = @rc.add_domain("mockdomain").add_application APP_NAME, 'mock-1.0'
+    @ssh_uri = URI.parse @app.ssh_url
+    filename = APP_NAME + '.tar.gz'
+    FileUtils.cp(File.expand_path('../../assets/targz_sample.tar.gz', __FILE__), filename)
+  end
+
+  after(:each) do
+    filename = APP_NAME + '.tar.gz'
+    File.delete filename if File.exist? filename
+  end
+
+  describe 'snapshot save' do
+    let(:arguments) {['snapshot', 'save', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p', 'password', '--app', 'mockapp']}
+
+    context 'when saving a snapshot' do
+      before(:each) do
+        `(exit 0)`
+        Kernel.should_receive(:`).with("ssh #{@ssh_uri.user}@#{@ssh_uri.host} 'snapshot' > #{@app.name}.tar.gz")
+      end
+      it { expect { run }.should exit_with_code(0) }
+    end
+
+    context 'when failing to save a snapshot' do
+      before(:each) do
+        `(exit 1)`
+        Kernel.should_receive(:`).with("ssh #{@ssh_uri.user}@#{@ssh_uri.host} 'snapshot' > #{@app.name}.tar.gz")
+      end
+      it { expect { run }.should exit_with_code(130) }
+    end
+
+    context 'when saving a snapshot on windows' do
+      before(:each) do
+        RHC::Helpers.stub(:windows?) do ; true; end
+        RHC::Helpers.stub(:jruby?) do ; false ; end
+        RHC::Helpers.stub(:linux?) do ; false ; end
+        ssh = mock(Net::SSH)
+        Net::SSH.should_receive(:start).with(@ssh_uri.host, @ssh_uri.user).and_yield(ssh)
+        ssh.should_receive(:exec!).with("snapshot").and_yield(nil, :stdout, 'foo').and_yield(nil, :stderr, 'foo')
+      end
+      it { expect { run }.should exit_with_code(0) }
+      it { run_output.should match("Success") }
+    end
+
+    context 'when timing out on windows' do
+      before(:each) do
+        RHC::Helpers.stub(:windows?) do ; true; end
+        RHC::Helpers.stub(:jruby?) do ; false ; end
+        RHC::Helpers.stub(:linux?) do ; false ; end
+        ssh = mock(Net::SSH)
+        Net::SSH.should_receive(:start).with(@ssh_uri.host, @ssh_uri.user).and_raise(Timeout::Error)
+      end
+      it { expect { run }.should exit_with_code(130) }
+    end
+
+  end
+
+  describe 'snapshot restore' do
+    let(:arguments) {['snapshot', 'restore', '--noprompt', '-l', 'test@test.foo', '-p', 'password', '--app', 'mockapp']}
+
+    context 'when restoring a snapshot' do
+      before(:each) do
+        File.stub!(:exists?).and_return(true)
+        RHC::TarGz.stub!(:contains).and_return(true)
+        `(exit 0)`
+        Kernel.should_receive(:`).with("cat #{@app.name}.tar.gz | ssh #{@ssh_uri.user}@#{@ssh_uri.host} 'restore INCLUDE_GIT'")
+      end
+      it { expect { run }.should exit_with_code(0) }
+    end
+
+    context 'when restoring a snapshot and failing to ssh' do
+      before(:each) do
+        File.stub!(:exists?).and_return(true)
+        RHC::TarGz.stub!(:contains).and_return(true)
+        Kernel.should_receive(:`).with("cat #{@app.name}.tar.gz | ssh #{@ssh_uri.user}@#{@ssh_uri.host} 'restore INCLUDE_GIT'")
+        $?.stub(:exitstatus) { 1 }
+      end
+      it { expect { run }.should exit_with_code(130) }
+    end
+
+    context 'when restoring a snapshot on windows' do
+      before(:each) do
+        RHC::Helpers.stub(:windows?) do ; true; end
+        RHC::Helpers.stub(:jruby?) do ; false ; end
+        RHC::Helpers.stub(:linux?) do ; false ; end
+        ssh = mock(Net::SSH)
+        session = mock(Net::SSH::Connection::Session)
+        channel = mock(Net::SSH::Connection::Channel)
+        Net::SSH.should_receive(:start).with(@ssh_uri.host, @ssh_uri.user).and_return(session)
+        session.should_receive(:open_channel).and_yield(channel)
+        channel.should_receive(:exec).with("restore INCLUDE_GIT").and_yield(nil, nil)
+        channel.should_receive(:on_data).and_yield(nil, 'foo')
+        channel.should_receive(:on_extended_data).and_yield(nil, nil, 'foo')
+        channel.should_receive(:on_close).and_yield(nil)
+        lines = ''
+        File.open(File.expand_path('../../assets/targz_sample.tar.gz', __FILE__), 'rb') do |file|
+          file.chunk(1024) do |chunk|
+            lines << chunk
+          end
+        end
+        channel.should_receive(:send_data).with(lines)
+        channel.should_receive(:eof!)
+        session.should_receive(:loop)
+      end
+      it { expect { run }.should exit_with_code(0) }
+    end
+
+    context 'when timing out on windows' do
+      before(:each) do
+        RHC::Helpers.stub(:windows?) do ; true; end
+        RHC::Helpers.stub(:jruby?) do ; false ; end
+        RHC::Helpers.stub(:linux?) do ; false ; end
+        ssh = mock(Net::SSH)
+        Net::SSH.should_receive(:start).with(@ssh_uri.host, @ssh_uri.user).and_raise(Timeout::Error)
+      end
+      it { expect { run }.should exit_with_code(130) }
+    end
+
+  end
+
+  describe 'snapshot restore file not found' do
+    let(:arguments) {['snapshot', 'restore', '--noprompt', '-l', 'test@test.foo', '-p', 'password', '--app', 'mockapp', '-f', 'foo.tar.gz']}
+    context 'when restoring a snapshot' do
+      it { expect { run }.should exit_with_code(130) }
+    end
+  end
+
+end
+

data/spec/rhc/commands/sshkey_spec.rb

@@ -58,14 +58,14 @@ describe RHC::Commands::Sshkey do
         end
       end
     end
-    
+
     context "when adding an invalid key" do
       let(:arguments) { %w[sshkey add --noprompt --config test.conf -l test@test.foo -p password foobar id_rsa.pub] }
-    
+
       before :each do
         @rc = MockRestClient.new
       end
-        
+
       it "fails to add the key" do
         FakeFS do
           keys = @rc.sshkeys
@@ -74,11 +74,33 @@ describe RHC::Commands::Sshkey do
             f << 'ssh-rsa AADAQABAAABAQCnCOqK7/mmvZ9AtCAerxjAasJ1rSpfuWT4vNm1+O/Fh0Di3chTWjY9a0M2hEnqkqnVG589L9CqCUeT0kdc3Vgw3JEcacSUr1z7tLr9kO+p/D5lSdQYzDGGRFOZ0H6lc/y8iNxWV1VO/sJvKx6cr5zvKIn8Q6GvhVNOxlai0IOb9FJxLGK95GLpZ+elzh8Tc9giy7KfwheAwhV2JoF9uRltE5JP/CNs7w/E29i1Z+jlueuu8RVotLmhSVNJm91Ey7OCtoI1iBE0Wv/SucFe32Qi08RWTM/MaGGz93KQNOVRGjNkosJjPmP1qU6WGBfliDkJAZXB0b6sEcnx1fbVikwZ'
           end
           expect { run }.should exit_with_code(128)
+          expect { run_output.should match("Name: mockkey") }
           @rc.sshkeys.length.should == num_keys
         end
       end
     end
 
+    context "when adding an invalid key with --confirm" do
+      let(:arguments) { %w[sshkey add --noprompt --confirm --config test.conf -l test@test.foo -p password foobar id_rsa.pub] }
+
+      before :each do
+        @rc = MockRestClient.new
+      end
+
+      it "warns and then adds the key" do
+        FakeFS do
+          keys = @rc.sshkeys
+          num_keys = keys.length
+          File.open('id_rsa.pub', 'w') do |f|
+            f << 'ssh-rsa AADAQABAAABAQCnCOqK7/mmvZ9AtCAerxjAasJ1rSpfuWT4vNm1+O/Fh0Di3chTWjY9a0M2hEnqkqnVG589L9CqCUeT0kdc3Vgw3JEcacSUr1z7tLr9kO+p/D5lSdQYzDGGRFOZ0H6lc/y8iNxWV1VO/sJvKx6cr5zvKIn8Q6GvhVNOxlai0IOb9FJxLGK95GLpZ+elzh8Tc9giy7KfwheAwhV2JoF9uRltE5JP/CNs7w/E29i1Z+jlueuu8RVotLmhSVNJm91Ey7OCtoI1iBE0Wv/SucFe32Qi08RWTM/MaGGz93KQNOVRGjNkosJjPmP1qU6WGBfliDkJAZXB0b6sEcnx1fbVikwZ'
+          end
+          expect { run }.should exit_with_code(0)
+          expect { run_output.should match("key you are uploading is not recognized") }
+          @rc.sshkeys.length.should == num_keys + 1
+        end
+      end
+    end
+
     context "when adding a nonexistent key" do
       let(:arguments) { %w[sshkey add --noprompt --config test.conf -l test@test.foo -p password foobar id_rsa.pub] }
     
@@ -138,4 +160,4 @@ describe RHC::Commands::Sshkey do
       end
     end
   end
-end
+end

data/spec/rhc/commands/tail_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+require 'rest_spec_helper'
+require 'rhc/commands/tail'
+require 'rhc/config'
+describe RHC::Commands::Tail do
+  before(:each) do
+    RHC::Config.set_defaults
+    @rc = MockRestClient.new
+    domain = @rc.add_domain("mock-domain-0")
+    @app = domain.add_application("mock-app-0", "ruby-1.8.7")
+  end
+
+  describe 'help' do
+    let(:arguments) { ['tail', '--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 tail") }
+    end
+  end
+
+  describe 'tail' do
+    let(:arguments) { ['tail', 'mock-app-0', '--noprompt', '--trace', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
+    context 'tail is run on an unreachable domain' do
+      it { expect { run }.should raise_error(SocketError) }
+    end
+    context 'tail succeeds and exits on Interrupt' do
+      before (:each) { @app.stub(:tail) { raise Interrupt.new } }
+      it { expect { run }.should exit_with_code(0) }
+    end
+  end
+end