rhc 1.32.2 → 1.33.4

data/lib/rhc/commands/port_forward.rb

@@ -131,7 +131,7 @@ module RHC::Commands
                     debug args.inspect
                     ssh.forward.local(*args)
                     fs.bound = true
-                  rescue Errno::EADDRINUSE, Errno::EACCES => e
+                  rescue Errno::EADDRINUSE, Errno::EACCES, Errno::EPERM => e
                     warn "#{e} while forwarding port #{fs.port_from}. Trying local port #{fs.port_from+1}"
                     fs.port_from += 1
                   rescue Timeout::Error, Errno::EADDRNOTAVAIL, Errno::EHOSTUNREACH, Errno::ECONNREFUSED, Net::SSH::AuthenticationFailed => e

data/lib/rhc/commands/ssh.rb

@@ -39,10 +39,19 @@ module RHC::Commands
 
         debug "Using user specified SSH: #{options.ssh}" if options.ssh
 
-        command_line = [RHC::Helpers.split_path(ssh), ('-vvv' if debug?), rest_app.ssh_string.to_s, command].flatten.compact
+        command_line = [RHC::Helpers.split_path(ssh), ('-vv' if debug?), rest_app.ssh_string.to_s, command].flatten.compact
 
         debug "Invoking Kernel.exec with #{command_line.inspect}"
-        Kernel.send(:exec, *command_line)
+        begin
+          Kernel.send(:exec, *command_line)
+        rescue Errno::ENOENT
+          debug "SSH executable #{ssh.inspect} not found, splitting and trying again..."
+
+          command_line = [ssh.chomp('"').reverse.chomp('"').reverse.split(' '), ('-vv' 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
       end
     end
 

data/lib/rhc/ssh_helpers.rb

@@ -268,7 +268,7 @@ module RHC
         else
           Net::SSH.start(ssh_uri.host, ssh_uri.user) do |ssh|
             File.open(filename, 'wb') do |file|
-              ssh.exec! "snapshot" do |channel, stream, data|
+              ssh.exec! snapshot_cmd do |channel, stream, data|
                 if stream == :stdout
                   file.write(data)
                 else

data/spec/rhc/commands/port_forward_spec.rb

@@ -131,6 +131,24 @@ describe RHC::Commands::PortForward do
       end
     end
 
+    # Windows 7 reportedly returns EPERM rather than EACCES when the
+    # port is in use by a local service (see
+    # <https://bugzilla.redhat.com/show_bug.cgi?id=1125963>).
+    context 'when local port is in use by local service on Windows 7' do
+      before(:each) do
+        Net::SSH.should_receive(:start).with(@uri.host, @uri.user).and_yield(@ssh).twice
+        @ssh.should_receive(:exec!).with("rhc-list-ports").and_yield(nil, :stderr, 'mysql -> 127.0.0.1:3306')
+        forward = double(Net::SSH::Service::Forward)
+        @ssh.should_receive(:forward).at_least(2).and_return(forward)
+        forward.should_receive(:local).with(3306, '127.0.0.1', 3306).and_raise(Errno::EPERM)
+        forward.should_receive(:local).with(3307, '127.0.0.1', 3306)
+        @ssh.should_receive(:loop).and_raise(Interrupt.new)
+      end
+      it 'should bind to a higher port' do
+        run_output.should include("3307")
+      end
+    end
+
     context 'when host refuses connection' do
       before(:each) do
         Net::SSH.should_receive(:start).with(@uri.host, @uri.user).and_yield(@ssh).twice

data/spec/rhc/commands/ssh_spec.rb

@@ -36,7 +36,7 @@ describe RHC::Commands::Ssh 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)
+        Kernel.should_receive(:exec).with("ssh", "-vv", "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") }
@@ -171,6 +171,23 @@ describe RHC::Commands::Ssh do
     end
   end
 
+  describe 'app ssh custom ssh with spaces' do
+    let(:arguments) { ['app', 'ssh', 'app1', '--ssh', '/path/to/ssh --with_custom_flag'] }
+    context 'when custom ssh does not exist as a path' do
+      before(:each) do
+        @domain = rest_client.add_domain("mockdomain")
+        @domain.add_application("app1", "mock_type")
+        RHC::Commands::Ssh.any_instance.should_not_receive(:has_ssh?)
+        File.should_receive(:exist?).at_least(1).and_return(true)
+        File.should_receive(:executable?).at_least(1).and_return(true)
+        subject.class.any_instance.stub(:discover_git_executable).and_return('git')
+        Kernel.should_receive(:exec).with('/path/to/ssh --with_custom_flag', "fakeuuidfortestsapp1@127.0.0.1").once.times.and_raise(Errno::ENOENT)
+        Kernel.should_receive(:exec).with('/path/to/ssh', '--with_custom_flag', "fakeuuidfortestsapp1@127.0.0.1").once.times.and_return(0)
+      end
+      it { expect { run }.to exit_with_code(0) }
+    end
+  end
+
   describe 'ssh tests' do
     let(:arguments) { ['app', 'ssh', 'app1', '-s /bin/blah'] }
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 147
+  hash: 155
   prerelease: 
   segments: 
   - 1
-  - 32
-  - 2
-  version: 1.32.2
+  - 33
+  - 4
+  version: 1.33.4
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-11-13 00:00:00 Z
+date: 2014-12-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh