rhc 0.95.14 → 0.96.9

data/README.md

@@ -1,4 +1,4 @@
-# OpenShift Command Line Tools (RHC) [![Build Status](https://secure.travis-ci.org/openshift/os-client-tools.png)](http://travis-ci.org/openshift/os-client-tools)
+# OpenShift Command Line Tools (RHC) [![Build Status](https://secure.travis-ci.org/openshift/rhc.png)](http://travis-ci.org/openshift/rhc)
 
 The OpenShift command line tools allow you to manage your OpenShift
 applications from the command line.  The [Getting Started
@@ -20,19 +20,18 @@ DEPENDENCIES:
 * ruby (1.8.7 or later)
 * rubygems
 
-Step 1:  Create a domain to under which your applications will live:
+Step 1:  Run the setup command to configure your system:
 
-    $ rhc domain create -n desirednamespace -l rhlogin
+    $ rhc setup
 
-The name you choose here will form part of your application's public
-URL.
+Follow the instructions in setup to set your SSH keys and create a domain.  The name you choose for your domain will form part of your application's public URL.
 
 Step 2: Create an OpenShift application:
 
-    $ rhc app create -l rhlogin -a appname -r /path/to/new/git/repo -t <framework Ex: php-5.3>
+    $ rhc app create -a appname -r /path/to/new/git/repo -t <framework Ex: php-5.3>
 
 Once that's complete, follow the directions printed at the end of running
-rhc app create
+rhc app create.
 
 
 ## Making changes to your application
@@ -46,6 +45,7 @@ git repo.  Commit them, then push.  For example:
 
 Then just reload your web page to see the changes.
 
+
 ## OS X Notes:
 
 git:
@@ -64,6 +64,7 @@ Installing git from MacPorts/HomeBrew/Fink/etc requires Xcode.
 Now obtain the client code, either via 'git clone' as above
 or via the rhc gem.
 
+
 ## Developing / Contributing
 We expect code contributions to follow these standards:
 
@@ -73,7 +74,7 @@ We expect code contributions to follow these standards:
 exec rake spec</code>.  Features are in 'features/' and can be run with
 <code>bundle exec rake features</code> (although these tests runs
 against the gem installed locally so you will need to gem install
-first).  See [README.md](https://github.com/openshift/os-client-tools/blob/master/features/README.md) in the features dir for more info.
+first).  See [README.md](https://github.com/openshift/rhc/blob/master/features/README.md) in the features dir for more info.
 3. We maintain 100% line coverage of all newly added code via spec
    testing.  The build will fail if new code is added and it does not
 have full line coverage.  Some old code is currently excluded until it

data/bin/rhc-chk

@@ -354,7 +354,7 @@ class Test3_SSH < Test::Unit::TestCase
     @@agent_keys ||= (
       begin
         Net::SSH::Authentication::Agent.connect.identities
-      rescue
+      rescue Exception
         nil
       end
     )
@@ -362,11 +362,11 @@ class Test3_SSH < Test::Unit::TestCase
   end
 
   def agent_key_names
-    @@agent_keys.map{|x| File.expand_path(x.comment) }
+    @@agent_keys.nil? ? nil : @@agent_keys.map{|x| File.expand_path(x.comment) }
   end
 
   def agent_key_fingerprints
-    @@agent_keys.map{|x| x.to_s.split("\n")[1..-2].join('') }
+    @@agent_keys.nil? ? nil : @@agent_keys.map{|x| x.to_s.split("\n")[1..-2].join('') }
   end
 
   def libra_public_key
@@ -428,13 +428,16 @@ class Test3_SSH < Test::Unit::TestCase
 
   private
   def check_permissions(file,permission)
+    # IO#stat is platform-specific, on windows it's usually 644 but in fact it doesn't matter
+    permission = /.../ if RHC::Helpers.windows?
+
     file = File.expand_path(file)
 
     assert File.exists?(file), error_for(:file_not_found,file)
 
     perms = sprintf('%o',File.stat(file).mode)[-3..-1]
 
-    assert_match permission, perms, error_for(:bad_permissions,[file,perms],permission.source)
+    assert_match(permission, perms, error_for(:bad_permissions,[file,perms],permission.source))
   end
 end
 

data/features/support/env.rb

@@ -1,8 +1,7 @@
 $: << File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
+
 require 'rhc/coverage_helper'
-SimpleCov.at_exit do
-    SimpleCov.result.format!
-end
+SimpleCov.at_exit{ SimpleCov.result.format! } if defined? SimpleCov
 
 require 'rhc_helper'
 require 'rhc-rest'

data/lib/rhc-common.rb

@@ -8,6 +8,7 @@ require 'rhc/vendor/sshkey'
 require 'resolv'
 require 'uri'
 require 'highline/import'
+require 'rhc'
 require 'rhc-rest'
 require 'rhc/helpers'
 require 'rhc/config'
@@ -20,7 +21,7 @@ module RHC
   DEFAULT_MAX_LENGTH = 16
   APP_NAME_MAX_LENGTH = 32
   MAX_RETRIES = 7
-  DEFAULT_DELAY = 2
+  DEFAULT_DELAY = 2.0
   API = "1.1.3"
   PATTERN_VERSION=/\A\d+\.\d+\.\d+\z/
   @read_timeout = 120
@@ -362,6 +363,8 @@ end
 
     puts "Contacting #{url.scheme}://#{url.host}" if @mydebug
     req.set_form_data({'json_data' => json_data, 'password' => password})
+    req['User-Agent'] = RHC::Helpers.user_agent
+
     http = http.new(url.host, url.port)
     http.open_timeout = @connect_timeout
     http.read_timeout = @read_timeout
@@ -519,19 +522,11 @@ end
         app_uuid = application.uuid
         result = "Successfully created application: #{app_name}"
 
-        # Since health_check_path is not returned, we need to fudge it for now
-        health_check_path =
-          case app_type
-          when /^php/
-            "health_check.php"
-          when /^perl/
-            "health_check.pl"
-          else
-            "health"
-          end
+        # health check path now returned by the API
+        health_check_path = application.health_check_path
 
         puts "DEBUG: '#{app_name}' creation returned success." if @mydebug
-      rescue Rhc::Rest::ResourceAccessException => e
+      rescue Rhc::Rest::ConnectionException, Rhc::Rest::ResourceAccessException => e
         print_response_err(Struct::FakeResponse.new(e.message,e.code))
       rescue Rhc::Rest::ValidationException => e
         validation_error_code = (e.code.nil?) ? 406 : e.code
@@ -737,61 +732,54 @@ IMPORTANT
            }
   end
 
+  #
+  # An application is considered available if the health check URL unambiguously returns a 1 or 0.
+  # Otherwise, if the root URL for the app successfully returns content it is also considered
+  # successful.  In the future, applications that do not expose a public web interface will need
+  # a more advanced check mechanism, or the check should not prevent creation.
+  #
   def self.check_app_available(net_http, app_name, fqdn, health_check_path, result, git_url, repo_dir, no_git)
-      #
-      # Test several times, doubling sleep time between attempts.
-      #
-      sleep_time = 2
-      attempt = 0
-      puts "Confirming application '#{app_name}' is available" if @mydebug
-      while attempt < MAX_RETRIES
-          attempt += 1
-          if @mydebug
-            puts "  Attempt # #{attempt}"
-          else
-            print CLEAR_LINE + "Confirming application '#{app_name}' is available:  Attempt # #{attempt}"
-          end
-          $stdout.flush
-          url = URI.parse("http://#{fqdn}/#{health_check_path}")
-          
-          sleep(2.0)
-          begin
-            response = net_http.get_response(url)
-          rescue Exception => e
-            response = nil
-          end
-          if !response.nil? && response.code == "200" && response.body[0,1] == "1"
-            puts CLEAR_LINE + "Confirming application '#{app_name}' is available:  Success!"
-            puts ""
-            puts "#{app_name} published:  http://#{fqdn}/"
-            puts "git url:  #{git_url}"
-
-            if @mydebug
-              unless no_git
-                puts "To make changes to '#{app_name}', commit to #{repo_dir}/."
-              else
-                puts <<LOOKSGOOD
+
+    available = MAX_RETRIES.times.any? do |i|
+      sleep i * DEFAULT_DELAY
+
+      puts "Checking if the application is available ##{i+1}"
+      if health_check_path and !health_check_path.empty?
+        value = open("http://#{fqdn}/#{health_check_path}").read[0,1] rescue nil
+        # TODO: I should be typed exception ApplicationHealthFailure
+        raise "ERROR: The application was unable to start.  Please report this issue via the forums or IRC or file a bug through our public bug tracker." if value == '0'
+        next true if value == '1'
+      end
+      open("http://#{fqdn}") rescue nil
+    end
+
+    if available
+      puts "Application #{app_name} is available at: http://#{fqdn}/"
+      puts "  Git URL: #{git_url}"
+
+      if @mydebug
+        unless no_git
+          puts "To make changes to '#{app_name}', commit to #{repo_dir}/."
+        else
+          puts <<LOOKSGOOD
 To make changes to '#{app_name}', you must first clone it with:
-      git clone #{git_url}
+git clone #{git_url}
 
 LOOKSGOOD
-                puts "Then run 'git push' to update your OpenShift space."
-              end
-            end
-            if result && !result.empty?
-              puts "#{result}"
-            end
-            return true
-          end
-          if !response.nil? && @mydebug
-            puts "Server responded with #{response.code}"
-            puts response.body unless response.code == '503'
-          end
-          puts "    sleeping #{sleep_time} seconds" if @mydebug
-          sleep sleep_time
-          sleep_time = delay(sleep_time)
+          puts "Then run 'git push' to update your OpenShift space."
+        end
       end
-      return false
+      if result && !result.empty?
+        puts "#{result}"
+      end
+      true
+    else
+      puts "Application is not available"
+      false
+    end
+  rescue StandardError => e
+    puts e
+    false
   end
   
   def self.destroy_app(libra_server, net_http, app_name, rhlogin, password)

data/lib/rhc-rest.rb

@@ -10,7 +10,9 @@ require 'rhc-rest/user'
 
 module Rhc
   module Rest
+    #API_VERSION = '1.1'
     @@headers = {:accept => :json}
+    #@@headers = {:accept => "application/json;version=#{Rhc::Rest::VERSION}"}
 
     def logger
       Logger.new(STDOUT)
@@ -60,7 +62,7 @@ module Rhc
       end
     end
 
-    def send(request)
+    def request(request)
       begin
         response = request.execute
         #set cookie
@@ -69,10 +71,9 @@ module Rhc
           @@headers["cookie"] = "rh_sso=#{rh_sso}"
         end
         return parse_response(response) unless response.nil? or response.code == 204
-      rescue RestClient::RequestTimeout, RestClient::ServerBrokeConnection, RestClient::SSLCertificateNotVerified => e
-        raise ResourceAccessException.new("Failed to access resource: #{e.message}")
+      rescue RestClient::RequestTimeout, RestClient::ServerBrokeConnection => e
+        raise ConnectionException.new("Connection to server timed out or got interrupted: #{e.message}")
       rescue RestClient::ExceptionWithResponse => e
-      #puts "#{e.response}"
         process_error_response(e.response)
       rescue Exception => e
         raise ResourceAccessException.new("Failed to access resource: #{e.message}")

data/lib/rhc-rest/application.rb

@@ -22,7 +22,7 @@ module Rhc
         method =  @links['ADD_CARTRIDGE']['method']
         payload = {:name => name}
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload)
-        return send(request)
+        return request(request)
       end
 
       #Get all Cartridge for this applications
