rhc 1.11.4 → 1.12.4

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-create app-delete app-force-stop app-reload app-restart 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 domain domain-create domain-delete domain-show domain-update git-clone logout port-forward server setup snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-list sshkey-remove sshkey-show tail threaddump"
+      opts="account alias alias-add alias-delete-cert alias-list alias-remove alias-update-cert app app-create app-delete app-force-stop app-reload app-restart 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 domain domain-create domain-delete domain-list domain-show domain-update git-clone logout port-forward server setup snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-list sshkey-remove sshkey-show tail threaddump"
     else
-      opts="account account-logout add-alias add-authorization add-cartridge add-sshkey alias alias-add alias-delete-cert alias-list alias-remove alias-update-cert aliases app app-create app-delete app-force-stop app-reload app-restart 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 create-app create-domain delete-all-authorization delete-app delete-authorization delete-cert-alias delete-domain domain domain-create domain-delete domain-show domain-update force-stop-app git-clone list-alias list-authorization list-cartridge list-sshkey logout port-forward reload-app reload-cartridge remove-alias remove-cartridge remove-sshkey restart-app restart-cartridge restore-snapshot save-snapshot scale-cartridge server setup show-app show-cartridge show-domain show-sshkey snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-delete sshkey-list sshkey-remove sshkey-show start-app start-cartridge status-cartridge stop-app stop-cartridge storage-cartridge tail threaddump tidy-app update-cert-alias update-domain"
+      opts="account account-logout add-alias add-authorization add-cartridge add-sshkey alias alias-add alias-delete-cert alias-list alias-remove alias-update-cert aliases app app-create app-delete app-force-stop app-reload app-restart 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 create-app create-domain delete-all-authorization delete-app delete-authorization delete-cert-alias delete-domain domain domain-create domain-delete domain-list domain-show domain-update domains force-stop-app git-clone list-alias list-authorization list-cartridge list-domain list-sshkey logout port-forward reload-app reload-cartridge remove-alias remove-cartridge remove-sshkey restart-app restart-cartridge restore-snapshot save-snapshot scale-cartridge server setup show-app show-cartridge show-domain show-sshkey snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-list sshkey-remove sshkey-show start-app start-cartridge status-cartridge stop-app stop-cartridge storage-cartridge tail threaddump tidy-app update-cert-alias update-domain"
     fi
   else
     prev="${COMP_WORDS[@]:0:COMP_CWORD}"
@@ -696,7 +696,7 @@ _rhc()
         if [[ "$cur" == -* ]]; then
           opts=""
         else
-          opts="create update show delete"
+          opts="create update show list delete"
         fi
         ;;
 
@@ -716,9 +716,17 @@ _rhc()
         fi
         ;;
 
-      "rhc domain show")
+      "rhc domain list")
         if [[ "$cur" == -* ]]; then
+          opts="--mine"
+        else
           opts=""
+        fi
+        ;;
+
+      "rhc domain show")
+        if [[ "$cur" == -* ]]; then
+          opts="--namespace"
         else
           opts=""
         fi
@@ -748,9 +756,17 @@ _rhc()
         fi
         ;;
 
-      "rhc domain-show")
+      "rhc domain-list")
         if [[ "$cur" == -* ]]; then
+          opts="--mine"
+        else
           opts=""
+        fi
+        ;;
+
+      "rhc domain-show")
+        if [[ "$cur" == -* ]]; then
+          opts="--namespace"
         else
           opts=""
         fi
@@ -764,6 +780,14 @@ _rhc()
         fi
         ;;
 
+      "rhc domains")
+        if [[ "$cur" == -* ]]; then
+          opts="--mine"
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc force-stop-app")
         if [[ "$cur" == -* ]]; then
           opts="--app --namespace"
@@ -804,6 +828,14 @@ _rhc()
         fi
         ;;
 
+      "rhc list-domain")
+        if [[ "$cur" == -* ]]; then
+          opts="--mine"
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc list-sshkey")
         if [[ "$cur" == -* ]]; then
           opts=""
@@ -942,7 +974,7 @@ _rhc()
 
       "rhc show-domain")
         if [[ "$cur" == -* ]]; then
-          opts=""
+          opts="--namespace"
         else
           opts=""
         fi
@@ -1008,7 +1040,7 @@ _rhc()
         if [[ "$cur" == -* ]]; then
           opts=""
         else
