@@ -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) src/__init__.py @@ -36,12 +36,6 @@ class CLI(object): 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 @@ class CLI(object): 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", src/cli.py @@ -104,8 +104,8 @@ class Main(object): 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: src/main.py @@ -35,8 +35,8 @@ class CLITest(unittest.TestCase): 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() tests/cli_test.py c4fddd0761d6028a3975fcb5db47c9771a714343 Guilherme Chapiewski guilherme.chapiewski@gmail.com http://github.com/guilhermechapiewski/simple-db-migrate/commit/af5f3e9790b049e0a8a36ab2d21e2d6a50c5915d af5f3e9790b049e0a8a36ab2d21e2d6a50c5915d 2009-10-06T12:26:54-07:00 2009-10-06T12:26:54-07:00 Renamed 'interactive mode' to 'paused mode'. ae100ee8a80ecddb75fd484b4e2418f19f9ae230 Guilherme Chapiewski guilherme.chapiewski@gmail.com