rhc 1.27.4 → 1.28.5

data/autocomplete/rhc_bash

@@ -10,9 +10,9 @@ _rhc()
     if [[ "$cur" == -* ]]; then
       opts="--always-prefix --clean --config --debug --insecure --limit --mock --noprompt --password --raw --rhlogin --server --ssl-ca-file --ssl-client-cert-file --ssl-version --timeout --token"
     elif [ -z $cur ]; then
-      opts="account alias alias-add alias-delete-cert alias-list alias-remove alias-update-cert app app-configure app-create app-delete app-deploy app-force-stop app-reload app-restart app-scale-down app-scale-up app-show app-start app-stop app-tidy apps authorization authorization-add authorization-delete authorization-delete-all authorization-list cartridge cartridge-add cartridge-list cartridge-reload cartridge-remove cartridge-restart cartridge-scale cartridge-show cartridge-start cartridge-status cartridge-stop cartridge-storage deployment deployment-activate deployment-list deployment-show domain domain-configure domain-create domain-delete domain-leave domain-list domain-rename domain-show env env-list env-set env-show env-unset git-clone logout member member-add member-list member-remove member-update port-forward scp server server-add server-configure server-list server-remove server-show server-status server-use setup snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-list sshkey-remove sshkey-show tail team team-create team-delete team-leave team-list team-show threaddump"
+      opts="account alias alias-add alias-delete-cert alias-list alias-remove alias-update-cert app app-configure app-create app-delete app-deploy app-force-stop app-reload app-restart app-scale-down app-scale-up app-show app-start app-stop app-tidy apps authorization authorization-add authorization-delete authorization-delete-all authorization-list cartridge cartridge-add cartridge-list cartridge-reload cartridge-remove cartridge-restart cartridge-scale cartridge-show cartridge-start cartridge-status cartridge-stop cartridge-storage deployment deployment-activate deployment-list deployment-show domain domain-configure domain-create domain-delete domain-leave domain-list domain-rename domain-show env env-list env-set env-show env-unset git-clone help logout member member-add member-list member-remove member-update port-forward region region-list scp server server-add server-configure server-list server-remove server-show server-status server-use setup snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-list sshkey-remove sshkey-show tail team team-create team-delete team-leave team-list team-show threaddump"
     else
-      opts="account account-logout activate-deployment add-alias add-authorization add-cartridge add-member add-server add-sshkey alias alias-add alias-delete-cert alias-list alias-remove alias-update-cert aliases app app-configure app-create app-delete app-deploy app-env app-force-stop app-reload app-restart app-scale-down app-scale-up app-scp app-show app-snapshot app-ssh app-start app-stop app-tidy apps authorization authorization-add authorization-delete authorization-delete-all authorization-list authorizations cartridge cartridge-add cartridge-list cartridge-reload cartridge-remove cartridge-restart cartridge-scale cartridge-show cartridge-start cartridge-status cartridge-stop cartridge-storage cartridges configure-app configure-domain configure-server create-app create-domain create-team delete-all-authorization delete-app delete-authorization delete-cert-alias delete-domain delete-team deploy deploy-app deployment deployment-activate deployment-list deployment-show deployments domain domain-configure domain-create domain-delete domain-leave domain-list domain-rename domain-show domains env env-add env-list env-remove env-set env-show env-unset force-stop-app git-clone leave-domain leave-team list-alias list-authorization list-cartridge list-deployment list-domain list-env list-member list-server list-sshkey list-team logout member member-add member-list member-remove member-update members port-forward reload-app reload-cartridge remove-alias remove-cartridge remove-member remove-server remove-sshkey rename-domain restart-app restart-cartridge restore-snapshot save-snapshot scale-cartridge scale-down-app scale-up-app scp server server-add server-configure server-list server-remove server-show server-status server-use servers set-env setup show-app show-cartridge show-deployment show-domain show-env show-server show-sshkey show-team snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-list sshkey-remove sshkey-show start-app start-cartridge status-cartridge status-server stop-app stop-cartridge storage-cartridge tail team team-create team-delete team-leave team-list team-show teams threaddump tidy-app unset-env update-cert-alias update-member use-server"
+      opts="account account-logout activate-deployment add-alias add-authorization add-cartridge add-member add-server add-sshkey alias alias-add alias-delete-cert alias-list alias-remove alias-update-cert aliases app app-configure app-create app-delete app-deploy app-env app-force-stop app-reload app-restart app-scale-down app-scale-up app-scp app-show app-snapshot app-ssh app-start app-stop app-tidy apps authorization authorization-add authorization-delete authorization-delete-all authorization-list authorizations cartridge cartridge-add cartridge-list cartridge-reload cartridge-remove cartridge-restart cartridge-scale cartridge-show cartridge-start cartridge-status cartridge-stop cartridge-storage cartridges configure-app configure-domain configure-server create-app create-domain create-team delete-all-authorization delete-app delete-authorization delete-cert-alias delete-domain delete-team deploy deploy-app deployment deployment-activate deployment-list deployment-show deployments domain domain-configure domain-create domain-delete domain-leave domain-list domain-rename domain-show domains env env-add env-list env-remove env-set env-show env-unset envs force-stop-app git-clone help leave-domain leave-team list-alias list-authorization list-cartridge list-deployment list-domain list-env list-member list-region list-server list-sshkey list-team logout member member-add member-list member-remove member-update members port-forward region region-list regions reload-app reload-cartridge remove-alias remove-cartridge remove-member remove-server remove-sshkey rename-domain restart-app restart-cartridge restore-snapshot save-snapshot scale-cartridge scale-down-app scale-up-app scp server server-add server-configure server-list server-remove server-show server-status server-use servers set-env setup show-app show-cartridge show-deployment show-domain show-env show-server show-sshkey show-team snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-list sshkey-remove sshkey-show sshkeys start-app start-cartridge status-cartridge status-server stop-app stop-cartridge storage-cartridge tail team team-create team-delete team-leave team-list team-show teams threaddump tidy-app unset-env update-cert-alias update-member use-server"
     fi
   else
     prev="${COMP_WORDS[@]:0:COMP_CWORD}"
