added super simple cache_key paster function for showing and cleaning cache keys

rhodecode/lib/paster_commands/cache_keys.py

@@ -0,0 +1,85 b''
+# -*- coding: utf-8 -*-
+"""
+    rhodecode.lib.paster_commands.cache_keys
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    cleanup-keys paster command for RhodeCode
+
+
+    :created_on: mar 27, 2013
+    :author: marcink
+    :copyright: (C) 2010-2013 Marcin Kuzminski <[e-mail]>
+    :license: GPLv3, see COPYING for more details.
+"""
+# 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, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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, see <http://www.gnu.org/licenses/>.
+from __future__ import with_statement
+
+import os
+import sys
+import logging
+
+from os.path import dirname as dn, join as jn
+from rhodecode.model.meta import Session
+#to get the rhodecode import
+rc_path = dn(dn(dn(os.path.realpath(__file__))))
+sys.path.append(rc_path)
+from rhodecode.lib.utils import BasePasterCommand
+
+from rhodecode.model.db import CacheInvalidation
+
+
+log = logging.getLogger(__name__)
+
+
+class Command(BasePasterCommand):
+
+    max_args = 1
+    min_args = 1
+
+    usage = "CONFIG_FILE"
+    group_name = "RhodeCode"
+    takes_config_file = -1
+    parser = BasePasterCommand.standard_parser(verbose=True)
+    summary = "Cache keys utils"
+
+    def command(self):
+        #get SqlAlchemy session
+        self._init_session()
+        _caches = CacheInvalidation.query().order_by(CacheInvalidation.cache_key).all()
+        if self.options.show:
+            for c_obj in _caches:
+                print 'key:%s active:%s' % (c_obj.cache_key, c_obj.cache_active)
+        elif self.options.cleanup:
+            for c_obj in _caches:
+                Session().delete(c_obj)
+                print 'removing key:%s' % (c_obj.cache_key)
+            Session().commit()
+        else:
+            print 'nothing done exiting...'
+        sys.exit(0)
+
+    def update_parser(self):
+        self.parser.add_option(
+            '--show',
+            action='store_true',
+            dest='show',
+            help=("show existing cache keys with together with status")
+        )
+
+        self.parser.add_option(
+            '--cleanup',
+            action="store_true",
+            dest="cleanup",
+            help="cleanup existing cache keys"
+        )

rhodecode/templates/base/base.html

