rhc 1.2.7 → 1.3.8

data/spec/rhc/commands/alias_spec.rb

@@ -2,16 +2,17 @@ require 'spec_helper'
 require 'rest_spec_helper'
 require 'rhc/commands/alias'
 require 'rhc/config'
+
 describe RHC::Commands::Alias do
   let(:client_links)   { mock_response_links(mock_client_links) }
   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!(:rest_client){ MockRestClient.new }
   before(:each) do
-    RHC::Config.set_defaults
-    @rc = MockRestClient.new
-    @rc.add_domain("mock_domain_0").add_application("mock_app_0", "ruby-1.8.7")
-    stub_api_request(:any, client_links['LIST_DOMAINS']['relative']).with(:headers => {'Accept-Encoding'=>'gzip, deflate'}).
+    user_config
+    rest_client.add_domain("mock_domain_0").add_application("mock_app_0", "ruby-1.8.7")
+    stub_api_request(:any, client_links['LIST_DOMAINS']['relative']).
             to_return({ :body   => {
                           :type => 'domains',
                           :data =>
@@ -24,7 +25,7 @@ describe RHC::Commands::Alias do
                         }.to_json,
                         :status => 200
                       })
-    stub_api_request(:any, domain_0_links['LIST_APPLICATIONS']['relative']).with(:headers => {'Accept-Encoding'=>'gzip, deflate'}).
+    stub_api_request(:any, domain_0_links['LIST_APPLICATIONS']['relative']).
             to_return({ :body   => {
                     :type => 'applications',
                     :data =>
@@ -39,7 +40,8 @@ describe RHC::Commands::Alias do
                   }.to_json,
                   :status => 200
                 })
-    stub_api_request(:any, app_0_links['ADD_ALIAS']['relative']).with(:body => {:event => 'add-alias', :alias => 'www.foo.bar'}, :headers => {'Accept-Encoding'=>'gzip, deflate', 'Content-Length'=>'33', 'Content-Type'=>'application/x-www-form-urlencoded'}).
+    stub_api_request(:any, app_0_links['ADD_ALIAS']['relative'], false).
+            with(:body => {:event => 'add-alias', :alias => 'www.foo.bar'}).
             to_return({ :body   => {
                           :type => 'application',
                           :data =>
@@ -55,7 +57,8 @@ describe RHC::Commands::Alias do
                         }.to_json,
                         :status => 200
                       })
