rhc 1.20.3 → 1.21.3

data/features/deployments_feature.rb

@@ -47,17 +47,17 @@ describe "rhc deployment scenarios" do
 
     it "should perform a complete deploy workflow" do
       configure_app_for_manual_git_deployment
-      edit_simple_change 'Welcome to Test'
-      app_page_content.should match /Welcome to OpenShift/
-      app_page_content.should_not match /Welcome to Test/
+      edit_simple_change 'Bienvenido a'
+      app_page_content.should match /Welcome to/
+      app_page_content.should_not match /Bienvenido a/
       deploy_master
-      app_page_content.should match /Welcome to Test/
-      app_page_content.should_not match /Welcome to OpenShift/
+      app_page_content.should match /Bienvenido a/
+      app_page_content.should_not match /Welcome to/
       deployment_id = find_inactive_deployment
       deployment_id.should_not be_nil
       activate deployment_id
-      app_page_content.should match /Welcome to OpenShift/
-      app_page_content.should_not match /Welcome to Test/
+      app_page_content.should match /Welcome to/
+      app_page_content.should_not match /Bienvenido a/
     end
 
     private
@@ -100,7 +100,7 @@ describe "rhc deployment scenarios" do
         Dir.chdir git_directory
         `git config user.email "you@example.com"`
         `git config user.name "Your Name"`
-        `sed -i "s/Welcome to OpenShift/#{content}/" php/index.php`
+        `sed -i "s/Welcome/#{content}/" index.php`
         `git commit -a -m "Commit from Feature Tests"`
         `git push origin master`
         Dir.chdir '../'

data/lib/rhc/commands/app.rb

@@ -600,7 +600,7 @@ module RHC::Commands
           sleep_time *= DEFAULT_DELAY_THROTTLE
         }
 
-        debug "End checking for application dns @ '#{host} - found=#{found}'"
+        debug "End checking for application dns @ '#{host} - found=#{host_found}'"
 
         host_found
       end

data/lib/rhc/commands/scp.rb

@@ -34,9 +34,14 @@ module RHC::Commands
 
       begin
           start_time = Time.now
+          last_sent = nil
           Net::SCP.send("#{action}!".to_sym, ssh_opts[1], ssh_opts[0], (action == 'upload' ? local_path : remote_path), (action == 'upload' ? remote_path : local_path)) do |ch, name, sent, total|
             #:nocov:
-            $stderr.print "\r #{action}ing #{name}: #{((sent.to_f/total.to_f)*100).to_i}% complete. #{sent}/#{total} bytes transferred " + (sent == total ? "in #{Time.now - start_time} seconds \n" : "")
+            if sent != last_sent
+              last_sent = sent
+              complete = total == 0 ? 100 : ((sent.to_f/total.to_f)*100).to_i
+              $stderr.print "\r #{action}ing #{name}: #{complete}% complete. #{sent}/#{total} bytes transferred " + (sent == total ? "in #{Time.now - start_time} seconds \n" : "")
+            end
             #:nocov:
           end
       rescue Errno::ECONNREFUSED

data/lib/rhc/helpers.rb

@@ -394,7 +394,9 @@ module RHC
       # :nocov:
       # Patch for BZ840938 to support Ruby 1.8 on machines without /etc/resolv.conf
       dns = Resolv::DNS.new((Resolv::DNS::Config.default_config_hash || {}))
-      dns.getresources(host, Resolv::DNS::Resource::IN::A).any?
+      resources = dns.getresources(host, Resolv::DNS::Resource::IN::A)
+      debug("Checking for #{host} from Resolv::DNS: #{resources.inspect}") if debug?
+      resources.present?
       # :nocov:
     end
 
@@ -402,7 +404,9 @@ module RHC
       with_tolerant_encoding do
         begin
           resolver = Resolv::Hosts.new
-          resolver.getaddress host
+          result = resolver.getaddress host
+          debug("Checking for #{host} from Resolv::Hosts: #{result.inspect}") if debug?
+          result
         rescue => e
           debug "Error while resolving with Resolv::Hosts: #{e.message}(#{e.class})\n  #{e.backtrace.join("\n  ")}"
         end

data/lib/rhc/wizard.rb

@@ -569,7 +569,7 @@ module RHC
 
 In order to fully interact with OpenShift you will need to install and configure a git client if you have not already done so.
 
-Documentation for installing other tools you will need for OpenShift can be found at https://openshift.redhat.com/community/developers/install-the-client-tools
+Documentation for installing other tools you will need for OpenShift can be found at https://www.openshift.com/developers/install-the-client-tools
 
 We recommend these free applications:
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 65
+  hash: 69
   prerelease: 
   segments: 
   - 1
-  - 20
+  - 21
   - 3
-  version: 1.20.3
+  version: 1.21.3
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-02-24 00:00:00 Z
+date: 2014-03-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh