rhc 1.3.8 → 1.4.7

data/bin/rhc-create-app

@@ -1,249 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rhc/coverage_helper'
-
-require 'rhc-common'
-
-RHC::Helpers.deprecated_command('rhc app create',true)
-
-def p_usage(error_code = 255)
-    libra_server = get_var('libra_server')
-    rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "required"
-    type_keys = RHC::get_cartridge_listing(nil, ', ', libra_server, RHC::Config.default_proxy, 'standalone', false)
-    puts <<USAGE
-
-Usage: #{$0}
-Create an OpenShift app.
-
-  -a|--app   application     Application name  (alphanumeric - max #{RHC::APP_NAME_MAX_LENGTH} chars) (required)
-  -t|--type  type            Type of app to create (#{type_keys}) (required)
-  -g|--gear-size size        The size of the gear for this app ([small|medium], defaults to small)
-  -s|--scaling               Enable scaling for this app
-  -l|--rhlogin  rhlogin      OpenShift login (#{rhlogin})
-  -p|--password  password    Password (optional, will prompt)
-  -r|--repo  path            Git Repo path (defaults to ./$app_name)
-  -n|--nogit                 Only create remote space, don't pull it locally
-  -d|--debug                 Print Debug info
-  -h|--help                  Show Usage info
-  --no-dns                   Skip DNS check. Must be used in combination with --nogit
-  --config  path             Path of alternate config file
-  --timeout #                Timeout, in seconds, for the session
-  --enable-jenkins [name]    Create a Jenkins application (see Note 1)
-
-Notes:
-1. Jenkins applications will have Jenkins embedded.  Their default name will be 'jenkins' if not specified and the '--no-dns' flag is ignored.
-
-USAGE
-exit error_code
-end
-
-begin
-    opts = GetoptLong.new(
-        ["--debug", "-d", GetoptLong::NO_ARGUMENT],
-        ["--help",  "-h", GetoptLong::NO_ARGUMENT],
-        ["--no-dns", GetoptLong::NO_ARGUMENT],
-        ["--nogit", "-n", GetoptLong::NO_ARGUMENT],
-        ["--rhlogin",  "-l", GetoptLong::REQUIRED_ARGUMENT],
-        ["--password",  "-p", GetoptLong::REQUIRED_ARGUMENT],
-        ["--app",   "-a", GetoptLong::REQUIRED_ARGUMENT],
-        ["--repo",  "-r", GetoptLong::REQUIRED_ARGUMENT],
-        ["--config", GetoptLong::REQUIRED_ARGUMENT],
-        ["--type",  "-t", GetoptLong::REQUIRED_ARGUMENT],
-        ["--gear-size", "-g", GetoptLong::REQUIRED_ARGUMENT],
-        ["--timeout", GetoptLong::REQUIRED_ARGUMENT],
-        ["--enable-jenkins", GetoptLong::OPTIONAL_ARGUMENT],
-        ["--scaling", "-s", GetoptLong::OPTIONAL_ARGUMENT]
-    )
-    opt = {}
-    opts.each do |o, a|
-        opt[o[2..-1]] = a.to_s
-    end
-rescue Exception => e
-  #puts e.message
-    p_usage
-end
-
-
-# If provided a config path, check it
-RHC::Config.check_cpath(opt)
-
-# Pull in configs from files
-libra_server = get_var('libra_server')
-debug = get_var('debug') == 'false' ? nil : get_var('debug')
-
-p_usage 0 if opt["help"]
-
-p_usage if 0 != ARGV.length
-
-debug = true if opt["debug"]
-
-RHC::debug(debug)
-
-RHC::timeout(opt['timeout'], get_var('timeout'))
-RHC::connect_timeout(opt["timeout"], get_var('timeout'))
-
-opt['rhlogin'] = get_var('default_rhlogin') unless opt['rhlogin']
-
-if !RHC::check_rhlogin(opt['rhlogin'])
-    p_usage
-end
-
-if !RHC::check_app(opt['app'])
-    p_usage
-end
-
-if !opt['type']
-    puts 'Type is required'
-    p_usage
-end
-
-if !opt['rhlogin'] || !opt['app'] || !opt['type']
-    p_usage
-end
-
-# Default gear size is small
-gear_size = opt['gear-size']
-gear_size = 'small' if !gear_size
-
-
-password = opt['password']
-if !password
-  password = RHC::get_password
-end
-
-user_info = RHC::get_user_info(libra_server, opt['rhlogin'], password, RHC::Config.default_proxy, false)
-app_info = user_info['app_info']
-
-if app_info[opt['app']]
-  puts "An application named '#{opt['app']}' in namespace '#{user_info['user_info']['domains'][0]['namespace']}' already exists"
-  exit 255
-end
-
-jenkins_app_name = nil
-has_jenkins = false
-if opt['enable-jenkins']
-  app_info.each do |app_name, app|
-    if app['framework'] == 'jenkins-1.4'
-      jenkins_app_name = app_name
-      has_jenkins = true
-      puts "
-Found existing Jenkins application: #{jenkins_app_name}
-"
-      if !opt['enable-jenkins'].empty?
-        puts "Ignoring specified Jenkins app name: #{opt['enable-jenkins']}"
-      end
-    end
-  end
-  if !has_jenkins
-    if opt['type'] =~ /^jenkins-/
-      has_jenkins = true
-      if opt['no-dns']
-        puts "
-The --no-dns option can't be used in conjunction with --enable-jenkins 
-when creating a #{opt['type']} application.  Either remove the --no-dns
-option or first install your #{opt['type']} application with --no-dns
-and then use rhc-ctl-app to embed the Jenkins client. 
-"
-        exit 255
-      end
-      jenkins_app_name = opt['app']
-      puts "
-The Jenkins client will be embedded into the Jenkins application 
-currently being created: '#{opt['app']}'
-"
-    end
-  end
-  if !has_jenkins
-    if !opt['enable-jenkins'].empty?
-      jenkins_app_name = opt['enable-jenkins']
-    else
-      jenkins_app_name = 'jenkins'
-    end
-  
-    if !RHC::check_app(jenkins_app_name)
-        p_usage
-    end
-
-    if jenkins_app_name == opt['app']
-      puts "You must specify a different name for your application and Jenkins ('#{opt['app']}')."
-      exit 100
-    end
-  
-    if app_info.has_key?(jenkins_app_name)
-      puts "You already have an application named '#{jenkins_app_name}'."
-      puts "In order to continue you'll need to specify a different name"
-      puts "with --enable-jenkins or destroy the existing application."
-      exit 100
-    end
-  end
-end
-
-opt['repo'] = opt['app'] unless opt['repo']
-
-if @mydebug
-  puts "
-  Found a bug? Post to the forum and we'll get right on it.
-      IRC: #openshift on freenode
-      Forums: https://openshift.redhat.com/community/forums/openshift
-  
-  "
-end
-
-#
-# Confirm local git repo exists
-#
-unless opt['nogit']
-    if File.exists?(opt['repo'])
-        puts "We will not overwrite an existing git repo. Please remove:"
-        puts "  #{File.expand_path(opt['repo'])}"
-        puts "Then try again."
-        puts
-        exit 210
-    else
-        begin
-            # Create the parent directory for the git repo
-            @git_parent = File.expand_path(opt['repo'] + "/../")
-            FileUtils.mkdir_p(@git_parent)
-        rescue Exception => e
-            puts "Could not write to #{@git_parent}"
-            puts "Reason: #{e.message}"
-            puts
-            puts "Please re-run from a directory you have write access to or specify -r with a"
-            puts "path you have write access to"
-            puts
-            exit 211
-        end
-    end
-end
-
-if jenkins_app_name && !has_jenkins
-  jenkins_app = RHC::create_app(libra_server, RHC::Config.default_proxy, user_info, jenkins_app_name, 'jenkins-1.4', opt['rhlogin'], password, nil, false, true, true)
-  available = RHC::check_app_available(RHC::Config.default_proxy, jenkins_app[:app_name], jenkins_app[:fqdn], jenkins_app[:health_check_path], jenkins_app[:result], jenkins_app[:git_url], nil, true)
-  if !available
-    puts "Unable to access your new Jenkins application."
-    exit 1
-  end
-end
-
-#
-# Create remote application space
-#
-main_app = RHC::create_app(libra_server, RHC::Config.default_proxy, user_info, opt['app'], opt['type'], opt['rhlogin'], password, opt['repo'], opt['no-dns'], opt['nogit'], false, gear_size, opt['scaling'])
-
-if !main_app
-  puts "Create app failed"
-  exit 1
-end
-
-if jenkins_app_name
-  puts "Now embedding the jenkins client into '#{opt['app']}'..."
-  RHC::ctl_app(libra_server, RHC::Config.default_proxy, opt['app'], opt['rhlogin'], password, 'configure', true, 'jenkins-client-1.4', nil, false)
-end
-
-unless opt['no-dns']
-  available = RHC::check_app_available(RHC::Config.default_proxy, main_app[:app_name], main_app[:fqdn], main_app[:health_check_path], main_app[:result], main_app[:git_url], opt['repo'], opt['nogit'])
-  if !available
-    puts "Unable to access your new application."
-    exit 1
-  end
-end

data/bin/rhc-create-domain

@@ -1,190 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rhc/coverage_helper'
-
-require 'rhc-common'
-
-RHC::Helpers.deprecated_command('rhc domain (create|update)',true)
-
-#
-# print help
-#
-def p_usage(exit_code = 255)
-    rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "required"
-    puts <<USAGE
-
-Usage: #{$0}
-Bind a registered rhcloud user to a domain in rhcloud.
-
-  NOTE: to change ssh key, alter your openshift <id_rsa> and
-        <id_rsa>.pub keys, then re-run with --alter
-
-  -n|--namespace   namespace   Namespace for your application(s) (alphanumeric - max #{RHC::DEFAULT_MAX_LENGTH} chars) (required)
-  -l|--rhlogin     rhlogin     OpenShift login (#{rhlogin})
-  -p|--password    password    Password (optional, will prompt)
-  -a|--alter                   Alter namespace (will change urls) and/or ssh key
-  -d|--debug                   Print Debug info
-  -h|--help                    Show Usage info
-  --config  path               Path of alternate config file
-  --timeout #                  Timeout, in seconds, for the session
-  
-USAGE
-exit exit_code
-end
-
-begin
-    opts = GetoptLong.new(
-        ["--debug", "-d", GetoptLong::NO_ARGUMENT],
-        ["--help",  "-h", GetoptLong::NO_ARGUMENT],
-        ["--rhlogin",  "-l", GetoptLong::REQUIRED_ARGUMENT],
-        ["--password",  "-p", GetoptLong::REQUIRED_ARGUMENT],
-        ["--namespace", "-n", GetoptLong::REQUIRED_ARGUMENT],
-        ["--config", GetoptLong::REQUIRED_ARGUMENT],
-        ["--alter", "-a", GetoptLong::NO_ARGUMENT],
-        ["--timeout", GetoptLong::REQUIRED_ARGUMENT]
-    )
-    
-    opt = {}
-    opts.each do |o, a|
-        opt[o[2..-1]] = a.to_s
-    end
-rescue Exception => e
-  #puts e.message
-  p_usage
-end
-
-# If provided a config path, check it
-RHC::Config.check_cpath(opt)
-
-# Pull in configs from files
-libra_server = get_var('libra_server')
-debug = get_var('debug') == 'false' ? nil : get_var('debug')
-opt['rhlogin'] = get_var('default_rhlogin') unless opt['rhlogin']
-
-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/"
-
-p_usage 0 if opt["help"]
-p_usage if 0 != ARGV.length
-
-
-debug = true if opt["debug"]
-
-RHC::debug(debug)
-
-RHC::timeout(opt["timeout"], get_var('timeout'))
-RHC::connect_timeout(opt["timeout"], get_var('timeout'))
-
-if !RHC::check_namespace(opt['namespace'])
-    p_usage
-end
-
-if !RHC::check_rhlogin(opt['rhlogin'])
-    p_usage
-end
-
-
-if !opt["rhlogin"] || !opt["namespace"]
-    p_usage
-end
-
-password = opt['password']
-if !password
-  password = RHC::get_password
-end
-
-#
-# Check to see if a ssh_key_file_path exists, if not create it.
-#
-
-if File.readable?(ssh_key_file_path)
-    puts "OpenShift key found at #{ssh_key_file_path}.  Reusing..."
-else
-    puts "Generating OpenShift ssh key to #{ssh_key_file_path}"
-    # Use system for interaction
-    system("ssh-keygen -t rsa -f '#{ssh_key_file_path}'")
-end
-
-ssh_keyfile_contents = File.open(ssh_pub_key_file_path).gets.chomp.split(' ')
-ssh_key = ssh_keyfile_contents[1]
-ssh_key_type = ssh_keyfile_contents[0]
-
-data = {'namespace' => opt['namespace'],
-        'rhlogin' => opt['rhlogin'],
-        'ssh' => ssh_key,
-        'key_type' => ssh_key_type}
-
-if (opt['alter'])
-  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, RHC::Config.default_proxy, true, not_found_message)
-end
-if debug
-  data[:debug] = true
-end
-RHC::print_post_data(data)
-json_data = RHC::generate_json(data)
-
-url = URI.parse("https://#{libra_server}/broker/domain")
-response = RHC::http_post(RHC::Config.default_proxy, url, json_data, password)
-
-if response.code == '200'
-    begin
-        json_resp = RHC::json_decode(response.body)
-        RHC::print_response_success(json_resp)
-        if opt['alter'] != ''
-            puts <<EOF
-Creation successful
-
-You may now create an application.
-
-EOF
-        else
-            app_info = user_info['app_info']
-            dns_success = true
-            if !app_info.empty? && opt['namespace'] != user_info['user_info']['domains'][0]['namespace']
-              #
-              # Confirm that the host(s) exist in DNS
-              #
-              puts "Now your new domain name(s) are being propagated worldwide (this might take a minute)..."
-              # Allow DNS to propogate
-              sleep 15
-              app_info.each_key do |appname|
-                  fqdn = "#{appname}-#{opt['namespace']}.#{user_info['user_info']['rhc_domain']}"
-                  
-                  # Now start checking for DNS
-                  loop = 0
-                  sleep_time = 2
-                  while loop < RHC::MAX_RETRIES && !RHC::hostexist?(fqdn)
-                      sleep sleep_time
-                      loop+=1
-                      puts "  retry # #{loop} - Waiting for DNS: #{fqdn}"
-                      sleep_time = RHC::delay(sleep_time)
-                  end
-                  
-                  if loop >= RHC::MAX_RETRIES
-                      puts "Host could not be found: #{fqdn}"
-                      dns_success = false
-                  end
-              end
-              puts "You can use rhc-domain-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."
-            else
-              puts "Alteration successful but at least one of the urls is still updating in DNS."
-            end
-            puts ""
-        end
-        exit 0
-    rescue RHC::JsonError
-        RHC::print_response_err(response)
-    end
-else
-    RHC::print_response_err(response)
-end
-exit 1

data/bin/rhc-ctl-app

@@ -1,180 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rhc/coverage_helper'
-
-require 'rhc-common'
-if ARGV.include? "--alias"
-  RHC::Helpers.deprecated_command('rhc alias (add|remove)',true)
-elsif ARGV.include? "-e" or ARGV.include? "--embed"
-  RHC::Helpers.deprecated_command('rhc cartridge (add|remove)',true)
-elsif ARGV.include? "-L" or ARGV.include? "--embed-list"
-  RHC::Helpers.deprecated_command('rhc cartridge list',true)
-else
-  RHC::Helpers.deprecated_command('rhc app (start|stop|force-stop|restart|reload|status|destroy|tidy)',true)
-end
-
-embed_mapper = { 'add' => 'configure', 'remove' => 'deconfigure' }
-
-def p_usage(exit_code = 255)
-    rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "required"
-    puts <<USAGE
-
-Usage: #{$0}
-Control an OpenShift express app
-
-  -a|--app   application   Application name  (alphanumeric) (required)
-  -l|--rhlogin rhlogin     OpenShift login (#{rhlogin})
-  -p|--password password   Password (optional, will prompt)
-  -c|--command command     (start|stop|force-stop|restart|reload|status|destroy|tidy|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 the session
-
-USAGE
-exit exit_code
-end
-
-def p_embedded_list
-    libra_server = get_var('libra_server')
-    puts ""
-    puts "List of supported embedded cartridges:"
-    puts ""
-    type_keys = RHC::get_cartridge_listing(nil, ', ', libra_server, RHC::Config.default_proxy, 'embedded', false)
-    puts type_keys
-    puts ""
-    exit 255
-end
-
-begin
-    opts = GetoptLong.new(
-        ["--debug",     "-d", GetoptLong::NO_ARGUMENT],
-        ["--help",      "-h", GetoptLong::NO_ARGUMENT],
-        ["--bypass",    "-b", GetoptLong::NO_ARGUMENT],
-        ["--embedded-list",   "-L", GetoptLong::NO_ARGUMENT],
-        ["--rhlogin",    "-l", GetoptLong::REQUIRED_ARGUMENT],
-        ["--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]
-    )
-    opt = {}
-    opts.each do |o, a|
-        opt[o[2..-1]] = a.to_s
-    end
-rescue Exception => e
-  #puts e.message
-    p_usage
-end
-
-# If provided a config path, check it
-RHC::Config.check_cpath(opt)
-
-# Pull in configs from files
-libra_server = get_var('libra_server')
-debug = get_var('debug') == 'false' ? nil : get_var('debug')
-ssh_config = "#{ENV['HOME']}/.ssh/config"
-ssh_config_d = "#{ENV['HOME']}/.ssh/"
-
-if opt["embedded-list"]
-    p_embedded_list
-end
-p_usage 0 if opt["help"]
-p_usage if 0 != ARGV.length
-
-debug = true if opt["debug"]
-
-RHC::debug(debug)
-
-RHC::timeout(opt["timeout"], get_var('timeout'))
-RHC::connect_timeout(opt["timeout"], get_var('timeout'))
-
-opt["rhlogin"] = get_var('default_rhlogin') unless opt["rhlogin"]
-
-if !RHC::check_rhlogin(opt['rhlogin'])
-    p_usage
-end
-
-if !RHC::check_app(opt['app'])
-    p_usage
-end
-
-unless opt["embed"] or opt["command"]
-    puts "Command or embed is required"
-    p_usage
-end
-
-if opt["command"]
-  unless opt["command"] =~ /^(start|stop|force-stop|restart|reload|status|destroy|tidy|add-alias|remove-alias)$/
-    puts "Invalid command '#{opt["command"]}' specified.  Valid commands are (start|stop|force-stop|restart|reload|status|destroy|tidy|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)"
-    p_usage
-  end
-end
-
-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
-
-opt["command"] = "deconfigure" if opt["command"] == "destroy"
-
-if !opt["bypass"] and opt["command"] == "deconfigure"
-    # deconfigure is the actual hook called on 'destroy'
-    # destroy is used for clarity
-
-
-    puts <<WARNING
-!!!! WARNING !!!! WARNING !!!! WARNING !!!!
-You are about to destroy the #{opt['app']} application.
-
-This is NOT reversible, all remote data for this application will be removed.
-WARNING
-
-    print "Do you want to destroy this application (y/n): "
-    begin
-      agree = gets.chomp
-      if agree != 'y'
-          puts "\n"
-          exit 217
-      end
-    rescue Interrupt
-      puts "\n"
-      exit 217
-    end
-end
-
-framework = nil
-if opt['embed']
-    action = opt['embed'].split('-')[0]
-    # override action if it's in the mapper
-    action = embed_mapper[opt['embed'].split('-')[0]] if embed_mapper[opt['embed'].split('-')[0]]
-    framework = opt['embed'].split('-')[1..-1].join('-')
-    url = URI.parse("https://#{libra_server}/broker/embed_cartridge")
-else
-    action = opt['command']
-    url = URI.parse("https://#{libra_server}/broker/cartridge")
-end
-
-RHC::ctl_app(libra_server, RHC::Config.default_proxy, opt['app'], opt['rhlogin'], password, action, opt['embed'], framework, opt['alias'])