Merge remote-tracking branch 'steven/master'

doc/dev/todo/steven

@@ -1,16 +1,7 @@
 Object:
-   code_remote
-   code
-   gencode
-   gencode_remote
-
-   path_remote
-
-   explorer_out_dir
 
 
 Type:
-   type.manifest_path
 
 
 GlobalExplorer:

lib/cdist/core/object.py

@@ -108,6 +108,20 @@ class Object(object):
             DOT_CDIST
         )
 
+    @property
+    def code_local(self):
+        return os.path.join(self.path, "code-local")
+
+    @property
+    def code_remote(self):
+        return os.path.join(self.path, "code-remote")
+
+    @property
+    def explorer_out_dir(self):
+        path = os.path.join(self.path, "explorer")
+        if not os.path.isdir(path):
+            os.mkdir(path)
+        return path
 
     ### requirements
     @property

lib/cdist/core/type.py

@@ -70,11 +70,6 @@ class Type(object):
         except KeyError as e:
             raise cdist.MissingEnvironmentVariableError(e.args[0])
 
-    # FIXME: probably wrong place for this
-    @property
-    def remote_explorer_dir(self):
-        return os.path.join(self.remote_path, "explorer")
-
     @classmethod
     def list_types(cls):
         """Return a list of type instances"""
@@ -112,6 +107,23 @@ class Type(object):
             self.name
         ) 
 
+    # FIXME: probably wrong place for this
+    @property
+    def remote_explorer_dir(self):
+        return os.path.join(self.remote_path, "explorer")
+
+    @property
+    def manifest_path(self):
+        return os.path.join(self.path, "manifest")
+
+    @property
+    def gencode_local(self):
+        return os.path.join(self.path, "gencode-local")
+
+    @property
+    def gencode_remote(self):
+        return os.path.join(self.path, "gencode-remote")
+
     @property
     def is_singleton(self):
         """Check whether a type is a singleton."""