@@ -31,7 +31,7 @@ module Rhc
         url = @links['LIST_CARTRIDGES']['href']
         method =  @links['LIST_CARTRIDGES']['method']
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers)
-        return send(request)
+        return request(request)
       end
 
       #Start Application
@@ -41,7 +41,7 @@ module Rhc
         method =  @links['START']['method']
         payload = {:event=> "start"}
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload)
-        return send(request)
+        return request(request)
       end
 
       #Stop  Application
@@ -55,7 +55,7 @@ module Rhc
           payload = {:event=> "stop"}
         end
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload)
-        return send(request)
+        return request(request)
       end
 
       #Restart Application
@@ -65,7 +65,7 @@ module Rhc
         method =  @links['RESTART']['method']
         payload = {:event=> "restart"}
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload)
-        return send(request)
+        return request(request)
       end
 
       #Delete Application
@@ -74,7 +74,7 @@ module Rhc
         url = @links['DELETE']['href']
         method =  @links['DELETE']['method']
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers)
-        return send(request)
+        return request(request)
       end
       alias :delete :destroy
     end

data/lib/rhc-rest/cartridge.rb

@@ -16,7 +16,7 @@ module Rhc
         method =  @links['START']['method']
         payload = {:event=> "start"}
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload)
-        return send(request)
+        return request(request)
       end
 
       #Stop Cartridge