@@ -86,7 +86,7 @@ _rhc()
 
       "rhc add-server")
         if [[ "$cur" == -* ]]; then
-          opts="--insecure --nickname --no-insecure --no-use-authorization-tokens --rhlogin --server --skip-wizard --use --use-authorization-tokens"
+          opts="--insecure --nickname --no-insecure --no-use-authorization-tokens --rhlogin --server --skip-wizard --ssl-ca-file --ssl-client-cert-file --ssl-version --timeout --use --use-authorization-tokens"
         else
           opts=""
         fi
@@ -104,7 +104,7 @@ _rhc()
         if [[ "$cur" == -* ]]; then
           opts=""
         else
-          opts="add remove update-cert delete-cert list"
+          opts="add delete-cert list remove update-cert"
         fi
         ;;
 
@@ -200,7 +200,7 @@ _rhc()
         if [[ "$cur" == -* ]]; then
           opts=""
         else
-          opts="create delete start stop scale-up scale-down force-stop restart reload tidy show deploy configure env snapshot"
+          opts="configure create delete deploy env force-stop reload restart scale-down scale-up show snapshot start stop tidy"
         fi
         ;;
 
@@ -214,7 +214,7 @@ _rhc()
 
       "rhc app create")
         if [[ "$cur" == -* ]]; then
-          opts="--app --dns --enable-jenkins --env --from-app --from-code --gear-size --git --namespace --no-dns --no-git --no-keys --no-scaling --repo --scaling --type"
+          opts="--app --dns --enable-jenkins --env --from-app --from-code --gear-size --git --namespace --no-dns --no-git --no-keys --no-scaling --region --repo --scaling --type"
         else
           opts=""
         fi
@@ -350,7 +350,7 @@ _rhc()
 
       "rhc app-create")
         if [[ "$cur" == -* ]]; then
-          opts="--app --dns --enable-jenkins --env --from-app --from-code --gear-size --git --namespace --no-dns --no-git --no-keys --no-scaling --repo --scaling --type"
+          opts="--app --dns --enable-jenkins --env --from-app --from-code --gear-size --git --namespace --no-dns --no-git --no-keys --no-scaling --region --repo --scaling --type"
         else
           opts=""
         fi
@@ -488,7 +488,7 @@ _rhc()
         if [[ "$cur" == -* ]]; then
           opts=""
         else
-          opts="list add delete delete-all"
+          opts="add delete delete-all list"
         fi
         ;;
 
