Couple of bug fixes

 * Use integer division when calculating width for help formatter
 * In dbexec, if instance doesn't exist, don't just crash - report it as a runtime error properly

Author: waveform80

Diff for: dbsuite/instance.py

@@ -69,6 +69,9 @@ def get_instance(name=None):
             close_fds=True
         )
         output = p.communicate()[0]
+        if p.returncode != 0:
+            raise ValueError(
+                'Instance %s does not exist or cannot be sourced' % name)
         for line in output.splitlines():
             var, value = line.split('=', 1)
             result[var] = value

Diff for: dbsuite/main/__init__.py

@@ -46,7 +46,7 @@ class HelpFormatter(optparse.IndentedHelpFormatter):
     # Customize the width of help output
     def __init__(self):
         width = min(130, terminal_size()[0] - 2)
-        optparse.IndentedHelpFormatter.__init__(self, max_help_position=width/3, width=width)
+        optparse.IndentedHelpFormatter.__init__(self, max_help_position=width // 3, width=width)
 
 
 class OptionParser(optparse.OptionParser):
@@ -103,6 +103,7 @@ def __init__(self, usage=None, version=None, description=None):
             help='enables debug mode (runs under PDB)')
 
     def __call__(self, args=None):
+        import pdb; pdb.set_trace()
         if args is None:
             args = sys.argv[1:]
         (options, args) = self.parser.parse_args(self.expand_args(args))

Diff for: dbsuite/script.py

@@ -308,8 +308,11 @@ def test_connection(self, connection):
         """Utility routine for testing database logins prior to script execution."""
         saved_instance = None
         if connection.instance:
-            saved_instance = get_instance()
-            set_instance(get_instance(connection.instance))
+            try:
+                saved_instance = get_instance()
+                set_instance(get_instance(connection.instance))
+            except Exception, e:
+                raise ScriptRuntimeError(str(e))
         try:
             args = [
                 '-o', # enable output