@@ -26,7 +26,7 @@ module Rhc
         method =  @links['STOP']['method']
         payload = {:event=> "stop"}
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload)
-        return send(request)
+        return request(request)
       end
 
       #Restart Cartridge
@@ -36,7 +36,7 @@ module Rhc
         method =  @links['RESTART']['method']
         payload = {:event=> "restart"}
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload)
-        return send(request)
+        return request(request)
       end
 
       #Reload Cartridge
@@ -46,7 +46,7 @@ module Rhc
         method =  @links['RESTART']['method']
         payload = {:event=> "reload"}
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload)
-        return send(request)
+        return request(request)
       end
 
       #Delete Cartridge
@@ -55,7 +55,7 @@ module Rhc
         url = @links['DELETE']['href']
         method =  @links['DELETE']['method']
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers)
-        return send(request)
+        return request(request)
       end
       alias :delete :destroy
       alias :delete :destroy

data/lib/rhc-rest/client.rb

@@ -9,13 +9,14 @@ module Rhc
         logger.debug "Connecting to #{end_point}" if @mydebug
         credentials = Base64.encode64("#{username}:#{password}")
         @@headers["Authorization"] = "Basic #{credentials}"
+        @@headers["User-Agent"] = RHC::Helpers.user_agent rescue nil
         #first get the API
         RestClient.proxy = ENV['http_proxy']
         request = RestClient::Request.new(:url => end_point, :method => :get, :headers => @@headers)
         begin
           response = request.execute
           result = RHC::Json.decode(response)
