@@ -1068,35 +1068,42 @@ def domains_add(self, args):
10681068 if not app :
10691069 app = self ._session .app
10701070 domain = args .get ('<domain>' )
1071- if domain is None :
1072- print ("Faulty input" )
1073- sys .exit (1 )
10741071 body = {'domain' : domain }
1075- response = self ._dispatch (
1076- 'post' , "/api/apps/{app}/domains" .format (app = app ),
1077- json .dumps (body ))
1072+ sys .stdout .write ("Adding {domain} to {app}... " .format (** locals ()))
1073+ sys .stdout .flush ()
1074+ try :
1075+ progress = TextProgress ()
1076+ progress .start ()
1077+ response = self ._dispatch ('post' , "/api/apps/{app}/domains" .format (app = app ), json .dumps (body ))
1078+ finally :
1079+ progress .cancel ()
1080+ progress .join ()
10781081 if response .status_code == requests .codes .ok : # @UndefinedVariable
1079- print ("Domain created " )
1082+ print ("done " )
10801083 else :
10811084 raise ResponseError (response )
10821085
10831086 def domains_remove (self , args ):
10841087 """
10851088 Unbind a domain for an application
10861089
1087- Usage: deis domains:rm <domain> [--app=<app>]
1090+ Usage: deis domains:remove <domain> [--app=<app>]
10881091 """
10891092 app = args .get ('--app' )
10901093 if not app :
10911094 app = self ._session .app
10921095 domain = args .get ('<domain>' )
1093- if domain is None :
1094- print ("Faulty input" )
1095- return
1096- response = self ._dispatch (
1097- 'delete' , "/api/domains/{domain}" .format (app = app , domain = domain ))
1098- if response .status_code == requests .codes .ok : # @UndefinedVariable
1099- print ("Domain removed" )
1096+ sys .stdout .write ("Removing {domain} from {app}... " .format (** locals ()))
1097+ sys .stdout .flush ()
1098+ try :
1099+ progress = TextProgress ()
1100+ progress .start ()
1101+ response = self ._dispatch ('delete' , "/api/domains/{domain}" .format (** locals ()))
1102+ finally :
1103+ progress .cancel ()
1104+ progress .join ()
1105+ if response .status_code == requests .codes .no_content : # @UndefinedVariable
1106+ print ("done" )
11001107 else :
11011108 raise ResponseError (response )
11021109
@@ -1112,7 +1119,13 @@ def domains_list(self, args):
11121119 response = self ._dispatch (
11131120 'get' , "/api/apps/{app}/domains" .format (app = app ))
11141121 if response .status_code == requests .codes .ok : # @UndefinedVariable
1115- print (json .dumps (response .json (), indent = 2 ))
1122+ domains = response .json ()['results' ]
1123+ print ("=== {} Domains" .format (app ))
1124+ if len (domains ) == 0 :
1125+ print ('No domains' )
1126+ return
1127+ for domain in domains :
1128+ print (domain ['domain' ])
11161129 else :
11171130 raise ResponseError (response )
11181131
0 commit comments