Renamed 'interactive mode' to 'paused mode'.

guilhermechapiewski · Oct 6, 2009 · af5f3e9 · af5f3e9
1 parent c4fddd0
commit af5f3e9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/src/__init__.py b/src/__init__.py
@@ -28,10 +28,11 @@ def run():
         config.put('show_sql_only', options.show_sql_only)
         config.put('new_migration', options.new_migration)
         config.put('drop_db_first', options.drop_db_first)
-        config.put('interactive_mode', options.interactive_mode)
+        config.put('paused_mode', options.paused_mode)
 
+        # paused mode forces log_level to 2
         log_level = int(options.log_level)
-        if options.interactive_mode:
+        if options.paused_mode:
             log_level = 2
 
         config.put('log_level', log_level)

diff --git a/src/cli.py b/src/cli.py
@@ -36,12 +36,6 @@ def __config_parser(self):
                 default="simple-db-migrate.conf", 
                 help="Use a specific config file. If not provided, will search for 'simple-db-migrate.conf' in the current directory.")
 
-        self.__parser.add_option("-i", "--interactive", 
-                action="store_true", 
-                dest="interactive_mode", 
-                default=False, 
-                help="Execute in interactive mode. In this mode you will need to press <enter> key in order to execute each SQL command, making it easier to see what is being executed and helping debug. When interactive mode is enabled, log level is automatically set to [2].")
-
         self.__parser.add_option("-l", "--log-level", 
                 dest="log_level", 
                 default=1, 
@@ -57,6 +51,12 @@ def __config_parser(self):
                 default=None, 
                 help="Create migration file with the given nickname. The nickname should contain only lowercase characters and underscore '_'. Example: 'create_table_xyz'.")
 
+        self.__parser.add_option("-p", "--paused-mode", 
+                action="store_true", 
+                dest="paused_mode", 
+                default=False, 
+                help="Execute in 'paused' mode. In this mode you will need to press <enter> key in order to execute each SQL command, making it easier to see what is being executed and helping debug. When interactive mode is enabled, log level is automatically set to [2].")
+
         self.__parser.add_option("-v", "--version", 
                 action="store_true",
                 dest="simple_db_migrate_version", 

diff --git a/src/main.py b/src/main.py
@@ -104,8 +104,8 @@ def execute_migrations(self, current_version, destination_version, is_migration_
 
                 self.mysql.change(sql, migration_version, is_migration_up, execution_log=log)
 
-                # interactive mode
-                if self.config.get("interactive_mode"):
+                # paused mode
+                if self.config.get("paused_mode"):
                     try:
                         raw_input("* press <enter> to continue... ")
                     except KeyboardInterrupt:

diff --git a/tests/cli_test.py b/tests/cli_test.py
@@ -35,8 +35,8 @@ def test_it_should_configure_all_options(self):
         self.assertTrue(parser.has_option("-l"))
         self.assertTrue(parser.has_option("--log-level"))
 
-        self.assertTrue(parser.has_option("-i"))
-        self.assertTrue(parser.has_option("--interactive"))
+        self.assertTrue(parser.has_option("-p"))
+        self.assertTrue(parser.has_option("--paused-mode"))
 
     def test_it_should_show_error_message_and_exit(self):
         cli = CLI()