@@ -1,341 +1,341 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="root.html"/>
 
 <!-- HEADER -->
 <div id="header-dd"></div>
 <div id="header">
     <div id="header-inner" class="title">
         <div id="logo">
             <h1><a href="${h.url('home')}">${c.rhodecode_name}</a></h1>
         </div>
         <!-- MENU -->
         ${self.page_nav()}
         <!-- END MENU -->
         ${self.body()}
     </div>
 </div>
 <!-- END HEADER -->
 
 <!-- CONTENT -->
 <div id="content">
     <div class="flash_msg">
         <% messages = h.flash.pop_messages() %>
         % if messages:
         <ul id="flash-messages">
             % for message in messages:
             <li class="${message.category}_msg">${message}</li>
             % endfor
         </ul>
         % endif
     </div>
     <div id="main">
         ${next.main()}
     </div>
 </div>
 <!-- END CONTENT -->
 
 <!-- FOOTER -->
 <div id="footer">
    <div id="footer-inner" class="title">
        <div>
            <p class="footer-link">
                 <a href="${h.url('bugtracker')}">${_('Submit a bug')}</a>
            </p>
            <p class="footer-link-right">
                <a href="${h.url('rhodecode_official')}">RhodeCode${'-%s' % c.rhodecode_instanceid if c.rhodecode_instanceid else ''}</a>
                ${c.rhodecode_version} &copy; 2010-${h.datetime.today().year} by Marcin Kuzminski
            </p>
        </div>
    </div>
 </div>
 <!-- END FOOTER -->
 
 ### MAKO DEFS ###
 <%def name="breadcrumbs()">
     <div class="breadcrumbs">
     ${self.breadcrumbs_links()}
     </div>
 </%def>
 
 <%def name="context_bar(current)">
     ${repo_context_bar(current)}
 </%def>
 
 <%def name="admin_menu()">
   <ul class="admin_menu">
       <li>${h.link_to(_('admin journal'),h.url('admin_home'),class_='journal ')}</li>
       <li>${h.link_to(_('repositories'),h.url('repos'),class_='repos')}</li>
       <li>${h.link_to(_('repository groups'),h.url('repos_groups'),class_='repos_groups')}</li>
       <li>${h.link_to(_('users'),h.url('users'),class_='users')}</li>
       <li>${h.link_to(_('user groups'),h.url('users_groups'),class_='groups')}</li>
       <li>${h.link_to(_('permissions'),h.url('edit_permission',id='default'),class_='permissions')}</li>
       <li>${h.link_to(_('ldap'),h.url('ldap_home'),class_='ldap')}</li>
       <li>${h.link_to(_('defaults'),h.url('defaults'),class_='defaults')}</li>
       <li class="last">${h.link_to(_('settings'),h.url('admin_settings'),class_='settings')}</li>
   </ul>
 </%def>
 
 <%def name="admin_menu_simple()">
   <ul>
       <li>${h.link_to(_('repository groups'),h.url('repos_groups'),class_='repos_groups')}</li>
   </ul>
 </%def>
 
 <%def name="repo_context_bar(current=None)">
   <%
       def follow_class():
           if c.repository_following:
               return h.literal('following')
           else:
               return h.literal('follow')
   %>
   <%
     def is_current(selected):
         if selected == current:
             return h.literal('class="current"')
     %>
 
   <!--- CONTEXT BAR -->
   <div id="context-bar" class="box">
       <div id="breadcrumbs">
         ${h.link_to(_(u'Repositories'),h.url('home'))}
         &raquo;
         ${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
       </div>
       <ul id="context-pages" class="horizontal-list">
         <li ${is_current('summary')}><a href="${h.url('summary_home', repo_name=c.repo_name)}" class="summary">${_('Summary')}</a></li>
         <li ${is_current('changelog')}><a href="${h.url('changelog_home', repo_name=c.repo_name)}" class="changelogs">${_('Changelog')}</a></li>
         <li ${is_current('files')}><a href="${h.url('files_home', repo_name=c.repo_name)}" class="files"></span>${_('Files')}</a></li>
         <li ${is_current('switch-to')}>
           <a href="#" id="branch_tag_switcher_2" class="dropdown switch-to"></span>${_('Switch To')}</a>
           <ul id="switch_to_list_2" class="switch_to submenu">
             <li><a href="#">${_('loading...')}</a></li>
           </ul>
         </li>
         <li ${is_current('options')}>
           <a href="#" class="dropdown options"></span>${_('Options')}</a>
           <ul>
              %if h.HasRepoPermissionAll('repository.admin')(c.repo_name):
                %if h.HasPermissionAll('hg.admin')('access settings on repository'):
                    <li>${h.link_to(_('Settings'),h.url('edit_repo',repo_name=c.repo_name),class_='settings')}</li>
                %else:
                    <li>${h.link_to(_('Settings'),h.url('repo_settings_home',repo_name=c.repo_name),class_='settings')}</li>
                %endif
              %endif
               %if c.rhodecode_db_repo.fork:
                <li>${h.link_to(_('Compare fork'),h.url('compare_url',repo_name=c.rhodecode_db_repo.fork.repo_name,org_ref_type='branch',org_ref='default',other_repo=c.repo_name,other_ref_type='branch',other_ref=request.GET.get('branch') or 'default', merge=1),class_='compare_request')}</li>
               %endif
               <li>${h.link_to(_('Lightweight changelog'),h.url('shortlog_home',repo_name=c.repo_name),class_='shortlog')}</li>
               <li>${h.link_to(_('Search'),h.url('search_repo',repo_name=c.repo_name),class_='search')}</li>
 
               %if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name) and c.rhodecode_db_repo.enable_locking:
                 %if c.rhodecode_db_repo.locked[0]:
                   <li>${h.link_to(_('Unlock'), h.url('toggle_locking',repo_name=c.repo_name),class_='locking_del')}</li>
                 %else:
                   <li>${h.link_to(_('Lock'), h.url('toggle_locking',repo_name=c.repo_name),class_='locking_add')}</li>
                 %endif
               %endif
