rhc 0.80.5 → 0.81.14

data/bin/rhc-create-domain

@@ -78,8 +78,11 @@ libra_server = get_var('libra_server')
 debug = get_var('debug') == 'false' ? nil : get_var('debug')
 
 
-libra_kfile = get_kfile(false)
-libra_kpfile = get_kpfile(libra_kfile, opt['alter'])
+ssh_key_file_path = get_kfile(false)
+ssh_pub_key_file_path = get_kpfile(ssh_key_file_path, opt['alter'])
+
+ssh_config = "#{ENV['HOME']}/.ssh/config"
+ssh_config_d = "#{ENV['HOME']}/.ssh/"
 
 if opt["help"]
     p_usage
@@ -113,7 +116,6 @@ end
 #
 # Add a new namespace to configs
 #
-
 def add_rhlogin_config(rhlogin, uuid)
     f = open(File.expand_path(config_path), 'a')
     unless config.get_value('default_rhlogin')
@@ -124,32 +126,108 @@ def add_rhlogin_config(rhlogin, uuid)
     f.close
 end
 
+#
+# Check / add new host to ~/.ssh/config
+#
+def add_ssh_config_host(rhc_domain, ssh_key_file_path, ssh_config, ssh_config_d)
+  
+  puts "Checking ~/.ssh/config"
+  ssh_key_file_name = File.basename(ssh_key_file_path)
+  if ssh_key_file_path =~ /^#{ENV['HOME']}/
+    ssh_key_file_path = ssh_key_file_path[ENV['HOME'].length..-1]
+    if ssh_key_file_path =~ /^\// || ssh_key_file_path =~ /^\\/
+      ssh_key_file_path = '~' + ssh_key_file_path
+    else
+      ssh_key_file_path = '~/' + ssh_key_file_path
+    end
+  end
+  if (ssh_key_file_name != 'id_rsa')
+    found = false
+
+    begin
+        File.open(ssh_config, "r") do |sline|
+            while(line = sline.gets)
+                if line.to_s.index("Host *.#{rhc_domain}") == 0
+                    found = true
+                    break
+                end
+            end
+        end
+    rescue Errno::EACCES
+        puts "Could not read from #{ssh_config}"
+        puts "Reason: " + $!
+        puts
+        puts "Please correct this first.  Then run rerun."
+        puts
+        exit 213
+    rescue Errno::ENOENT
+        puts "Could not find #{ssh_config}.  This is ok, continuing"
+    end
+    if found
+        puts "Found #{rhc_domain} in ~/.ssh/config... No need to adjust"
+    else
+        puts "    Adding #{rhc_domain} to ~/.ssh/config"
+        begin
+            f = File.open(ssh_config, "a")
+            f.puts <<SSH
+
+# Added by rhc-create-domain on #{`date`}
+Host *.#{rhc_domain}
+    IdentityFile #{ssh_key_file_path}
+    VerifyHostKeyDNS yes
+    StrictHostKeyChecking no
+    UserKnownHostsFile ~/.ssh/libra_known_hosts
+
+SSH
+            f.close
+        rescue Errno::EACCES
+            puts "Could not write to #{ssh_config}"
+            puts "Reason: " + $!
+            puts
+            puts "Please correct this first.  Then run rerun."
+            puts
+            exit 214
+        rescue Errno::ENOENT
+            # Make directory and config if they do not exist
+            puts "Could not find directory: " + $!
+            puts "creating"
+            FileUtils.mkdir_p ssh_config_d
+            file = File.open(ssh_config, 'w')
+            file.close
+            retry
+        end
+    end
+
+    File.chmod(0700, ssh_config_d)
+    File.chmod(0600, ssh_config)
+  end
+end
+
 
 #
-# Check to see if a libra_kfile exists, if not create it.
+# Check to see if a ssh_key_file_path exists, if not create it.
 #
 
