[Erp5-report] r36906 cedric.dsm - /erp5/trunk/utils/erp5.recipe.memcachedserver/src/erp5/re...

[nobody at svn.erp5.org]

Author: cedric.dsm
Date: Tue Jul  6 17:35:10 2010
New Revision: 36906

URL: http://svn.erp5.org?rev=36906&view=rev
Log:
Applying conventions on memcachedserver

Modified:
    erp5/trunk/utils/erp5.recipe.memcachedserver/src/erp5/recipe/memcachedserver/__init__.py

Modified: erp5/trunk/utils/erp5.recipe.memcachedserver/src/erp5/recipe/memcachedserver/__init__.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.memcachedserver/src/erp5/recipe/memcachedserver/__init__.py?rev=36906&r1=36905&r2=36906&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.recipe.memcachedserver/src/erp5/recipe/memcachedserver/__init__.py [utf8] (original)
+++ erp5/trunk/utils/erp5.recipe.memcachedserver/src/erp5/recipe/memcachedserver/__init__.py [utf8] Tue Jul  6 17:35:10 2010
@@ -30,13 +30,15 @@ class Recipe(object):
     self.egg = zc.recipe.egg.Egg(buildout, options['recipe'], options)
     self.logger=logging.getLogger(self.name)
 
-  def createDirIfNeeded(self, path):
-    # Checks directory existence. If not, creates it
+  def createDirectoryIfNeeded(self, path):
+    """ Checks directory existence. If not, creates it
+    """
+    print (path)
     if not os.path.isdir(path):
       self.logger.info("Creating %s directory..." % path)
       os.makedirs(path)
 
-  def install_script(self, script_name):
+  def installScript(self, script_name):
     """ Create default scripts
     """
     self.logger.info('Installing memcached wrapper script...')
@@ -45,7 +47,7 @@ class Recipe(object):
     memcached_bin_folder = options.get("memcached_bin_folder")
     memcached_conf_file = options.get("memcached_conf_file")
 
-    self.createDirIfNeeded(memcached_bin_folder)
+    self.createDirectoryIfNeeded(memcached_bin_folder)
     # Warning : if python2.4 is not installed with buildout you will get a
     # "ValueError: too many values to unpack" error.
     # To avoid this, make sure python2.4 is installed by buildout
@@ -53,14 +55,16 @@ class Recipe(object):
     # See https://bugs.launchpad.net/zc.buildout/+bug/421833 -
     requirements, ws = self.egg.working_set(['erp5.recipe.memcachedserver'])
     zc.buildout.easy_install.scripts(
-      [(script_name,'erp5.recipe.memcachedserver.ctl', 'main')],
+      [('wrapper','erp5.recipe.memcachedserver.ctl', 'main')],
       ws, options['executable'], memcached_bin_folder,
       arguments = ("\n        '%s/%s' ,"
                    "\n        '%s' " % (memcached_software_bin,
-                                         script_name,
-                                         memcached_conf_file)))
+                                        script_name,
+                                        memcached_conf_file)))
 
-  def build_configuration_file(self):
+  def buildConfigurationFile(self):
+    """ Creates configuration file
+    """
     config_file_location = self.options.get('memcached_conf_file')
     tcp_port = self.options.get('memcached_tcp_port')
     udp_port = self.options.get('memcached_udp_port')
@@ -75,7 +79,7 @@ class Recipe(object):
     key_size = self.options.get('memcached_key_size')
     threads = self.options.get('memcached_threads')
 
-    self.createDirIfNeeded(os.path.dirname(config_file_location))
+    self.createDirectoryIfNeeded(os.path.dirname(config_file_location))
     
     # Creates config file
     self.logger.info('Creating memcached config file...')
@@ -116,11 +120,11 @@ class Recipe(object):
 
 
   def install(self):
-    home = self.options.get('instancehome')
-    self.createDirIfNeeded(home)
+    home = self.options.get('memcached_instancehome')
+    self.createDirectoryIfNeeded(home)
     
-    self.build_configuration_file()
-    self.install_script('memcached')
+    self.buildConfigurationFile()
+    self.installScript('memcached')
     return []
 
   update = install