Mercurial > kallithea
changeset 2289:5893414dea91 beta
renamed setup module into a setup_rhodecode.
setup is coliding with some namespaces
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Thu, 17 May 2012 00:53:20 +0200 |
| parents | e24dcf2304a0 |
| children | 533a126dc9ab 982d8a80e048 |
| files | rhodecode/config/setup/__init__.py rhodecode/config/setup_rhodecode.py rhodecode/tests/functional/test_files.py setup.py |
| diffstat | 4 files changed, 89 insertions(+), 89 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/config/setup/__init__.py Thu May 17 00:49:53 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,87 +0,0 @@ -import os -from paste.script.appinstall import AbstractInstallCommand -from paste.script.command import BadCommand -from paste.deploy import appconfig - - -class SetupCommand(AbstractInstallCommand): - - default_verbosity = 1 - max_args = 1 - min_args = 1 - summary = "Setup an application, given a config file" - usage = "CONFIG_FILE" - - description = """\ - Note: this is an experimental command, and it will probably change - in several ways by the next release. - - Setup an application according to its configuration file. This is - the second part of a two-phase web application installation - process (the first phase is prepare-app). The setup process may - consist of things like creating directories and setting up - databases. - """ - - parser = AbstractInstallCommand.standard_parser( - simulate=True, quiet=True, interactive=True) - parser.add_option('--user', - action='store', - dest='username', - default=None, - help='Admin Username') - parser.add_option('--email', - action='store', - dest='email', - default=None, - help='Admin Email') - parser.add_option('--password', - action='store', - dest='password', - default=None, - help='Admin password min 6 chars') - parser.add_option('--repos', - action='store', - dest='repos_location', - default=None, - help='Absolute path to repositories location') - parser.add_option('--name', - action='store', - dest='section_name', - default=None, - help='The name of the section to set up (default: app:main)') - - def command(self): - config_spec = self.args[0] - section = self.options.section_name - if section is None: - if '#' in config_spec: - config_spec, section = config_spec.split('#', 1) - else: - section = 'main' - if not ':' in section: - plain_section = section - section = 'app:'+section - else: - plain_section = section.split(':', 1)[0] - if not config_spec.startswith('config:'): - config_spec = 'config:' + config_spec - if plain_section != 'main': - config_spec += '#' + plain_section - config_file = config_spec[len('config:'):].split('#', 1)[0] - config_file = os.path.join(os.getcwd(), config_file) - self.logging_file_config(config_file) - conf = appconfig(config_spec, relative_to=os.getcwd()) - ep_name = conf.context.entry_point_name - ep_group = conf.context.protocol - dist = conf.context.distribution - if dist is None: - raise BadCommand( - "The section %r is not the application (probably a filter). " - "You should add #section_name, where section_name is the " - "section that configures your application" % plain_section) - installer = self.get_installer(dist, ep_group, ep_name) - installer.setup_config( - self, config_file, section, self.sysconfig_install_vars(installer)) - self.call_sysconfig_functions( - 'post_setup_hook', installer, config_file) \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/rhodecode/config/setup_rhodecode.py Thu May 17 00:53:20 2012 +0200 @@ -0,0 +1,87 @@ +import os +from paste.script.appinstall import AbstractInstallCommand +from paste.script.command import BadCommand +from paste.deploy import appconfig + + +class SetupCommand(AbstractInstallCommand): + + default_verbosity = 1 + max_args = 1 + min_args = 1 + summary = "Setup an application, given a config file" + usage = "CONFIG_FILE" + + description = """\ + Note: this is an experimental command, and it will probably change + in several ways by the next release. + + Setup an application according to its configuration file. This is + the second part of a two-phase web application installation + process (the first phase is prepare-app). The setup process may + consist of things like creating directories and setting up + databases. + """ + + parser = AbstractInstallCommand.standard_parser( + simulate=True, quiet=True, interactive=True) + parser.add_option('--user', + action='store', + dest='username', + default=None, + help='Admin Username') + parser.add_option('--email', + action='store', + dest='email', + default=None, + help='Admin Email') + parser.add_option('--password', + action='store', + dest='password', + default=None, + help='Admin password min 6 chars') + parser.add_option('--repos', + action='store', + dest='repos_location', + default=None, + help='Absolute path to repositories location') + parser.add_option('--name', + action='store', + dest='section_name', + default=None, + help='The name of the section to set up (default: app:main)') + + def command(self): + config_spec = self.args[0] + section = self.options.section_name + if section is None: + if '#' in config_spec: + config_spec, section = config_spec.split('#', 1) + else: + section = 'main' + if not ':' in section: + plain_section = section + section = 'app:'+section + else: + plain_section = section.split(':', 1)[0] + if not config_spec.startswith('config:'): + config_spec = 'config:' + config_spec + if plain_section != 'main': + config_spec += '#' + plain_section + config_file = config_spec[len('config:'):].split('#', 1)[0] + config_file = os.path.join(os.getcwd(), config_file) + self.logging_file_config(config_file) + conf = appconfig(config_spec, relative_to=os.getcwd()) + ep_name = conf.context.entry_point_name + ep_group = conf.context.protocol + dist = conf.context.distribution + if dist is None: + raise BadCommand( + "The section %r is not the application (probably a filter). " + "You should add #section_name, where section_name is the " + "section that configures your application" % plain_section) + installer = self.get_installer(dist, ep_group, ep_name) + installer.setup_config( + self, config_file, section, self.sysconfig_install_vars(installer)) + self.call_sysconfig_functions( + 'post_setup_hook', installer, config_file)
--- a/rhodecode/tests/functional/test_files.py Thu May 17 00:49:53 2012 +0200 +++ b/rhodecode/tests/functional/test_files.py Thu May 17 00:53:20 2012 +0200 @@ -193,7 +193,7 @@ short = '27cd5cce30c9%s' % arch_ext fname = '27cd5cce30c96924232dffcd24178a07ffeb5dfc%s' % arch_ext filename = '%s-%s' % (HG_REPO, short) - response = self.app.get(url(controller='files', + response = self.app.get(url(controller='files', action='archivefile', repo_name=HG_REPO, fname=fname))
--- a/setup.py Thu May 17 00:49:53 2012 +0200 +++ b/setup.py Thu May 17 00:53:20 2012 +0200 @@ -94,7 +94,7 @@ main = pylons.util:PylonsInstaller [paste.global_paster_command] - setup-rhodecode=rhodecode.config.setup:SetupCommand + setup-rhodecode=rhodecode.config.setup_rhodecode:SetupCommand make-index=rhodecode.lib.indexers:MakeIndex make-rcext=rhodecode.config.rcextensions.make_rcextensions:MakeRcExt upgrade-db=rhodecode.lib.dbmigrate:UpgradeDb