-		      ## TODO: this check feels wrong, it would be better to have a check for permissions
-		      ## also it feels like a job for the controller
-		      %if c.rhodecode_user.username != 'default':
-		          <li>
-		           <a class="${follow_class()}" onclick="javascript:toggleFollowingRepo(this,${c.rhodecode_db_repo.repo_id},'${str(h.get_token())}');">
-		            <span class="show-follow">${_('Follow')}</span>
-		            <span class="show-following">${_('Unfollow')}</span>
-		          </a>
-		          </li>
-		          <li><a href="${h.url('repo_fork_home',repo_name=c.repo_name)}" class="fork">${_('Fork')}</a></li>
-		          %if h.is_hg(c.rhodecode_repo):
-		          <li><a href="${h.url('pullrequest_home',repo_name=c.repo_name)}" class="pull-request">${_('Create Pull Request')}</a></li>
-		          %endif
-		      %endif
+              ## TODO: this check feels wrong, it would be better to have a check for permissions
+              ## also it feels like a job for the controller
+              %if c.rhodecode_user.username != 'default':
+                  <li>
+                   <a class="${follow_class()}" onclick="javascript:toggleFollowingRepo(this,${c.rhodecode_db_repo.repo_id},'${str(h.get_token())}');">
+                    <span class="show-follow">${_('Follow')}</span>
+                    <span class="show-following">${_('Unfollow')}</span>
+                  </a>
+                  </li>
+                  <li><a href="${h.url('repo_fork_home',repo_name=c.repo_name)}" class="fork">${_('Fork')}</a></li>
+                  %if h.is_hg(c.rhodecode_repo):
+                  <li><a href="${h.url('pullrequest_home',repo_name=c.repo_name)}" class="pull-request">${_('Create Pull Request')}</a></li>
+                  %endif
+              %endif
              </ul>
         </li>
         <li ${is_current('showpullrequest')}>
           <a href="${h.url('pullrequest_show_all',repo_name=c.repo_name)}" title="${_('Show Pull Requests')}" class="pull-request">${_('Pull Requests')}
             %if c.repository_pull_requests:
               <span>${c.repository_pull_requests}</span>
             %endif
           </a>
         </li>
       </ul>
   </div>
   <script type="text/javascript">
       YUE.on('branch_tag_switcher_2','mouseover',function(){
          var loaded = YUD.hasClass('branch_tag_switcher_2','loaded');
          if(!loaded){
              YUD.addClass('branch_tag_switcher_2','loaded');
              ypjax("${h.url('branch_tag_switcher',repo_name=c.repo_name)}",'switch_to_list_2',
                  function(o){},
                  function(o){YUD.removeClass('branch_tag_switcher_2','loaded');}
                  ,null);
          }
          return false;
       });
   </script>
   <!--- END CONTEXT BAR -->
 </%def>
 
 <%def name="usermenu()">
     ## USER MENU
     <li>
       <a class="menu_link childs" id="quick_login_link">
           <span class="icon">
              <img src="${h.gravatar_url(c.rhodecode_user.email,20)}" alt="avatar">
           </span>
           %if c.rhodecode_user.username != 'default':
             <span class="menu_link_user">${c.rhodecode_user.username}</span>
             %if c.unread_notifications != 0:
               <span class="menu_link_notifications">${c.unread_notifications}</span>
             %endif
           %else:
               <span>${_('Not logged in')}</span>
           %endif
       </a>
 
   <div class="user-menu">
       <div id="quick_login">
         %if c.rhodecode_user.username == 'default':
             <h4>${_('Login to your account')}</h4>
             ${h.form(h.url('login_home',came_from=h.url.current()))}
             <div class="form">
                 <div class="fields">
                     <div class="field">
                         <div class="label">
                             <label for="username">${_('Username')}:</label>
                         </div>
                         <div class="input">
                             ${h.text('username',class_='focus')}
                         </div>
 
                     </div>
                     <div class="field">
                         <div class="label">
                             <label for="password">${_('Password')}:</label>
                         </div>
                         <div class="input">
                             ${h.password('password',class_='focus')}
                         </div>
 
                     </div>
                     <div class="buttons">
                         <div class="password_forgoten">${h.link_to(_('Forgot password ?'),h.url('reset_password'))}</div>
                         <div class="register">
                         %if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')():
                          ${h.link_to(_("Don't have an account ?"),h.url('register'))}
                         %endif
                         </div>
                         <div class="submit">
                             ${h.submit('sign_in',_('Log In'),class_="ui-btn xsmall")}
                         </div>
                     </div>
                 </div>
             </div>
             ${h.end_form()}
         %else:
             <div class="links_left">
                 <div class="full_name">${c.rhodecode_user.full_name_or_username}</div>
                 <div class="email">${c.rhodecode_user.email}</div>
                 <div class="big_gravatar"><img alt="gravatar" src="${h.gravatar_url(c.rhodecode_user.email,48)}" /></div>
                 ##<div class="notifications"><a href="${h.url('notifications')}">${_('Notifications')}</a></div>
                 <div class="unread"><a href="${h.url('notifications')}">${_('Unread notifications')}: ${c.unread_notifications}</a></div>
             </div>
             <div class="links_right">
             <ol class="links">
               ##<li>${h.link_to(_(u'Home'),h.url('home'))}</li>
               <li>${h.link_to(_(u'Journal'),h.url('journal'))}</li>
               <li>${h.link_to(_(u'My account'),h.url('admin_settings_my_account'))}</li>
               <li class="logout">${h.link_to(_(u'Log Out'),h.url('logout_home'))}</li>
             </ol>
             </div>
         %endif
       </div>
   </div>
 
     </li>
 </%def>
 
 <%def name="menu(current=None)">
         <%
         def is_current(selected):
             if selected == current:
                 return h.literal('class="current"')
         %>
         <ul id="quick" class="horizontal-list">
           <!-- repo switcher -->
           <li ${is_current('repositories')}>
               <a class="menu_link repo_switcher childs" id="repo_switcher" title="${_('Switch repository')}" href="${h.url('home')}">
               ${_('Repositories')}
               </a>
               <ul id="repo_switcher_list" class="repo_switcher">
                   <li>
                       <a href="#">${_('loading...')}</a>
                   </li>
               </ul>
           </li>
           ##ROOT MENU
           %if c.rhodecode_user.username != 'default':
             <li ${is_current('journal')}>
               <a class="menu_link journal" title="${_('Show recent activity')}"  href="${h.url('journal')}">
               ${_('Journal')}
               </a>
             </li>
           %else:
             <li ${is_current('journal')}>
               <a class="menu_link journal" title="${_('Public journal')}"  href="${h.url('public_journal')}">
               ${_('Public journal')}
               </a>
             </li>
           %endif
           <li ${is_current('search')}>
               <a class="menu_link search" title="${_('Search in repositories')}"  href="${h.url('search')}">
               ${_('Search')}
               </a>
           </li>
           % if h.HasPermissionAll('hg.admin')('access admin main page'):
             <li ${is_current('admin')}>
               <a class="menu_link admin childs" title="${_('Admin')}" href="${h.url('admin_home')}">
                 ${_('Admin')}
               </a>
               ${admin_menu()}
             </li>
           % elif c.rhodecode_user.groups_admin:
           <li ${is_current('admin')}>
               <a class="menu_link admin childs" title="${_('Admin')}" href="${h.url('admin_home')}">
                 ${_('Admin')}
               </a>
               ${admin_menu_simple()}
           </li>
           % endif
           ${usermenu()}
 <script type="text/javascript">
     YUE.on('repo_switcher','mouseover',function(){
       var target = 'q_filter_rs';
       var qfilter_activate = function(){
           var nodes = YUQ('ul#repo_switcher_list li a.repo_name');
           var func = function(node){
               return node.parentNode;
           }
           q_filter(target,nodes,func);
       }
 
       var loaded = YUD.hasClass('repo_switcher','loaded');
       if(!loaded){
          YUD.addClass('repo_switcher','loaded');
          ypjax("${h.url('repo_switcher')}",'repo_switcher_list',
              function(o){qfilter_activate();YUD.get(target).focus()},
              function(o){YUD.removeClass('repo_switcher','loaded');}
              ,null);
       }else{
          YUD.get(target).focus();
       }
       return false;
      });
 
      YUE.on('header-dd', 'click',function(e){
          YUD.addClass('header-inner', 'hover');
          YUD.addClass('content', 'hover');
      });
 
 </script>
 </%def>

