rhc 0.98.16 → 1.0.4

data/bin/rhc

@@ -1,33 +1,9 @@
 #!/usr/bin/env ruby
-#
-# print help
-#
 require 'rhc/coverage_helper'
 
 # Require rhc-common for wizard invocation
 require 'rhc-common'
 
-def p_usage(exit_code = 255)
-    puts <<USAGE
-
-Usage: rhc (<resource> | --help) [<command>] [<args>]
-Command line tool for performing operations related to your rhcloud account.
-
-List of resources
-  domain             Manage the namespace for the registered rhcloud user.
-  app                Manage applications within the rhcloud account.
-  sshkey             Manage multiple keys for the registered rhcloud user.
-  port-forward       Forward remote ports to the workstation
-  server             Display information about the status of the service.
-  setup              Run the setup wizard to configure your account.
-
-See 'rhc <resource> --help' for more applicable commands and argumments on a specific resource.
-USAGE
-
-exit exit_code
-end
-
-
 def get_args
   ARGV.shift
   args = ""
@@ -38,32 +14,14 @@ def get_args
   args
 end
 
-def run_setup_wizard_if_needed
-  if not (RHC::Config.has_local_config? or
-          RHC::Config.has_opts_config? or
-          ARGV.include?('--noprompt') or
-          ARGV.include?('--help') or
-          ARGV.include?('-h'))
-    RHC::Wizard.new(RHC::Config).run
-  end
-  ARGV.delete('--noprompt')
-end
-
 begin
-  case ARGV[0]
-  when "app"
-    run_setup_wizard_if_needed
-    system("rhc-app #{get_args} 2>&1")
-    retcode = $?.exitstatus
-  else
-    begin
-      require 'rhc/cli'
-      RHC::CLI.set_terminal
-      RHC::CLI.start(ARGV)
-      retcode = 0
-    rescue SystemExit => e
-      retcode = e.status
-    end
+  begin
+    require 'rhc/cli'
+    RHC::CLI.set_terminal
+    RHC::CLI.start(ARGV)
+    retcode = 0
+  rescue SystemExit => e
+    retcode = e.status
   end
 
   if retcode == nil

data/bin/rhc-app

@@ -5,6 +5,18 @@ require 'rhc/coverage_helper'
 require 'rhc-common'
 require 'base64'
 
+if ["add-alias", "remove-alias"].include? ARGV[0]
+  RHC::Helpers.deprecated_command('rhc alias (add|remove)',true)
+elsif "snapshot" == ARGV[0]
+  RHC::Helpers.deprecated_command('rhc snapshot (save|restore)',true)
+elsif "tail" == ARGV[0]
+  RHC::Helpers.deprecated_command('rhc tail',true)
+elsif "cartridge" == ARGV[0]
+  RHC::Helpers.deprecated_command('rhc cartridge (add|remove|status|stop|start|restart|reload)',true)
+else
+  RHC::Helpers.deprecated_command('rhc app (create|delete|show|stop|force-stop|start|restart|reload|tidy)',true)
+end
+
 $embed_mapper = { 'add' => 'configure', 'remove' => 'deconfigure' }
 
 #
@@ -32,7 +44,6 @@ List of commands
   tidy                           Garbage collects the git repo and empties log/tmp dirs
   add-alias                      Add a custom domain name for the application
   remove-alias                   Remove a custom domain name for the application
-  threaddump                     Trigger a thread dump for jbossas, jbosseap, and ruby applications
   tail                           Tail the logs of an application
   snapshot       [save|restore]  Saves/Restores an application snapshot to/from a tarball at the location specified using --filepath (default: ./$APPNAME.tar.gz)
   cartridge      <action>        Manage a cartridge running in this application
@@ -425,7 +436,7 @@ begin
         ["--config", GetoptLong::REQUIRED_ARGUMENT],
         ["--timeout", GetoptLong::REQUIRED_ARGUMENT]
     )