@@ -568,7 +568,7 @@ _rhc()
         if [[ "$cur" == -* ]]; then
           opts=""
         else
-          opts="list add show remove start stop restart status reload scale storage"
+          opts="add list reload remove restart scale show start status stop storage"
         fi
         ;;
 
@@ -774,7 +774,7 @@ _rhc()
 
       "rhc configure-server")
         if [[ "$cur" == -* ]]; then
-          opts="--hostname --insecure --nickname --no-insecure --no-use-authorization-tokens --rhlogin --server --skip-wizard --use --use-authorization-tokens"
+          opts="--hostname --insecure --nickname --no-insecure --no-use-authorization-tokens --rhlogin --server --skip-wizard --ssl-ca-file --ssl-client-cert-file --ssl-version --timeout --use --use-authorization-tokens"
         else
           opts=""
         fi
@@ -782,7 +782,7 @@ _rhc()
 
       "rhc create-app")
         if [[ "$cur" == -* ]]; then
-          opts="--app --dns --enable-jenkins --env --from-app --from-code --gear-size --git --namespace --no-dns --no-git --no-keys --no-scaling --repo --scaling --type"
+          opts="--app --dns --enable-jenkins --env --from-app --from-code --gear-size --git --namespace --no-dns --no-git --no-keys --no-scaling --region --repo --scaling --type"
         else
           opts=""
         fi
@@ -872,7 +872,7 @@ _rhc()
         if [[ "$cur" == -* ]]; then
           opts=""
         else
-          opts="list show activate"
+          opts="activate list show"
         fi
         ;;
 
@@ -936,7 +936,7 @@ _rhc()
         if [[ "$cur" == -* ]]; then
           opts=""
         else
-          opts="create rename configure show list delete leave"
+          opts="configure create delete leave list rename show"
         fi
         ;;
 
@@ -1064,7 +1064,7 @@ _rhc()
         if [[ "$cur" == -* ]]; then
           opts=""
         else
-          opts="add set remove unset list show"
+          opts="add list remove set show unset"
         fi
         ;;
 
@@ -1164,6 +1164,14 @@ _rhc()
         fi
         ;;
 
+      "rhc envs")
+        if [[ "$cur" == -* ]]; then
+          opts="--app --application-id --namespace --quotes --table"
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc force-stop-app")
         if [[ "$cur" == -* ]]; then
           opts="--app --application-id --namespace"
@@ -1180,6 +1188,14 @@ _rhc()
         fi
         ;;
 
+      "rhc help")
+        if [[ "$cur" == -* ]]; then
+          opts=""
+        else
+          opts="account account-logout activate-deployment add-alias add-authorization add-cartridge add-member add-server add-sshkey alias alias-add alias-delete-cert alias-list alias-remove alias-update-cert aliases app app-configure app-create app-delete app-deploy app-env app-force-stop app-reload app-restart app-scale-down app-scale-up app-scp app-show app-snapshot app-ssh app-start app-stop app-tidy apps authorization authorization-add authorization-delete authorization-delete-all authorization-list authorizations cartridge cartridge-add cartridge-list cartridge-reload cartridge-remove cartridge-restart cartridge-scale cartridge-show cartridge-start cartridge-status cartridge-stop cartridge-storage cartridges configure-app configure-domain configure-server create-app create-domain create-team delete-all-authorization delete-app delete-authorization delete-cert-alias delete-domain delete-team deploy deploy-app deployment deployment-activate deployment-list deployment-show deployments domain domain-configure domain-create domain-delete domain-leave domain-list domain-rename domain-show domains env env-add env-list env-remove env-set env-show env-unset envs force-stop-app git-clone leave-domain leave-team list-alias list-authorization list-cartridge list-deployment list-domain list-env list-member list-region list-server list-sshkey list-team logout member member-add member-list member-remove member-update members port-forward region region-list regions reload-app reload-cartridge remove-alias remove-cartridge remove-member remove-server remove-sshkey rename-domain restart-app restart-cartridge restore-snapshot save-snapshot scale-cartridge scale-down-app scale-up-app scp server server-add server-configure server-list server-remove server-show server-status server-use servers set-env setup show-app show-cartridge show-deployment show-domain show-env show-server show-sshkey show-team snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-list sshkey-remove sshkey-show sshkeys start-app start-cartridge status-cartridge status-server stop-app stop-cartridge storage-cartridge tail team team-create team-delete team-leave team-list team-show teams threaddump tidy-app unset-env update-cert-alias update-member use-server"
+        fi
+        ;;
+
       "rhc leave-domain")
         if [[ "$cur" == -* ]]; then
           opts="--namespace"
