kallithea Changeset - d09381593b12

Changeset - d09381593b12

Parent rev.

Child rev.

[Not reviewed]

default

1 2 0

Marcin Kuzminski - 15 years ago 2010-07-15 06:25:43
marcin@python-works.com

updated db manage script, and remove broken test

3 files changed with 25 insertions and 30 deletions:

pylons_app/lib/db_manage.py

pylons_app/lib/utils.py

pylons_app/tests/configparser_test.py

0 comments (0 inline, 0 general)

pylons_app/lib/db_manage.py

➞

Show inline comments

 #!/usr/bin/env python
 # encoding: utf-8
 # database managment for hg app
 # Copyright (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>
+#
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
 # This program is distributed in the hope that it will be useful,
@@ @@ -29,24 +29,20 @@ import os @@
 import sys
 import uuid
 ROOT = dn(dn(dn(os.path.realpath(__file__))))
 sys.path.append(ROOT)
 from pylons_app.lib.auth import get_crypt_password
 from pylons_app.lib.utils import ask_ok
 from pylons_app.model import init_model
 from pylons_app.model.db import User, Permission, HgAppUi, HgAppSettings
 from pylons_app.model import meta
 from sqlalchemy.engine import create_engine
 import logging
 log = logging.getLogger('db manage')
 log.setLevel(logging.DEBUG)
 console_handler = logging.StreamHandler()
 console_handler.setFormatter(logging.Formatter("%(asctime)s.%(msecs)03d"
                                   " %(levelname)-5.5s [%(name)s] %(message)s"))
 log.addHandler(console_handler)
 log = logging.getLogger(__name__)
 class DbManage(object):
     def __init__(self, log_sql):
         self.dbname = 'hg_app.db'
         dburi = 'sqlite:////%s' % jn(ROOT, self.dbname)
         engine = create_engine(dburi, echo=log_sql)
@@ @@ -66,29 +62,32 @@ class DbManage(object): @@
         """
         Create a auth database
         """
         self.check_for_db(override)
         if override:
             log.info("database exisist and it's going to be destroyed")
             if self.db_exists:
             destroy = ask_ok('Are you sure to destroy old database ? [y/n]')
             if not destroy:
                 sys.exit()
             if self.db_exists and destroy:
                 os.remove(jn(ROOT, self.dbname))
         meta.Base.metadata.create_all(checkfirst=override)
         checkfirst = not override
         meta.Base.metadata.create_all(checkfirst=checkfirst)
         log.info('Created tables for %s', self.dbname)
     def admin_prompt(self):
         import getpass
         username = raw_input('Specify admin username:')
         password = getpass.getpass('Specify admin password:')
         self.create_user(username, password, True)
     def config_prompt(self):
         log.info('Setting up repositories config')
         path = raw_input('Specify valid full path to your repositories'
                         ' you can change this later application settings:')
+                        ' you can change this later in application settings:')
         if not os.path.isdir(path):
             log.error('You entered wrong path')
             sys.exit()
         hooks = HgAppUi()

pylons_app/lib/utils.py

➞

Show inline comments

@@ @@ -13,26 +13,27 @@ @@
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 from beaker.cache import cache_region
 """
 Created on April 18, 2010
 Utilities for hg app
 @author: marcink
 """
 import os
 import logging
 from beaker.cache import cache_region
 from mercurial import ui, config, hg
 from mercurial.error import RepoError
 from pylons_app.model import meta
 from pylons_app.model.db import Repository, User, HgAppUi, HgAppSettings
 from pylons_app.model import meta
 from vcs.backends.base import BaseChangeset
 from vcs.utils.lazy import LazyProperty
 import logging
 import os
 log = logging.getLogger(__name__)
 def get_repo_slug(request):
     return request.environ['pylons.routes_dict'].get('repo_name')
@@ @@ -74,13 +75,21 @@ def check_repo(repo_name, base_path, ver @@
         return False
     except RepoError:
         #it means that there is no valid repo there...
         log.info('%s repo is free for creation', repo_name)
         return True
 def ask_ok(prompt, retries=4, complaint='Yes or no, please!'):
     while True:
         ok = raw_input(prompt)
         if ok in ('y', 'ye', 'yes'): return True
         if ok in ('n', 'no', 'nop', 'nope'): return False
         retries = retries - 1
         if retries < 0: raise IOError
         print complaint
 @cache_region('super_short_term', 'cached_hg_ui')
 def get_hg_ui_cached():
     try:
         sa = meta.Session
         ret = sa.query(HgAppUi).all()
     finally:
@@ @@ -167,14 +176,12 @@ def invalidate_cache(name, *args): @@
         region_invalidate(_get_repos_cached, None, *args)
     if name == 'full_changelog':
         from pylons_app.model.hg_model import _full_changelog_cached
         region_invalidate(_full_changelog_cached, None, *args)
 from vcs.backends.base import BaseChangeset
 from vcs.utils.lazy import LazyProperty
 class EmptyChangeset(BaseChangeset):
     revision = -1
     message = ''
     @LazyProperty

pylons_app/tests/configparser_test.py

➞

Show inline comments

deleted file

0 comments (0 inline, 0 general)