rhc 1.2.7 → 1.3.8

data/spec/rhc/commands/domain_spec.rb

@@ -1,24 +1,21 @@
 require 'spec_helper'
 require 'rest_spec_helper'
 require 'rhc/commands/domain'
-require 'rhc/config'
 
 describe RHC::Commands::Domain do
-  before(:each) do
-    RHC::Config.set_defaults
-  end
+  let!(:rest_client){ MockRestClient.new }
+  before{ user_config }
 
   describe 'default action' do
     context 'when run with no domains' do
       let(:arguments) { ['domain', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
-      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/) }
+
+      it { expect { run }.should 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 { run_output.should match(/The default action for this resource is 'show'/) }
     end
@@ -28,44 +25,36 @@ 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
-      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/) }
+      it { expect { run }.should 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(:each) do
-        @rc = MockRestClient.new
-        @rc.add_domain("onedomain")
-      end
+      before{ rest_client.add_domain("onedomain") }
+
       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("The domain onedomain exists but has no applications. You can use")
       end
     end
 
     context 'when run with multiple domain no apps' do
       before(:each) do
-        @rc = MockRestClient.new
-        @rc.add_domain("firstdomain")
-        @rc.add_domain("seconddomain")
+        rest_client.add_domain("firstdomain")
+        rest_client.add_domain("seconddomain")
       end
       it { expect { run }.should exit_with_code(0) }
       it "should match output" do
         output = run_output
-        output.should match("Applications in firstdomain")
+        output.should match("The domain firstdomain exists but has no applications. You can use")
         output.should_not match("Applications in seconddomain")
       end
     end
 
     context 'when run with one domain multiple apps' do
       before(:each) do
-        @rc = MockRestClient.new
-        d = @rc.add_domain("appdomain")
+        d = rest_client.add_domain("appdomain")
         a = d.add_application("app_no_carts", "testframework-1.0")
         a = d.add_application("app_multi_carts", "testframework-1.0")
         a.add_cartridge("testcart-1")
@@ -86,15 +75,14 @@ describe RHC::Commands::Domain do
 
     context 'when run with an app without cartridges' do
       before(:each) do
-        @rc = MockRestClient.new
-        d = @rc.add_domain("appdomain")
+        d = rest_client.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$\n\s+[=]*\s+None/)
+        output.should match(/127.0.0.1\s*$/m)
       end
     end
   end