@@ -1252,6 +1268,14 @@ _rhc()
         fi
         ;;
 
+      "rhc list-region")
+        if [[ "$cur" == -* ]]; then
+          opts=""
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc list-server")
         if [[ "$cur" == -* ]]; then
           opts=""
@@ -1288,7 +1312,7 @@ _rhc()
         if [[ "$cur" == -* ]]; then
           opts=""
         else
-          opts="list add update remove"
+          opts="add list remove update"
         fi
         ;;
 
@@ -1372,6 +1396,38 @@ _rhc()
         fi
         ;;
 
+      "rhc region")
+        if [[ "$cur" == -* ]]; then
+          opts=""
+        else
+          opts="list"
+        fi
+        ;;
+
+      "rhc region list")
+        if [[ "$cur" == -* ]]; then
+          opts=""
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc region-list")
+        if [[ "$cur" == -* ]]; then
+          opts=""
+        else
+          opts=""
+        fi
+        ;;
+
+      "rhc regions")
+        if [[ "$cur" == -* ]]; then
+          opts=""
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc reload-app")
         if [[ "$cur" == -* ]]; then
           opts="--app --application-id --namespace"
@@ -1504,13 +1560,13 @@ _rhc()
         if [[ "$cur" == -* ]]; then
           opts=""
         else
-          opts="status add list use remove configure show"
+          opts="add configure list remove show status use"
         fi
         ;;
 
       "rhc server add")
         if [[ "$cur" == -* ]]; then
-          opts="--insecure --nickname --no-insecure --no-use-authorization-tokens --rhlogin --server --skip-wizard --use --use-authorization-tokens"
+          opts="--insecure --nickname --no-insecure --no-use-authorization-tokens --rhlogin --server --skip-wizard --ssl-ca-file --ssl-client-cert-file --ssl-version --timeout --use --use-authorization-tokens"
         else
           opts=""
         fi
@@ -1518,7 +1574,7 @@ _rhc()
 
       "rhc server configure")
         if [[ "$cur" == -* ]]; then
-          opts="--hostname --insecure --nickname --no-insecure --no-use-authorization-tokens --rhlogin --server --skip-wizard --use --use-authorization-tokens"
+          opts="--hostname --insecure --nickname --no-insecure --no-use-authorization-tokens --rhlogin --server --skip-wizard --ssl-ca-file --ssl-client-cert-file --ssl-version --timeout --use --use-authorization-tokens"
         else
           opts=""
         fi
@@ -1566,7 +1622,7 @@ _rhc()
 
       "rhc server-add")
         if [[ "$cur" == -* ]]; then
-          opts="--insecure --nickname --no-insecure --no-use-authorization-tokens --rhlogin --server --skip-wizard --use --use-authorization-tokens"
+          opts="--insecure --nickname --no-insecure --no-use-authorization-tokens --rhlogin --server --skip-wizard --ssl-ca-file --ssl-client-cert-file --ssl-version --timeout --use --use-authorization-tokens"
         else
           opts=""
         fi
@@ -1574,7 +1630,7 @@ _rhc()
 
       "rhc server-configure")
         if [[ "$cur" == -* ]]; then
-          opts="--hostname --insecure --nickname --no-insecure --no-use-authorization-tokens --rhlogin --server --skip-wizard --use --use-authorization-tokens"
+          opts="--hostname --insecure --nickname --no-insecure --no-use-authorization-tokens --rhlogin --server --skip-wizard --ssl-ca-file --ssl-client-cert-file --ssl-version --timeout --use --use-authorization-tokens"
         else
           opts=""
         fi
@@ -1712,7 +1768,7 @@ _rhc()
         if [[ "$cur" == -* ]]; then
           opts=""
         else
-          opts="save restore"
+          opts="restore save"
         fi
         ;;
 
@@ -1760,7 +1816,7 @@ _rhc()
         if [[ "$cur" == -* ]]; then
           opts=""
         else
