Merge pull request #74 from nchammas/friendly-cli-requirements

Check CLI option dependencies cleanly

.travis.yml

@@ -6,3 +6,4 @@ install:
   - "pip install -r requirements/developer.pip"
 script:
   - "py.test ./tests/test_static.py"
+  - "py.test ./tests/test_flintrock.py"

flintrock/ec2.py

@@ -15,6 +15,7 @@
 from .core import FlintrockCluster
 from .core import provision_cluster
 from .exceptions import (
+    Error,
     ClusterNotFound,
     ClusterAlreadyExists,
     ClusterInvalidState,
@@ -402,7 +403,7 @@ def launch(
             region=region)
     except boto.exception.EC2ResponseError as e:
         if e.error_code == 'InvalidAMIID.NotFound':
-            raise Exception(
+            raise Error(
                 "Error: Could not find {ami} in region {region}.".format(
                     ami=ami,
                     region=region))

flintrock/exceptions.py

@@ -1,3 +1,7 @@
+class NothingToDo(Exception):
+    pass
+
+
 class UsageError(Exception):
     pass
 
@@ -9,19 +13,19 @@ def __init__(self, provider: str):
         self.provider = provider
 
 
-class NothingToDo(Exception):
+class Error(Exception):
     pass
 
 
-class ClusterNotFound(Exception):
+class ClusterNotFound(Error):
     pass
 
 
-class ClusterAlreadyExists(Exception):
+class ClusterAlreadyExists(Error):
     pass
 
 
-class ClusterInvalidState(Exception):
+class ClusterInvalidState(Error):
     def __init__(self, *, attempted_command: str, state: str):
         super().__init__(
             "Cluster is in state '{s}'. Cannot execute {c}.".format(
@@ -31,7 +35,7 @@ def __init__(self, *, attempted_command: str, state: str):
         self.state = state
 
 
-class NodeError(Exception):
+class NodeError(Error):
     def __init__(self, error: str):
         super().__init__(
             "At least one node raised an error: " + error)