Rebase Workspaces on Editable packages

conans/model/workspace.py

@@ -14,21 +14,26 @@
 class LocalPackage(object):
     def __init__(self, base_folder, data, cache, ws_layout, ws_generators):
         self._base_folder = base_folder
-        self._conanfile_folder = data.get("path")  # The folder with the conanfile
-        layout = data.get("layout")
+        self._conanfile_folder = data.pop("path", None)  # The folder with the conanfile
+        if self._conanfile_folder is None:
+            raise ConanException("Workspace editable does not define path")
+        layout = data.pop("layout", None)
         if layout:
-            self.layout = get_editable_abs_path(data.get("layout"), self._base_folder,
+            self.layout = get_editable_abs_path(layout, self._base_folder,
                                                 cache.conan_folder)
         else:
             self.layout = ws_layout
 
-        generators = data.get("generators")
+        generators = data.pop("generators", None)
         if isinstance(generators, str):
             generators = [generators]
         if generators is None:
             generators = ws_generators
         self.generators = generators
 
+        if data:
+            raise ConanException("Workspace unrecognized fields: %s" % data)
+
     @property
     def root_folder(self):
         return os.path.abspath(os.path.join(self._base_folder, self._conanfile_folder))
@@ -116,12 +121,18 @@ def _loads(self, text):
         if not self._root:
             raise ConanException("Conan workspace needs at least 1 root conanfile")
 
-        editables = yml.pop("editables", None)
+        editables = yml.pop("editables", {})
         for package_name, data in editables.items():
+            if not data:
+                raise ConanException("Workspace editable %s does not define data"
+                                     % str(package_name))
             workspace_package = LocalPackage(self._base_folder, data,
                                              self._cache, ws_layout, generators)
             package_name = ConanFileReference.loads(package_name)
             self._workspace_packages[package_name] = workspace_package
         for package_name in self._root:
             if package_name not in self._workspace_packages:
-                raise ConanException("Root %s is not a local package" % package_name)
+                raise ConanException("Root %s is not defined as editable" % str(package_name))
+
+        if yml:
+            raise ConanException("Workspace unrecognized fields: %s" % yml)

conans/test/integration/workspace_test.py

@@ -8,7 +8,10 @@
 
 from conans.client import tools
 from conans.test.utils.tools import TestClient
-from conans.util.files import load
+from conans.util.files import load, save
+from conans.test.utils.test_files import temp_folder
+from conans.model.workspace import Workspace
+from conans.errors import ConanException
 
 
 conanfile_build = """from conans import ConanFile, CMake
@@ -89,6 +92,66 @@ def package_info(self):
 
 
 class WorkspaceTest(unittest.TestCase):
+
+    def parse_test(self):
+        folder = temp_folder()
+        path = os.path.join(folder, "conanws.yml")
+        project = "root: Hellob/0.1@lasote/stable"
+        save(path, project)
+        with self.assertRaisesRegexp(ConanException,
+                                     "Root Hellob/0.1@lasote/stable is not defined as editable"):
+            Workspace(path, None)
+
+        project = dedent("""
+            editables:
+                HelloB/0.1@lasote/stable:
+                    path: B
+                    random: something
+            root: HelloB/0.1@lasote/stable
+            """)
+        save(path, project)
+
+        with self.assertRaisesRegexp(ConanException,
+                                     "Workspace unrecognized fields: {'random': 'something'}"):
+            Workspace(path, None)
+
+        project = dedent("""
+            editables:
+                HelloB/0.1@lasote/stable:
+                    path: B
+            root: HelloB/0.1@lasote/stable
+            random: something
+            """)
+        save(path, project)
+
+        with self.assertRaisesRegexp(ConanException,
+                                     "Workspace unrecognized fields: {'random': 'something'}"):
+            Workspace(path, None)
+
+        project = dedent("""
+            editables:
+                HelloB/0.1@lasote/stable:
+            root: HelloB/0.1@lasote/stable
+            """)
+        save(path, project)
+
+        with self.assertRaisesRegexp(ConanException,
+                                     "Workspace editable HelloB/0.1@lasote/stable "
+                                     "does not define data"):
+            Workspace(path, None)
+
+        project = dedent("""
+            editables:
+                HelloB/0.1@lasote/stable:
+                    layout: layout
+            root: HelloB/0.1@lasote/stable
+            """)
+        save(path, project)
+
+        with self.assertRaisesRegexp(ConanException,
+                                     "Workspace editable does not define path"):
+            Workspace(path, None)
+
     def simple_test(self):
         client = TestClient()