-          opts="list show add remove"
+          opts="add list remove show"
         fi
         ;;
 
@@ -1828,6 +1884,14 @@ _rhc()
         fi
         ;;
 
+      "rhc sshkeys")
+        if [[ "$cur" == -* ]]; then
+          opts=""
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc start-app")
         if [[ "$cur" == -* ]]; then
           opts="--app --application-id --namespace"
@@ -1896,7 +1960,7 @@ _rhc()
         if [[ "$cur" == -* ]]; then
           opts=""
         else
-          opts="create show list delete leave"
+          opts="create delete leave list show"
         fi
         ;;
 

data/lib/rhc/auth.rb

@@ -1,5 +1,6 @@
 module RHC::Auth
   autoload :Basic,      'rhc/auth/basic'
+  autoload :X509,       'rhc/auth/x509'
   autoload :Token,      'rhc/auth/token'
   autoload :TokenStore, 'rhc/auth/token_store'
 end

data/lib/rhc/auth/basic.rb

@@ -32,6 +32,14 @@ module RHC::Auth
       username? and not (password.nil? and @skip_interactive and @no_interactive)
     end
 
+    def expired_token_message
+      "Your authorization token has expired. Please sign in now to continue on #{openshift_server}."
+    end
+
+    def get_token_message
+      "Please sign in to start a new session to #{openshift_server}."
+    end
+
     attr_reader :username
 
     protected

data/lib/rhc/auth/token.rb

@@ -15,18 +15,27 @@ module RHC::Auth
     end
 
     def to_request(request)
-      if token
-        debug "Using token authentication"
-        (request[:headers] ||= {})['authorization'] = "Bearer #{token}"
-      elsif auth and (!@allows_tokens or @can_get_token == false)
+      if auth and !token and (!@allows_tokens or @can_get_token == false)
         debug "Bypassing token auth"
         auth.to_request(request)
+      else
+        # If no token is available an empty one will be submitted at this
+        # point.  This is actually required in order for the retry logic to be
+        # triggered in all cases.
+        #
+        # Previously a request with no authentication was submitted to trigger
+        # this behavior but it was found not to work in certain scenarios where
+        # Broker authentication is handled by Apache.  In those cases a 403 is
+        # returned and not secondary authentication attempt is made.
+        debug "Using token authentication"
+        (request[:headers] ||= {})['authorization'] = "Bearer #{token}"
       end
       request
     end
 
     def retry_auth?(response, client)
-      if response.status == 401
+      case response.status
+      when 401
         token_rejected(response, client)
       else
         false
@@ -74,9 +83,9 @@ module RHC::Auth
         @can_get_token = client.supports_sessions? && @allows_tokens
 
         if has_token
-          warn "Your authorization token has expired. Please sign in now to continue on #{openshift_server}."
+          warn auth.expired_token_message
         elsif @can_get_token
-          info "Please sign in to start a new session to #{openshift_server}."
+          info auth.get_token_message
         end
 
         return auth.retry_auth?(response, client) unless @can_get_token

data/lib/rhc/auth/x509.rb

@@ -0,0 +1,53 @@
+module RHC::Auth
+  class X509
+    def initialize(*args)
+      @options = args[0] || Commander::Command::Options.new
+    end
+
+    def to_request(request)
+      request[:client_cert] = certificate_file(options.ssl_client_cert_file)
+      request[:client_key] = rsa_key_file(options.ssl_client_key_file)
+      request
+    end
+
+    def certificate_file(file)
+      file && OpenSSL::X509::Certificate.new(IO.read(File.expand_path(file)))
+    rescue => e
+      debug e
+      raise OptionParser::InvalidOption.new(nil, "The certificate '#{file}' cannot be loaded: #{e.message} (#{e.class})")
+    end
+
+    def rsa_key_file(file)
+      file && OpenSSL::PKey::RSA.new(IO.read(File.expand_path(file)))
+    rescue => e
+      debug e
+      raise OptionParser::InvalidOption.new(nil, "The RSA key '#{file}' cannot be loaded: #{e.message} (#{e.class})")
+    end
+
+    def retry_auth?(response, client)
+      # This is really only hit in the case of token auth falling back to x509.
+      # x509 auth doesn't usually get 401s.
+      if response.status == 401
+        true
+      else
+        false
+      end
+    end
+
+    def can_authenticate?
+      true
+    end
+
+    def expired_token_message
+      "Your authorization token has expired.  " + get_token_message
+    end
+
+    def get_token_message
+      "Fetching a new token from #{openshift_server}."
+    end
+
+    protected
+      include RHC::Helpers
+      attr_reader :options
+  end
+end