-          opts="list show add delete remove"
+          opts="list show add remove"
         fi
         ;;
 
@@ -1020,14 +1052,6 @@ _rhc()
         fi
         ;;
 
-      "rhc sshkey delete")
-        if [[ "$cur" == -* ]]; then
-          opts=""
-        else
-          opts=""
-        fi
-        ;;
-
       "rhc sshkey list")
         if [[ "$cur" == -* ]]; then
           opts=""
@@ -1060,14 +1084,6 @@ _rhc()
         fi
         ;;
 
-      "rhc sshkey-delete")
-        if [[ "$cur" == -* ]]; then
-          opts=""
-        else
-          opts=""
-        fi
-        ;;
-
       "rhc sshkey-list")
         if [[ "$cur" == -* ]]; then
           opts=""

data/features/domain.feature

@@ -10,14 +10,19 @@ Feature: Existing Domain Operations
     When domain is updated
     Then the domain should be reserved
 
-  Scenario: Domain Show
+  Scenario: Domain List
     When rhc domain is run
+    When rhc domain list is run
+    Then the default domain action output should equal the list action output
+
+  Scenario: Domain Show
     When rhc domain show is run
-    Then the default domain action output should equal the show action output
+    Then the domain show command output should show the domain
+    Then the domain command should exit with an exitcode of 0
 
   Scenario: Domain Create Fails
     When rhc domain create is called
-    Then the domain command should fail with an exitcode of 1
+    Then the domain command should exit with an exitcode of 1
 
   Scenario: Domain Delete
     When domain is deleted

data/features/lib/rhc_helper/commandify.rb

@@ -65,6 +65,8 @@ module RHCHelper
       case cmd
         when /app delete/
           args << "--confirm "
+        when /domain list/
+          # domain list doesn't take arguments
         when /domain show/
           # domain show doesn't take arguments
         when /domain update/
@@ -174,6 +176,10 @@ module RHCHelper
     @domain_output = stdout
   end
 
+  def domain_list_callback(exitcode, stdout, stderr, arg)
+    @domain_list_output = stdout
+  end
+
   def domain_show_callback(exitcode, stdout, stderr, arg)
     @domain_show_output = stdout
   end

data/features/lib/rhc_helper/domain.rb

@@ -10,7 +10,7 @@ module RHCHelper
     extend API
 
     class << self
-      attr_reader :domain_output, :domain_show_output, :exitcode
+      attr_reader :domain_output, :domain_list_output, :domain_show_output, :exitcode
     end
 
     def self.unique_namespace(prefix)

data/features/step_definitions/domain_steps.rb

@@ -27,18 +27,23 @@ When /^rhc domain (.*)is run$/ do |action|
   Domain.send(:"#{cmd}")
 end
 
-Then /^the default domain action output should equal the show action output$/ do
+Then /^the default domain action output should equal the list action output$/ do
   Domain.domain_output.should match($namespace)
 
   domain_output = Domain.domain_output.lines.sort
-  domain_show_output = Domain.domain_show_output.lines.sort
+  domain_list_output = Domain.domain_list_output.lines.sort
 
   # check line by line while ignoring debug output which is timestamped
-  domain_output.zip(domain_show_output) do |a, b|
+  domain_output.zip(domain_list_output) do |a, b|
     a.should == b unless a.match("DEBUG") 
   end
 end
 
+Then /^the domain show command output should show the domain$/ do
+  domain_show_output = Domain.domain_show_output.lines
+  domain_show_output.find {|line| line["Domain #{$namespace}"] }.should be_true, "Unable to find \"Domain #{$namespace}\" in #{domain_show_output.inspect}"
+end
+
 Then /^the domain should be reserved?$/ do
   # Sleep to allow DNS to propogate
   sleep 5
@@ -54,7 +59,7 @@ Then /^the domain should be reserved?$/ do
   resolved.should be_true, 'Not able to lookup DNS TXT record in time.'
 end
 
-Then /^the domain command should fail with an exitcode of (\d*)$/ do |exitcode|
+Then /^the domain command should exit with an exitcode of (\d*)$/ do |exitcode|
   exitcode = exitcode.to_i
   Domain.exitcode.should == exitcode
 end

data/lib/rhc/auth/basic.rb

@@ -13,8 +13,10 @@ module RHC::Auth
     end
 
     def to_request(request)
