rhc 1.6.8 → 1.7.8

data/spec/rhc/commands/domain_spec.rb

@@ -10,13 +10,13 @@ describe RHC::Commands::Domain do
     context 'when run with no domains' do
       let(:arguments) { ['domain', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
 
-      it { expect { run }.should exit_with_code(1) }
+      it { expect { run }.to exit_with_code(1) }
       it { run_output.should match(/In order to deploy applications.*rhc domain create/) }
     end
     context 'when help is shown' do
       let(:arguments) { ['domain', '--noprompt', '--help'] }
 
-      it { expect { run }.should exit_with_code(0) }
+      it { expect { run }.to exit_with_code(0) }
       it { run_output.should match(/The default action for this resource is 'show'/) }
     end
   end
@@ -25,14 +25,14 @@ describe RHC::Commands::Domain do
     let(:arguments) { ['domain', 'show', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
 
     context 'when run with no domains' do
-      it { expect { run }.should exit_with_code(1) }
+      it { expect { run }.to exit_with_code(1) }
       it { run_output.should match(/In order to deploy applications.*rhc domain create/) }
     end
 
     context 'when run with one domain no apps' do
       before{ rest_client.add_domain("onedomain") }
 
-      it { expect { run }.should exit_with_code(0) }
+      it { expect { run }.to exit_with_code(0) }
       it "should match output" do
         output = run_output
         output.should match("The domain onedomain exists but has no applications. You can use")
@@ -44,7 +44,7 @@ describe RHC::Commands::Domain do
         rest_client.add_domain("firstdomain")
         rest_client.add_domain("seconddomain")
       end
-      it { expect { run }.should exit_with_code(0) }
+      it { expect { run }.to exit_with_code(0) }
       it "should match output" do
         output = run_output
         output.should match("The domain firstdomain exists but has no applications. You can use")
@@ -61,7 +61,7 @@ describe RHC::Commands::Domain do
         a.add_cartridge("testcart-2")
         a.add_cartridge("testcart-3")
       end
-      it { expect { run }.should exit_with_code(0) }
+      it { expect { run }.to exit_with_code(0) }
       it "should match output" do
         output = run_output
         output.should match("app_no_carts")
@@ -78,7 +78,7 @@ describe RHC::Commands::Domain do
         d = rest_client.add_domain("appdomain")
         a = d.add_application("app_no_carts")
       end
-      it { expect { run }.should exit_with_code(0) }
+      it { expect { run }.to exit_with_code(0) }
       it "should match output" do
         output = run_output
         output.should match("app_no_carts")
@@ -93,7 +93,7 @@ describe RHC::Commands::Domain do
     context 'when no issues with ' do
 
       it "should create a domain" do
-        expect { run }.should exit_with_code(0)
+        expect { run }.to exit_with_code(0)
         rest_client.domains[0].id.should == 'testnamespace'
       end
       it { run_output.should match(/'testnamespace'.*?RESULT:.*?Success/m) }
@@ -107,7 +107,7 @@ describe RHC::Commands::Domain do
       before{ rest_client.add_domain("olddomain") }
 
       it "should update a domain" do
-        expect { run }.should exit_with_code(0)
+        expect { run }.to exit_with_code(0)
         rest_client.domains[0].id.should == 'alterednamespace'
       end
       it { run_output.should match(/Changing namespace 'olddomain' to 'alterednamespace'.*?RESULT:.*?Success/m) }
@@ -115,7 +115,7 @@ describe RHC::Commands::Domain do
 
     context 'when there is no domain' do
       it "should not create a domain" do
-        expect { run }.should exit_with_code(127)
+        expect { run }.to exit_with_code(127)
         rest_client.domains.empty?.should be_true
       end
       it { run_output.should match("not found") }
@@ -129,7 +129,7 @@ describe RHC::Commands::Domain do
       before{ rest_client.add_domain("olddomain") }
 
       it "should update a domain" do
-        expect { run }.should exit_with_code(0)
+        expect { run }.to exit_with_code(0)
         rest_client.domains[0].id.should == 'alterednamespace'
       end
       it { run_output.should match(/Changing namespace 'olddomain' to 'alterednamespace'.*?RESULT:.*?Success/m) }
@@ -143,7 +143,7 @@ describe RHC::Commands::Domain do
       before{ rest_client.add_domain("deleteme") }
 
       it "should delete a domain" do
-        expect { run }.should exit_with_code(0)
+        expect { run }.to exit_with_code(0)
         rest_client.domains.empty?.should be_true
       end
     end
@@ -152,7 +152,7 @@ describe RHC::Commands::Domain do
       before{ rest_client.add_domain("dontdelete") }
 
       it "should error out" do
-        expect { run }.should exit_with_code(127)
+        expect { run }.to exit_with_code(127)
         rest_client.domains[0].id.should == 'dontdelete'
       end
       it { run_output.should match("Domain deleteme not found") }
@@ -164,7 +164,7 @@ describe RHC::Commands::Domain do
         domain.add_application 'testapp1', 'mock-1.0'
       end
       it "should error out" do
-        expect { run }.should exit_with_code(128)
+        expect { run }.to exit_with_code(128)
         rest_client.domains[0].id.should == 'deleteme'
       end
       it { run_output.should match("Domain contains applications.*?Delete applications first.") }
@@ -178,7 +178,7 @@ describe RHC::Commands::Domain do
       before{ rest_client.add_domain("deleteme") }
 
       it "should delete a domain" do
-        expect { run }.should exit_with_code(0)
+        expect { run }.to exit_with_code(0)
         rest_client.domains.empty?.should be_true
       end
     end
@@ -189,7 +189,7 @@ describe RHC::Commands::Domain do
 
     context 'help is run' do
       it "should display help" do
-        expect { run }.should exit_with_code(0)
+        expect { run }.to exit_with_code(0)
       end
       it('should output usage') { run_output.should match("Usage: rhc domain") }
     end

data/spec/rhc/commands/git_clone_spec.rb

@@ -42,7 +42,7 @@ describe RHC::Commands::GitClone do
           end
         end
 
-        it { expect { run }.should exit_with_code(0) }
+        it { expect { run }.to exit_with_code(0) }
         it { run_output.should match("Cloned") }
       end
 
@@ -65,14 +65,14 @@ describe RHC::Commands::GitClone do
               FakeFS::FileSystem.find(hook))
           end
         end
-        it { expect { run }.should exit_with_code(0) }
+        it { expect { run }.to exit_with_code(0) }
         it { run_output.should match("Copied") }
       end
 
       context "reports failure" do
         before{ @instance.stub(:git_clone_repo).and_raise(RHC::GitException) }
 
-        it { expect { run }.should exit_with_code(216) }
+        it { expect { run }.to exit_with_code(216) }
         it { run_output.should match("Git returned an error") }
       end
     end

data/spec/rhc/commands/logout_spec.rb

@@ -0,0 +1,86 @@
+require 'spec_helper'
+require 'rest_spec_helper'
+require 'rhc'
+require 'rhc/commands/logout'
+
+describe RHC::Commands::Logout do
+
+  describe '#run' do
+    let(:arguments) { ['logout'] }
+    let(:username) { 'foo' }
+    let(:password) { nil }
+    let(:supports_auth) { false }
+    let(:server) { mock_uri }
+    let!(:token_store) { RHC::Auth::TokenStore.new(Dir.mktmpdir) }
+    before{ user_config }
+    before do
+      stub_api(mock_user_auth, supports_auth)
+      stub_user
+      RHC::Auth::TokenStore.should_receive(:new).at_least(0).times.and_return(token_store)
+    end
+
+    context "when calling from the alias" do
+      let(:arguments){ ['account', 'logout', '-h'] }
+      it("should print usage"){ run_output.should match "Usage: rhc logout" }
+    end
+
+    it("should clear the token cache"){ expect{ run }.to call(:clear).on(token_store) }
+    it("should exit with success"){ expect{ run }.to exit_with_code(0) }
+    it("should display a message"){ run_output.should match("All local sessions removed.") }
+
+    context "when --all is requested" do
+      let(:arguments) { ['account', 'logout', '--all'] }
+
+      context "if the server does not implement authorizations" do
+        it("should display a message"){ run_output.should match(/Deleting all authorizations associated with your account.*not supported/) }
+        it("should exit with success"){ expect{ run }.to exit_with_code(0) }
+      end
+
+      context "if the server implements authorizations" do
+        let(:supports_auth) { true }
+        before{ stub_delete_authorizations }
+
+        it("should display a message"){ run_output.should match(/Deleting all authorizations associated with your account.*done/) }
+        it("should exit with success"){ expect{ run }.to exit_with_code(0) }
+      end
+    end
+
+    context "when --token is provided" do
+      let(:arguments) { ['account', 'logout', '--token', 'foo'] }
+      def user_auth; { :token => 'foo' }; end
+
+      context "if the server does not implement authorizations" do
+        it("should display a message"){ run_output.should match(/Ending session on server.*not supported/) }
+        it("should exit with success"){ expect{ run }.to exit_with_code(0) }
+      end
+
+      context "if the server implements authorizations" do
+        let(:supports_auth) { true }
+
+        context "if the server returns successfully" do
+          before{ stub_delete_authorization('foo') }
+
+          it("should display a message"){ run_output.should match(/Ending session on server.*deleted/) }
+          it("should exit with success"){ expect{ run }.to exit_with_code(0) }
+          it("should clear the token cache"){ expect{ run }.to call(:clear).on(token_store) }
+        end
+
+        context "if the server rejects the token" do
+          before{ stub_request(:delete, mock_href('broker/rest/user/authorizations/foo', false)).to_return(:status => 401, :body => {}.to_json) }
+
+          it("should display a message"){ run_output.should match(/Ending session on server.*already closed/) }
+          it("should exit with success"){ expect{ run }.to exit_with_code(0) }
+          it("should clear the token cache"){ expect{ run }.to call(:clear).on(token_store) }
+        end
+
+        context "if the server returns an unexpected error" do
+          before{ stub_request(:delete, mock_href('broker/rest/user/authorizations/foo', false)).to_return(:status => 500, :body => {}.to_json) }
+
+          it("should display a message"){ run_output.should match(/Ending session on server.*The server did not respond/) }
+          it("should exit with success"){ expect{ run }.to exit_with_code(0) }
+          it("should clear the token cache"){ expect{ run }.to call(:clear).on(token_store) }
+        end
+      end
+    end
+  end
+end

data/spec/rhc/commands/port_forward_spec.rb

@@ -26,7 +26,7 @@ describe RHC::Commands::PortForward do
         @gg.should_receive(:gears).and_return([{'state' => 'stopped', 'id' => 'fakegearid'}])
       end
       it "should error out and suggest restarting the application" do
-        expect { run }.should exit_with_code(1)
+        expect { run }.to exit_with_code(1)
       end
       it { run_output.should match(/Application \S+ is stopped\..*restart/m) }
     end
@@ -37,7 +37,7 @@ describe RHC::Commands::PortForward do
         @ssh.should_receive(:exec!).with("rhc-list-ports").and_yield(nil, :stderr, '127.0.0.1:3306')
       end
       it "should error out as no ports to forward" do
-        expect { run }.should exit_with_code(102)
+        expect { run }.to exit_with_code(102)
         rest_client.domains[0].id.should == 'mockdomain'
         rest_client.domains[0].applications.size.should == 1
         rest_client.domains[0].applications[0].name.should == 'mockapp'
@@ -51,7 +51,7 @@ describe RHC::Commands::PortForward do
         @ssh.should_receive(:exec!).with("rhc-list-ports").and_yield(nil, :stderr, 'permission denied')
       end
       it "should error out as permission denied" do
-        expect { run }.should exit_with_code(129)
+        expect { run }.to exit_with_code(129)
         rest_client.domains[0].id.should == 'mockdomain'
         rest_client.domains[0].applications.size.should == 1
         rest_client.domains[0].applications[0].name.should == 'mockapp'
@@ -69,7 +69,7 @@ describe RHC::Commands::PortForward do
         @ssh.should_receive(:loop)
       end
       it "should run successfully" do
-        expect { run }.should exit_with_code(0)
+        expect { run }.to exit_with_code(0)
         rest_client.domains[0].id.should == 'mockdomain'
         rest_client.domains[0].applications.size.should == 1
         rest_client.domains[0].applications[0].name.should == 'mockapp'
@@ -82,7 +82,7 @@ describe RHC::Commands::PortForward do
         Net::SSH.should_receive(:start).and_raise(Errno::EHOSTUNREACH)
       end
       it "should error out" do
-        expect { run }.should exit_with_code(1)
+        expect { run }.to exit_with_code(1)
         rest_client.domains[0].id.should == 'mockdomain'
         rest_client.domains[0].applications.size.should == 1
         rest_client.domains[0].applications[0].name.should == 'mockapp'
@@ -94,7 +94,7 @@ describe RHC::Commands::PortForward do
       before(:each) do
         rest_client.should_receive(:find_domain).and_raise(RHC::Rest::ConnectionException)
       end
-      it("should error out") { expect { run }.should exit_with_code(1) }
+      it("should error out") { expect { run }.to exit_with_code(1) }
       it{ run_output.should match("Connection.*failed:") }
     end
 
@@ -108,7 +108,7 @@ describe RHC::Commands::PortForward do
         @ssh.should_receive(:loop).and_raise(Interrupt.new)
       end
       it "should exit when user interrupts" do
-        expect { run }.should exit_with_code(0)
+        expect { run }.to exit_with_code(0)
         rest_client.domains[0].id.should == 'mockdomain'
         rest_client.domains[0].applications.size.should == 1
         rest_client.domains[0].applications[0].name.should == 'mockapp'
@@ -139,7 +139,7 @@ describe RHC::Commands::PortForward do
         @ssh.should_receive(:forward).and_raise(Errno::ECONNREFUSED)
       end
       it "should error out" do
-        expect { run }.should exit_with_code(0)
+        expect { run }.to exit_with_code(0)
       end
       it { run_output.should include("ssh -N") }
       it { run_output.should include("Error forwarding") }
@@ -164,7 +164,7 @@ describe RHC::Commands::PortForward do
         @ssh.should_receive(:loop).and_raise(Interrupt.new)
       end
       it "should exit when user interrupts" do
-        expect { run }.should exit_with_code(0)
+        expect { run }.to exit_with_code(0)
         rest_client.domains[0].id.should == 'mockdomain'
         rest_client.domains[0].applications.size.should == 1
         rest_client.domains[0].applications[0].name.should == 'mockapp'

data/spec/rhc/commands/server_spec.rb

@@ -13,13 +13,13 @@ describe RHC::Commands::Server do
     context 'when server refuses connection' do
       before { stub_request(:get, 'https://foo.com/broker/rest/api').with(&user_agent_header).with(&expect_authorization(:user => 'person')).to_raise(SocketError) }
       it('should output an error') { run_output.should =~ /Connected to foo.com.*Unable to connect to the server/m }
-      it { expect { run }.should exit_with_code(1) }
+      it { expect { run }.to exit_with_code(1) }
     end
 
     context 'when API is missing' do
       before { stub_request(:get, 'https://foo.com/broker/rest/api').with(&user_agent_header).with(&expect_authorization(:user => 'person')).to_return(:status => 404) }
       it('should output an error') { run_output.should =~ /Connected to foo.com.*server is not responding correctly/m }
-      it { expect { run }.should exit_with_code(1) }
+      it { expect { run }.to exit_with_code(1) }
     end
 
     context 'when API is at version 1.2' do
@@ -27,7 +27,7 @@ describe RHC::Commands::Server do
         rest_client.stub(:api_version_negotiated).and_return('1.2')
       end
       it('should output an error') { run_output.should =~ /Connected to foo.com.*Using API version 1.2/m }
-      it { expect { run }.should exit_with_code(0) }
+      it { expect { run }.to exit_with_code(0) }
     end
   end
 
@@ -38,7 +38,7 @@ describe RHC::Commands::Server do
     context 'when no issues' do
       before { stub_request(:get, 'https://openshift.redhat.com/app/status/status.json').with(&user_agent_header).to_return(:body => {'issues' => []}.to_json) }
       it('should output success') { run_output.should =~ /All systems running fine/ }
-      it { expect { run }.should exit_with_code(0) }
+      it { expect { run }.to exit_with_code(0) }
     end
 
     context 'when 1 issue' do
@@ -55,7 +55,7 @@ describe RHC::Commands::Server do
               }] 
             }}]}.to_json)
       end
