rhc 1.13.6 → 1.14.7

data/spec/rhc/commands/domain_spec.rb

@@ -160,7 +160,7 @@ describe RHC::Commands::Domain do
         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'.*success.*?Applications.*in their URL./m) }
+      it { run_output.should match(/Renaming domain 'olddomain' to 'alterednamespace'.*done.*?Applications in this domain will use the new name in their URL./m) }
     end
 
     context 'when there is no domain' do
@@ -182,7 +182,7 @@ describe RHC::Commands::Domain do
         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'.*success.*?Applications.*in their URL./m) }
+      it { run_output.should match(/Renaming domain 'olddomain' to 'alterednamespace'.*done.*?Applications in this domain will use the new name in their URL./m) }
     end
   end
 

data/spec/rhc/commands/snapshot_spec.rb

@@ -80,7 +80,7 @@ describe RHC::Commands::Snapshot do
         File.stub(:exists?).and_return(true)
         RHC::TarGz.stub(:contains).and_return(true)
         `(exit 0)`
-        Kernel.should_receive(:`).with("cat #{@app.name}.tar.gz | ssh #{@ssh_uri.user}@#{@ssh_uri.host} 'restore INCLUDE_GIT'")
+        Kernel.should_receive(:`).with("cat '#{@app.name}.tar.gz' | ssh #{@ssh_uri.user}@#{@ssh_uri.host} 'restore INCLUDE_GIT'")
       end
       it { expect { run }.to exit_with_code(0) }
     end
@@ -89,7 +89,7 @@ describe RHC::Commands::Snapshot do
       before(:each) do
         File.stub(:exists?).and_return(true)
         RHC::TarGz.stub(:contains).and_return(true)