-          @links = send(request)
+          @links = request(request)
         rescue RestClient::ExceptionWithResponse => e
             logger.error "Failed to get API #{e.response}"
         rescue Exception => e
@@ -30,7 +31,7 @@ module Rhc
         method =  @links['ADD_DOMAIN']['method']
         payload = {:id => id}
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload)
-        return send(request)
+        return request(request)
       end
 
       #Get all Domain
@@ -39,7 +40,7 @@ module Rhc
         url = @links['LIST_DOMAINS']['href']
         method =  @links['LIST_DOMAINS']['method']
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers)
-        return send(request)
+        return request(request)
       end
 
       #Find Domain by namesapce
@@ -76,7 +77,7 @@ module Rhc
         url = @links['LIST_CARTRIDGES']['href']
         method =  @links['LIST_CARTRIDGES']['method']
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers)
-        return send(request)
+        return request(request)
       end
 
       #Find Cartridge by name
@@ -97,7 +98,7 @@ module Rhc
         url = @links['GET_USER']['href']
         method =  @links['GET_USER']['method']
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers)
-        return send(request)
+        return request(request)
       end
 
       #find Key by name

data/lib/rhc-rest/domain.rb

@@ -27,7 +27,7 @@ module Rhc
           timeout = 300 # 5 minute timeout for scalable app
         end
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload, :timeout => timeout)
-        return send(request)
+        return request(request)
       end
 
       #Get all Application for this domain
@@ -36,7 +36,7 @@ module Rhc
         url = @links['LIST_APPLICATIONS']['href']
         method =  @links['LIST_APPLICATIONS']['method']
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers)
-        return send(request)
+        return request(request)
       end
 
       #Update Domain
@@ -46,7 +46,7 @@ module Rhc
         method =  @links['UPDATE']['method']
         payload = {:id => new_id}
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload)
-        return send(request)
+        return request(request)
       end
       alias :save :update
 
@@ -57,7 +57,7 @@ module Rhc
         method =  @links['DELETE']['method']
         payload = {:force => force}
         request = RestClient::Request.new(:url => url, :method => method, :headers => @@headers, :payload => payload)
-        return send(request)
+        return request(request)
       end
       alias :delete :destroy
     end