rhc 1.26.9 → 1.27.4

data/lib/rhc/commands/app.rb

@@ -83,7 +83,7 @@ module RHC::Commands
 
         from_app = find_app(:app => options.from_app)
 
-        arg_envs = from_app.environment_variables.collect {|env| "#{env.name}=#{env.value} "} + arg_envs
+        arg_envs = from_app.environment_variables.collect {|env| "#{env.name}=#{env.value}"} + arg_envs
         cartridges = from_app.cartridges.reject{|c| c.tags.include?('web_proxy')}.collect{|c| c.custom? ? c.url : c.name}
       end
 

data/lib/rhc/commands/domain.rb

@@ -62,7 +62,7 @@ module RHC::Commands
       domain.rename(new_namespace)
       success "done"
 
-      info "Applications in this domain will use the new name in their URL."
+      info "Applications created in this domain will use the new name in their URL."
 
       0
     end

data/lib/rhc/commands/server.rb

@@ -14,15 +14,15 @@ module RHC::Commands
       (development) and Enterprise (production) and the user also has a personal
       OpenShift Online account:
 
-        rhc server add openshift.redhat.com online -l personal@email.com
-        rhc server add origin.openshift.mycompany.com development -l user@company.com
-        rhc server add enterprise.openshift.mycompany.com production  -l user@company.com
+        rhc add-server openshift.redhat.com online -l personal@email.com
+        rhc add-server origin.openshift.mycompany.com development -l user@company.com
+        rhc add-server enterprise.openshift.mycompany.com production  -l user@company.com
 
       Then, to switch between the servers:
 
-        rhc server use online
-        rhc server use development
-        rhc server use production
+        rhc use-server online
+        rhc use-server development
+        rhc use-server production
 
       To list all servers configured:
 
@@ -132,7 +132,9 @@ module RHC::Commands
     def use(server)
       server = server_configs.find(server)
 
-      if wizard_to_server(server.hostname, true, :login => server.login, :use_authorization_tokens => server.use_authorization_tokens, :insecure => server.insecure)
+      attrs = [:login, :use_authorization_tokens, :insecure, :timeout, :ssl_version, :ssl_client_cert_file, :ssl_ca_file]
+
+      if wizard_to_server(server.hostname, true, attrs.inject({}){ |h, (k, v)| h[k] = server.send(k); h })
         paragraph { success "Now using '#{server.hostname}'" }
         0
       else
@@ -213,9 +215,9 @@ module RHC::Commands
         options['use_authorization_tokens'] = args[:use_authorization_tokens] unless args[:use_authorization_tokens].nil?
         options['insecure'] = args[:insecure] unless args[:insecure].nil?
         options['timeout'] = args[:timeout] unless args[:timeout].nil?
-        options['ssl_version'] = args[:ssl_version] unless args[:ssl_version].nil?
-        options['ssl_client_cert_file'] = args[:ssl_client_cert_file] unless args[:ssl_client_cert_file].nil?
-        options['ssl_ca_file'] = args[:ssl_ca_file] unless args[:ssl_ca_file].nil?
+        options['ssl_version'] = args[:ssl_version]
+        options['ssl_client_cert_file'] = args[:ssl_client_cert_file]
+        options['ssl_ca_file'] = args[:ssl_ca_file]
         RHC::ServerWizard.new(config, options, server_configs, set_default).run
       end
 

data/lib/rhc/commands/ssh.rb

@@ -39,7 +39,8 @@ module RHC::Commands
 
         debug "Using user specified SSH: #{options.ssh}" if options.ssh
 
-        command_line = [ ssh.split, rest_app.ssh_string.to_s, command].flatten.compact
+        command_line = [ ssh.split, ('-vvv' if debug?), rest_app.ssh_string.to_s, command ].flatten.compact
+
         debug "Invoking Kernel.exec with #{command_line.inspect}"
         Kernel.send(:exec, *command_line)
       end

data/lib/rhc/helpers.rb

@@ -338,7 +338,10 @@ module RHC
         :auto_deploy     => 'Deployment',
         :sha1            => 'SHA1',
         :ref             => 'Git Reference',
-        :use_authorization_tokens => 'Use Auth Tokens'
+        :use_authorization_tokens => 'Use Auth Tokens',
+        :ssl_ca_file     => 'SSL Cert CA File',
+        :ssl_version     => 'SSL Version',
+        :ssl_client_cert_file => 'SSL x509 Client Cert File'
       })
 
       headings[value]

data/spec/rhc/commands/domain_spec.rb

@@ -206,7 +206,7 @@ describe RHC::Commands::Domain do
         expect { run }.to exit_with_code(0)
         rest_client.domains[0].name.should == 'alterednamespace'
       end
-      it { run_output.should match(/Renaming domain 'olddomain' to 'alterednamespace'.*done.*?Applications in this domain will use the new name in their URL./m) }
+      it { run_output.should match(/Renaming domain 'olddomain' to 'alterednamespace'.*done.*?Applications created in this domain will use the new name in their URL./m) }
     end
 
     context 'when there is no domain' do
@@ -227,7 +227,7 @@ describe RHC::Commands::Domain do
       expect { run }.to exit_with_code(0)
       rest_client.domains[0].name.should == 'alterednamespace'
     end
-    it { run_output.should match(/This command is deprecated.*Renaming domain 'olddomain' to 'alterednamespace'.*done.*?Applications in this domain will use the new name in their URL./m) }
+    it { run_output.should match(/This command is deprecated.*Renaming domain 'olddomain' to 'alterednamespace'.*done.*?Applications created in this domain will use the new name in their URL./m) }
   end
 
   describe 'alter alias has been removed' do

data/spec/rhc/commands/ssh_spec.rb

@@ -28,6 +28,21 @@ describe RHC::Commands::Ssh do
       it { expect{ run }.to exit_with_code(0) }
     end
   end
+  
+  describe 'ssh without command including debugging' do
+    let(:arguments) { ['app', 'ssh', 'app1', '--debug'] }
+
+    context 'when run' do
+      before(:each) do
+        @domain = rest_client.add_domain("mockdomain")
+        @domain.add_application("app1", "mock_type")
+        Kernel.should_receive(:exec).with("ssh", "-vvv", "fakeuuidfortestsapp1@127.0.0.1").and_return(0)
+      end
+      # It would be nice if this checked for the debug[123]: messages from standard error but im not sure how to look for that.
+      it { run_output.should match("Connecting to fakeuuidfortestsapp") }
+      it { expect{ run }.to exit_with_code(0) }
+    end
+  end
 
   describe 'app ssh with command' do
     let(:arguments) { ['app', 'ssh', 'app1', 'ls', '/tmp'] }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 109
+  hash: 115
   prerelease: 
   segments: 
   - 1
-  - 26
-  - 9
-  version: 1.26.9
+  - 27
+  - 4
+  version: 1.27.4
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-06-24 00:00:00 Z
+date: 2014-07-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh