# HG changeset patch # User cmlenz # Date 1119566865 0 # Node ID 80bc0fae3ed101beea5434dd6146f7a211bfdbd5 # Parent ab569c55c835e57a3038aef75a4f47c54533ef4f Renamed {{{Configuration}}} to {{{BuildConfig}}}. diff --git a/bitten/master.py b/bitten/master.py --- a/bitten/master.py +++ b/bitten/master.py @@ -23,7 +23,7 @@ from trac.env import Environment from bitten import __version__ as VERSION -from bitten.model import Build, Configuration +from bitten.model import Build, BuildConfig from bitten.util import archive, beep, xmlio @@ -50,7 +50,7 @@ try: repos.sync() - for config in Configuration.select(self.env): + for config in BuildConfig.select(self.env): node = repos.get_node(config.path) if (node.path, node.rev) in self.build_queue: # Builds already pending diff --git a/bitten/model.py b/bitten/model.py --- a/bitten/model.py +++ b/bitten/model.py @@ -23,7 +23,7 @@ schema_version = 1 -class Configuration(object): +class BuildConfig(object): """Representation of a build configuration.""" _table = Table('bitten_config', key='name')[ @@ -106,7 +106,7 @@ "FROM bitten_config WHERE active=1 " "ORDER BY name") for name, path, label, active, description in cursor: - config = Configuration(env) + config = BuildConfig(env) config.name = name config.path = path or '' config.label = label or '' diff --git a/bitten/trac_ext/main.py b/bitten/trac_ext/main.py --- a/bitten/trac_ext/main.py +++ b/bitten/trac_ext/main.py @@ -22,7 +22,7 @@ from trac.core import * from trac.env import IEnvironmentSetupParticipant -from bitten.model import Build, Configuration, schema_version +from bitten.model import Build, BuildConfig, schema_version from bitten.trac_ext import web_ui class BuildSystem(Component): @@ -35,7 +35,7 @@ # Create the required tables db = self.env.get_db_cnx() cursor = db.cursor() - for table in [Build._table, Configuration._table]: + for table in [Build._table, BuildConfig._table]: cursor.execute(db.to_sql(table)) tarballs_dir = os.path.join(self.env.path, 'snapshots') diff --git a/bitten/trac_ext/web_ui.py b/bitten/trac_ext/web_ui.py --- a/bitten/trac_ext/web_ui.py +++ b/bitten/trac_ext/web_ui.py @@ -25,7 +25,7 @@ from trac.web.chrome import INavigationContributor from trac.web.main import IRequestHandler from trac.wiki import wiki_to_html -from bitten.model import Configuration +from bitten.model import BuildConfig class BuildModule(Component): @@ -155,7 +155,7 @@ if 'cancel' in req.args.keys(): req.redirect(self.env.href.build()) - config = Configuration(self.env) + config = BuildConfig(self.env) config.name = req.args.get('name') config.active = req.args.has_key('active') config.label = req.args.get('label', '') @@ -170,7 +170,7 @@ if 'cancel' in req.args.keys(): req.redirect(self.env.href.build(config_name)) - config = Configuration(self.env, config_name) + config = BuildConfig(self.env, config_name) config.name = req.args.get('name') config.active = req.args.has_key('active') config.label = req.args.get('label', '') @@ -182,7 +182,7 @@ def _render_overview(self, req): req.hdf['title'] = 'Build Status' - configurations = Configuration.select(self.env, include_inactive=True) + configurations = BuildConfig.select(self.env, include_inactive=True) for idx, config in enumerate(configurations): description = config.description if description: @@ -195,7 +195,7 @@ req.hdf['build.mode'] = 'overview' def _render_config(self, req, config_name): - config = Configuration(self.env, config_name) + config = BuildConfig(self.env, config_name) req.hdf['title'] = 'Build Configuration "%s"' \ % escape(config.label or config.name) description = config.description @@ -209,7 +209,7 @@ req.hdf['build.mode'] = 'view_config' def _render_config_form(self, req, config_name=None): - config = Configuration(self.env, config_name) + config = BuildConfig(self.env, config_name) if config.exists: req.hdf['title'] = 'Edit Build Configuration "%s"' \ % escape(config.label or config.name)