Skip to content

Commit 56e5de9

Browse files
author
Clark Perkins
committed
Make sure cli actually loads
1 parent bbb3fd2 commit 56e5de9

File tree

3 files changed

+3
-25
lines changed

3 files changed

+3
-25
lines changed

stackdio/cli/blueprints/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import json
44
import sys
55

6-
from stackdio.blueprints.generator import BlueprintException, BlueprintGenerator
6+
from stackdio.cli.blueprints.generator import BlueprintException, BlueprintGenerator
77

88

99
def main():

stackdio/cli/mixins/bootstrap.py

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ class PublicKeyNotFound(Exception):
2020
class BootstrapMixin(Cmd):
2121

2222
def __init__(self):
23-
super(BootstrapMixin, self).__init__()
24-
2523
# quieting down pylint
2624
self.has_public_key = None
2725
self.validated = False
@@ -99,28 +97,6 @@ def do_initial_setup(self, args=None):
9997
self._save_config()
10098
self._setprompt()
10199

102-
if self.validated:
103-
bootstrap = raw_input("Bootstrap your account now (y/n)? ")
104-
if bootstrap not in ["y", "Y"]:
105-
return
106-
self.do_bootstrap()
107-
108-
print(self.colorize("""
109-
##
110-
## Success! You're ready to start using stackd.io. Try running
111-
## 'help' to see what all is available here. You can also go to
112-
## {0} to use the UI.
113-
##
114-
""".format(
115-
self.config["url"][0:self.config["url"].find("api/")]),
116-
"green"))
117-
118-
else:
119-
print(self.colorize(
120-
"Unable to bootstrap your account",
121-
"red"))
122-
return
123-
124100
def do_bootstrap(self, args=None):
125101
"""Bootstrap an account with predefined formulas and blueprints"""
126102

stackdio/cli/polling.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
import sys
33
import time
44

5+
56
class TimeoutException(Exception):
67
pass
78

9+
810
def poll_and_wait(func, args=None, sleep_time=2, max_time=120):
911
"""Execute func in increments of sleep_time for no more than max_time.
1012
Raise TimeoutException if we're not successful in max_time"""

0 commit comments

Comments
 (0)