@@ -6,6 +6,8 @@ DATABASE_USER = "root" DATABASE_PASSWORD = "" DATABASE_NAME = "migration_example" +############################################################################### + # There is an alternative and convenient way to create your configuration # files making it possible to override values. If you use 'os.getenv' like # in the example below, you can pass value to override the default settings @@ -24,6 +26,14 @@ DATABASE_NAME = "migration_example" ############################################################################### +# In some cases you will not want to write database passwords in the config +# files (e.g. production databases passwords). You can configure the password +# to be asked for you in the command line. +# +# DATABASE_PASSWORD = "<<ask_me>>" + +############################################################################### + # Relative path from the location of this file. # You can put multiple directories if you want, separated by ':'. # The path can be absolute or relative (recommended). example/simple-db-migrate.conf @@ -1,3 +1,4 @@ +from getpass import getpass import codecs import sys @@ -11,12 +12,13 @@ SIMPLE_DB_MIGRATE_VERSION = '1.3.7' sys.stdout = codecs.getwriter('utf-8')(sys.stdout) def run(): + cli = CLI() try: - (options, args) = CLI().parse() + (options, args) = cli.parse() if options.simple_db_migrate_version: msg = 'simple-db-migrate v%s' % SIMPLE_DB_MIGRATE_VERSION - CLI().info_and_exit(msg) + cli.info_and_exit(msg) if options.show_colors: CLI.show_colors() @@ -36,11 +38,20 @@ def run(): log_level = 2 config.put('log_level', log_level) + + # Ask the password for user if configured + if config.get('db_password') == '<<ask_me>>': + cli.msg('\nPlease inform password to connect to database "%s@%s:%s"' % (config.get('db_user'), config.get('db_host'), config.get('db_name'))) + passwd = getpass() + config.remove('db_password') + config.put('db_password', passwd) # If CLI was correctly parsed, execute db-migrate. Main(config).execute() + except KeyboardInterrupt: + cli.info_and_exit("\nExecution interrupted by user...") except Exception, e: - CLI().error_and_exit(str(e)) + cli.error_and_exit(str(e)) if __name__ == '__main__': run() src/__init__.py @@ -23,7 +23,13 @@ class Config(object): if config_key in self._config: raise Exception("the configuration key '%s' already exists and you cannot override any configuration" % config_key) self._config[config_key] = config_value - + + def remove(self, config_key): + try: + del self._config[config_key] + except KeyError: + raise Exception("invalid configuration key ('%s')" % config_key) + def _parse_migrations_dir(self, dirs, config_dir=''): abs_dirs = [] for dir in dirs.split(':'): src/config.py @@ -106,10 +106,7 @@ class Main(object): # paused mode if self.config.get("paused_mode"): - try: - raw_input("* press <enter> to continue... ") - except KeyboardInterrupt: - self.cli.info_and_exit("\nExecution interrupted by the user...") + raw_input("* press <enter> to continue... ") # recording the last statement executed sql_statements_executed.append(sql) src/main.py @@ -101,6 +101,17 @@ MIGRATIONS_DIR = os.getenv('MIGRATIONS_DIR') or 'example' result = config.get_variable(locals(), 'weird_variable', 'weirdest_variable') assert result == weird_variable + + def test_it_should_delete_config(self): + config_path = os.path.abspath('sample.conf') + config = FileConfig(config_path) + config.put('sample_config', 'TEST') + + assert config.get('sample_config') == 'TEST' + + config.remove('sample_config') + + self.assertRaises(Exception, config.get, 'sample_config') class InPlaceConfigTest(unittest.TestCase): tests/config_test.py 21427d0de461921f60a5d867438b170eaa43b05c Guilherme Chapiewski guilherme.chapiewski@gmail.com http://github.com/guilhermechapiewski/simple-db-migrate/commit/56e0183cad7dd9afcdca8261b8b61a5a0e242925 56e0183cad7dd9afcdca8261b8b61a5a0e242925 2009-10-06T13:05:57-07:00 2009-10-06T13:05:57-07:00 #48: New option to ask for passwords instead of configuring them on the config file. 2944642a42afcca8af11eb789be6662372c9374b Guilherme Chapiewski guilherme.chapiewski@gmail.com