Merge pull request #157 from josenavas/issue140

Informative errors on qiita_env

.travis.yml

@@ -22,7 +22,7 @@ script:
   - qiita_env start_cluster --cluster general
   - qiita_env start_cluster --cluster demo
   - qiita_env start_cluster --cluster reserved
-  - qiita_env make_test_env
+  - qiita_env make_env --env test
   - nosetests --with-doctest
   - pep8 qiita_db qiita_core qiita_pet setup.py
   # we need to run the test suite from setup.py for coveralls to grab the info

INSTALL.md

@@ -38,7 +38,7 @@ Once you have [PostgresSQL](http://www.postgresql.org/download/) and [redis](htt
 echo "export QIITA_CONFIG_FP=$QIITA_DIR/qiita_core/support_files/config_demo.txt" >> ~/.bashrc
 source ~/.bashrc
 pip install https://github.com/biocore/qiita/archive/master.zip
-qiita_env make_demo_env
+qiita_env make_env --env demo
 ```
 ## If using other operating systems that are not Ubuntu
 

qiita_core/exceptions.py

@@ -53,3 +53,8 @@ class IncorrectPasswordError(QiitaError):
 class IncorrectEmailError(QiitaError):
     """Email fails validation"""
     pass
+
+
+class QiitaEnvironmentError(QiitaError):
+    """Exception for error when dealing with the environment"""
+    pass

qiita_db/commands.py

@@ -78,7 +78,7 @@ def load_study_from_cmd(owner, title, info):
     efo_ids = get_required('efo_ids')
     efo_ids = [x.strip() for x in efo_ids.split(',')]
 
-    Study.create(User(owner), title, efo_ids, infodict)
+    return Study.create(User(owner), title, efo_ids, infodict)
 
 
 def load_preprocessed_data_from_cmd(study_id, filedir, filepathtype,
@@ -110,7 +110,7 @@ def load_preprocessed_data_from_cmd(study_id, filedir, filepathtype,
                                    submitted_to_insdc=submitted_to_insdc)
 
 
-def sample_template_adder(sample_temp_path, study_id):
+def load_sample_template_from_cmd(sample_temp_path, study_id):
     r"""Adds a sample template to the database
 
     Parameters