data/lib/rhc/autocomplete.rb

@@ -55,6 +55,14 @@ module RHC
         end.flatten.compact.sort)
         @commands[name.to_s] = v
       end
+
+      # Inject autocomplete for a help command whose possible actions are all other commands in root or hyphenated form
+      @top_level_commands << 'help'
+      @commands['help'] = {
+        :actions => @commands.keys.sort.select {|c| c != '' && c !~ / /},
+        :switches => []
+      }
+
       @commands.delete('')
       @commands = @commands.to_a.sort{ |a,b| a[0] <=> b[0] }
 

data/lib/rhc/autocomplete_templates/bash.erb

@@ -8,9 +8,9 @@ _rhc()
   cur="${COMP_WORDS[COMP_CWORD]}"
   if [ $COMP_CWORD -eq 1 ]; then
     if [[ "$cur" == -* ]]; then
-      opts=<%= "\"%s\"" % global_options.join(' ') %>
+      opts=<%= "\"%s\"" % global_options.sort.join(' ') %>
     elif [ -z $cur ]; then
-      opts=<%= "\"%s\"" % top_level_commands.join(' ') %>
+      opts=<%= "\"%s\"" % top_level_commands.sort.join(' ') %>
     else
       opts=<%= "\"%s\"" % commands.map{ |c| c.first }.delete_if{ |s| s.include? ' ' }.sort.join(' ') %>
     fi
@@ -22,9 +22,9 @@ _rhc()
       <%- for name, data in commands %>
       <%= "\"rhc %s\")" % name %>
         if [[ "$cur" == -* ]]; then
-          opts=<%= "\"%s\"" % data[:switches].join(" ") %>
+          opts=<%= "\"%s\"" % data[:switches].sort.join(" ") %>
         else
-          opts=<%= "\"%s\"" % data[:actions].join(" ") %>
+          opts=<%= "\"%s\"" % data[:actions].sort.join(" ") %>
         fi
         ;;
       <%- end %>

data/lib/rhc/commands/app.rb

@@ -58,6 +58,7 @@ module RHC::Commands
     option ["-e", "--env VARIABLE=VALUE"], "Environment variable(s) to be set on this app, or path to a file containing environment variables", :type => :list
     option ["--from-app NAME"], "Create based on another application. All content and configurations will be copied from the original app."
     option ["--from-code URL"], "URL to a Git repository that will become the initial contents of the application"
+    option ["--region REGION"], "The region where the application gears will be located"
     option ["--[no-]git"], "Skip creating the local Git repository."
     option ["--[no-]dns"], "Skip waiting for the application DNS name to resolve. Must be used in combination with --no-git"
     option ['--no-keys'], "Skip checking SSH keys during app creation", :hide => true
@@ -77,7 +78,7 @@ module RHC::Commands
 
       if options.from_app
         raise RHC::AppCloneNotSupportedException, "The server does not support creating apps based on others (rhc create-app --from-app)." if (!rest_domain.has_param?('ADD_APPLICATION', 'cartridges[][name]') || !rest_domain.has_param?('ADD_APPLICATION', 'cartridges[][url]'))
-        raise ArgumentError, "Option --from-code is incompatible with --from--app. When creating an app based on another resource you can either specify a Git repository URL with --from-code or an existing app name with --from-app." if options.from_code     
+        raise ArgumentError, "Option --from-code is incompatible with --from-app. When creating an app based on another resource you can either specify a Git repository URL with --from-code or an existing app name with --from-app." if options.from_code     
         raise ArgumentError, "Option --no-dns is incompatible with --from-app. We need to propagate the new app DNS to be able to configure it." if options.dns == false
         raise ArgumentError, "Do not specify cartridges when creating an app based on another one. All cartridges will be copied from the original app." if !(cartridges || []).empty?
 
@@ -106,9 +107,13 @@ module RHC::Commands
       end
 
       scaling = options.scaling
