| 10 | 10 |
parser.add_argument('--cert', action="store", dest="cert_path",
|
| 11 | 11 |
default=None,
|
| 12 | 12 |
help="Path to the valid CouchDB certificate")
|
| 13 | |
@@ -204,45 +200,6 @@ def query_user_bool(question, default=Tr
|
|
13 |
@@ -204,44 +200,6 @@ def query_user_bool(question, default=Tr
|
| 14 | 14 |
"(or 'y' or 'n').\n")
|
| 15 | 15 |
|
| 16 | 16 |
|
|
| 31 | 31 |
- if not line.find('#'):
|
| 32 | 32 |
- break
|
| 33 | 33 |
- else:
|
| 34 | |
- modules.append([line[:line.index('=')], (line[line.index('=')+2:]).strip()])
|
|
34 |
- modules.append(line.strip('\n'))
|
| 35 | 35 |
- f.close()
|
| 36 | 36 |
- pip_dist = [dist.project_name.lower() for dist in pip.get_installed_distributions()]
|
| 37 | |
-
|
| 38 | 37 |
- for module in modules:
|
| 39 | |
- if module[0].lower() not in pip_dist:
|
|
38 |
- if module.lower() not in pip_dist:
|
| 40 | 39 |
- try:
|
| 41 | |
- __import__(module[0])
|
|
40 |
- __import__(module)
|
| 42 | 41 |
- except ImportError:
|
| 43 | 42 |
- if query_user_bool("Missing module %s."
|
| 44 | |
- " Do you wish to install it?" % module[0]):
|
| 45 | |
- pip.main(['install', "%s==%s" %
|
| 46 | |
- (module[0], module[1]), '--user'])
|
|
43 |
- " Do you wish to install it?" % module):
|
|
44 |
- pip.main(['install', "%s" %
|
|
45 |
- module, '--user'])
|
| 47 | 46 |
-
|
| 48 | 47 |
- else:
|
| 49 | 48 |
- return False
|
|
| 56 | 55 |
def startProfiler(app, output, depth):
|
| 57 | 56 |
"""Profiler handler.
|
| 58 | 57 |
|
| 59 | |
@@ -522,40 +479,6 @@ _/ ____\_____ ____________ __| _/__
|
|
58 |
@@ -522,40 +480,6 @@ _/ ____\_____ ____________ __| _/__
|
| 60 | 59 |
logger.info("Starting Faraday IDE.")
|
| 61 | 60 |
|
| 62 | 61 |
|
|
| 97 | 96 |
def checkCouchUrl():
|
| 98 | 97 |
import requests
|
| 99 | 98 |
try:
|
| 100 | |
@@ -571,30 +494,6 @@ def checkCouchUrl():
|
|
99 |
@@ -571,30 +495,6 @@ def checkCouchUrl():
|
| 101 | 100 |
# Non fatal error
|
| 102 | 101 |
pass
|
| 103 | 102 |
|
|
| 128 | 127 |
def init():
|
| 129 | 128 |
"""Initializes what is needed before starting.
|
| 130 | 129 |
|
| 131 | |
@@ -622,20 +521,12 @@ def main():
|
|
130 |
@@ -621,20 +521,12 @@ def main():
|
| 132 | 131 |
os.chdir(FARADAY_BASE)
|
| 133 | 132 |
|
| 134 | 133 |
init()
|
|
| 137 | 136 |
- logger.info("Dependencies met.")
|
| 138 | 137 |
- if args.cert_path:
|
| 139 | 138 |
- os.environ[REQUESTS_CA_BUNDLE_VAR] = args.cert_path
|
| 140 | |
- checkConfiguration()
|
|
139 |
- checkConfiguration(args.gui)
|
| 141 | 140 |
- setConf()
|
| 142 | 141 |
- checkCouchUrl()
|
| 143 | 142 |
- checkVersion()
|
|
| 148 | 147 |
- logger.error("Dependencies not met. Unable to start Faraday.")
|
| 149 | 148 |
+ printBanner()
|
| 150 | 149 |
+ logger.info("Dependencies met.")
|
| 151 | |
+ checkConfiguration()
|
|
150 |
+ checkConfiguration(args.gui)
|
| 152 | 151 |
+ setConf()
|
| 153 | 152 |
+ checkCouchUrl()
|
| 154 | 153 |
+ startFaraday()
|