-      it { expect { run }.should exit_with_code(1) }
+      it { expect { run }.to exit_with_code(1) }
       it('should output message') { run_output.should =~ /1 open issue/ }
       it('should output title') { run_output.should =~ /Root cause/ }
       it('should contain update') { run_output.should =~ /Working on update/ }

data/spec/rhc/commands/setup_spec.rb

@@ -24,14 +24,14 @@ describe RHC::Commands::Setup do
 
     context 'when no issues' do
       it "should exit 0" do
-        expect { run }.should exit_with_code(0)
+        expect { run }.to exit_with_code(0)
       end
     end
 
     context 'when there is an issue' do
       it "should exit 1" do
         @wizard.stub!(:run).and_return(false)
-        expect { run }.should exit_with_code(1)
+        expect { run }.to exit_with_code(1)
       end
     end
   end
@@ -72,7 +72,7 @@ describe RHC::Commands::Setup do
     let(:input) { ['', 'y', '', ''] }
     let!(:rest_client){ MockRestClient.new }
 
-    it("succeeds"){ FakeFS{ expect { run input }.should exit_with_code 0 } }
+    it("succeeds"){ FakeFS{ expect { run input }.to exit_with_code 0 } }
     it("the output includes debug output") do
       FakeFS{ run_output( input ).should match 'DEBUG' }
     end
