rhc 0.97.17 → 0.98.16

data/spec/rhc/commands/domain_spec.rb

@@ -8,7 +8,7 @@ describe RHC::Commands::Domain do
     RHC::Config.set_defaults
   end
 
-  describe 'run' do
+  describe 'default action' do
     let(:arguments) { ['domain', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
 
     context 'when run with no domains' do
@@ -16,7 +16,19 @@ describe RHC::Commands::Domain do
         @rc = MockRestClient.new
       end
       it { expect { run }.should exit_with_code(0) }
-      it { run_output.should match("Namespace: No namespaces found") }
+      it { run_output.should match(/No domain exists.  You can use/) }
+    end
+  end
+
+  describe 'show' do
+    let(:arguments) { ['domain', 'show', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
+
+    context 'when run with no domains' do
+      before(:each) do
+        @rc = MockRestClient.new
+      end
+      it { expect { run }.should exit_with_code(0) }
+      it { run_output.should match(/No domain exists.  You can use/) }
     end
 
     context 'when run with one domain no apps' do
@@ -27,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("Namespace onedomain's Applications")
-        output.should match("No applications found")
+        output.should match(/Applications in onedomain\:/)
+        output.should match(/No applications.  You can use/)
       end
     end
 
@@ -41,10 +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("Namespace\\(0\\): firstdomain")
-        output.should match("Namespace\\(1\\): seconddomain")
-        output.should match("Namespace firstdomain's Applications")
-        output.should match("Namespace seconddomain's Applications")
+        output.should match("Applications in firstdomain\:")
+        output.should_not match("Applications in seconddomain\:")
       end
     end
 
@@ -62,7 +72,6 @@ describe RHC::Commands::Domain do
       it "should match output" do
         output = run_output
         output.should match("app_no_carts")
-        output.should match("None")
         output.should match("app_multi_carts")
         output.should match("testframework-1.0")
         output.should match("testcart-1")
@@ -70,6 +79,20 @@ describe RHC::Commands::Domain do
         output.should match("testcart-3")
       end
     end
+
+    context 'when run with an app without cartridges' do
+      before(:each) do
+        @rc = MockRestClient.new
+        d = @rc.add_domain("appdomain")
+        a = d.add_application("app_no_carts")
+      end
+      it { expect { run }.should exit_with_code(0) }
+      it "should match output" do
+        output = run_output
+        output.should match("app_no_carts")
+        output.should match("Cartridges: none")
+      end
+    end
   end
 
   describe 'create' do
@@ -84,7 +107,7 @@ describe RHC::Commands::Domain do
         expect { run }.should exit_with_code(0)
         @rc.domains[0].id.should == 'testnamespace'
       end
-      it { run_output.should match(/'testnamespace'\n\nRESULT:\n.*Success/m) }
+      it { run_output.should match(/'testnamespace'.*?RESULT:.*?Success/m) }
     end
   end
 
@@ -101,7 +124,7 @@ describe RHC::Commands::Domain do
         expect { run }.should exit_with_code(0)
         @rc.domains[0].id.should == 'alterednamespace'
       end
-      it { run_output.should match(/Updating domain 'olddomain' to namespace 'alterednamespace'\n\nRESULT:\n.*Success/m) }
+      it { run_output.should match(/Changing namespace 'olddomain' to 'alterednamespace'.*?RESULT:.*?Success/m) }
     end
 
     context 'when there is no domain' do
@@ -130,7 +153,7 @@ describe RHC::Commands::Domain do
         expect { run }.should exit_with_code(0)
         @rc.domains[0].id.should == 'alterednamespace'
       end
-      it { run_output.should match(/Updating domain 'olddomain' to namespace 'alterednamespace'\n\nRESULT:\n.*Success/m) }
+      it { run_output.should match(/Changing namespace 'olddomain' to 'alterednamespace'.*?RESULT:.*?Success/m) }
     end
   end
 
@@ -161,6 +184,19 @@ describe RHC::Commands::Domain do
       end
       it { run_output.should match("Domain deleteme does not exist") }
     end
+
+    context 'when there are applications on the domain' do
+      before(:each) do
+        @rc = MockRestClient.new
+        domain = @rc.add_domain("deleteme")
+        domain.add_application 'testapp1', 'mock-1.0'
+      end
+      it "should error out" do
+        expect { run }.should exit_with_code(128)
+        @rc.domains[0].id.should == 'deleteme'
+      end
+      it { run_output.should match("Domain contains applications.*?Delete applications first.") }
+    end
   end
 
   describe 'alias destroy' do
@@ -177,26 +213,13 @@ describe RHC::Commands::Domain do
         @rc.domains.empty?.should be_true
       end
     end
-
-    context 'when domain contains app' do
-      before(:each) do
-        @rc = MockRestClient.new
-        d = @rc.add_domain("deleteme")
-        d.add_application("app1", "testframework-1.0")
-      end
-
-      it "should fail to delete domain" do
-        expect { run }.should exit_with_code(128)
-        @rc.domains.empty?.should be_false
-      end
-    end
   end
 
   describe 'status' do
     let(:arguments) { ['domain', 'status', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
 
     before(:each) do
-      Kernel.stub!(:system) do |cmd| 
+      Kernel.stub!(:system) do |cmd|
         @cmd = cmd
         # run the true command to get $?.exitstatus == 0
         system("true")
@@ -213,7 +236,7 @@ describe RHC::Commands::Domain do
   end
 
   describe 'help' do
-    let(:arguments) { ['domain', 'help'] }
+    let(:arguments) { ['domain', '--help'] }
 
     context 'help is run' do
       it "should display help" do

data/spec/rhc/commands/port-forward_spec.rb

@@ -0,0 +1,133 @@
+require 'spec_helper'
+require 'rhc/commands/port-forward'
+require 'rhc/config'
+require 'uri'
+
+describe RHC::Commands::PortForward do
+
+  before(:each) do
+    RHC::Config.set_defaults
+  end
+
+  describe 'run' do
+    let(:arguments) { ['port-forward', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p', 'password', '--app', 'mockapp'] }
+
+    context 'when port forwarding a scaled app' do
+      before(:each) do
+        @rc = MockRestClient.new
+        domain = @rc.add_domain("mockdomain")
+        domain.add_application 'mockapp', 'mock-1.0', true
+      end
+      it "should error out" do
+        expect { run }.should exit_with_code(128)
+      end
+      it "should match the app state" do
+        @rc.domains[0].id.should == 'mockdomain'
+        @rc.domains[0].applications.size.should == 1
+        @rc.domains[0].applications[0].name.should == 'mockapp'
+      end
+      it { run_output.should match("This utility does not currently support scaled applications. You will need to set up port forwarding manually.") }
+    end
+
+    context 'when port forwarding an app without ports to forward' do
+      before(:each) do
+        @rc = MockRestClient.new
+        domain = @rc.add_domain("mockdomain")
+        app = domain.add_application 'mockapp', 'mock-1.0'
+        uri = URI.parse app.ssh_url
+        ssh = mock(Net::SSH)
+        Net::SSH.should_receive(:start).with(uri.host, uri.user).and_yield(ssh)
+        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)
+        @rc.domains[0].id.should == 'mockdomain'
+        @rc.domains[0].applications.size.should == 1
+        @rc.domains[0].applications[0].name.should == 'mockapp'
+      end
+      it { run_output.should match("no available ports to forward.") }
+    end
+
+    context 'when port forwarding an app with permission denied ports' do
+      before(:each) do
+        @rc = MockRestClient.new
+        domain = @rc.add_domain("mockdomain")
+        app = domain.add_application 'mockapp', 'mock-1.0'
+        ssh = mock(Net::SSH)
+        uri = URI.parse app.ssh_url
+        Net::SSH.should_receive(:start).with(uri.host, uri.user).and_yield(ssh)
+        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)
+        @rc.domains[0].id.should == 'mockdomain'
+        @rc.domains[0].applications.size.should == 1
+        @rc.domains[0].applications[0].name.should == 'mockapp'
+      end
+      it { run_output.should match("Permission denied") }
+    end
+
+    context 'when port forwarding an app with ports to forward' do
+      before(:each) do
+        @rc = MockRestClient.new
+        domain = @rc.add_domain("mockdomain")
+        app = domain.add_application 'mockapp', 'mock-1.0'
+        ssh = mock(Net::SSH)
+        uri = URI.parse app.ssh_url
+        Net::SSH.should_receive(:start).with(uri.host, uri.user).and_yield(ssh).twice
+        ssh.should_receive(:exec!).with("rhc-list-ports").and_yield(nil, :stdout, '127.0.0.1:3306')
+        forward = mock(Net::SSH::Service::Forward)
+        ssh.should_receive(:forward).and_return(forward)
+        forward.should_receive(:local).with('127.0.0.1', 3306, '127.0.0.1', 3306)
+        ssh.should_receive(:loop)
+      end
+      it "should error out as no ports to forward" do
+        expect { run }.should exit_with_code(0)
+        @rc.domains[0].id.should == 'mockdomain'
+        @rc.domains[0].applications.size.should == 1
+        @rc.domains[0].applications[0].name.should == 'mockapp'
+      end
+      it { run_output.should include("Forwarding ports, use ctl + c to stop") }
+    end
+
+    context 'when port forwarding an app with ports to forward' do
+      before(:each) do
+        @rc = MockRestClient.new
+        domain = @rc.add_domain("mockdomain")
+        app = domain.add_application 'mockapp', 'mock-1.0'
+      end
+      it "should error out if ssh host is unreachable" do
+        expect { run }.should exit_with_code(1)
+        @rc.domains[0].id.should == 'mockdomain'
+        @rc.domains[0].applications.size.should == 1
+        @rc.domains[0].applications[0].name.should == 'mockapp'
+      end
+      it { run_output.should include("Error trying to forward ports.") }
+    end
+
+    context 'when port forwarding an app with ports to forward' do
+      before(:each) do
+        @rc = MockRestClient.new
+        domain = @rc.add_domain("mockdomain")
+        app = domain.add_application 'mockapp', 'mock-1.0'
+        ssh = mock(Net::SSH)
+        uri = URI.parse app.ssh_url
+        Net::SSH.should_receive(:start).with(uri.host, uri.user).and_yield(ssh).twice
+        ssh.should_receive(:exec!).with("rhc-list-ports").and_yield(nil, :stdout, '127.0.0.1:3306')
+        forward = mock(Net::SSH::Service::Forward)
+        ssh.should_receive(:forward).and_return(forward)
+        forward.should_receive(:local).with('127.0.0.1', 3306, '127.0.0.1', 3306)
+        ssh.should_receive(:loop).and_raise(Interrupt.new)
+      end
+      it "should exit when user interrupts" do
+        expect { run }.should exit_with_code(0)
+        @rc.domains[0].id.should == 'mockdomain'
+        @rc.domains[0].applications.size.should == 1
+        @rc.domains[0].applications[0].name.should == 'mockapp'
+      end
+      it { run_output.should include("Ending port forward") }
+    end
+
+   end
+end
+

data/spec/rhc/commands/setup_spec.rb

@@ -35,14 +35,14 @@ describe RHC::Commands::Setup do
   end
 
   describe 'help' do
-    let(:arguments) { ['setup', 'help'] }
+    let(:arguments) { ['setup', '--help'] }
 
     context 'help is run' do
       it "should display help" do
         @wizard.stub!(:run).and_return(true)
         expect { run }.should exit_with_code(0)
       end
-      it('should output usage') { run_output.should match("Runs the setup wizard") }
+      it('should output usage') { run_output.should match("Easy to use wizard for getting started") }
     end
   end
 end

data/spec/rhc/commands/sshkey_spec.rb

@@ -0,0 +1,141 @@
+require 'spec_helper'
+require 'rhc/commands/sshkey'
+require 'rhc/config'
+
+
+describe RHC::Commands::Sshkey do
+  before(:each) do
+    RHC::Config.set_defaults
+  end
+  
+  describe 'list' do
+      
+    context "when run with list command" do
+      
+      let(:arguments) { %w[sshkey list --noprompt --config test.conf -l test@test.foo -p  password --trace] }
+
+      before(:each) do
+        @rc = MockRestClient.new
+      end
+
+      it { expect { run }.should exit_with_code(0) }
+      it { run_output.should match("Name: mockkey") }
+    end
+  end
+  
+  describe 'show' do
+      
+    context "when run with show command" do
+      
+      let(:arguments) { %w[sshkey show mockkey1 --noprompt --config test.conf -l test@test.foo -p  password --trace] }
+
+      before(:each) do
+        @rc = MockRestClient.new
+      end
+
+      it { expect { run }.should exit_with_code(0) }
+      it { run_output.should match("Name: mockkey1") }
+    end
+  end
+  
+  describe "add" do
+    context "when adding a valid 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 'adds the key' do
+        FakeFS do
+          keys = @rc.sshkeys
+          num_keys = keys.length
+          File.open('id_rsa.pub', 'w') do |f|
+            f << 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCnCOqK7/mmvZ9AtCAerxjAasJ1rSpfuWT4vNm1+O/Fh0Di3chTWjY9a0M2hEnqkqnVG589L9CqCUeT0kdc3Vgw3JEcacSUr1z7tLr9kO+p/D5lSdQYzDGGRFOZ0H6lc/y8iNxWV1VO/sJvKx6cr5zvKIn8Q6GvhVNOxlai0IOb9FJxLGK95GLpZ+elzh8Tc9giy7KfwheAwhV2JoF9uRltE5JP/CNs7w/E29i1Z+jlueuu8RVotLmhSVNJm91Ey7OCtoI1iBE0Wv/SucFe32Qi08RWTM/MaGGz93KQNOVRGjNkosJjPmP1qU6WGBfliDkJAZXB0b6sEcnx1fbVikwZ'
+          end
+          expect { run }.should exit_with_code(0)
+          @rc.sshkeys.length.should == num_keys + 1
+        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
+          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(128)
+          @rc.sshkeys.length.should == num_keys
+        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] }
+    
+      it "exits with status code Errno::ENOENT::Errno" do
+        expect { run }.should exit_with_code(128)
+      end
+    end
+    
+    context "when attempting to add an existing but inaccessible key" do
+      let(:arguments) { %w[sshkey add --noprompt --config test.conf -l test@test.foo -p password foobar inaccessible_key.pub] }
+      
+      before :all do
+        @inaccessible_key = 'inaccessible_key.pub'
+        File.new(@inaccessible_key, 'w+')
+        File.chmod(0000, @inaccessible_key)
+      end
+      
+      after :all do
+        File.delete @inaccessible_key
+      end
+    
+      it "exits with status code Errno::EACCES::Errno" do
+        expect { run }.should exit_with_code(128)
+      end
+      
+    end
+  end
+  
+  describe "remove" do
+    context "when removing an existing key" do
+      let (:arguments) { %w[sshkey remove --noprompt --config test.conf -l test@test.foo -p password mockkey2] }
+      
+      before :each do
+        @rc = MockRestClient.new
+      end
+      
+      it 'deletes the key' do
+        keys = @rc.sshkeys
+        num_keys = keys.length
+        expect {run}.should exit_with_code(0)
+        @rc.sshkeys.length.should == num_keys - 1
+      end
+    end
+
+    context "when removing a nonexistent key" do
+      let (:arguments) { %w[sshkey remove --noprompt --config test.conf -l test@test.foo -p password no_match] }
+      
+      before :each do
+        @rc = MockRestClient.new
+        @keys = @rc.sshkeys
+      end
+      
+      it 'leaves keys untouched' do
+        num_keys = @keys.length
+        expect {run}.should exit_with_code(0)
+        @rc.sshkeys.length.should == num_keys
+      end
+    end
+  end
+end