-      request[:user] ||= username || (request[:lazy_auth] != true && ask_username) || nil
-      request[:password] ||= password || (username? && request[:lazy_auth] != true && ask_password) || nil
+      request[:user] ||=
+        lambda{ username || (request[:lazy_auth] != true && ask_username) || nil }
+      request[:password] ||=
+        lambda{ password || (username? && request[:lazy_auth] != true && ask_password) || nil }
       request
     end
 

data/lib/rhc/cli.rb

@@ -15,6 +15,7 @@ module RHC
 
     def self.set_terminal
       $terminal.wrap_at = HighLine::SystemExtensions.terminal_size.first rescue 80 if $stdin.tty?
+      $terminal.wrap_at = nil if $terminal.wrap_at == 0
       #$terminal.page_at = :auto if $stdin.tty? and $stdout.tty?
       # FIXME: ANSI terminals are not default on windows but we may just be
       #        hitting a bug in highline if windows does support another method.

data/lib/rhc/commands/apps.rb

@@ -5,11 +5,9 @@ module RHC::Commands
     summary "List all your applications"
     description "Display the list of applications that you own. Includes information about each application."
     def run
-      domains = rest_client.domains
+      applications = rest_client.applications(:include => :cartridges).sort
 
-      info "In order to deploy applications, you must create a domain with 'rhc setup' or 'rhc create-domain'." and return 1 if domains.empty?
-
-      applications = domains.map{ |d| d.applications(:include => :cartridges) }.flatten.sort
+      info "In order to deploy applications, you must create a domain with 'rhc setup' or 'rhc create-domain'." and return 1 if applications.empty? && rest_client.domains.empty?
 
       applications.each{ |a| display_app(a, a.cartridges) }.blank? and
         info "No applications. Use 'rhc create-app'." and

data/lib/rhc/commands/cartridge.rb

@@ -33,6 +33,7 @@ module RHC::Commands
     default_action :list
 
     summary "List available cartridges"
+    syntax ''
     option ["-v", "--verbose"], "Display more details about each cartridge"
     alias_action :"app cartridge list", :root_command => true, :deprecated => true
     alias_action :"cartridges", :root_command => true

data/lib/rhc/commands/domain.rb

@@ -13,9 +13,9 @@ module RHC::Commands
 
         http://<appname>-test.rhcloud.com
 
-      Today, each account may have a single domain.
+      Each account may have access to one or more domains shared by others.
       DESC
-    default_action :show
+    default_action :list
 
     summary "Define a namespace for your applications to share."
     syntax "<namespace>"
@@ -50,21 +50,18 @@ module RHC::Commands
       0
     end
 
-    summary "Display your domain and any applications"
-    def show
-      domain = rest_client.domains.first
+    summary "Display a domain and its applications"
+    argument :namespace, "Namespace of the domain", ["-n", "--namespace NAME"], :optional => true
+    def show(namespace)
+      domain = (rest_client.find_domain(namespace) if namespace) || rest_client.domains.first
 
       warn "In order to deploy applications, you must create a domain with 'rhc setup' or 'rhc create-domain'." and return 1 unless domain
 
       applications = domain.applications(:include => :cartridges)
+      display_domain(domain, applications)
 
       if applications.present?
-        header "Applications in #{domain.id} domain" do
-          applications.each do |a|
-            display_app(a,a.cartridges)
-          end
-        end
-        success "You have #{applications.length} applications in your domain."
+        success "You have #{pluralize(applications.length, 'application')} in your domain."
       else
         success "The domain #{domain.id} exists but has no applications. You can use 'rhc create-app' to create a new application."
       end
@@ -72,6 +69,23 @@ module RHC::Commands
       0
     end
 
+    summary "Display all domains you have access to"
+    option ['--mine'], "Display only domains you own"
+    alias_action :domains, :root_command => true
+    def list
+      domains = rest_client.send(options.mine ? :owned_domains : :domains)
+
+      warn "In order to deploy applications, you must create a domain with 'rhc setup' or 'rhc create-domain'." and return 1 unless domains.present?
+
+      domains.each do |d|
+        display_domain(d)
+      end
+
+      success "You have access to #{pluralize(domains.length, 'domain')}."
+
+      0
+    end    
+
     summary "DEPRECATED use 'setup' instead"
     deprecated 'rhc setup'
     # :nocov:

data/lib/rhc/commands/port_forward.rb

@@ -1,4 +1,3 @@
-require 'rhc/commands/base'
 require 'uri'
 
 module RHC::Commands