@@ -84,7 +84,7 @@ describe RHC::Commands::Setup do
     let(:input) { ['', 'y', '', ''] }
     let!(:rest_client){ MockRestClient.new }
 
-    it("succeeds"){ FakeFS{ expect { run input }.should exit_with_code 0 } }
+    it("succeeds"){ FakeFS{ expect { run input }.to 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
@@ -96,9 +96,23 @@ describe RHC::Commands::Setup do
     context 'help is run' do
       it "should display help" do
         @wizard.stub!(:run).and_return(true)
-        expect { run }.should exit_with_code(0)
+        expect { run }.to exit_with_code(0)
       end
       it('should output usage') { run_output.should match("Connects to an OpenShift server to get you started. Will") }
     end
   end
+
+  describe '--autocomplete' do
+    let(:arguments) { ['setup', '--autocomplete'] }
+    before do 
+      path = File.join(Gem.loaded_specs['rhc'].full_gem_path, "autocomplete")
+      FakeFS::FileUtils.mkdir_p(path)
+      FakeFS::FileUtils.touch(File.join(path, "rhc_bash"))
+    end
+
+    context 'is passed' do
+      it('should output information') { FakeFS{ run_output.should match("To enable tab-completion") } }
+      it('should output the gem path') { FakeFS{ run_output.should match File.join(RHC::Config.home_conf_dir, 'bash_autocomplete') } }
+    end
+  end
 end

data/spec/rhc/commands/snapshot_spec.rb

@@ -9,7 +9,7 @@ describe RHC::Commands::Snapshot do
   APP_NAME = 'mockapp'
 
   let!(:rest_client) { MockRestClient.new }
-  before(:each) do
+  before do
     user_config
     @app = rest_client.add_domain("mockdomain").add_application APP_NAME, 'mock-1.0'
     @ssh_uri = URI.parse @app.ssh_url
@@ -17,14 +17,14 @@ describe RHC::Commands::Snapshot do
     FileUtils.cp(File.expand_path('../../assets/targz_sample.tar.gz', __FILE__), filename)
   end
 
-  after(:each) do
+  after do
     filename = APP_NAME + '.tar.gz'
     File.delete filename if File.exist? filename
   end
 
   describe 'snapshot without an action' do
     let(:arguments) {['snapshot', '--trace', '--noprompt']}
-    it('should raise') { expect{ run }.should raise_error(ArgumentError, /Please specify an action to take/) }
+    it('should raise') { expect{ run }.to raise_error(ArgumentError, /Please specify an action to take/) }
   end
 
   describe 'snapshot save' do
@@ -35,7 +35,7 @@ describe RHC::Commands::Snapshot 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) }
+      it { expect { run }.to exit_with_code(0) }
     end
 
     context 'when failing to save a snapshot' do