-  elsif ARGV[0] =~ /^(show|start|stop|force-stop|restart|reload|status|destroy|tidy|add-alias|remove-alias|threaddump|destroy)$/
+  elsif ARGV[0] =~ /^(show|start|stop|force-stop|restart|reload|status|destroy|tidy|add-alias|remove-alias|destroy)$/
     ARGV.shift
     opts = GetoptLong.new(
         ["--debug", "-d", GetoptLong::NO_ARGUMENT],
@@ -505,7 +516,7 @@ case argv_c[0]
     create_app
   when "show"
     show_app
-  when "start", "stop", "force-stop", "restart", "reload", "status", "tidy", "add-alias", "remove-alias", "threaddump", "destroy"
+  when "start", "stop", "force-stop", "restart", "reload", "status", "tidy", "add-alias", "remove-alias", "destroy"
     control_app(argv_c[0])
   when "tail"
     system("rhc-tail-files #{get_args argv_c} 2>&1")

data/bin/rhc-chk

@@ -5,6 +5,7 @@ require 'rhc/coverage_helper'
 require 'rhc-common'
 require 'net/http'
 require 'net/https'
+require 'net/ssh'
 require 'rbconfig'
 require 'yaml'
 require 'tempfile'
@@ -129,17 +130,8 @@ end
 #
 # Check for proxy environment
 #
-if ENV['http_proxy']
-  if ENV['http_proxy']!~/^(\w+):\/\// then
-    ENV['http_proxy']="http://" + ENV['http_proxy']
-  end
-  proxy_uri=URI.parse(ENV['http_proxy'])
-  $http = Net::HTTP::Proxy(proxy_uri.host, proxy_uri.port, proxy_uri.user, proxy_uri.password)
-  $debuginfo['environment']['proxy'] = "#{proxy_uri.user}:#{proxy_uri.password}@#{proxy_uri.host}:#{proxy_uri.port}"
-else
-  $http = Net::HTTP
-  $debuginfo['environment']['proxy'] = "none"
-end
+$http = RHC::Config.default_proxy
+$debuginfo['environment']['proxy'] = (RHC::Config.using_proxy? ? ENV['http_proxy'] : "none")
 
 #####################################
 #     Done setting up environment   #
@@ -366,18 +358,26 @@ class Test3_SSH < Test::Unit::TestCase
   end
 
   def agent_key_fingerprints
-    @@agent_keys.nil? ? nil : @@agent_keys.map{|x| x.to_s.split("\n")[1..-2].join('') }
+    @@agent_keys.nil? ? nil : @@agent_keys.map{|x| x.fingerprint }
   end
 
   def libra_public_key
-    @@local_ssh_pubkey ||= (
-    fp = File.open(@libra_kpfile)
-      fp.gets.split(' ')[1]
+    @@local_ssh_pubkey ||= libra_public_key_content.split(' ')[1]
+  end
+
+  def libra_public_key_content
+    @@local_ssh_pubkey_content ||= (
+      fp = File.open(@libra_kpfile)
+      fp.gets
     )
   ensure
     fp.close if fp
   end
 
+  def libra_public_key_fingerprint
+    @@local_ssh_pubkey_fingerprint ||= Net::SSH::KeyFactory.load_data_public_key(libra_public_key_content).fingerprint
+  end
+
   def test_01_local_files
     [
       [@libra_kfile, /[4-7]00/], # Needs to at least be readable by user and nobody else
@@ -390,7 +390,7 @@ class Test3_SSH < Test::Unit::TestCase
   def test_02_ssh_agent
     require_agent_keys
 
-    assert agent_key_names.include?(File.expand_path(@libra_kfile)) ,error_for(:pubkey_not_loaded, ": #{@libra_kpfile}")
+    assert agent_key_fingerprints.include?(libra_public_key_fingerprint) ,error_for(:pubkey_not_loaded, ": #{@libra_kpfile}")
   end
 
   def test_03_remote_ssh_keys

data/bin/rhc-create-app

@@ -4,6 +4,8 @@ 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"

data/bin/rhc-create-domain

@@ -4,8 +4,7 @@ require 'rhc/coverage_helper'
 
 require 'rhc-common'
 
-puts "Warning: This command is deprecated and will be removed in the future. Please use 'rhc domain (create|update)' instead."
-puts""
+RHC::Helpers.deprecated_command('rhc domain (create|update)',true)
 
 #
 # print help

data/bin/rhc-ctl-app

@@ -3,6 +3,15 @@
 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' }
 
@@ -16,7 +25,7 @@ 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|threaddump)
+  -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
@@ -103,8 +112,8 @@ unless opt["embed"] or opt["command"]
 end
 
 if opt["command"]
-  unless opt["command"] =~ /^(start|stop|force-stop|restart|reload|status|destroy|tidy|add-alias|remove-alias|threaddump)$/
-    puts "Invalid command '#{opt["command"]}' specified.  Valid commands are (start|stop|force-stop|restart|reload|status|destroy|tidy|add-alias|remove-alias|threaddump)"
+  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"]

data/bin/rhc-ctl-domain

@@ -4,8 +4,7 @@ require 'rhc/coverage_helper'
 
 require 'rhc-common'
 
-puts "Warning: This command is deprecated and will be removed in the future. Please use 'rhc sshkey' instead."
-puts""
+RHC::Helpers.deprecated_command('rhc sshkey',true)
 
 #
 # print help

data/bin/rhc-domain

@@ -4,8 +4,7 @@ require 'rhc/coverage_helper'
 
 require 'rhc-common'
 
-puts "Warning: This command is deprecated and will be removed in the future. Please use 'rhc domain' instead."
-puts""
+RHC::Helpers.deprecated_command('rhc domain',true)
 
 #
 # print help

data/bin/rhc-domain-info

@@ -4,8 +4,7 @@ require 'rhc/coverage_helper'
 
 require 'rhc-common'
 
-puts "Warning: This command is deprecated and will be removed in the future. Please use 'rhc domain show' instead."
-puts""
+RHC::Helpers.deprecated_command('rhc domain show',true)
 
 #
 # print help

data/bin/rhc-port-forward

@@ -4,8 +4,7 @@ require 'rhc/coverage_helper'
 
 require 'rhc-common'
 
-puts "Warning: This command is deprecated and will be removed in the future. Please use 'rhc port-forward' instead."
-puts""
+RHC::Helpers.deprecated_command('rhc port-forward',true)
 
 #
 # print help

data/bin/rhc-snapshot

@@ -4,6 +4,9 @@ require 'rhc/coverage_helper'
 
 require 'rhc-common'
 
+puts "Warning: This command is deprecated and will be removed in the future. Please use 'rhc snapshot' instead."
+puts""
+
 #
 # print help
 #

data/bin/rhc-sshkey

@@ -4,8 +4,7 @@ require 'rhc/coverage_helper'
 
 require 'rhc-common'
 
-puts "Warning: This command is deprecated and will be removed in the future. Please use 'rhc sshkey' instead."
-puts""
+RHC::Helpers.deprecated_command('rhc sshkey',true)
 
 #
 # print help

data/bin/rhc-tail-files

@@ -91,7 +91,7 @@ unless user_info['app_info'][app]
     exit 101
 end
 
-opt['files'] = "#{opt['app']}/logs/*" unless opt['files']
+opt['files'] = "*/log*/*" unless opt['files']
 file_glob = "#{opt['files']}"
 app_uuid = user_info['app_info'][app]['uuid']
 namespace = user_info['user_info']['domains'][0]['namespace']

data/bin/rhc-user-info

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # print deprecation warning
-
-puts "Warning: This command is deprecated. Please use rhc-domain-info instead."
-puts""
+RHC::Helpers.deprecated_command('rhc-domain-info',true)
 
 args = ""
 ARGV.each do|a|

data/features/application.feature

@@ -21,4 +21,7 @@ Feature: Application Operations
       | running | shown     | it              | succeed |
       | running | stopped   | the application | not be accessible |
       | stopped | started   | the application | be accessible |
-      | running | destroyed | the application | not exist |
+      # After the app is deleted, it is resolving to the OpenShift server
+      #   I think it's because of US2108
+      #   TODO: This needs to be fixed by "not exist" checking DNS instead of HTTP
+      | running | deleted   | it              | succeed |

data/features/domain.feature

@@ -23,7 +23,3 @@ Feature: Existing Domain Operations
     When domain is deleted
     Then domains should be empty
 
-  Scenario: Domain Update Fails
-    When domain is deleted
-    When domain is updated
-    Then the domain command should fail with an exitcode of 127

data/features/geared_application.feature

@@ -0,0 +1,11 @@
+@geared_application @geared_user_required @domain_required
+Feature: Scaled Application Operations
+
+  @init
+  Scenario: Geared Application Creation
+    When a php-5.3 application is created with a medium gear
+    Then the application should be accessible
+    Then the application should have a medium gear
+
+
+

data/features/lib/rhc_helper/app.rb

@@ -15,14 +15,14 @@ module RHCHelper
     include Httpify
 
     # attributes to represent the general information of the application
-    attr_accessor :name, :type, :hostname, :repo, :embed, :snapshot, :uid, :alias
+    attr_accessor :name, :type, :hostname, :repo, :embed, :snapshot, :uid, :alias, :scalable, :gear_profile
 
     # mysql connection information
     attr_accessor :mysql_hostname, :mysql_user, :mysql_password, :mysql_database
 
     # Create the data structure for a test application
-    def initialize(type, name)
-      @name, @type = name, type
+    def initialize(type, name, scalable=false, gear_profile=nil)
+      @name, @type, @scalable, @gear_profile = name, type, scalable, gear_profile
       @hostname = "#{name}-#{$namespace}.#{$domain}"
       @repo = "#{TEMP_DIR}/#{$namespace}_#{name}_repo"
       @file = "#{TEMP_DIR}/#{$namespace}.json"
@@ -47,7 +47,7 @@ module RHCHelper
       end
     end
 
-    def self.create_unique(type, prefix="test")
+    def self.create_unique(type, scalable, gear_profile=nil, prefix="test")
       # Get a REST client to verify the application name
       client = RHC::Rest::Client.new($end_point, $username, $password)
 
@@ -68,7 +68,7 @@ module RHCHelper
         next if test_names.index(name)
 
         # Create the app
-        app = App.new(type, name)
+        app = App.new(type, name, scalable, gear_profile)
         app.persist
         return app
       end
@@ -92,6 +92,17 @@ module RHCHelper
       persist
     end
 
+    def is_created?
+      # Get a REST client to verify the application is on the server
+      client = RHC::Rest::Client.new($end_point, $username, $password)
+      begin
+        client.domains[0].find_application(name)
+      rescue
+        return false
+      end
+      true
+    end
+
     def cartridge(name)
       @embed_helpers[name] = RHCHelper::Cartridge.new(self, name) unless @embed_helpers.include?(name)
       @embed_helpers[name]

data/features/lib/rhc_helper/cartridge.rb

@@ -24,23 +24,23 @@ module RHCHelper
       @file = "#{TEMP_DIR}/#{$namespace}.json"
     end
 
-    def rhc_app_cartridge(cmd)
-      full_cmd = "rhc app cartridge #{cmd} -l #{$username} -p #{$password} -a #{@app_name}"
-      full_cmd += " -c #{@name}" if cmd != "list"
+    def rhc_cartridge(cmd)
+      full_cmd = "rhc cartridge #{cmd} -l #{$username} -p #{$password} -a #{@app_name}"
+      full_cmd += " #{@name}" if cmd != "list"
       run(full_cmd, nil) do |exitstatus, out, err, arg|
         yield exitstatus, out, err, arg if block_given?
       end
     end
 
     def add
-      rhc_app_cartridge('add') do |exitstatus, out, err, arg|
+      rhc_cartridge('add') do |exitstatus, out, err, arg|
         yield exitstatus, out, err, arg if block_given?
       end
     end
 
     def status
       result = ""
-      rhc_app_cartridge('status') do |exitstatus, out, err, arg|
+      rhc_cartridge('status') do |exitstatus, out, err, arg|
         result = out
       end
 
@@ -48,19 +48,35 @@ module RHCHelper
     end
 
     def start
-      rhc_app_cartridge('start')
+      rhc_cartridge('start')
     end
 
     def stop
-      rhc_app_cartridge('stop')
+      rhc_cartridge('stop')
     end
 
     def restart
-      rhc_app_cartridge('restart')
+      rhc_cartridge('restart')
     end
 
     def remove
-      rhc_app_cartridge('remove')
+      rhc_cartridge('remove --confirm')
+    end
+
+    def scale(values)
+      status = nil
+      rhc_cartridge("scale #{values}") do |exitstatus, out, err, arg|
+        status = exitstatus
+      end
+      status
+    end
+
+    def show
+      result = ""
+      rhc_cartridge('show') do |exitstatus, out, err, arg|
+        result = out
+      end
+      result
     end
   end
 end

data/features/lib/rhc_helper/commandify.rb

@@ -51,8 +51,8 @@ module RHCHelper
     def get_args(cmd, arg0=nil, debug=true)
       args = " "
       args << "-l #{$username} "
-      args << "-p #{$password} "
-      args << "-d " if debug
+      args << "-p \"#{$password}\" "
+      args << "--debug " if debug
 
       # Add the application name for all application commands
       if cmd =~ /app/
@@ -62,20 +62,25 @@ module RHCHelper
 
       # Command specific arguments
       case cmd
+        when /app delete/
+          args << "--confirm "
         when /domain show/
           # domain show doesn't take arguments
+        when /domain update/
+          args << "#{$old_namespace} #{$namespace}"
         when /domain /
           raise "No namespace set" unless $namespace
           # use legacy switch for specifying namespace to verify older interface
           # should switch to using argument once all commands are moved over
-          args << "-n #{$namespace} "
-        when /destroy/
-          args << "-b "
+          args << "#{$namespace} "
         when /snapshot/
           args << "-f #{@snapshot} "
         when /create/
           args << "-r #{@repo} "
           args << "-t #{@type} "
+          args << "-s " unless @scalable.nil?
+          args << "-g #{@gear_profile} " unless @gear_profile.nil?
+          args << "--noprompt "
         when /add-alias/
           raise "No alias set" unless @alias
           args << "--alias #{@alias} "
@@ -123,9 +128,31 @@ module RHCHelper
   # Begin Post Processing Callbacks
   #
   def app_create_callback(exitcode, stdout, stderr, arg)
-    match = stdout.split.map {|line| line.match(SSH_OUTPUT_PATTERN)}.compact[0]
+    match = stdout.match(UUID_OUTPUT_PATTERN)
     @uid = match[1] if match
-    raise "UID not parsed from app create output" unless @uid
+    match = stdout.match(GEAR_PROFILE_OUTPUT_PATTERN)
+    @gear_profile = nil
+    @gear_profile = match[1] if match
+
+    def no_match(msg,expected,actual)
+      [ msg,
+        "-"*20,
+        ("Expected: %s" % expected),
+        ("Actual:\n%s" % actual),
+        "-"*20,
+      ].join("\n")
+    end
+
+    raise no_match(
+      "UID not parsed from app create output",
+      UUID_OUTPUT_PATTERN, stdout
+    ) unless @uid
+
+    raise no_match(
+      "Gear Profile not parsed from app create output",
+      GEAR_PROFILE_OUTPUT_PATTERN, stdout
+    ) unless @gear_profile
+
     persist
   end
 

data/features/lib/rhc_helper/domain.rb

@@ -51,7 +51,7 @@ module RHCHelper
     end
 
     def self.update(prefix="update")
-      old_namespace = $namespace
+      $old_namespace = $namespace
       $namespace = unique_namespace(prefix)
       rhc_domain_update
 
@@ -62,7 +62,7 @@ module RHCHelper
           f.write($namespace)
         end
       else
-        $namespace = old_namespace
+        $namespace = $old_namespace
       end
     end
 

data/features/lib/rhc_helper/httpify.rb

@@ -53,13 +53,20 @@ module RHCHelper
       start   = Time.now
 
       # Helper function to log message and sleep
-      def my_sleep(start,uri,e,options)
-        err_str = "Connection inacessible for %s (%s) - %.2f seconds"
-        logger.info(err_str % [uri,e.class,Time.now - start])
-        logger.info "Sleeping for %d seconds, retrying" % options[:sleep]
+      def my_sleep(status,expected,start,options)
+        [
+          ["Expecting", expected.class],
+          ["Received", status.class ],
+          ["Elapsed", Time.now - start ],
+        ].each do |values|
+            logger.info "%10s: %s" % values
+          end
         sleep options[:sleep]
       end
 
+      expected = options[:expected]
+      expected = (expected.to_s =~ /^Net/) ? expected.new(nil,nil,nil) : expected.new
+
       begin
         timeout(options[:timeout]) do
           loop do
@@ -75,18 +82,21 @@ module RHCHelper
                          # Pass these up so we can check them
                          return e
                        end
-            logger.debug "Received: %s" % response
 
             case response
-            # Catch any response if we're expecting it
-            when options[:expected]
+              # Catch any response if we're expecting it or redirection
+            when expected.class, Net::HTTPRedirection
               break
-            # Retry these responses
+              # Retry these responses
             when Net::HTTPServiceUnavailable, SocketError
-              my_sleep(start,uri,response,options)
+              my_sleep(response,expected,start,options)
             else
-              # Some other response
-              break
+              case expected
+              when Net::HTTPServiceUnavailable
+                my_sleep(response,expected,start,options)
+              else
+                break
+              end
             end
           end
         end
@@ -111,10 +121,10 @@ module RHCHelper
       return response
     end
 
-    def is_inaccessible?
-      check_response({
+    def is_inaccessible?(options = {})
+      check_response(options.merge({
         :expected => Net::HTTPServiceUnavailable
-      })
+      }))
     end
 
     def is_accessible?(options = {})

data/features/lib/rhc_helper/persistable.rb

@@ -25,7 +25,7 @@ module RHCHelper
     end
 
     def from_json(json)
-      app = App.new(json['type'], json['name'])
+      app = App.new(json['type'], json['name'], json['scalable'])
       app.embed = json['embed']
       app.mysql_user = json['mysql_user']
       app.mysql_password = json['mysql_password']