Merge pull request #44 from fabianofranz/master

Fixes Bugzilla 823854

express/bin/rhc-port-forward

@@ -102,8 +102,9 @@ Net::SSH.start(ssh_host, app_uuid) do |ssh|
 
   ssh.exec! "rhc-list-ports" do |channel, stream, data|
 
-    if data.is_a?(String) 
-      data = data.split '\n'
+    # data comes from a linux server so it is a one-line string for windows, we need to split \n manually
+    if RHC::Helpers.windows? 
+      data = data.split /\n/
     end
 
     if stream == :stderr
@@ -148,8 +149,9 @@ Net::SSH.start(ssh_host, app_uuid) do |ssh|
     Net::SSH.start(ssh_host, scaled_uuid) do |ssh|
 
       ssh.exec! "rhc-list-ports" do |channel, stream, data|
-        if data.is_a?(String) 
-          data = data.split '\n'
+        # data comes from a linux server so it is a one-line string for windows, we need to split \n manually
+        if RHC::Helpers.windows?
+          data = data.split /\n/
         end
         if stream == :stderr
           data.each { |line|
@@ -184,11 +186,10 @@ Net::SSH.start(ssh_host, app_uuid) do |ssh|
 
   hosts_and_ports_descriptions.each { |description| puts "Binding #{description}..." }
 
-  puts "Use ctl + c to stop"
-
   begin
 
     Net::SSH.start(ssh_host, app_uuid) do |ssh|
+      puts "Use ctl + c to stop"
       hosts_and_ports.each do |host_and_port|
         host, port = host_and_port.split(/:/)
         ssh.forward.local(host, port.to_i, host, port.to_i)

express/lib/rhc/helpers.rb

@@ -136,5 +136,13 @@ def paragraph(&block)
     def jruby? ; RUBY_PLATFORM =~ /java/i end
     def windows? ; RUBY_PLATFORM =~ /win(32|dows|ce)|djgpp|(ms|cyg|bcc)win|mingw32/i end
     def unix? ; !jruby? && !windows? end
+
   end
 end
+
+# mock for windows
+if defined?(UNIXServer) != 'constant' or UNIXServer.class != Class
+  #:nocov:
+  class UNIXServer; end 
+  #:nocov:
+end