-if File.readable?(libra_kfile)
-    puts "OpenShift Express key found at #{libra_kfile}.  Reusing..."
+if File.readable?(ssh_key_file_path)
+    puts "OpenShift Express key found at #{ssh_key_file_path}.  Reusing..."
 else
-    puts "Generating OpenShift Express ssh key to #{libra_kfile}"
+    puts "Generating OpenShift Express ssh key to #{ssh_key_file_path}"
     # Use system for interaction
-    system("ssh-keygen -t rsa -f '#{libra_kfile}'")
+    system("ssh-keygen -t rsa -f '#{ssh_key_file_path}'")
 end
 
-ssh_key = File.open(libra_kpfile).gets.chomp.split(' ')[1]
+ssh_key = File.open(ssh_pub_key_file_path).gets.chomp.split(' ')[1]
 
-puts "Contacting https://#{libra_server}"
 data = {'namespace' => opt['namespace'],
-                'rhlogin' => opt['rhlogin'],
-                'ssh' => ssh_key}
+        'rhlogin' => opt['rhlogin'],
+        'ssh' => ssh_key}
 if (opt['alter'])
-  data['alter'] = "true"
+  data[:alter] = true
   not_found_message = "A user with rhlogin '#{opt['rhlogin']}' does not have a registered domain.  Be sure to run rhc-create-domain without -a|--alter first."
   user_info = RHC::get_user_info(libra_server, opt['rhlogin'], password, @http, true, not_found_message)
 end
 if debug
-  data['debug'] = "true"
+  data[:debug] = true
 end
 RHC::print_post_data(data)
 json_data = RHC::generate_json(data)
@@ -163,6 +241,7 @@ if response.code == '200'
         RHC::print_response_success(json_resp)
         json_rhlogininfo = JSON.parse(json_resp['data'])
         add_rhlogin_config(json_rhlogininfo['rhlogin'], json_rhlogininfo['uuid'])
+        add_ssh_config_host(json_rhlogininfo['rhc_domain'], ssh_key_file_path, ssh_config, ssh_config_d)
     
         if opt['alter'] != ''
             puts <<EOF
@@ -199,11 +278,13 @@ EOF
                       dns_success = false
                   end
               end
+              puts "You can use rhc-user-info to view any url changes.  Be sure to update any links"
+              puts "including the url in your local git config: <local_git_repo>/.git/config"
             end
             if dns_success
-              puts "Alteration successful.  You can use rhc-user-info to view any url changes."
+              puts "Alteration successful."
             else
-              puts "Alteration successful but at least one of the urls is still updating in DNS.  You can use rhc-user-info to view any url changes."
+              puts "Alteration successful but at least one of the urls is still updating in DNS."
             end
             puts ""
         end
@@ -214,4 +295,4 @@ EOF
 else
     RHC::print_response_err(response)
 end
-exit 254
+exit 1

data/bin/rhc-ctl-app

