rhc 1.2.7 → 1.3.8

data/spec/rhc/commands/apps_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+require 'rest_spec_helper'
+require 'rhc/commands/apps'
+
+describe RHC::Commands::Apps do
+  before{ user_config }
+  let!(:rest_client){ MockRestClient.new }
+
+  describe 'run' do
+    context 'when no domains' do
+      let(:arguments) { ['apps'] }
+
+      it { expect { run }.should exit_with_code(1) }
+      it { run_output.should match(/In order to deploy applications.*rhc domain create/) }
+    end
+
+    context 'with a domain' do
+      let(:arguments){ ['apps'] }
+      let!(:domain){ rest_client.add_domain("first") }
+
+      it { expect { run }.should exit_with_code(1) }
+      it { run_output.should match(/No applications.*rhc app create/) }
+
+      context 'with apps' do
+        let(:arguments) { ['apps'] }
+        before{ domain.add_application('scaled', 'php', true) }
+
+        it { expect { run }.should exit_with_code(0) }
+        it { run_output.should match(/scaled.*\-\-.*php.*Scaling:.*x2 \(minimum/m) }
+      end
+    end
+
+    context 'when help is shown' do
+      let(:arguments) { ['apps', '--help'] }
+      it { expect { run }.should exit_with_code(0) }
+      it { run_output.should match(/rhc apps.*Display the list of applications/m) }
+    end
+  end
+end

data/spec/rhc/commands/cartridge_spec.rb

@@ -22,132 +22,142 @@ describe RHC::Commands::Cartridge do
     exit_with_code_and_message(code)
   end
 
-
-  before(:each) do
-    RHC::Config.set_defaults
-  end
+  before{ user_config }
 
   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
+    let!(:rest_client){ MockRestClient.new }
+    context "with all arguments" do
+      let(:arguments) { ['cartridge', '--trace', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
+      it { succeed_with_message /mock_cart-1.*mock_cart-2.*unique_mock_cart-1/m }
+    end
+    context "without password" do
+      let(:arguments) { ['cartridge', '--trace', '--noprompt', '--config', 'test.conf'] }
       it { succeed_with_message /mock_cart-1.*mock_cart-2.*unique_mock_cart-1/m }
     end
   end
 
-  describe 'run without password' do
-    let(:arguments) { ['cartridge', '--trace', '--noprompt', '--config', 'test.conf'] }
-
-    context 'when run' do
-      before(:each) do
-        @rc = MockRestClient.new
+  describe 'cartridge list' do
+    let(:arguments){ ['cartridge', 'list'] }
+    let(:username){ nil }
+    let(:password){ nil }
+    let(:server){ mock_uri }
+    let(:user_auth){ false }
+
+    context 'with valid carts' do
+      before{ stub_api; stub_simple_carts }
+
+      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{ expect{ run }.should exit_with_code(0) }
+
+      context 'with verbose list' do
+        let(:arguments){ ['cartridge', 'list', '--verbose'] }
+        it{ run_output.should match /Mock1 Cart.*\[mock_standalone_cart\-1\] \(web\)/ }
+        it{ run_output.should match /mock_standalone_cart\-2 \(web\)/ }
+        it{ run_output.should match "Mock2 description\n\n" }
+        it{ run_output.should match "Tagged with: scheduled" }
+        it{ run_output.should_not match("Tagged with: cartridge") }
       end
-      it { succeed_with_message /mock_cart-1.*mock_cart-2.*unique_mock_cart-1/m }
     end
   end
 
   describe 'alias app cartridge' do
+    let!(:rest_client){ MockRestClient.new }
     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/m }
     end
   end
 
   describe 'cartridge add' do
+    let!(:rest_client){ MockRestClient.new }
     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")
+        domain = rest_client.add_domain("mock_domain")
         app = domain.add_application("app1", "mock_type")
       end
-      it {
-        succeed_with_message
-      }
+      it { succeed_with_message /Adding mock_cart-1 to application 'app1' \.\.\. / }
+      it { succeed_with_message /Connection URL:\s+http\:\/\/fake\.url/ }
+      it { succeed_with_message /Prop1:\s+value1/ }
+      it { succeed_with_message /Cartridge added with properties/ }
     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'] }
+  describe 'cartridge add' do
+    let!(:rest_client){ MockRestClient.new }
+    let(:instance) do
+      domain = rest_client.add_domain("mock_domain")
+      @app = domain.add_application("app1", "mock_type")
+      instance = RHC::Commands::Cartridge.new
+      RHC::Commands::Cartridge.stub(:new) { instance }
+      instance
+    end
 
-    context 'when run' do
+    context 'with app context' do
+      let(:arguments) { ['cartridge', 'add', 'mock_cart-1', '--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")
-        instance = RHC::Commands::Cartridge.new
-        instance.stub(:git_config_get) { |key| app.uuid if key == "rhc.app-uuid" }
-        RHC::Commands::Cartridge.stub(:new) { instance }
+        instance.stub(:git_config_get) { |key| @app.uuid if key == "rhc.app-uuid" }
       end
-      it {
-        succeed_with_message
-      }
+      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 'with named app context' do
+      let(:arguments) { ['cartridge', 'add', 'mock_cart-1', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
+      before(:each) do
+        instance.stub(:git_config_get) { |key| @app.name if key == "rhc.app-name" }
+      end
+      it{ succeed_with_message }
+    end
 
-    context 'when run' do
+    context 'without app context' do
+      let(:arguments) { ['cartridge', 'add', 'mock_cart-1', '--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")
-        instance = RHC::Commands::Cartridge.new
-        instance.stub(:git_config_get) { |key| "" if key == "rhc.app-uuid" }
-        RHC::Commands::Cartridge.stub(:new) { instance }
+        instance.should_receive(:git_config_get).with('rhc.app-name').and_return(nil)
+        instance.should_receive(:git_config_get).with('rhc.app-uuid').and_return('')
       end
-      it {
-        fail_with_code
-      }
+      it{ fail_with_code }
+    end
+    context 'without missing app context' do
+      let(:arguments) { ['cartridge', 'add', 'mock_cart-1', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
+      before(:each) do
+        instance.should_receive(:git_config_get).with('rhc.app-name').and_return(nil)
+        instance.should_receive(:git_config_get).with('rhc.app-uuid').and_return('foo')
+      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'] }
+  describe 'cartridge add' do
+    let!(:rest_client){ MockRestClient.new }
 
-    context 'when run' do
+    context 'when invoked through an alias' do
+      let(:arguments) { ['app', 'cartridge', 'add', 'unique_mock_cart', '--app', 'app1', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
       before(:each) do
-        @rc = MockRestClient.new
-        domain = @rc.add_domain("mock_domain")
+        domain = rest_client.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
+    context 'when cartridge does not exist' do
+      let(:arguments) { ['cartridge', 'add', 'nomatch_cart', '--app', 'app1', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
       before(:each) do
-        @rc = MockRestClient.new
-        domain = @rc.add_domain("mock_domain")
+        domain = rest_client.add_domain("mock_domain")
         app = domain.add_application("app1", "mock_type")
       end
-      it {
-        fail_with_code 154
-      }
+      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
+    context 'when multiple carts match' do
+      let(:arguments) { ['cartridge', 'add', 'mock_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")
+        domain = rest_client.add_domain("mock_domain")
         app = domain.add_application("app1", "mock_type")
       end
       it {
@@ -156,29 +166,24 @@ describe RHC::Commands::Cartridge do
     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'] }
+  describe 'cartridge remove' do
+    let!(:rest_client){ MockRestClient.new }
 
-    context 'when run' do
+    context 'when run with --noprompt and without --confirm' do
+      let(:arguments) { ['cartridge', 'remove', '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")
+        domain = rest_client.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'] }
+      it{ fail_with_message "This action requires the --confirm option" }
+    end
 
-    context 'when run' do
+    context 'when run with confirmation' do
+      let(:arguments) { ['cartridge', 'remove', 'mock_cart-1', '--confirm', '--trace', '-a', 'app1', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
       before(:each) do
-        @rc = MockRestClient.new
-        domain = @rc.add_domain("mock_domain")
+        domain = rest_client.add_domain("mock_domain")
         @app = domain.add_application("app1", "mock_type")
       end
       it "should remove cartridge" do
@@ -194,11 +199,11 @@ describe RHC::Commands::Cartridge do
   end
 
   describe 'cartridge status' do
+    let!(:rest_client){ MockRestClient.new }
     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")
+      @domain = rest_client.add_domain("mock_domain")
       @app = @domain.add_application("app1", "mock_type")
       @app.add_cartridge('mock_cart-1')
     end
@@ -214,12 +219,12 @@ describe RHC::Commands::Cartridge do
   end
 
   describe 'cartridge start' do
+    let!(:rest_client){ MockRestClient.new }
     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")
+        domain = rest_client.add_domain("mock_domain")
         app = domain.add_application("app1", "mock_type")
         app.add_cartridge('mock_cart-1')
       end
@@ -228,12 +233,12 @@ describe RHC::Commands::Cartridge do
   end
 
   describe 'cartridge stop' do
+    let!(:rest_client){ MockRestClient.new }
     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")
+        domain = rest_client.add_domain("mock_domain")
         app = domain.add_application("app1", "mock_type")
         app.add_cartridge('mock_cart-1')
       end
@@ -242,12 +247,12 @@ describe RHC::Commands::Cartridge do
   end
 
   describe 'cartridge restart' do
+    let!(:rest_client){ MockRestClient.new }
     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")
+        domain = rest_client.add_domain("mock_domain")
         app = domain.add_application("app1", "mock_type")
         app.add_cartridge('mock_cart-1')
       end
@@ -256,12 +261,12 @@ describe RHC::Commands::Cartridge do
   end
 
   describe 'cartridge reload' do
+    let!(:rest_client){ MockRestClient.new }
     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")
+        domain = rest_client.add_domain("mock_domain")
         app = domain.add_application("app1", "mock_type")
         app.add_cartridge('mock_cart-1')
       end
@@ -270,8 +275,24 @@ describe RHC::Commands::Cartridge do
   end
 
   describe 'cartridge show' do
+    let!(:rest_client){ MockRestClient.new }
     let(:arguments) { ['cartridge', 'show', 'mock_cart-1', '-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")
+      app.add_cartridge('mock_cart-1')
+    end
+
+    context 'when run with exactly the same case as how cartridge was created' do
+      it { run_output.should match('Connection URL: http://fake.url') }
+      it { run_output.should match(/Prop1:\s+value1/) }
+    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")
@@ -279,34 +300,36 @@ describe RHC::Commands::Cartridge do
       app.add_cartridge('mock_cart-1')
     end
 
-    context 'when run' do
-      it { run_output.should match('Connection URL = http://fake.url') }
+    context 'when run with different case from how cartrige was created' do
+      it { run_output.should match('Connection URL: http://fake.url') }
+      it { run_output.should match(/Prop1:\s+value1/) }
     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'] }
 
     context 'when run' do
       before(:each) do
-        @rc = MockRestClient.new
-        domain = @rc.add_domain("mock_domain")
+        domain = rest_client.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') }
+      it { run_output.should match(/Scaling: .*x2 \(minimum/) }
+      it { run_output.should match('minimum: 2') }
+      it { run_output.should match('maximum: available') }
     end
   end
 
   describe 'cartridge scale' do
+    let!(:rest_client){ MockRestClient.new }
     let(:arguments) { ['cartridge', 'scale', @cart_type || 'mock_type', '-a', 'app1', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] | (@extra_args || []) }
 
+    let(:current_scale) { 1 }
     before(:each) do
-      @rc = MockRestClient.new
-      domain = @rc.add_domain("mock_domain")
+      domain = rest_client.add_domain("mock_domain")
       app = domain.add_application("app1", "mock_type", scalable)
+      app.cartridges.first.stub(:current_scale).and_return(current_scale)
     end
 
     context 'when run with scalable app' do
@@ -318,12 +341,12 @@ describe RHC::Commands::Cartridge do
 
       it "with a min value" do
         @extra_args = ["--min","6"]
-        succeed_with_message "Minimum = 6"
+        succeed_with_message "minimum: 6"
       end
 
       it "with a max value" do
         @extra_args = ["--max","3"]
-        succeed_with_message 'Maximum = 3'
+        succeed_with_message 'maximum: 3'
       end
 
       it "with an invalid min value" do
@@ -355,10 +378,9 @@ describe RHC::Commands::Cartridge do
     let(:cart_type) { ['mock_cart-1'] }
 
     before(:each) do
-      @rc = MockRestClient.new
-      domain = @rc.add_domain("mock_domain")
+      domain = rest_client.add_domain("mock_domain")
       app = domain.add_application("app1", "mock_type", false)
-      app.add_cartridge('mock_cart-1', true, 5)
+      app.add_cartridge('mock_cart-1', true)
     end
 
     context 'when run with no arguments' do