-        Kernel.should_receive(:`).with("cat #{@app.name}.tar.gz | ssh #{@ssh_uri.user}@#{@ssh_uri.host} 'restore INCLUDE_GIT'")
+        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 }.to exit_with_code(130) }

data/spec/rhc/helpers_spec.rb

@@ -434,11 +434,14 @@ describe AllRhcHelpers do
         it{ subject.send(:match_cart, cart, 'foo').should be_false }
       end
       context 'with simple strings' do
-        let(:cart){ OpenStruct.new(:name => 'FOO-more_max any', :description => 'bar', :tags => [:baz]) }
+        let(:cart){ OpenStruct.new(:name => 'FOO-more_max any', :description => 'bar word', :tags => [:baz]) }
         it{ subject.send(:match_cart, cart, 'foo').should be_true }
         it{ subject.send(:match_cart, cart, 'fo').should be_true }
         it{ subject.send(:match_cart, cart, 'oo').should be_true }
         it{ subject.send(:match_cart, cart, 'bar').should be_true }
+        it{ subject.send(:match_cart, cart, 'word').should be_true }
+        it{ subject.send(:match_cart, cart, 'bar word').should be_true }
+        it{ subject.send(:match_cart, cart, 'wor').should be_false }
         it{ subject.send(:match_cart, cart, 'baz').should be_true }
         it{ subject.send(:match_cart, cart, 'more max').should be_true }
         it{ subject.send(:match_cart, cart, 'foo more max any').should be_true }

data/spec/rhc/rest_application_spec.rb

@@ -70,8 +70,8 @@ module RHC
             cart = app_obj.add_cartridge(:name => 'mock_cart_0')
             cart.should be_an_instance_of RHC::Rest::Cartridge
             cart.name.should == 'mock_cart_0'
-          end          
-        end        
+          end
+        end
 
         context "with a URL cart" do
           before{ stub_api_request(:any, app_links['ADD_CARTRIDGE']['relative'], false).with(:body => {:url => 'http://foo.com'}.to_json).to_return(mock_cartridge_response(1, true)) }
@@ -100,7 +100,7 @@ module RHC
             cart.display_name.should == 'mock_cart_0'
             cart.only_in_new?.should be_true
             cart.only_in_existing?.should be_false
-          end          
+          end
         end
       end
 

data/spec/rhc/rest_client_spec.rb

@@ -202,7 +202,7 @@ module RHC
         end
 
         context "#find_domain" do
-          context "when server does not support SHOW_DOMAIN" do 
+          context "when server does not support SHOW_DOMAIN" do
             before do
               stub_api_request(:any, api_links['LIST_DOMAINS']['relative']).
                 to_return({ :body   => {
@@ -237,7 +237,7 @@ module RHC
 
           context "when server supports SHOW_DOMAIN" do
             let(:api_links){ client_links.merge!(mock_response_links([['SHOW_DOMAIN', 'domains/:name', 'get']])) }
-            before do 
+            before do
               stub_api_request(:any, api_links['SHOW_DOMAIN']['relative'].gsub(/:name/, 'mock_domain_0')).
                 to_return({ :body   => {
                               :type => 'domain',
@@ -257,11 +257,11 @@ module RHC
                                }
                             }.to_json,
                             :status => 200
-                          })                
+                          })
               stub_api_request(:any, api_links['SHOW_DOMAIN']['relative'].gsub(/:name/, 'mock_domain_2')).
                 to_return({ :body => {:messages => [{:exit_code => 127}]}.to_json,
                             :status => 404
-                          })                
+                          })
             end
             it "returns a domain object for matching domain IDs" do
               match = nil
@@ -274,7 +274,7 @@ module RHC
               expect { match = client.find_domain('mock_domain_%^&') }.to_not raise_error
               match.id.should == 'mock_domain_%^&'
               match.class.should == RHC::Rest::Domain
-            end            
+            end
             it "raise an error when no matching domain IDs can be found" do
               expect { client.find_domain('mock_domain_2') }.to raise_error(RHC::Rest::DomainNotFoundException)
             end
@@ -283,11 +283,11 @@ module RHC
 
         context "when server supports LIST_DOMAINS_BY_OWNER" do
           let(:api_links){ client_links.merge!(mock_response_links([['LIST_DOMAINS_BY_OWNER', 'domains', 'get']])) }
-          before do 
+          before do
             stub_api_request(:any, "#{api_links['LIST_DOMAINS_BY_OWNER']['relative']}?owner=@self").
               to_return({ :body   => {
                             :type => 'domains',
-                            :data => [{ 
+                            :data => [{
                               :id    => 'mock_domain_0',
                               :links => mock_response_links(mock_domain_links('mock_domain_0')),
                             }]
@@ -674,7 +674,7 @@ module RHC
         its(:user){ should == username.call }
         its(:passwd){ should == password.call }
         its(:to_str){ should == ["#{username.call}:#{password.call}"].pack('m').tr("\n", '') }
-      end      
+      end
     end
   end
 end

data/spec/rhc/rest_spec.rb

@@ -301,6 +301,7 @@ module RHC
         end
 
         it "copies all non-warning and non-info messages to the object" do
+          subject.stub(:debug?).and_return(false)
           subject.send(:parse_response, response).messages.should == ['Result field', 'Result severity']
         end
 
@@ -498,7 +499,7 @@ module RHC
         it{ response.should raise_error(RHC::Rest::ConnectionException, "An unexpected error occured: Generic Error") }
       end
 
-      context "with a an unauthorized request" do
+      context "with an unauthorized request" do
         before do
           return_data = {
             :body    => nil,
@@ -508,6 +509,13 @@ module RHC
           stub_request(:get, mock_href).to_return(return_data)
         end
         it("raises not authenticated"){ response.should raise_error(RHC::Rest::UnAuthorizedException, 'Not authenticated') }
+
+        context "when auth will retry forever" do
+          let(:auth){ stub('auth', :to_request => nil) }
+          before{ subject.stub(:auth).and_return(auth); auth.should_receive(:retry_auth?).exactly(4).times.and_return(true) }
+          it("raises not authenticated"){ response.should raise_error(RHC::Rest::UnAuthorizedException, 'Not authenticated') }
+          after{ WebMock.should have_requested(:get, mock_href).times(RHC::Rest::Client::MAX_RETRIES) }
+        end
       end
     end
 

data/spec/rhc/wizard_spec.rb

@@ -63,8 +63,8 @@ describe RHC::Wizard do
     subject{ described_class.new(config, options) }
     let(:app) do
       app = Object.new
-      app.should_receive(:host).at_least(1).and_return('foo.com')
-      app.should_receive(:uuid).at_least(1).and_return('uuid')
+      app.should_receive(:ssh_url).at_least(1).and_return('ssh://uuid@foo.com')
+      app.stub(:host).and_return('foo.com')
       app
     end
     let(:ssh) do
@@ -82,7 +82,7 @@ describe RHC::Wizard do
     it "should attempt an SSH connection to the first app" do
       subject.should_receive(:ssh_key_uploaded?).and_return(true)
       subject.should_receive(:applications).and_return([app])
-      Net::SSH.should_receive(:start).with(app.host, app.uuid, {:timeout => 60}).and_return(ssh)
+      Net::SSH.should_receive(:start).with("foo.com", "uuid", {:timeout => 60}).and_return(ssh)
       subject.send(:test_ssh_connectivity).should be_true
     end    
     it "should handle a failed connection" do
@@ -523,7 +523,7 @@ describe RHC::Wizard do
 
         wizard.send(:upload_ssh_key_stage).should be_false
 
-        last_output.should match("Your ssh public key at .* is invalid or unreadable\.")
+        last_output.should match("Your public SSH key at .* is invalid or unreadable\.")
       end
 
       it "should cause upload_ssh_key to catch NotImplementedError and return false" do
@@ -535,7 +535,7 @@ describe RHC::Wizard do
         wizard.send(:upload_ssh_key_stage).should be_false
 
         output = last_output
-        output.should match("Your ssh public key at .* is invalid or unreadable\.")
+        output.should match("Your public SSH key at .* is invalid or unreadable\.")
       end
 
       it "should find a unique name" do

data/spec/wizard_spec_helper.rb

@@ -74,7 +74,7 @@ module WizardStepsHelper
 
     next_stage.should_not be_nil
 
-    last_output.should match('You can upload your SSH key at a later time using ')
+    last_output.should match('You can upload your public SSH key at a later time using ')
   end
 
   def should_find_matching_server_key
@@ -158,7 +158,7 @@ module WizardStepsHelper
     next_stage.should_not be_nil
 
     last_output do |s|
-      s.should match(/Checking your namespace .*none/)
+      s.should match(/Checking for a domain .*none/)
       s.should match(/(?:Too long.*?){2}/m)
     end
     subject.send(:options).__hash__[:namespace].should == 'testnamespace'
@@ -170,9 +170,9 @@ module WizardStepsHelper
     next_stage.should_not be_nil
 
     last_output do |s|
-      s.should match(/Checking your namespace .*none/)
-      s.should match("You will not be able to create applications without first creating a namespace")
-      s.should match("You may create a namespace later through 'rhc create-domain'")
+      s.should match(/Checking for a domain .*none/)
+      s.should match("You will not be able to create an application without completing this step.")
+      s.should match("You may create a domain later through 'rhc create-domain'")
     end
     subject.send(:options).__hash__[:namespace].should be_nil
   end
@@ -180,7 +180,7 @@ module WizardStepsHelper
   def should_find_a_namespace(namespace)
     next_stage.should_not be_nil
 
-    last_output.should match(/Checking your namespace .*#{namespace}/)
+    last_output.should match(/Checking for a domain .*#{namespace}/)
     subject.send(:options).__hash__[:namespace].should be_nil
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 33
   prerelease: 
   segments: 
   - 1
-  - 13
-  - 6
-  version: 1.13.6
+  - 14
+  - 7
+  version: 1.14.7
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-27 00:00:00 Z
+date: 2013-09-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh
@@ -378,6 +378,7 @@ files:
 - features/lib/rhc_helper/sshkey.rb
 - features/lib/rhc_helper/loggable.rb
 - features/lib/rhc_helper/app.rb
+- features/lib/rhc_helper/env.rb
 - features/lib/rhc_helper.rb
 - features/domain.feature
 - bin/rhc
@@ -501,5 +502,6 @@ test_files:
 - features/lib/rhc_helper/sshkey.rb
 - features/lib/rhc_helper/loggable.rb
 - features/lib/rhc_helper/app.rb
+- features/lib/rhc_helper/env.rb
 - features/lib/rhc_helper.rb
 - features/domain.feature