@@ -35,12 +35,13 @@ Control an OpenShift express app
   -a|--app   application   Application name  (alphanumeric) (required)
   -l|--rhlogin rhlogin     Red Hat login (RHN or OpenShift login with OpenShift Express access) (#{rhlogin})
   -p|--password password   RHLogin password  (optional, will prompt)
-  -c|--command command     (start|stop|force-stop|restart|reload|status|destroy)
+  -c|--command command     (start|stop|force-stop|restart|reload|status|destroy|add-alias|remove-alias)
   -L|--embedded-list       List supported embedded cartridges
   -e|--embed               (add|remove|stop|start|restart|status|reload)-$cartridge eg: add-mysql-5.1
   -b|--bypass              Bypass warnings
   -d|--debug               Print Debug info
   -h|--help                Show Usage info
+  --alias                  Specify server alias (when using add/remove-alias)
   --config  path           Path of alternate config file
   --timeout #              Timeout, in seconds, for connection
 
@@ -69,6 +70,7 @@ begin
         ["--embed",      "-e", GetoptLong::REQUIRED_ARGUMENT],
         ["--password",   "-p", GetoptLong::REQUIRED_ARGUMENT],
         ["--app",        "-a", GetoptLong::REQUIRED_ARGUMENT],
+        ["--alias",      GetoptLong::REQUIRED_ARGUMENT],
         ["--config", GetoptLong::REQUIRED_ARGUMENT],
         ["--command",    "-c", GetoptLong::REQUIRED_ARGUMENT],
         ["--timeout", GetoptLong::REQUIRED_ARGUMENT]
@@ -121,14 +123,14 @@ unless opt["embed"] or opt["command"]
 end
 
 if opt["command"]
-  unless opt["command"] =~ /^(start|stop|force-stop|restart|reload|status|destroy)$/
-    puts "Invalid command '#{opt["command"]}' specified.  Valid commands are (start|stop|force-stop|restart|reload|status|destroy)"
+  unless opt["command"] =~ /^(start|stop|force-stop|restart|reload|status|destroy|add-alias|remove-alias)$/
+    puts "Invalid command '#{opt["command"]}' specified.  Valid commands are (start|stop|force-stop|restart|reload|status|destroy|add-alias|remove-alias)"
     p_usage
   end
 elsif opt["embed"]
   action = opt['embed'].split('-')[0]
   unless action =~ /^(add|remove|start|stop|restart|status|reload)$/
-    puts "Invalid embed action '#{action}' specified.  Valid embed actions are (add|remove|start|stop|restart|status|reload)"
+    puts "Invalid embed action '#{action}' specified.  Valid embed actions are (add|remove|start|stop|restart|status|reload|add-alias|remove-alias)"
     p_usage
   end
 end
@@ -137,23 +139,17 @@ unless opt['rhlogin'] && opt['app'] && (opt['command'] || opt['embed'])
     p_usage
 end
 
+if opt['command'] and (opt['alias'] and !(opt['command'] =~ /-alias$/)) || ((opt['command'] =~ /-alias$/) and ! opt['alias'])
+    puts "When specifying alias make sure to use -c add-alias or -c remove-alias"
+    p_usage
+end
+
+
 password = opt['password']
 if !password
   password = RHC::get_password
 end
 
-user_info = RHC::get_user_info(libra_server, opt['rhlogin'], password, @http, debug, false)
-app = user_info['app_info'][opt['app']]
-if app
-  framework = app['framework']
-else
-  puts "Application not found: #{opt['app']}"
-  exit 101
-end
-#
-# Send Warning
-#
-
 opt["command"] = "deconfigure" if opt["command"] == "destroy"
 
 if !opt["bypass"] and opt["command"] == "deconfigure"
@@ -176,6 +172,7 @@ WARNING
     end
 end
 
+framework = nil
 if opt['embed']
     action = opt['embed'].split('-')[0]
     # override action if it's in the mapper
@@ -187,25 +184,4 @@ else
     url = URI.parse("https://#{libra_server}/broker/cartridge")
 end
 
-data = {:cartridge => framework,
-                :action => action,
-                :app_name => "#{opt['app']}",
-                :rhlogin => "#{opt['rhlogin']}"
-                }
-if debug
-  data['debug'] = "true"
-end
-
-json_data = RHC::generate_json(data)
-puts "Submitting form: #{json_data}" if debug
-
-puts "Contacting https://#{libra_server}"
-
-response = RHC::http_post(@http, url, json_data, password)
-
-if response.code == '200'
-    json_resp = JSON.parse(response.body)
-    RHC::print_response_success(json_resp, true)
-else
-    RHC::print_response_err(response)
-end
+RHC::ctl_app(libra_server, @http, opt['app'], opt['rhlogin'], password, action, opt['embed'], framework, opt['alias'])

data/bin/rhc-snapshot

@@ -153,7 +153,7 @@ end
     puts
     puts ssh_cmd
     puts
-    exit 254
+    exit 1
 end
 puts output if opt['restore'] && debug
 exit 0

data/bin/rhc-tail-files

@@ -134,7 +134,7 @@ rescue SystemCallError
   puts
   puts ssh_cmd
   puts
-  exit 254
+  exit 1
 end
 # this should never happen
 exit 1

data/bin/rhc-user-info

@@ -102,7 +102,7 @@ if opt['info']
     puts "User Info"
     puts "========="
     puts "Namespace: #{user_info['user_info']['namespace']}"
-    puts "    UUID: #{user_info['user_info']['uuid']}"
+    #puts "    UUID: #{user_info['user_info']['uuid']}"
     puts "   RHLogin: #{user_info['user_info']['rhlogin']}"
     puts " ssh_key: #{user_info['user_info']['ssh_key']}"
 end
@@ -112,27 +112,34 @@ if opt['apps']
 
     puts "Application Info"
     puts "================"
-    user_info['app_info'].each do |key, val|
-        puts key
-        puts "    Framework: #{val['framework']}"
-        puts "     Creation: #{val['creation_time']}"
-        puts "         UUID: #{val['uuid']}"
-        puts "      Git URL: ssh://#{val['uuid']}@#{key}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']}/~/git/#{key}.git/"
-        puts "   Public URL: http://#{key}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']}/"
-        puts ""
-        puts " Embedded: "
-        if val['embedded'] && !val['embedded'].empty? 
-            val['embedded'].each do |embed_key, embed_val|
-                if embed_val.has_key?('info') && !embed_val['info'].empty?
-                    puts "      #{embed_key} - #{embed_val['info']}"
-                else
-                    puts "      #{embed_key}"
-                end
-            end
-        else
-            puts "      None"
-        end
-        puts ""
+    unless user_info['app_info'].empty?
+      user_info['app_info'].each do |key, val|
+          puts key
+          puts "    Framework: #{val['framework']}"
+          puts "     Creation: #{val['creation_time']}"
+          puts "         UUID: #{val['uuid']}"
+          puts "      Git URL: ssh://#{val['uuid']}@#{key}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']}/~/git/#{key}.git/"
+          puts "   Public URL: http://#{key}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']}/"
+          if val['aliases'] && !val['aliases'].empty?
+            puts "      Aliases: #{val['aliases'].join(', ')}"
+          end
+          puts ""
+          puts " Embedded: "
+          if val['embedded'] && !val['embedded'].empty? 
+              val['embedded'].each do |embed_key, embed_val|
+                  if embed_val.has_key?('info') && !embed_val['info'].empty?
+                      puts "      #{embed_key} - #{embed_val['info']}"
+                  else
+                      puts "      #{embed_key}"
+                  end
+              end
+          else
+              puts "      None"
+          end
+          puts ""
+      end
+    else
+      puts "No applications found.  You can use rhc-create-app to create new applications."
     end
 
 end

data/lib/rhc-common.rb

@@ -42,13 +42,23 @@ module RHC
   @mydebug = false
   broker_version = "?.?.?"
   api_version = "?.?.?"
+  
+  DEBUG_INGORE_KEYS = {
+    'result' => nil,
+    'debug' => nil,
+    'exit_code' => nil,
+    'messages' => nil,
+    'data' => nil,
+    'api' => nil,
+    'broker' => nil
+  }
 
   def self.timeout(val)
     if val
       @mytimeout = val.to_i
       unless @mytimeout > 0 
         puts 'Timeout must be specified as a number greater than 0'
-        exit 254
+        exit 1
       end
     end
   end
@@ -77,11 +87,10 @@ module RHC
   end
 
   def self.get_cartridges_list(libra_server, net_http, cart_type="standalone", print_result=nil)
-    puts "Contacting https://#{libra_server} to obtain list of cartridges..."
-    puts " (please excuse the delay)"
+    puts "Obtaining list of cartridges (please excuse the delay)..."
     data = {'cart_type' => cart_type}
     if @mydebug
-      data['debug'] = "true"
+      data[:debug] = true
     end
     print_post_data(data)
     json_data = generate_json(data)
@@ -96,7 +105,7 @@ module RHC
     begin
       json_resp = JSON.parse(response.body)
     rescue JSON::ParserError
-      exit 254
+      exit 1
     end
     update_server_api_v(json_resp)
     if print_result
@@ -105,7 +114,7 @@ module RHC
     begin
       carts = (JSON.parse(json_resp['data']))['carts']
     rescue JSON::ParserError
-      exit 254
+      exit 1
     end
     carts
   end
@@ -173,11 +182,9 @@ module RHC
   end
 
   def self.get_user_info(libra_server, rhlogin, password, net_http, print_result, not_found_message=nil)
-
-    puts "Contacting https://#{libra_server}"
     data = {'rhlogin' => rhlogin}
     if @mydebug
-      data['debug'] = "true"
+      data[:debug] = true
     end
     print_post_data(data)
     json_data = generate_json(data)
@@ -199,12 +206,12 @@ module RHC
       else
         print_response_err(response)
       end
-      exit 254
+      exit 1
     end
     begin
       json_resp = JSON.parse(response.body)
     rescue JSON::ParserError
-      exit 254
+      exit 1
     end
     update_server_api_v(json_resp)
     if print_result
@@ -213,7 +220,7 @@ module RHC
     begin
       user_info = JSON.parse(json_resp['data'].to_s)
     rescue JSON::ParserError
-      exit 254
+      exit 1
     end
     user_info
   end
@@ -224,6 +231,9 @@ module RHC
       print "Password: "
       system "stty -echo"
       password = gets.chomp
+    rescue Interrupt
+      puts "\n"
+      exit 1
     ensure
       system "stty echo"
     end
@@ -234,6 +244,7 @@ module RHC
   def self.http_post(http, url, json_data, password)
     req = http::Post.new(url.path)
 
+    puts "Contacting #{url.scheme}://#{url.host}" if @mydebug
     req.set_form_data({'json_data' => json_data, 'password' => password})
     http = http.new(url.host, url.port)
     http.open_timeout = @mytimeout
@@ -263,14 +274,14 @@ module RHC
     if (!@mydebug)
       puts "Re-run with -d for more information."
     end
-    exit_code = 254
+    exit_code = 1
     if response.content_type == 'application/json'
       puts "JSON response:"
       begin
         json_resp = JSON.parse(response.body)
         exit_code = print_json_body(json_resp)
       rescue JSON::ParserError
-        exit_code = 254
+        exit_code = 1
       end
     elsif @mydebug
       puts "HTTP response from server is #{response.body}"
@@ -288,18 +299,18 @@ module RHC
     end
   end
 
-  def self.print_response_success(json_resp, always_print_result=false)
+  def self.print_response_success(json_resp, print_result=false)
     if @mydebug
       puts "Response from server:"
-      print_json_body(json_resp)
-    elsif always_print_result
+      print_json_body(json_resp, print_result)
+    elsif print_result
       print_json_body(json_resp)
     else
       print_response_messages(json_resp)
     end
   end
 
-  def self.print_json_body(json_resp)
+  def self.print_json_body(json_resp, print_result=true)
     print_response_messages(json_resp)
     exit_code = json_resp['exit_code']
     if @mydebug
@@ -311,20 +322,20 @@ module RHC
         puts "Exit Code: #{exit_code}"
         if (json_resp.length > 3)
           json_resp.each do |k,v|
-            if (k != 'result' && k != 'debug' && k != 'exit_code' && k != 'messages' && k != 'data')
+            if !DEBUG_INGORE_KEYS.has_key?(k)
               puts "#{k.to_s}: #{v.to_s}"
             end
           end
         end
       end
+      if json_resp['api']
+        puts "API version:    #{json_resp['api']}"
+      end
+      if json_resp['broker']
+        puts "Broker version: #{json_resp['broker']}"
+      end
     end
-    if json_resp['api']
-      puts "API version:    #{json_resp['api']}"
-    end
-    if json_resp['broker']
-      puts "Broker version: #{json_resp['broker']}"
-    end
-    if json_resp['result']
+    if print_result && json_resp['result']
       puts ''
       puts 'RESULT:'
       puts json_resp['result']
@@ -341,6 +352,270 @@ module RHC
       resp = dns.getresources(host, Resolv::DNS::Resource::IN::A)
       return resp.any?
   end
+  
+  def self.create_app(libra_server, net_http, user_info, app_name, app_type, rhlogin, password, repo_dir=nil, no_dns=false, no_git=false, no_git_message=nil)
+    puts "Attempting to create remote application space: #{app_name}"
+    
+    data = {:cartridge => app_type,
+            :action => 'configure',
+            :app_name => app_name,
+            :rhlogin => rhlogin
+           }
+    if @mydebug
+      data[:debug] = true
+    end    
+    json_data = generate_json(data)
+    
+    url = URI.parse("https://#{libra_server}/broker/cartridge")
+    response = http_post(net_http, url, json_data, password)
+    
+    if response.code == '200'
+        json_resp = JSON.parse(response.body)
+        print_response_success(json_resp)
+        json_data = JSON.parse(json_resp['data'])
+        health_check_path = json_data['health_check_path']
+        app_uuid = json_data['uuid']
+        result = json_resp['result']
+        puts "DEBUG: '#{app_name}' creation returned success." if @mydebug
+    else
+        print_response_err(response)
+    end
+
+    #
+    # At this point, we need to register a handler to guarantee app
+    # cleanup on any exceptions or calls to exit
+    #
+    at_exit do
+      unless $!.nil? || $!.is_a?(SystemExit) && $!.success?
+        puts "Cleaning up application"
+        destroy_app(libra_server, net_http, app_name, rhlogin, password)
+      end
+    end
+    
+    namespace = user_info['user_info']['namespace']
+    rhc_domain = user_info['user_info']['rhc_domain']
+
+    fqdn = "#{app_name}-#{namespace}.#{rhc_domain}"
+    
+    loop = 0
+    #
+    # Confirm that the host exists in DNS
+    #
+    unless no_dns
+      puts "Now your new domain name is being propagated worldwide (this might take a minute)..."
+  
+      # Allow DNS to propogate
+      sleep 15
+  
+      # Now start checking for DNS
+      sleep_time = 2
+      while loop < MAX_RETRIES && !hostexist?(fqdn)
+          sleep sleep_time
+          loop+=1
+          puts "  retry # #{loop} - Waiting for DNS: #{fqdn}"
+          sleep_time = delay(sleep_time)
+      end
+    end
+    
+    # If the hostname couldn't be resolved, print out the git URL
+    # and exit cleanly.  This will help solve issues where DNS times
+    # out in APAC, etc on resolution.
+    if loop >= MAX_RETRIES
+        puts <<WARNING
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+WARNING: We weren't able to lookup your hostname (#{fqdn}) 
+in a reasonable amount of time.  This can happen periodically and will just
+take an extra minute or two to propagate depending on where you are in the
+world.  Once you are able to access your application in a browser, you can then
+clone your git repository.
+
+  Application URL: http://#{fqdn}
+
+  Git Repository URL: #{git_url}
+
+  Git Clone command: 
+    git clone #{git_url} #{repo_dir}
+
+If you can't get your application '#{app_name}' running in the browser, you can
+also try destroying and recreating the application as well using:
+
+  rhc-ctl-app -c destroy -a #{app_name} -l #{rhlogin}
+
+If this doesn't work for you, let us know in the forums or in IRC and we'll
+make sure to get you up and running.
+
+  Forums: https://www.redhat.com/openshift/forums/express
+
+  IRC: #openshift (on Freenode)
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+WARNING
+        exit 0
+    end
+    
+    #
+    # Pull new repo locally
+    #
+    
+    git_url = "ssh://#{app_uuid}@#{app_name}-#{namespace}.#{rhc_domain}/~/git/#{app_name}.git/"
+    
+    unless no_git
+        puts "Pulling new repo down"
+    
+        puts "git clone --quiet #{git_url} #{repo_dir}" if @mydebug
+        quiet = (@mydebug ? ' ' : '--quiet ')
+        git_clone = %x<git clone #{quiet} #{git_url} #{repo_dir}>
+        if $?.exitstatus != 0
+            puts "Error in git clone"
+            puts git_clone
+            exit 216
+        end
+    else
+      if no_git_message
+        puts no_git_message
+      else         
+        puts <<IMPORTANT
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+IMPORTANT: Since the -n flag was specified, no local repo has been created.
+This means you can't make changes to your published application until after
+you clone the repo yourself.  See the git url below for more information.
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+IMPORTANT
+      end
+    end
+    
+    #
+    # At this point, we need to register a handler to guarantee git
+    # repo cleanup on any exceptions or calls to exit
+    #
+    unless no_git
+      at_exit do
+          unless $!.nil? || $!.is_a?(SystemExit) && $!.success?
+              puts "Cleaning up git repo"
+              FileUtils.rm_rf repo_dir
+          end
+      end
+    end
+    return {:app_name => app_name,
+            :fqdn => fqdn,
+            :health_check_path => health_check_path,
+            :git_url => git_url,
+            :repo_dir => repo_dir,
+            :result => result
+           }
+  end
+
+  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"
+      while attempt < MAX_RETRIES
+          attempt += 1
+          puts "  Attempt # #{attempt}"
+          url = URI.parse("http://#{fqdn}/#{health_check_path}")
+          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 <<LOOKSGOOD
+
+Success!  Your application '#{app_name}' is now published here:
+
+      http://#{fqdn}/
+
+The remote repository is located here:
+
+    #{git_url}
+
+LOOKSGOOD
+            unless no_git
+      puts <<LOOKSGOOD
+To make changes to '#{app_name}', commit to #{repo_dir}/.
+LOOKSGOOD
+            else
+        puts <<LOOKSGOOD
+To make changes to '#{app_name}', you must first clone it with:
+
+    git clone #{git_url}
+
+LOOKSGOOD
+        puts <<LOOKSGOOD
+Then run 'git push' to update your OpenShift Express space.
+
+LOOKSGOOD
+            end
+            if result && !result.empty?
+        
+              puts <<LOOKSGOOD
+
+#{result}
+              
+LOOKSGOOD
+            end
+            return true
+          end
+          if !response.nil? && @mydebug
+            puts "Server responded with #{response.code}"
+            puts response.body unless response.code == '503'
+          end
+          puts
+          puts "    sleeping #{sleep_time} seconds"
+          sleep sleep_time
+          sleep_time = delay(sleep_time)
+      end
+      return false
+  end
+  
+  def self.destroy_app(libra_server, net_http, app_name, rhlogin, password)
+    json_data = generate_json(
+                       {:action => 'deconfigure',
+                        :app_name => app_name,
+                        :rhlogin => rhlogin
+                        })
+    url = URI.parse("https://#{libra_server}/broker/cartridge")
+    http_post(net_http, url, json_data, password)
+  end
+  
+  def self.ctl_app(libra_server, net_http, app_name, rhlogin, password, action, embedded=false, framework=nil, server_alias=nil)
+    data = {:action => action,
+            :app_name => app_name,
+            :rhlogin => rhlogin
+           }
+    
+    data[:server_alias] = server_alias if server_alias
+    if framework
+      data[:cartridge] = framework
+    end
+    
+    if @mydebug
+      data[:debug] = true
+    end
+    
+    json_data = generate_json(data)
+
+    url = nil
+    if embedded
+      url = URI.parse("https://#{libra_server}/broker/embed_cartridge")
+    else
+      url = URI.parse("https://#{libra_server}/broker/cartridge")
+    end
+    response = http_post(net_http, url, json_data, password)
+    
+    if response.code == '200'
+        json_resp = JSON.parse(response.body)
+        print_response_success(json_resp, true)
+    else
+        print_response_err(response)
+    end
+  end
 
 end