@@ -43,7 +43,7 @@ describe RHC::Commands::Snapshot 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) }
+      it { expect { run }.to exit_with_code(130) }
     end
 
     context 'when saving a snapshot on windows' do
@@ -55,7 +55,7 @@ describe RHC::Commands::Snapshot do
         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 { expect { run }.to exit_with_code(0) }
       it { run_output.should match("Success") }
     end
 
@@ -67,7 +67,7 @@ describe RHC::Commands::Snapshot do
         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) }
+      it { expect { run }.to exit_with_code(130) }
     end
 
   end
@@ -82,7 +82,7 @@ describe RHC::Commands::Snapshot do
         `(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) }
+      it { expect { run }.to exit_with_code(0) }
     end
 
     context 'when restoring a snapshot and failing to ssh' do
@@ -92,7 +92,7 @@ describe RHC::Commands::Snapshot do
         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) }
+      it { expect { run }.to exit_with_code(130) }
     end
 
     context 'when restoring a snapshot on windows' do
@@ -119,7 +119,7 @@ describe RHC::Commands::Snapshot do
         channel.should_receive(:eof!)
         session.should_receive(:loop)
       end
-      it { expect { run }.should exit_with_code(0) }
+      it { expect { run }.to exit_with_code(0) }
     end
 
     context 'when timing out on windows' do
@@ -130,7 +130,7 @@ describe RHC::Commands::Snapshot do
         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) }
+      it { expect { run }.to exit_with_code(130) }
     end
 
   end
@@ -138,7 +138,7 @@ describe RHC::Commands::Snapshot do
   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) }
+      it { expect { run }.to exit_with_code(130) }
     end
   end