@@ -103,13 +91,10 @@ describe RHC::Commands::Domain do
     let(:arguments) { ['domain', 'create', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password', 'testnamespace'] }
 
     context 'when no issues with ' do
-      before(:each) do
-        @rc = MockRestClient.new
-      end
 
       it "should create a domain" do
         expect { run }.should exit_with_code(0)
-        @rc.domains[0].id.should == 'testnamespace'
+        rest_client.domains[0].id.should == 'testnamespace'
       end
       it { run_output.should match(/'testnamespace'.*?RESULT:.*?Success/m) }
     end
@@ -119,26 +104,19 @@ describe RHC::Commands::Domain do
     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
-        @rc = MockRestClient.new
-        @rc.add_domain("olddomain")
-      end
+      before{ rest_client.add_domain("olddomain") }
 
       it "should update a domain" do
         expect { run }.should exit_with_code(0)
-        @rc.domains[0].id.should == 'alterednamespace'
+        rest_client.domains[0].id.should == 'alterednamespace'
       end
       it { run_output.should match(/Changing namespace 'olddomain' to 'alterednamespace'.*?RESULT:.*?Success/m) }
     end
 
     context 'when there is no domain' do
-      before(:each) do
-        @rc = MockRestClient.new
-      end
-
       it "should not create a domain" do
         expect { run }.should exit_with_code(127)
-        @rc.domains.empty?.should be_true
+        rest_client.domains.empty?.should be_true
       end
       it { run_output.should match("does not exist") }
     end
@@ -148,14 +126,11 @@ describe RHC::Commands::Domain do
     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
-        @rc = MockRestClient.new
-        @rc.add_domain("olddomain")
-      end
+      before{ rest_client.add_domain("olddomain") }
 
       it "should update a domain" do
         expect { run }.should exit_with_code(0)
-        @rc.domains[0].id.should == 'alterednamespace'
+        rest_client.domains[0].id.should == 'alterednamespace'
       end
       it { run_output.should match(/Changing namespace 'olddomain' to 'alterednamespace'.*?RESULT:.*?Success/m) }
     end
@@ -165,39 +140,32 @@ describe RHC::Commands::Domain do
     let(:arguments) { ['domain', 'delete', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password', 'deleteme'] }
 
     context 'when no issues with ' do
-      before(:each) do
-        @rc = MockRestClient.new
-        @rc.add_domain("deleteme")
-      end
+      before{ rest_client.add_domain("deleteme") }
 
       it "should delete a domain" do
         expect { run }.should exit_with_code(0)
-        @rc.domains.empty?.should be_true
+        rest_client.domains.empty?.should be_true
       end
     end
 
     context 'when there is a different domain' do
-      before(:each) do
-        @rc = MockRestClient.new
-        @rc.add_domain("dontdelete")
-      end
+      before{ rest_client.add_domain("dontdelete") }
 
       it "should error out" do
         expect { run }.should exit_with_code(127)
-        @rc.domains[0].id.should == 'dontdelete'
+        rest_client.domains[0].id.should == 'dontdelete'
       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 = rest_client.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'
+        rest_client.domains[0].id.should == 'deleteme'
       end
       it { run_output.should match("Domain contains applications.*?Delete applications first.") }
     end
@@ -207,34 +175,11 @@ describe RHC::Commands::Domain do
     let(:arguments) { ['domain', 'destroy', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password', 'deleteme'] }
 
     context 'when no issues with ' do
-      before(:each) do
-        @rc = MockRestClient.new
-        @rc.add_domain("deleteme")
-      end
+      before{ rest_client.add_domain("deleteme") }
 
       it "should delete a domain" do
         expect { run }.should exit_with_code(0)
-        @rc.domains.empty?.should be_true
-      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|
-        @cmd = cmd
-        # run the true command to get $?.exitstatus == 0
-        system("true")
-      end
-    end
-
-    context 'rhc-chk should be executed' do
-      it "runs" do 
-        expect { run }.should exit_with_code(0)
-        # check lengths here because different versions of ruby output the switches in different order
-        @cmd.length.should == "rhc-chk --noprompt true --config test.conf --rhlogin test@test.foo --password password 2>&1".length
+        rest_client.domains.empty?.should be_true
       end
     end
   end

data/spec/rhc/commands/git_clone_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+require 'rest_spec_helper'
+require 'rhc/commands/git_clone'
+
+describe RHC::Commands::GitClone do
+  before(:each) do
+    FakeFS.activate!
+    FakeFS::FileSystem.clear
+    user_config
+    @instance = RHC::Commands::GitClone.new
+    RHC::Commands::GitClone.stub(:new) do
+      @instance.stub(:git_config_get) { "" }
+      @instance.stub(:git_config_set) { "" }
+      Kernel.stub(:sleep) { }
+      @instance.stub(:host_exists?) do |host|
+        host.match("dnserror") ? false : true
+      end
+      @instance
+    end
+  end
+  let!(:rest_client){ MockRestClient.new }
+  before(:each) do
+    @domain = rest_client.add_domain("mockdomain")
+    @app = @domain.add_application("app1", "mock_unique_standalone_cart")
+  end
+
+  after(:each) do
+    FakeFS.deactivate!
+  end
+
+  describe 'git-clone' do
+    let(:arguments) { ['app', 'git-clone', 'app1'] }
+
+    context "stubbing git_clone_repo" do
+      context "reports success successfully" do
+        before do
+          @instance.stub(:git_clone_repo) do |git_url, repo_dir|
+            Dir::mkdir(repo_dir)
+            say "Cloned"
+            true
+          end
+        end
+
+        it { expect { run }.should exit_with_code(0) }
+        it { run_output.should match("Cloned") }
+      end
+
+      context "reports failure" do
+        before{ @instance.stub(:git_clone_repo).and_raise(RHC::GitException) }
+
+        it { expect { run }.should exit_with_code(216) }
+        it { run_output.should match("Git returned an error") }
+      end
+    end
+  end
+end

data/spec/rhc/commands/{port-forward_spec.rb → port_forward_spec.rb}

@@ -1,20 +1,17 @@
 require 'spec_helper'
-require 'rhc/commands/port-forward'
-require 'rhc/config'
-require 'uri'
+require 'rest_spec_helper'
+require 'rhc/commands/port_forward'
 
 describe RHC::Commands::PortForward do
 
-  before(:each) do
-    RHC::Config.set_defaults
-  end
+  let!(:rest_client){ MockRestClient.new }
+  before{ user_config }
 
   describe 'run' do
     let(:arguments) { ['port-forward', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p', 'password', '--app', 'mockapp'] }
 
     before :each do
-      @rc = MockRestClient.new
-      @domain = @rc.add_domain("mockdomain")
+      @domain = rest_client.add_domain("mockdomain")
       @app = @domain.add_application 'mockapp', 'mock-1.0'
       @uri = URI.parse @app.ssh_url
       @ssh = mock(Net::SSH)
@@ -24,7 +21,7 @@ describe RHC::Commands::PortForward do
       before(:each) do
         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')
-        @gg = MockRestGearGroup.new
+        @gg = MockRestGearGroup.new(rest_client)
         @app.should_receive(:gear_groups).and_return([@gg])
         @gg.should_receive(:gears).and_return([{'state' => 'stopped', 'id' => 'fakegearid'}])
       end
@@ -41,9 +38,9 @@ describe RHC::Commands::PortForward do
       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'
+        rest_client.domains[0].id.should == 'mockdomain'
+        rest_client.domains[0].applications.size.should == 1
+        rest_client.domains[0].applications[0].name.should == 'mockapp'
       end
       it { run_output.should match("no available ports to forward.") }
     end
@@ -55,9 +52,9 @@ describe RHC::Commands::PortForward do
       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'
+        rest_client.domains[0].id.should == 'mockdomain'
+        rest_client.domains[0].applications.size.should == 1
+        rest_client.domains[0].applications[0].name.should == 'mockapp'
       end
       it { run_output.should match("Permission denied") }
     end
@@ -77,9 +74,9 @@ describe RHC::Commands::PortForward do
       end
       it "should run successfully" 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'
+        rest_client.domains[0].id.should == 'mockdomain'
+        rest_client.domains[0].applications.size.should == 1
+        rest_client.domains[0].applications[0].name.should == 'mockapp'
       end
       it { run_output.should match(/Forwarding ports.*Press CTRL-C/m) }
     end
@@ -90,21 +87,19 @@ describe RHC::Commands::PortForward do
       end
       it "should error out" 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'
+        rest_client.domains[0].id.should == 'mockdomain'
+        rest_client.domains[0].applications.size.should == 1
+        rest_client.domains[0].applications[0].name.should == 'mockapp'
       end
       it { run_output.should include("Error trying to forward ports.") }
     end
 
     context 'when REST client connection times out' do
       before(:each) do
-        @rc.should_receive(:find_domain).and_raise(RestClient::ServerBrokeConnection)
-      end
-      it "should error out" do
-        expect { run }.should exit_with_code(1)
+        rest_client.should_receive(:find_domain).and_raise(RHC::Rest::ConnectionException)
       end
-      it { run_output.should match("Connection.*failed:") }
+      it("should error out") { expect { run }.should exit_with_code(1) }
+      it{ run_output.should match("Connection.*failed:") }
     end
 
     context 'when port forwarding an app with ports to forward' do
@@ -122,9 +117,9 @@ describe RHC::Commands::PortForward do
       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'
+        rest_client.domains[0].id.should == 'mockdomain'
+        rest_client.domains[0].applications.size.should == 1
+        rest_client.domains[0].applications[0].name.should == 'mockapp'
       end
       it { run_output.should include("Ending port forward") }
     end
@@ -162,9 +157,9 @@ describe RHC::Commands::PortForward do
       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'
+        rest_client.domains[0].id.should == 'mockdomain'
+        rest_client.domains[0].applications.size.should == 1
+        rest_client.domains[0].applications[0].name.should == 'mockapp'
       end
       it { run_output.should include("Ending port forward") }
     end

data/spec/rhc/commands/server_spec.rb

@@ -1,14 +1,39 @@
 require 'spec_helper'
+require 'rest_spec_helper'
 require 'rhc/commands/server'
 require 'rhc/config'
 
 describe RHC::Commands::Server do
-  before(:each) do
-    RHC::Config.set_defaults
+  before(:each){ user_config }
+  let(:rest_client) { MockRestClient.new }
+
+  describe 'run against a different server' do
+    let(:arguments) { ['server', '--server', 'foo.com', '-l', 'person', '-p', ''] }
+
+    context 'when server refuses connection' do
+      before { stub_request(:get, 'https://person:@foo.com/broker/rest/api').with(&user_agent_header).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) }
+    end
+
+    context 'when API is missing' do
+      before { stub_request(:get, 'https://person:@foo.com/broker/rest/api').with(&user_agent_header).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) }
+    end
+
+    context 'when API is at version 1.2' do
+      before 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) }
+    end
   end
 
   describe 'run' do
     let(:arguments) { ['server'] }
+    before{ rest_client.stub(:auth).and_return(nil) }
 
     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) }
@@ -17,7 +42,7 @@ describe RHC::Commands::Server do
     end
 
     context 'when 1 issue' do
-      before do 
+      before do
         stub_request(:get, 'https://openshift.redhat.com/app/status/status.json').with(&user_agent_header).to_return(:body => 
           {'open' => [
             {'issue' => {