Mercurial > kallithea
changeset 548:b75b77ef649d
renamed hg_app to rhodecode
line wrap: on
line diff
--- a/.hgignore Wed Oct 06 03:18:16 2010 +0200 +++ b/.hgignore Wed Oct 06 03:22:52 2010 +0200 @@ -8,7 +8,7 @@ syntax: regexp ^\.pydevproject$ syntax: regexp -^hg_app\.db$ +^rhodecode\.db$ syntax: regexp ^test\.db$ syntax: regexp
--- a/MANIFEST.in Wed Oct 06 03:18:16 2010 +0200 +++ b/MANIFEST.in Wed Oct 06 03:22:52 2010 +0200 @@ -2,8 +2,8 @@ include README.rst include rhodecode/config/deployment.ini_tmpl -include hg_app_daemon -include hg_app_daemon2 +include rhodecode_daemon +include rhodecode_daemon2 recursive-include rhodecode/public/css * recursive-include rhodecode/public/images *
--- a/development.ini Wed Oct 06 03:18:16 2010 +0200 +++ b/development.ini Wed Oct 06 03:22:52 2010 +0200 @@ -94,7 +94,7 @@ ######################################################### ### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG ### ######################################################### -sqlalchemy.db1.url = sqlite:///%(here)s/hg_app.db +sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db #sqlalchemy.db1.echo = False #sqlalchemy.db1.pool_recycle = 3600 sqlalchemy.convert_unicode = true
--- a/init.d/hg_app_daemon Wed Oct 06 03:18:16 2010 +0200 +++ b/init.d/hg_app_daemon Wed Oct 06 03:22:52 2010 +0200 @@ -3,7 +3,7 @@ #### THIS IS AN GENTOO INIT.D SCRIPT#### ######################################## -APP_NAME="hg_app" +APP_NAME="rhodecode" APP_HOMEDIR="marcink/python_workspace" APP_PATH="/home/$APP_HOMEDIR/$APP_NAME"
--- a/init.d/hg_app_daemon2 Wed Oct 06 03:18:16 2010 +0200 +++ b/init.d/hg_app_daemon2 Wed Oct 06 03:22:52 2010 +0200 @@ -13,7 +13,7 @@ # Description: starts instance of hg-app using start-stop-daemon ### END INIT INFO -APP_NAME="hg_app" +APP_NAME="rhodecode" APP_HOMEDIR="marcink/python_workspace" APP_PATH="/home/$APP_HOMEDIR/$APP_NAME"
--- a/production.ini Wed Oct 06 03:18:16 2010 +0200 +++ b/production.ini Wed Oct 06 03:22:52 2010 +0200 @@ -94,7 +94,7 @@ ######################################################### ### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG ### ######################################################### -sqlalchemy.db1.url = sqlite:///%(here)s/hg_app.db +sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db #sqlalchemy.db1.echo = False #sqlalchemy.db1.pool_recycle = 3600 sqlalchemy.convert_unicode = true
--- a/rhodecode/config/deployment.ini_tmpl Wed Oct 06 03:18:16 2010 +0200 +++ b/rhodecode/config/deployment.ini_tmpl Wed Oct 06 03:22:52 2010 +0200 @@ -95,7 +95,7 @@ ######################################################### ### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG ### ######################################################### -sqlalchemy.db1.url = sqlite:///%(here)s/hg_app.db +sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db #sqlalchemy.db1.echo = False #sqlalchemy.db1.pool_recycle = 3600 sqlalchemy.convert_unicode = true
--- a/rhodecode/config/environment.py Wed Oct 06 03:18:16 2010 +0200 +++ b/rhodecode/config/environment.py Wed Oct 06 03:22:52 2010 +0200 @@ -4,7 +4,7 @@ from pylons.error import handle_mako_error from rhodecode.config.routing import make_map from rhodecode.lib.auth import set_available_permissions, set_base_path -from rhodecode.lib.utils import repo2db_mapper, make_ui, set_hg_app_config +from rhodecode.lib.utils import repo2db_mapper, make_ui, set_rhodecode_config from rhodecode.model import init_model from rhodecode.model.hg_model import _get_repos_cached_initial from sqlalchemy import engine_from_config @@ -72,7 +72,7 @@ repo2db_mapper(_get_repos_cached_initial(config['pylons.app_globals'], initial)) set_available_permissions(config) set_base_path(config) - set_hg_app_config(config) + set_rhodecode_config(config) # CONFIGURATION OPTIONS HERE (note: all config options will override # any Pylons config options)
--- a/rhodecode/controllers/admin/repos.py Wed Oct 06 03:18:16 2010 +0200 +++ b/rhodecode/controllers/admin/repos.py Wed Oct 06 03:22:52 2010 +0200 @@ -73,16 +73,16 @@ form_result = {} try: form_result = _form.to_python(dict(request.POST)) - repo_model.create(form_result, c.hg_app_user) + repo_model.create(form_result, c.rhodecode_user) invalidate_cache('cached_repo_list') h.flash(_('created repository %s') % form_result['repo_name'], category='success') if request.POST.get('user_created'): - action_logger(self.hg_app_user, 'user_created_repo', + action_logger(self.rhodecode_user, 'user_created_repo', form_result['repo_name'], '', self.sa) else: - action_logger(self.hg_app_user, 'admin_created_repo', + action_logger(self.rhodecode_user, 'admin_created_repo', form_result['repo_name'], '', self.sa) except formencode.Invalid as errors: @@ -176,7 +176,7 @@ return redirect(url('repos')) try: - action_logger(self.hg_app_user, 'admin_deleted_repo', + action_logger(self.rhodecode_user, 'admin_deleted_repo', repo_name, '', self.sa) repo_model.delete(repo) invalidate_cache('cached_repo_list')
--- a/rhodecode/controllers/admin/settings.py Wed Oct 06 03:18:16 2010 +0200 +++ b/rhodecode/controllers/admin/settings.py Wed Oct 06 03:22:52 2010 +0200 @@ -32,7 +32,7 @@ HasPermissionAnyDecorator from rhodecode.lib.base import BaseController, render from rhodecode.lib.utils import repo2db_mapper, invalidate_cache, \ - set_hg_app_config, get_hg_settings, get_hg_ui_settings, make_ui + set_rhodecode_config, get_hg_settings, get_hg_ui_settings, make_ui from rhodecode.model.db import User, UserLog, HgAppSettings, HgAppUi from rhodecode.model.forms import UserForm, ApplicationSettingsForm, \ ApplicationUiSettingsForm @@ -118,17 +118,17 @@ try: hgsettings1 = self.sa.query(HgAppSettings)\ .filter(HgAppSettings.app_settings_name == 'title').one() - hgsettings1.app_settings_value = form_result['hg_app_title'] + hgsettings1.app_settings_value = form_result['rhodecode_title'] hgsettings2 = self.sa.query(HgAppSettings)\ .filter(HgAppSettings.app_settings_name == 'realm').one() - hgsettings2.app_settings_value = form_result['hg_app_realm'] + hgsettings2.app_settings_value = form_result['rhodecode_realm'] self.sa.add(hgsettings1) self.sa.add(hgsettings2) self.sa.commit() - set_hg_app_config(config) + set_rhodecode_config(config) h.flash(_('Updated application settings'), category='success') @@ -231,7 +231,7 @@ GET /_admin/my_account Displays info about my account """ # url('admin_settings_my_account') - c.user = self.sa.query(User).get(c.hg_app_user.user_id) + c.user = self.sa.query(User).get(c.rhodecode_user.user_id) c.user_repos = [] for repo in c.cached_repo_list.values(): if repo.dbrepo.user.username == c.user.username: @@ -259,9 +259,9 @@ # method='put') # url('admin_settings_my_account_update', id=ID) user_model = UserModel() - uid = c.hg_app_user.user_id + uid = c.rhodecode_user.user_id _form = UserForm(edit=True, old_data={'user_id':uid, - 'email':c.hg_app_user.email})() + 'email':c.rhodecode_user.email})() form_result = {} try: form_result = _form.to_python(dict(request.POST)) @@ -270,7 +270,7 @@ category='success') except formencode.Invalid as errors: - c.user = self.sa.query(User).get(c.hg_app_user.user_id) + c.user = self.sa.query(User).get(c.rhodecode_user.user_id) c.user_repos = [] for repo in c.cached_repo_list.values(): if repo.dbrepo.user.username == c.user.username:
--- a/rhodecode/controllers/admin/users.py Wed Oct 06 03:18:16 2010 +0200 +++ b/rhodecode/controllers/admin/users.py Wed Oct 06 03:22:52 2010 +0200 @@ -72,7 +72,7 @@ user_model.create(form_result) h.flash(_('created user %s') % form_result['username'], category='success') - #action_logger(self.hg_app_user, 'new_user', '', '', self.sa) + #action_logger(self.rhodecode_user, 'new_user', '', '', self.sa) except formencode.Invalid as errors: return htmlfill.render( render('admin/users/user_add.html'),
--- a/rhodecode/controllers/login.py Wed Oct 06 03:18:16 2010 +0200 +++ b/rhodecode/controllers/login.py Wed Oct 06 03:22:52 2010 +0200 @@ -46,7 +46,7 @@ #redirect if already logged in c.came_from = request.GET.get('came_from', None) - if c.hg_app_user.is_authenticated: + if c.rhodecode_user.is_authenticated: return redirect(url('hg_home')) if request.POST: @@ -63,7 +63,7 @@ auth_user.user_id = user.user_id auth_user.name = user.name auth_user.lastname = user.lastname - session['hg_app_user'] = auth_user + session['rhodecode_user'] = auth_user session.save() log.info('user %s is now authenticated', username) @@ -138,7 +138,7 @@ return render('/password_reset.html') def logout(self): - session['hg_app_user'] = AuthUser() + session['rhodecode_user'] = AuthUser() session.save() log.info('Logging out and setting user as Empty') redirect(url('hg_home'))
--- a/rhodecode/controllers/settings.py Wed Oct 06 03:18:16 2010 +0200 +++ b/rhodecode/controllers/settings.py Wed Oct 06 03:22:52 2010 +0200 @@ -121,7 +121,7 @@ return redirect(url('hg_home')) try: - action_logger(self.hg_app_user, 'user_deleted_repo', + action_logger(self.rhodecode_user, 'user_deleted_repo', repo_name, '', self.sa) repo_model.delete(repo) invalidate_cache('cached_repo_list') @@ -156,11 +156,11 @@ try: form_result = _form.to_python(dict(request.POST)) form_result.update({'repo_name':repo_name}) - repo_model.create_fork(form_result, c.hg_app_user) + repo_model.create_fork(form_result, c.rhodecode_user) h.flash(_('fork %s repository as %s task added') \ % (repo_name, form_result['fork_name']), category='success') - action_logger(self.hg_app_user, 'user_forked_repo', + action_logger(self.rhodecode_user, 'user_forked_repo', repo_name, '', self.sa) except formencode.Invalid as errors: c.new_repo = errors.value['fork_name']
--- a/rhodecode/controllers/summary.py Wed Oct 06 03:18:16 2010 +0200 +++ b/rhodecode/controllers/summary.py Wed Oct 06 03:22:52 2010 +0200 @@ -54,7 +54,7 @@ uri = u'%(protocol)s://%(user)s@%(host)s%(prefix)s/%(repo_name)s' % { 'protocol': e.get('wsgi.url_scheme'), - 'user':str(c.hg_app_user.username), + 'user':str(c.rhodecode_user.username), 'host':e.get('HTTP_HOST'), 'prefix':e.get('SCRIPT_NAME'), 'repo_name':c.repo_name, }
--- a/rhodecode/lib/auth.py Wed Oct 06 03:18:16 2010 +0200 +++ b/rhodecode/lib/auth.py Wed Oct 06 03:22:52 2010 +0200 @@ -230,11 +230,11 @@ Gets user from session, and wraps permissions into user @param session: """ - user = session.get('hg_app_user', AuthUser()) + user = session.get('rhodecode_user', AuthUser()) if user.is_authenticated: user = fill_data(user) user = fill_perms(user) - session['hg_app_user'] = user + session['rhodecode_user'] = user session.save() return user @@ -248,7 +248,7 @@ return decorator(self.__wrapper, func) def __wrapper(self, func, *fargs, **fkwargs): - user = session.get('hg_app_user', AuthUser()) + user = session.get('rhodecode_user', AuthUser()) log.debug('Checking login required for user:%s', user.username) if user.is_authenticated: log.debug('user %s is authenticated', user.username) @@ -287,7 +287,7 @@ # _wrapper.__dict__.update(func.__dict__) # _wrapper.__doc__ = func.__doc__ - self.user_perms = session.get('hg_app_user', AuthUser()).permissions + self.user_perms = session.get('rhodecode_user', AuthUser()).permissions log.debug('checking %s permissions %s for %s', self.__class__.__name__, self.required_perms, func.__name__) @@ -378,7 +378,7 @@ self.repo_name = None def __call__(self, check_Location=''): - user = session.get('hg_app_user', False) + user = session.get('rhodecode_user', False) if not user: return False self.user_perms = user.permissions
--- a/rhodecode/lib/base.py Wed Oct 06 03:18:16 2010 +0200 +++ b/rhodecode/lib/base.py Wed Oct 06 03:22:52 2010 +0200 @@ -15,8 +15,8 @@ class BaseController(WSGIController): def __before__(self): - c.hg_app_version = __version__ - c.hg_app_name = config['hg_app_title'] + c.rhodecode_version = __version__ + c.rhodecode_name = config['rhodecode_title'] c.repo_name = get_repo_slug(request) c.cached_repo_list = _get_repos_cached() c.repo_switcher_list = _get_repos_switcher_cached(c.cached_repo_list) @@ -40,7 +40,7 @@ # available in environ['pylons.routes_dict'] try: #putting this here makes sure that we update permissions every time - self.hg_app_user = c.hg_app_user = auth.get_user(session) + self.rhodecode_user = c.rhodecode_user = auth.get_user(session) return WSGIController.__call__(self, environ, start_response) finally: meta.Session.remove()
--- a/rhodecode/lib/celerylib/tasks.py Wed Oct 06 03:18:16 2010 +0200 +++ b/rhodecode/lib/celerylib/tasks.py Wed Oct 06 03:22:52 2010 +0200 @@ -34,7 +34,7 @@ raise Exception('Could not get application settings !') settings = {} for each in ret: - settings['hg_app_' + each.app_settings_name] = each.app_settings_value + settings['rhodecode_' + each.app_settings_name] = each.app_settings_value return settings
--- a/rhodecode/lib/middleware/simplehg.py Wed Oct 06 03:18:16 2010 +0200 +++ b/rhodecode/lib/middleware/simplehg.py Wed Oct 06 03:22:52 2010 +0200 @@ -59,7 +59,7 @@ #=================================================================== username = REMOTE_USER(environ) if not username: - self.authenticate.realm = self.config['hg_app_realm'] + self.authenticate.realm = self.config['rhodecode_realm'] result = self.authenticate(environ) if isinstance(result, str): AUTH_TYPE.update(environ, 'basic')
--- a/rhodecode/lib/utils.py Wed Oct 06 03:18:16 2010 +0200 +++ b/rhodecode/lib/utils.py Wed Oct 06 03:22:52 2010 +0200 @@ -144,7 +144,7 @@ raise Exception('Could not get application settings !') settings = {} for each in ret: - settings['hg_app_' + each.app_settings_name] = each.app_settings_value + settings['rhodecode_' + each.app_settings_name] = each.app_settings_value return settings @@ -223,7 +223,7 @@ return baseui -def set_hg_app_config(config): +def set_rhodecode_config(config): hgsettings = get_hg_settings() for k, v in hgsettings.items():
--- a/rhodecode/model/db.py Wed Oct 06 03:18:16 2010 +0200 +++ b/rhodecode/model/db.py Wed Oct 06 03:22:52 2010 +0200 @@ -8,14 +8,14 @@ log = logging.getLogger(__name__) class HgAppSettings(Base): - __tablename__ = 'hg_app_settings' + __tablename__ = 'rhodecode_settings' __table_args__ = (UniqueConstraint('app_settings_name'), {'useexisting':True}) app_settings_id = Column("app_settings_id", INTEGER(), nullable=False, unique=True, default=None, primary_key=True) app_settings_name = Column("app_settings_name", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) app_settings_value = Column("app_settings_value", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) class HgAppUi(Base): - __tablename__ = 'hg_app_ui' + __tablename__ = 'rhodecode_ui' __table_args__ = {'useexisting':True} ui_id = Column("ui_id", INTEGER(), nullable=False, unique=True, default=None, primary_key=True) ui_section = Column("ui_section", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
--- a/rhodecode/model/forms.py Wed Oct 06 03:18:16 2010 +0200 +++ b/rhodecode/model/forms.py Wed Oct 06 03:22:52 2010 +0200 @@ -333,8 +333,8 @@ class _ApplicationSettingsForm(formencode.Schema): allow_extra_fields = True filter_extra_fields = False - hg_app_title = UnicodeString(strip=True, min=1, not_empty=True) - hg_app_realm = UnicodeString(strip=True, min=1, not_empty=True) + rhodecode_title = UnicodeString(strip=True, min=1, not_empty=True) + rhodecode_realm = UnicodeString(strip=True, min=1, not_empty=True) return _ApplicationSettingsForm
--- a/rhodecode/templates/admin/settings/settings.html Wed Oct 06 03:18:16 2010 +0200 +++ b/rhodecode/templates/admin/settings/settings.html Wed Oct 06 03:22:52 2010 +0200 @@ -82,19 +82,19 @@ <div class="field"> <div class="label"> - <label for="hg_app_title">${_('Application name')}:</label> + <label for="rhodecode_title">${_('Application name')}:</label> </div> <div class="input"> - ${h.text('hg_app_title',size=30)} + ${h.text('rhodecode_title',size=30)} </div> </div> <div class="field"> <div class="label"> - <label for="hg_app_realm">${_('Realm text')}:</label> + <label for="rhodecode_realm">${_('Realm text')}:</label> </div> <div class="input"> - ${h.text('hg_app_realm',size=30)} + ${h.text('rhodecode_realm',size=30)} </div> </div>
--- a/rhodecode/templates/admin/users/user_edit_my_account.html Wed Oct 06 03:18:16 2010 +0200 +++ b/rhodecode/templates/admin/users/user_edit_my_account.html Wed Oct 06 03:22:52 2010 +0200 @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${c.hg_app_user.username} ${_('account')} + ${c.rhodecode_user.username} ${_('account')} </%def> <%def name="breadcrumbs_links()">
--- a/rhodecode/templates/base/base.html Wed Oct 06 03:18:16 2010 +0200 +++ b/rhodecode/templates/base/base.html Wed Oct 06 03:22:52 2010 +0200 @@ -18,11 +18,11 @@ <ul id="logged-user"> <li class="first"> <div class="gravatar"> - <img alt="gravatar" src="${h.gravatar_url(c.hg_app_user.email,24)}" /> + <img alt="gravatar" src="${h.gravatar_url(c.rhodecode_user.email,24)}" /> </div> <div class="account"> - ${h.link_to('%s %s'%(c.hg_app_user.name,c.hg_app_user.lastname),h.url('admin_settings_my_account'))}<br/> - ${h.link_to(c.hg_app_user.username,h.url('admin_settings_my_account'))} + ${h.link_to('%s %s'%(c.rhodecode_user.name,c.rhodecode_user.lastname),h.url('admin_settings_my_account'))}<br/> + ${h.link_to(c.rhodecode_user.username,h.url('admin_settings_my_account'))} </div> </li> <li class="last highlight">${h.link_to(u'Logout',h.url('logout_home'))}</li> @@ -34,7 +34,7 @@ </div> <!-- logo --> <div id="logo"> - <h1><a href="${h.url('hg_home')}">${c.hg_app_name}</a></h1> + <h1><a href="${h.url('hg_home')}">${c.rhodecode_name}</a></h1> </div> <!-- end logo --> <!-- quick menu --> @@ -66,7 +66,7 @@ <!-- footer --> <div id="footer"> - <p>Hg App ${c.hg_app_version} © 2010 by Marcin Kuzminski</p> + <p>Hg App ${c.rhodecode_version} © 2010 by Marcin Kuzminski</p> <script type="text/javascript">${h.tooltip.activate()}</script> </div> <!-- end footer -->
--- a/rhodecode/templates/index.html Wed Oct 06 03:18:16 2010 +0200 +++ b/rhodecode/templates/index.html Wed Oct 06 03:22:52 2010 +0200 @@ -1,10 +1,10 @@ ## -*- coding: utf-8 -*- <%inherit file="base/base.html"/> <%def name="title()"> - ${c.hg_app_name} + ${c.rhodecode_name} </%def> <%def name="breadcrumbs()"> - ${c.hg_app_name} + ${c.rhodecode_name} </%def> <%def name="page_nav()"> ${self.menu('home')}
--- a/rhodecode/templates/search/search.html Wed Oct 06 03:18:16 2010 +0200 +++ b/rhodecode/templates/search/search.html Wed Oct 06 03:22:52 2010 +0200 @@ -10,7 +10,7 @@ :${c.cur_query} </%def> <%def name="breadcrumbs()"> - ${c.hg_app_name} + ${c.rhodecode_name} </%def> <%def name="page_nav()"> ${self.menu('home')}
--- a/rhodecode/tests/__init__.py Wed Oct 06 03:18:16 2010 +0200 +++ b/rhodecode/tests/__init__.py Wed Oct 06 03:22:52 2010 +0200 @@ -54,5 +54,5 @@ assert False, 'could not login using %s %s' % (username, password) assert response.status == '302 Found', 'Wrong response code from login got %s' % response.status - assert response.session['hg_app_user'].username == username, 'wrong logged in user got %s expected %s' % (response.session['hg_app_user'].username, username) + assert response.session['rhodecode_user'].username == username, 'wrong logged in user got %s expected %s' % (response.session['rhodecode_user'].username, username) return response.follow()
--- a/rhodecode/tests/functional/test_login.py Wed Oct 06 03:18:16 2010 +0200 +++ b/rhodecode/tests/functional/test_login.py Wed Oct 06 03:22:52 2010 +0200 @@ -15,7 +15,7 @@ {'username':'test_admin', 'password':'test12'}) assert response.status == '302 Found', 'Wrong response code from login got %s' % response.status - assert response.session['hg_app_user'].username == 'test_admin', 'wrong logged in user' + assert response.session['rhodecode_user'].username == 'test_admin', 'wrong logged in user' response = response.follow() assert 'auto description for vcs_test' in response.body @@ -25,7 +25,7 @@ 'password':'test12'}) print response assert response.status == '302 Found', 'Wrong response code from login got %s' % response.status - assert response.session['hg_app_user'].username == 'test_regular', 'wrong logged in user' + assert response.session['rhodecode_user'].username == 'test_regular', 'wrong logged in user' response = response.follow() assert 'auto description for vcs_test' in response.body assert '<a title="Admin" href="/_admin">' not in response.body