setup.py

@@ -1,171 +1,172 b''
 import os
 import sys
 import platform
 
 if sys.version_info < (2, 5):
     raise Exception('RhodeCode requires python 2.5 or later')
 
 
 here = os.path.abspath(os.path.dirname(__file__))
 
 
 def _get_meta_var(name, data, callback_handler=None):
     import re
     matches = re.compile(r'(?:%s)\s*=\s*(.*)' % name).search(data)
     if matches:
         if not callable(callback_handler):
             callback_handler = lambda v: v
 
         return callback_handler(eval(matches.groups()[0]))
 
 _meta = open(os.path.join(here, 'rhodecode', '__init__.py'), 'rb')
 _metadata = _meta.read()
 _meta.close()
 
 callback = lambda V: ('.'.join(map(str, V[:3])) + '.'.join(V[3:]))
 __version__ = _get_meta_var('VERSION', _metadata, callback)
 __license__ = _get_meta_var('__license__', _metadata)
 __author__ = _get_meta_var('__author__', _metadata)
 __url__ = _get_meta_var('__url__', _metadata)
 # defines current platform
 __platform__ = platform.system()
 
 is_windows = __platform__ in _get_meta_var('PLATFORM_WIN', _metadata)
 
 requirements = [
     "waitress==0.8.2",
     "webob==1.0.8",
     "webtest==1.4.3",
     "Pylons==1.0.0",
     "Beaker==1.6.4",
     "WebHelpers==1.3",
     "formencode==1.2.4",
     "SQLAlchemy==0.7.10",
     "Mako==0.7.3",
     "pygments>=1.5",
     "whoosh>=2.4.0,<2.5",
     "celery>=2.2.5,<2.3",
     "babel",
     "python-dateutil>=1.5.0,<2.0.0",
     "dulwich>=0.8.7,<0.9.0",
     "markdown==2.2.1",
     "docutils==0.8.1",
     "simplejson==2.5.2",
     "mock",
 ]
 
 if sys.version_info < (2, 6):
     requirements.append("pysqlite")
 
 if sys.version_info < (2, 7):
     requirements.append("unittest2")
     requirements.append("argparse")
 
 if is_windows:
     requirements.append("mercurial==2.5.2")
 else:
     requirements.append("py-bcrypt")
     requirements.append("mercurial==2.5.2")
 
 
 dependency_links = [
 ]
 
 classifiers = [
     'Development Status :: 4 - Beta',
     'Environment :: Web Environment',
     'Framework :: Pylons',
     'Intended Audience :: Developers',
     'License :: OSI Approved :: GNU General Public License (GPL)',
     'Operating System :: OS Independent',
     'Programming Language :: Python',
     'Programming Language :: Python :: 2.5',
     'Programming Language :: Python :: 2.6',
     'Programming Language :: Python :: 2.7',
 ]
 
 
 # additional files from project that goes somewhere in the filesystem
 # relative to sys.prefix
 data_files = []
 
 # additional files that goes into package itself
 package_data = {'rhodecode': ['i18n/*/LC_MESSAGES/*.mo', ], }
 
 description = ('RhodeCode is a fast and powerful management tool '
                'for Mercurial and GIT with a built in push/pull server, '
                'full text search and code-review.')
 keywords = ' '.join(['rhodecode', 'rhodiumcode', 'mercurial', 'git',
                      'code review', 'repo groups', 'ldap'
                       'repository management', 'hgweb replacement'
                       'hgwebdir', 'gitweb replacement', 'serving hgweb', ])
 # long description
 try:
     readme_file = 'README.rst'
     changelog_file = 'docs/changelog.rst'
     long_description = open(readme_file).read() + '\n\n' + \
         open(changelog_file).read()
 
 except IOError, err:
     sys.stderr.write("[WARNING] Cannot find file specified as "
         "long_description (%s)\n or changelog (%s) skipping that file" \
             % (readme_file, changelog_file))
     long_description = description
 
 
 try:
     from setuptools import setup, find_packages
 except ImportError:
     from ez_setup import use_setuptools
     use_setuptools()
     from setuptools import setup, find_packages
 # packages
 packages = find_packages(exclude=['ez_setup'])
 
 setup(
     name='RhodeCode',
     version=__version__,
     description=description,
     long_description=long_description,
     keywords=keywords,
     license=__license__,
     author=__author__,
     author_email='[e-mail]',
     dependency_links=dependency_links,
     url=__url__,
     install_requires=requirements,
     classifiers=classifiers,
     setup_requires=["PasteScript>=1.6.3"],
     data_files=data_files,
     packages=packages,
     include_package_data=True,
     test_suite='nose.collector',
     package_data=package_data,
     message_extractors={'rhodecode': [
             ('**.py', 'python', None),
             ('templates/**.mako', 'mako', {'input_encoding': 'utf-8'}),
             ('templates/**.html', 'mako', {'input_encoding': 'utf-8'}),
             ('public/**', 'ignore', None)]},
     zip_safe=False,
     paster_plugins=['PasteScript', 'Pylons'],
     entry_points="""
     [console_scripts]
     rhodecode-api =  rhodecode.bin.rhodecode_api:main
 
     [paste.app_factory]
     main = rhodecode.config.middleware:make_app
 
     [paste.app_install]
     main = pylons.util:PylonsInstaller
 
     [paste.global_paster_command]
     setup-rhodecode=rhodecode.lib.paster_commands.setup_rhodecode:Command
     cleanup-repos=rhodecode.lib.paster_commands.cleanup:Command
     update-repoinfo=rhodecode.lib.paster_commands.update_repoinfo:Command
     make-rcext=rhodecode.lib.paster_commands.make_rcextensions:Command
     repo-scan=rhodecode.lib.paster_commands.repo_scan:Command
+    cache-keys=rhodecode.lib.paster_commands.cache_keys:Command
     make-index=rhodecode.lib.indexers:MakeIndex
     upgrade-db=rhodecode.lib.dbmigrate:UpgradeDb
     celeryd=rhodecode.lib.celerypylons.commands:CeleryDaemonCommand
     """,
 )