+      region = options.region
+
+      raise RHC::RegionsAndZonesNotSupportedException if region.present? && !rest_client.supports_regions_and_zones?
 
       if from_app
         scaling = from_app.scalable if scaling.nil?
+        region = from_app.region if region.nil?
 
         cartridges = from_app.cartridges.reject{|c| c.tags.include?('web_proxy')}.collect do |cartridge|
           {
@@ -131,6 +136,7 @@ module RHC::Commands
                ["Gear Size:", options.gear_size || (from_app ? "Copied from '#{from_app.name}'" : "default")],
                ["Scaling:", (scaling ? "yes" : "no") + (from_app && options.scaling.nil? ? " (copied from '#{from_app.name}')" : '')],
               (["Environment Variables:", env.map{|item| "#{item.name}=#{item.value}"}.join(', ')] if env.present?),
+              (["Region:", region + (from_app && options.region.nil? ? " (copied from '#{from_app.name}')" : '')] if region),
               ].compact
              )
       end
@@ -139,7 +145,7 @@ module RHC::Commands
         say "Creating application '#{name}' ... "
 
         # create the main app
-        rest_app = create_app(name, cartridges, rest_domain, options.gear_size, scaling, options.from_code, env, options.auto_deploy, options.keep_deployments, options.deployment_branch, options.deployment_type)
+        rest_app = create_app(name, cartridges, rest_domain, options.gear_size, scaling, options.from_code, env, options.auto_deploy, options.keep_deployments, options.deployment_branch, options.deployment_type, region)
         success "done"
 
         paragraph{ indent{ success rest_app.messages.map(&:strip) } }
@@ -403,19 +409,25 @@ module RHC::Commands
         end
 
       elsif options.gears
-        gear_info = find_app(:with_gear_groups => true).map do |group|
+        domain, app = discover_domain_and_app
+        gear_info = rest_client.find_application_gear_groups_endpoints(domain, app).map do |group|
           group.gears.map do |gear|
             [
               gear['id'],
-              gear['state'] == 'started' ? gear['state'] : color(gear['state'], :yellow),
-              group.cartridges.collect{ |c| c['name'] }.join(' '),
-              group.gear_profile,
+              gear['state'] == 'started' ? color(gear['state'], :green) : color(gear['state'], :yellow),
+              (gear['endpoints'].blank? ? group.cartridges : gear['endpoints']).collect{ |c| c['cartridge_name'] || c['name'] }.join(' '),
+              group.gear_profile,              
+              gear['region'],
+              gear['zone'],
               ssh_string(gear['ssh_url'])
             ]
           end
         end.flatten(1)
 
-        say table(gear_info, :header => ['ID', 'State', 'Cartridges', 'Size', 'SSH URL'])
+        explicit_regions = gear_info.select{|i| !i[4].nil?}.present?
+        explicit_zones = gear_info.select{|i| !i[5].nil?}.present?
+
+        say table(gear_info.map(&:compact), :header => ['ID', 'State', 'Cartridges', 'Size', explicit_regions ? 'Region' : nil, explicit_zones ? 'Zone' : nil, 'SSH URL'].compact)
 
       elsif options.configuration
         display_app_configurations(find_app)
@@ -561,7 +573,7 @@ module RHC::Commands
         result
       end
 
-      def create_app(name, cartridges, rest_domain, gear_size=nil, scale=nil, from_code=nil, environment_variables=nil, auto_deploy=nil, keep_deployments=nil, deployment_branch=nil, deployment_type=nil)
+      def create_app(name, cartridges, rest_domain, gear_size=nil, scale=nil, from_code=nil, environment_variables=nil, auto_deploy=nil, keep_deployments=nil, deployment_branch=nil, deployment_type=nil, region=nil)
         app_options = {:cartridges => Array(cartridges)}
         app_options[:gear_profile] = gear_size if gear_size
         app_options[:scale] = scale if scale
@@ -572,6 +584,7 @@ module RHC::Commands
         app_options[:keep_deployments] = keep_deployments if keep_deployments
         app_options[:deployment_branch] = deployment_branch if deployment_branch
         app_options[:deployment_type] = deployment_type if deployment_type
+        app_options[:region] = region if region
         debug "Creating application '#{name}' with these options - #{app_options.inspect}"
         rest_domain.add_application(name, app_options)
       rescue RHC::Rest::Exception => e