-stub_api_request(:any, app_0_links['REMOVE_ALIAS']['relative']).with(:body => {:event => 'remove-alias', :alias => 'www.foo.bar'}, :headers => {'Accept-Encoding'=>'gzip, deflate', 'Content-Length'=>'36', 'Content-Type'=>'application/x-www-form-urlencoded'}).
+    stub_api_request(:any, app_0_links['REMOVE_ALIAS']['relative'], false).
+            with(:body => {:event => 'remove-alias', :alias => 'www.foo.bar'}).
             to_return({ :body   => {
                           :type => 'application',
                           :data =>
@@ -108,16 +111,14 @@ stub_api_request(:any, app_0_links['REMOVE_ALIAS']['relative']).with(:body => {:
   end
 
   describe 'add alias' do
-    let(:arguments) { ['alias', 'add', 'mock_app_0', 'www.foo.bar', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password' ] }
-    context 'with no issues' do
-      it { expect { run }.should exit_with_code(0) }
-    end
+    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 }
   end
 
   describe 'remove alias' do
-    let(:arguments) { ['alias', 'remove', 'mock_app_0', 'www.foo.bar', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password' ] }
-    context 'with no issues' do
-      it { expect { run }.should exit_with_code(0) }
-    end
+    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 }
   end
 end

data/spec/rhc/commands/app_spec.rb

@@ -4,11 +4,13 @@ require 'rhc/commands/app'
 require 'rhc/config'
 
 describe RHC::Commands::App do
+  let!(:rest_client){ MockRestClient.new }
   before(:each) do
     FakeFS.activate!
     FakeFS::FileSystem.clear
-    RHC::Config.set_defaults
-    RHC::Helpers::MAX_RETRIES = 3
+    user_config
+    RHC::Helpers::remove_const(:MAX_RETRIES) rescue nil
+    RHC::Helpers::const_set(:MAX_RETRIES, 3)
     @instance = RHC::Commands::App.new
     RHC::Commands::App.stub(:new) do
       @instance.stub(:git_config_get) { "" }
@@ -32,7 +34,6 @@ describe RHC::Commands::App do
   describe 'app default' do
     before(:each) do
       FakeFS.deactivate!
-      @rc = MockRestClient.new
     end
 
     context 'app' do
@@ -43,8 +44,7 @@ describe RHC::Commands::App do
 
   describe 'app create' do
     before(:each) do
-      @rc = MockRestClient.new
-      domain = @rc.add_domain("mockdomain")
+      domain = rest_client.add_domain("mockdomain")
     end
 
     context 'when run without a cart' do
@@ -57,21 +57,39 @@ describe RHC::Commands::App do
       let(:arguments) { ['app', 'create', 'app1', 'mock_standalone_cart-1', '--noprompt', '--timeout', '10', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
       it { expect { run }.should exit_with_code(0) }
       it { run_output.should match("Success") }
+      it { run_output.should match("Cartridges: mock_standalone_cart-1\n") }
+    end
+
+    context 'when run with multiple carts' do
+      let(:arguments) { ['app', 'create', 'app1', 'mock_standalone_cart-1', 'mock_cart-1', '--noprompt', '-p',  'password'] }
+      it { expect { run }.should exit_with_code(0) }
+      it { run_output.should match("Success") }
+      it { run_output.should match("Cartridges: mock_standalone_cart-1, mock_cart-1\n") }
+      after{ rest_client.domains.first.applications.first.cartridges.find{ |c| c.name == 'mock_cart-1' }.should be_true }
+    end
+
+    context 'when run with a git url' do
+      let(:arguments) { ['app', 'create', 'app1', 'mock_standalone_cart-1', '--from', 'git://url', '--noprompt', '-p',  'password'] }
+      it { expect { run }.should exit_with_code(0) }
+      it { run_output.should match("Success") }
+      it { run_output.should match("Source Code: git://url\n") }
+      it { run_output.should match("Initial Git URL: git://url\n") }
+      after{ rest_client.domains.first.applications.first.initial_git_url.should == 'git://url' }
     end
 
     context 'when no cartridges are returned' do
       before(:each) do
-        domain = @rc.domains.first
-        @rc.stub(:cartridges) { [] }
-        domain.stub(:add_application).and_raise(RHC::Rest::ValidationException.new('Each application needs a web cartridge', '', '109'))
+        domain = rest_client.domains.first
+        #rest_client.stub(:cartridges) { [] }
+#        domain.stub(:add_application).and_raise(RHC::Rest::ValidationException.new('Each application needs a web cartridge', '', '109'))
       end
       context 'without trace' do
         let(:arguments) { ['app', 'create', 'app1', 'nomatch_cart', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
-        it { run_output.should match(/Valid cartridge types:.*Each application needs a web cartridge/m) }
+        it("should display the list of cartridges") { run_output.should match(/Short Name.*mock_standalone_cart-2/m) }
       end
       context 'with trace' do
         let(:arguments) { ['app', 'create', 'app1', 'nomatch_cart', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password', '--trace'] }
-        it { expect { run }.should raise_error(RHC::Rest::ValidationException) }
+        it { expect { run }.should raise_error(RHC::CartridgeNotFoundException, "There are no cartridges that match 'nomatch_cart'.") }
       end
     end
   end
@@ -81,8 +99,7 @@ describe RHC::Commands::App do
 
     context 'when run' do
       before(:each) do
-        @rc = MockRestClient.new
-        domain = @rc.add_domain("mockdomain")
+        domain = rest_client.add_domain("mockdomain")
       end
       it { expect { run }.should raise_error(RHC::MultipleCartridgesException) }
     end
@@ -93,10 +110,10 @@ describe RHC::Commands::App do
 
     context 'when run' do
       before(:each) do
-        @rc = MockRestClient.new
-        @domain = @rc.add_domain("mockdomain")
+        @domain = rest_client.add_domain("mockdomain")
       end
       it "should create a jenkins app and a regular app with an embedded jenkins client" do
+        #puts run_output
         expect { run }.should exit_with_code(0)
         jenkins_app = @domain.find_application("jenkins")
         jenkins_app.cartridges[0].name.should == "jenkins-1.4"
@@ -111,10 +128,9 @@ describe RHC::Commands::App do
 
     context 'when run' do
       before(:each) do
-        @rc = MockRestClient.new
-        domain = @rc.add_domain("mockdomain")
+        domain = rest_client.add_domain("mockdomain")
       end
-      it { expect { run }.should raise_error(ArgumentError, /The --no-dns option can't be used in conjunction with --enable-jenkins/) }
+      it { expect { run }.should_not raise_error(ArgumentError, /The --no-dns option can't be used in conjunction with --enable-jenkins/) }
     end
   end
 
@@ -123,8 +139,7 @@ describe RHC::Commands::App do
 
     context 'when run' do
       before(:each) do
-        @rc = MockRestClient.new
-        domain = @rc.add_domain("mockdomain")
+        domain = rest_client.add_domain("mockdomain")
       end
       it { expect { run }.should raise_error(ArgumentError, /You have named both your main application and your Jenkins application/) }
     end
@@ -135,8 +150,7 @@ describe RHC::Commands::App do
 
     context 'when run' do
       before(:each) do
-        @rc = MockRestClient.new
-        @domain = @rc.add_domain("mockdomain")
+        @domain = rest_client.add_domain("mockdomain")
         @domain.add_application("jenkins", "jenkins-1.4")
       end
       it "should use existing jenkins" do
@@ -147,30 +161,16 @@ describe RHC::Commands::App do
     end
   end
 
-  describe 'app create enable-jenkins named after existing app' do
-    let(:arguments) { ['app', 'create', 'app1', 'mock_unique_standalone_cart', '--trace', '--enable-jenkins', 'app2', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
-
-    context 'when run' do
-      before(:each) do
-        @rc = MockRestClient.new
-        domain = @rc.add_domain("mockdomain")
-        domain.add_application("app2", "mock_unique_standalone_cart")
-      end
-      it { expect { run }.should raise_error(ArgumentError, /You have named your Jenkins application the same as an existing application/) }
-    end
-  end
-
   describe 'app create jenkins fails to install warnings' do
     let(:arguments) { ['app', 'create', 'app1', 'mock_unique_standalone_cart', '--enable-jenkins', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
 
     before(:each) do
-      @rc = MockRestClient.new
-      @domain = @rc.add_domain("mockdomain")
+      @domain = rest_client.add_domain("mockdomain")
     end
 
     context 'when run with error in jenkins setup' do
       before(:each) do
-        @instance.stub(:setup_jenkins_app) { raise Exception }
+        @instance.stub(:add_jenkins_app) { raise Exception }
       end
       it "should print out jenkins warning" do
         run_output.should match("Jenkins failed to install")
@@ -179,7 +179,7 @@ describe RHC::Commands::App do
 
     context 'when run with error in jenkins-client setup' do
       before(:each) do
-        @instance.stub(:setup_jenkins_client) { raise Exception }
+        @instance.stub(:add_jenkins_cartridge) { raise Exception }
       end
       it "should print out jenkins warning" do
         run_output.should match("Jenkins client failed to install")
@@ -192,9 +192,8 @@ describe RHC::Commands::App do
 
     context 'when run with server error in jenkins-client setup' do
       before(:each) do
-        @rc = MockRestClient.new
-        @domain = @rc.add_domain("mockdomain")
-        @instance.stub(:setup_jenkins_client) { raise RHC::Rest::ServerErrorException.new("Server error", 157) }
+        @domain = rest_client.add_domain("mockdomain")
+        @instance.stub(:add_jenkins_cartridge) { raise RHC::Rest::ServerErrorException.new("Server error", 157) }
       end
       it "should fail embedding jenkins cartridge" do
         Kernel.should_receive(:sleep).and_return(true)
@@ -208,8 +207,7 @@ describe RHC::Commands::App do
 
     context 'when run' do
       before(:each) do
-        @rc = MockRestClient.new
-        @domain = @rc.add_domain("dnserror")
+        @domain = rest_client.add_domain("dnserror")
       end
       it { run_output.should match("unable to lookup your hostname") }
     end
@@ -219,9 +217,9 @@ describe RHC::Commands::App do
     let(:arguments) { ['app', 'create', 'app1', 'mock_unique_standalone_cart', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
 
     before(:each) do
-      @rc = MockRestClient.new
-      @domain = @rc.add_domain("mockdomain")
-      @instance.stub(:run_git_clone) { raise RHC::GitException }
+      @domain = rest_client.add_domain("mockdomain")
+      @instance.stub(:git_clone_application) { raise RHC::GitException }
+      @instance.should_not_receive(:check_sshkeys!)
     end
 
     context 'when run with error in git clone' do
@@ -257,8 +255,7 @@ describe RHC::Commands::App do
     let(:arguments) { ['app', 'create', 'app1', 'mock_unique_standalone_cart', '--noprompt', '--nogit', '--config', '/tmp/test.conf', '-l', 'test@test.foo', '-p',  'password'] }
 
     before (:each) do
-      @rc = MockRestClient.new
-      @domain = @rc.add_domain("mockdomain")
+      @domain = rest_client.add_domain("mockdomain")
     end
 
     context 'when run' do
@@ -270,8 +267,7 @@ describe RHC::Commands::App do
     let(:arguments) { ['app', 'create', 'app1', 'mock_unique_standalone_cart', '--config', '/tmp/test.conf', '-l', 'test@test.foo', '-p',  'password'] }
 
     before (:each) do
-      @rc = MockRestClient.new
-      @domain = @rc.add_domain("mockdomain")
+      @domain = rest_client.add_domain("mockdomain")
       # fakefs is activated
       Dir.mkdir('/tmp/')
       File.open('/tmp/test.conf', 'w') do |f|
@@ -279,7 +275,7 @@ describe RHC::Commands::App do
       end
 
       # don't run wizard here because we test this elsewhere
-      wizard_instance = RHC::SSHWizard.new(@rc)
+      wizard_instance = RHC::SSHWizard.new(rest_client, RHC::Config.new, Commander::Command::Options.new)
       wizard_instance.stub(:ssh_key_uploaded?) { true }
       RHC::SSHWizard.stub(:new) { wizard_instance }
       RHC::Config.stub(:should_run_ssh_wizard?) { false }
@@ -290,65 +286,86 @@ describe RHC::Commands::App do
     end
   end
 
-  describe 'app git-clone' do
-    let(:arguments) { ['app', 'git-clone', '--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("mockdomain")
-        @app = @domain.add_application("app1", "mock_unique_standalone_cart")
-      end
-      it { expect { run }.should exit_with_code(0) }
-    end
-  end
-
   describe 'app delete' do
-    let(:arguments) { ['app', 'delete', '--trace', '-a', 'app1', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
+    let(:arguments) { ['app', 'delete', '--trace', '-a', 'app1', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
 
     context 'when run' do
-      before(:each) do
-        @rc = MockRestClient.new
-        @domain = @rc.add_domain("mockdomain")
-      end
-      it "should not remove app when no is sent as input" do
-        @app = @domain.add_application("app1", "mock_type")
-        expect { run(["no"]) }.should exit_with_code(0)
-        @domain.applications.length.should == 1
-        @domain.applications[0] == @app
-      end
+      before{ @domain = rest_client.add_domain("mockdomain") }
 
-      it "should remove app when yes is sent as input" do
-        @app = @domain.add_application("app1", "mock_type")
-        expect { run(["yes"]) }.should exit_with_code(0)
-        @domain.applications.length.should == 0
-      end
       it "should raise cartridge not found exception when no apps exist" do
         expect { run }.should raise_error RHC::ApplicationNotFoundException
       end
+
+      context "with an app" do
+        before{ @app = @domain.add_application("app1", "mock_type") }
+
+        it "should not remove app when no is sent as input" do
+          expect { run(["no"]) }.should raise_error(RHC::ConfirmationError)
+          @domain.applications.length.should == 1
+          @domain.applications[0] == @app
+        end
+
+        it "should remove app when yes is sent as input" do
+          expect { run(["yes"]) }.should exit_with_code(0)
+          @domain.applications.length.should == 0
+        end
+
+        context "with --noprompt but without --confirm" do
+          let(:arguments) { ['app', 'delete', 'app1', '--noprompt', '--trace'] }
+          it "should not remove the app" do
+            expect { run(["no"]) }.should raise_error(RHC::ConfirmationError)
+            @domain.applications.length.should == 1
+          end
+        end
+        context "with --noprompt and --confirm" do
+          let(:arguments) { ['app', 'delete', 'app1', '--noprompt', '--confirm'] }
+          it "should remove the app" do
+            expect { run }.should exit_with_code(0)
+            @domain.applications.length.should == 0
+          end
+        end
+      end
     end
   end
 
   describe 'app show' do
     let(:arguments) { ['app', 'show', 'app1', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
 
-    context 'when run' do
+    context 'when run with the same case as created' do
       before(:each) do
-        @rc = MockRestClient.new
-        @domain = @rc.add_domain("mockdomain")
+        FakeFS.deactivate!
+        @domain = rest_client.add_domain("mockdomain")
         @domain.add_application("app1", "mock_type")
       end
-      it { run_output.should match("app1 @ https://app1-mockdomain.fake.foo/") }
+      it("should output an app") { run_output.should match("app1 @ https://app1-mockdomain.fake.foo/") }
+      it { run_output.should match(/Gears:\s+1 small/) }
     end
 
     context 'when run with scaled app' do
+      before(:each) do
+        @domain = rest_client.add_domain("mockdomain")
+        app = @domain.add_application("app1", "mock_type", true)
+        cart1 = app.add_cartridge('mock_cart-1')
+        cart2 = app.add_cartridge('mock_cart-2')
+        cart2.gear_profile = 'medium'
+      end
+      it { run_output.should match("app1 @ https://app1-mockdomain.fake.foo/") }
+      it { run_output.should match(/Scaling:.*x2/) }
+      it { run_output.should match(/Gears:\s+Located with mock_type/) }
+      it { run_output.should match(/Gears:\s+1 medium/) }
+    end
+  end
+
+  describe 'app show' do
+    let(:arguments) { ['app', 'show', 'APP1', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
+
+    context 'when run with the different case from created' do
       before(:each) do
         @rc = MockRestClient.new
         @domain = @rc.add_domain("mockdomain")
-        @domain.add_application("app1", "mock_type",true)
+        @domain.add_application("app1", "mock_type")
       end
       it { run_output.should match("app1 @ https://app1-mockdomain.fake.foo/") }
-      it { run_output.should match("Scaled x2") }
     end
   end
 
@@ -357,8 +374,7 @@ describe RHC::Commands::App do
 
     context 'when run' do
       before(:each) do
-        @rc = MockRestClient.new
-        @domain = @rc.add_domain("mockdomain")
+        @domain = rest_client.add_domain("mockdomain")
         @domain.add_application("app1", "mock_type")
       end
       it { run_output.should match("started") }
@@ -370,8 +386,7 @@ describe RHC::Commands::App do
 
     context 'when run' do
       before(:each) do
-        @rc = MockRestClient.new
-        @domain = @rc.add_domain("mockdomain")
+        @domain = rest_client.add_domain("mockdomain")
         @domain.add_application("app1", "mock_type")
       end
       it { run_output.should match("started") }
@@ -382,8 +397,7 @@ describe RHC::Commands::App do
   describe 'app actions' do
 
     before(:each) do
-      @rc = MockRestClient.new
-      domain = @rc.add_domain("mockdomain")
+      domain = rest_client.add_domain("mockdomain")
       app = domain.add_application("app1", "mock_type")
       app.add_cartridge('mock_cart-1')
     end
@@ -420,4 +434,13 @@ describe RHC::Commands::App do
       it { run_output.should match('cleaned') }
     end
   end
+
+  describe "#create_app" do
+    it("should list cartridges when a server error happens") do
+      subject.should_receive(:list_cartridges)
+      domain = stub
+      domain.stub(:add_application).and_raise(RHC::Rest::ValidationException.new('Foo', :cartridges, 109))
+      expect{ subject.send(:create_app, 'name', 'jenkins-1.4', domain) }.to raise_error(RHC::Rest::ValidationException)
+    end
+  end
 end