data/lib/rhc/commands/sshkey.rb

@@ -68,7 +68,7 @@ module RHC::Commands
 
     summary 'Remove SSH key from your account'
     syntax '<name>'
-    alias_action :delete
+    alias_action :delete, :deprecated => true
     argument :name, 'Name of SSH key to remove'
     def remove(name)
       say "Removing the key '#{name} ... "

data/lib/rhc/helpers.rb

@@ -52,6 +52,7 @@ module RHC
     end    
 
     def date(s)
+      return nil unless s.present?
       now = Date.today
       d = datetime_rfc3339(s).to_time
       if now.year == d.year

data/lib/rhc/highline_extensions.rb

@@ -257,9 +257,10 @@ class HighLine::Header < Struct.new(:text, :width, :indent, :color)
     def rows
       @rows ||= begin
         if !width || width == 0
-          [text.is_a?(Array) ? text.join(' ') : text]
+          [text.is_a?(Array) ? text.compact.join(' ') : text]
 
         elsif text.is_a? Array
+          text.compact!
           widths = text.map{ |s| s.strip_ansi.length }
           chars, join, indented = 0, 1, (indent || '').length
           narrow = width - indented

data/lib/rhc/output_helpers.rb

@@ -1,6 +1,26 @@
 module RHC
   module OutputHelpers
 
+    def display_domain(domain, applications=nil)
+      paragraph do
+        header ["Domain #{domain.id}", ("(owned by #{domain.owner})" if domain.owner.present?)] do
+          section(:bottom => 1) do
+            say format_table \
+              nil,
+              get_properties(
+                domain,
+                :creation_time,
+                :allowed_gear_sizes
+              ),
+              :delete => true
+          end
+          applications.each do |a|
+            display_app(a,a.cartridges)
+          end if applications.present?
+        end
+      end
+    end
+
     #---------------------------
     # Application information
     #---------------------------
@@ -12,6 +32,7 @@ module RHC
               nil,
               get_properties(
                 app,
+                :domain,
                 :creation_time,
                 :gear_info,
                 :git_url,

data/lib/rhc/rest.rb

@@ -1,8 +1,10 @@
 module RHC
   module Rest
 
-    autoload :Base,        'rhc/rest/base'
-    autoload :Attributes,  'rhc/rest/attributes'
+    autoload :Base,          'rhc/rest/base'
+    autoload :Attributes,    'rhc/rest/attributes'
+
+    autoload :HTTPClient,    'rhc/rest/httpclient'
 
     autoload :Api,           'rhc/rest/api'
     autoload :Application,   'rhc/rest/application'

data/lib/rhc/rest/api.rb

@@ -10,18 +10,20 @@ module RHC
         @server_api_versions = []
         debug "Client supports API versions #{preferred_api_versions.join(', ')}"
         @client_api_versions = preferred_api_versions
-        @server_api_versions, links = api_info({
+        @server_api_versions, @current_api_version, links = api_info({
           :url => client.url,
           :method => :get,
+          :accept => :json,
           :lazy_auth => true,
         })
         debug "Server supports API versions #{@server_api_versions.join(', ')}"
 
         if api_version_negotiated
-          unless server_api_version_current?
+          debug "   Using API version #{api_version_negotiated}"
+          unless client_api_version_current?
             debug "Client API version #{api_version_negotiated} is not current. Refetching API"
             # need to re-fetch API
-            @server_api_versions, links = api_info({
+            @server_api_versions, @current_api_version, links = api_info({
               :url => client.url,
               :method => :get,
               :accept => :json,
@@ -54,15 +56,11 @@ module RHC
       end
 
       def client_api_version_current?
-        current_client_api_version == api_version_negotiated
+        current_api_version == api_version_negotiated
       end
 
-      def current_client_api_version
-        client_api_versions.last
-      end
-
-      def server_api_version_current?
-        @server_api_versions && @server_api_versions.max == api_version_negotiated
+      def current_api_version
+        @current_api_version
       end
 
       def warn_about_api_versions
@@ -81,7 +79,7 @@ server at #{URI.parse(client.url).host} supports #{@server_api_versions.join(',
         def api_info(req)
           client.request(req) do |response|
             json_response = ::RHC::Json.decode(response.content)
-            [ json_response['supported_api_versions'], json_response['data'] ]
+            [ json_response['supported_api_versions'], json_response['api_version'] || json_response['version'].to_f, json_response['data'] ]
           end
         end
     end