major refactoring to do better generic directories

1 files changed, 11 insertions, 63 deletions

diff --git a/modules/package.py b/modules/package.py
index b548c58..4efb186 100644
--- a/modules/package.py
+++ b/modules/package.py
@@ -17,74 +17,27 @@
 #
 
 from __future__ import with_statement
-import tarfile
 
-from os import makedirs, getcwd
-from os.path import abspath, join, split, splitext, basename, exists
-from configobj import ConfigObj
-from subprocess import Popen, PIPE
-from urllib import urlretrieve
 
-from base.module import Module
 from base.base import log
 from base.exceptions import ExecutionException
 from base.util import pwd, copy
 from base.profiles import ver_rel
 
-#TODO: Find universal library for parsing URLs and PATHs alike
+from modules.directory import Directory
 
-class Package(Module):
-    def __init__(self, name=None):
-        if not name:
-            log.debug('no name with package')
-            cwd = getcwd()
-            log.debug(split(cwd))
-            if self.is_dir_pkg(cwd):
-                self.load_pkg(cwd)
-            else:
-                self.make_pkg(cwd)
-            name = split(getcwd())[1]
-            
-            self.code_dir = getcwd()
-            #detect name somehow
-        else:
-            log.debug('package.init with name ' + name)
-            dir = abspath(name)
-            if not exists(dir):
-                makedirs(dir)
-            if self.is_dir_pkg(dir):
-                self.load_pkg(dir)
-            else:
-                self.make_pkg(dir)
 
-    def is_dir_pkg(self, dir):
-        with pwd(dir):
-            cfg = ConfigObj('.devshell')
-            try:
-                if cfg['type'] == 'package':
-                    log.debug('is type package')
-                    return True
-                else:
-                    return False
-            except KeyError, e:
-                return False
-
-    def load_pkg(self, dir):
-        log.debug('package.load_pkg')
-        with pwd(dir):
-            self.cfg = ConfigObj('.devshell')
-        self.name = self.cfg['name']
-        self.code_dir = self.cfg['code_dir']
+class Package(Directory):
+    _type = 'package'
+    def load_dir(self, dir):
+        super(Package, self).load_dir(dir)
+        # this is a hack for some refactoring backwards compatibility
+        #TODO: replace code_dir with just dir
+        self.code_dir = self.cfg['dir']
 
-    def make_pkg(self, dir):
-        log.debug('package.make_pkg')
-        with pwd(dir):
-            name = split(getcwd())[1]
-            self.cfg = ConfigObj('.devshell')
-            self.cfg['type'] = 'package'
-            self.cfg['name'] = self.name = name
-            self.cfg['code_dir'] = self.code_dir = dir
-            self.cfg.write()
+    def make_dir(self, dir):
+        super(Package, self).make_dir(dir)
+        self.code_dir = dir
 
     def add_spec(self, spec_file):
         log.debug('spec_file is %s' % spec_file)
@@ -96,11 +49,6 @@ class Package(Module):
                 log.error(str(e))
                 raise ExecutionException(e, 'spec-file could not be added')
 
-    def close(self):
-        log.debug('writing self.cfg for package')
-        with pwd(self.code_dir):
-            self.cfg.write()
-
     @property
     def spec_file(self):
         return self.name + '.spec'