Refactored and split apart exceptions

2 files changed, 106 insertions, 96 deletions

diff --git a/cbc/environment.py b/cbc/environment.py
index 78b64cc..34d77b2 100755
--- a/cbc/environment.py
+++ b/cbc/environment.py
@@ -1,7 +1,8 @@
 import os

+from .exceptions import IncompleteEnv

+from tempfile import TemporaryDirectory

+import time

 

-class IncompleteEnv(Exception):

-    pass

 

 class Environment(object):

     def __init__(self, *args, **kwargs):

@@ -19,10 +20,17 @@ class Environment(object):
         

         if not os.path.exists(self.cbchome):

             os.makedirs(self.cbchome)

-            

+        

+        temp_prefix = os.path.basename(os.path.splitext(__name__)[0])

+        tempdir = TemporaryDirectory(prefix=temp_prefix, dir=self.cbchome)

+        self.working_dir = tempdir.name 

+        time.sleep(10)

         self.config['meta'] = self.join('meta.yaml')

         self.config['build'] = self.join('build.sh')

         self.config['build_windows'] = self.join('bld.bat')

+        print(self.working_dir)

         

     def join(self, path):

-        return os.path.join(self.cbchome, path)
\ No newline at end of file
+        return os.path.join(self.cbchome, path)

+            

+        
\ No newline at end of file
diff --git a/cbc/meta.py b/cbc/meta.py
index da6ce3b..0670304 100644..100755
--- a/cbc/meta.py
+++ b/cbc/meta.py
@@ -1,93 +1,95 @@
-'''I refuse to write the same thing over and over again in meta.yaml.
-And yeah, conda supports Jinja2, but ugh... No.
-'''
-
-import os
-import conda_build.metadata
-import yaml
-from configparser import SafeConfigParser, ExtendedInterpolation
-from collections import OrderedDict
-from .environment import Environment
-
-class SpecError(Exception):
-    pass
-
-class Spec(object):
-    def __init__(self, filename, env):
-        
-        if not os.path.exists(filename):
-            raise OSError('"{0}" does not exist.'.format(filename));
-        
-        self.filename = filename
-        
-        if not isinstance(env, Environment):
-            raise SpecError('Expecting instance of cbc.environment.Environment, got: "{0}"'.format(type(env)))
-        
-        self.env = env
-        self.keywords = ['build_ext', 'cgi']
-        
-        
-        self.fields = self.convert_conda_fields(conda_build.metadata.FIELDS)
-        self.config = SafeConfigParser(interpolation=ExtendedInterpolation(), allow_no_value=True)
-        # Include built-in Conda metadata fields
-        self.config.read_dict(self.fields)
-        # Include user-defined build fields
-        self.config.read(self.filename)
-        # Convert ConfigParser -> dict
-        self.spec = self.as_dict(self.config)
-        
-        self.spec_metadata = {}
-        for keyword in self.keywords:
-            if self.spec[keyword]:
-                self.spec_metadata[keyword] = self.spec[keyword]  
-
-        # Convert dict to YAML-compatible dict
-        self.conda_metadata = self.scrub(self.spec, self.keywords)
-
-    def conda_write_meta(self):
-        with open(os.path.join(self.env.config['meta']), 'w+') as metafile:
-            yaml.safe_dump(self.conda_metadata, metafile, default_flow_style=False, line_break=True, indent=4)
-
-    def convert_conda_fields(self, fields):
-        temp = OrderedDict()
-        for fkey, fval in fields.items():
-            temp[fkey] = { x: '' for x in fval}
-
-        return temp
-
-    def scrub(self, obj, force_remove=[]):
-        obj_c = obj.copy()
-        if isinstance(obj_c, dict):
-            for key,val in obj_c.items():
-                for reserved in force_remove:
-                    if reserved in key:
-                        del obj[reserved]
-                        continue
-                if isinstance(val, dict):
-                    val = self.scrub(val)
-                if val is None or val == {} or not val:
-                    del obj[key]
-
-        return obj
-
-
-    def as_dict(self, config):
-        """
-        Converts a ConfigParser object into a dictionary.
-
-        The resulting dictionary has sections as keys which point to a dict of the
-        sections options as key => value pairs.
-        """
-        the_dict = {}
-        for section in config.sections():
-            the_dict[section] = {}
-            for key, val in config.items(section):
-                for cast in (int, float, bool, str):
-                    try:
-                        the_dict[section][key] = cast(val)
-                    except ValueError:
-                        pass
-
-        return the_dict
-
+'''I refuse to write the same thing over and over again in meta.yaml.

+And yeah, conda supports Jinja2, but ugh... No.

+'''

+

+import os

+import conda_build.metadata

+import yaml

+from configparser import SafeConfigParser, ExtendedInterpolation

+from collections import OrderedDict

+from .environment import Environment

+from .exceptions import MetaDataError

+

+

+class MetaData(object):

+    def __init__(self, filename, env):

+        

+        if not os.path.exists(filename):

+            raise OSError('"{0}" does not exist.'.format(filename));

+        

+        self.filename = filename

+        

+        if not isinstance(env, Environment):

+            raise MetaDataError('Expecting instance of cbc.environment.Environment, got: "{0}"'.format(type(env)))

+        

+        self.env = env

+        self.keywords = ['cbc_build', 'cbc_cgi']

+        

+        

+        self.fields = self.convert_conda_fields(conda_build.metadata.FIELDS)

+        self.config = SafeConfigParser(interpolation=ExtendedInterpolation(), allow_no_value=True)

+        # Include built-in Conda metadata fields

+        self.config.read_dict(self.fields)

+        # Include user-defined build fields

+        self.config.read(self.filename)

+        # Convert ConfigParser -> dict

+        self.local = self.as_dict(self.config)

+        

+        self.local_metadata = {}

+        for keyword in self.keywords:

+            if keyword in self.local:

+                self.local_metadata[keyword] = self.local[keyword]  

+

+        # Convert dict to YAML-compatible dict

+        self.conda_metadata = self.scrub(self.local, self.keywords)

+        

+    def run(self):

+        self.conda_write_meta()

+

+    def conda_write_meta(self):

+        with open(os.path.join(self.env.config['meta']), 'w+') as metafile:

+            yaml.safe_dump(self.conda_metadata, metafile, default_flow_style=False, line_break=True, indent=4)

+

+    def convert_conda_fields(self, fields):

+        temp = OrderedDict()

+        for fkey, fval in fields.items():

+            temp[fkey] = { x: '' for x in fval}

+

+        return temp

+

+    def scrub(self, obj, force_remove=[]):

+        obj_c = obj.copy()

+        if isinstance(obj_c, dict):

+            for key,val in obj_c.items():

+                for reserved in force_remove:

+                    if reserved in key:

+                        del obj[reserved]

+                        continue

+                if isinstance(val, dict):

+                    val = self.scrub(val)

+                if val is None or val == {} or not val:

+                    del obj[key]

+

+        return obj

+

+

+    def as_dict(self, config):

+        """

+        Converts a ConfigParser object into a dictionary.

+

+        The resulting dictionary has sections as keys which point to a dict of the

+        sections options as key => value pairs.

+        """

+        the_dict = {}

+        for section in config.sections():

+            the_dict[section] = {}

+            for key, val in config.items(section):

+                for cast in (int, float, bool, str):

+                    try:

+                        the_dict[section][key] = cast(val)

+                    except ValueError:

+                        pass

+

+        return the_dict

+

     
\ No newline at end of file