Using OWM.userdir for config bundle loader/manager

owmeta_core/bundle/__init__.py

@@ -375,6 +375,7 @@ def __init__(self, ident, bundles_directory=DEFAULT_BUNDLES_DIRECTORY, version=N
         conf.update({'rdf.source': 'default'})
         self.version = version
         self.remotes = remotes
+        # XXX: Look at how we bring in projects remotes directory
         if not remotes_directory:
             remotes_directory = DEFAULT_REMOTES_DIRECTORY
         self.remotes_directory = realpath(expandvars(expanduser(remotes_directory)))

owmeta_core/command.py

@@ -1081,13 +1081,20 @@ def _conf(self, *args, read_only=False):
 
             deps = dat.get('dependencies', None)
             if deps:
-                cfg_builder = BundleDependentStoreConfigBuilder(read_only=read_only)
+                bundles_directory = self.bundle._bundles_directory()
+                remotes_directory = self.bundle._user_remotes_directory()
+                # XXX: Look at how we bring in projects remotes directory
+                cfg_builder = BundleDependentStoreConfigBuilder(bundles_directory=bundles_directory,
+                                                                remotes_directory=remotes_directory,
+                                                                read_only=read_only)
                 store_name, store_conf = cfg_builder.build(store_conf, deps)
                 dat['rdf.source'] = 'default'
                 dat['rdf.store'] = store_name
                 dat['rdf.store_conf'] = store_conf
 
-                self._bundle_dep_mgr = BundleDependencyManager(dependencies=lambda: deps)
+                self._bundle_dep_mgr = BundleDependencyManager(bundles_directory=bundles_directory,
+                                                               remotes_directory=remotes_directory,
+                                                               dependencies=lambda: deps)
 
             self._owm_connection = connect(conf=dat)
 

owmeta_core/commands/bundle.py

@@ -304,6 +304,12 @@ def fetch(self, bundle_id, bundle_version=None):
     def _bundles_directory(self):
         return p(self._parent.userdir, 'bundles')
 
+    def _user_remotes_directory(self):
+        return p(self._parent.userdir, 'remotes')
+
+    def _project_remotes_directory(self):
+        return p(self._parent.owmdir, 'remotes')
+
     def load(self, input_file_name):
         '''
         Load a bundle from a file and register it into the project

tests/OWMCLITest.py

@@ -135,7 +135,7 @@ def test_translator_list(owm_project):
 
 
 def test_translate_data_source_loader(owm_project):
-    owm = OWM(owmdir=p(owm_project.testdir, '.owm'))
+    owm = owm_project.owm()
     with owm.connect() as conn:
         with transaction.manager:
             # Create data sources
@@ -183,7 +183,7 @@ def test_translate_data_source_loader(owm_project):
 @mark.core_bundle_version(1)
 @mark.core_bundle
 def test_source_list(owm_project, core_bundle):
-    owm = OWM(owmdir=p(owm_project.testdir, '.owm'))
+    owm = owm_project.owm()
     deps = [{'id': 'openworm/owmeta-core', 'version': 1}]
     owm.config.set('dependencies', json.dumps(deps))
 

tests/conftest.py

@@ -140,7 +140,6 @@ def owm_project_with_customizations(request):
 
 @fixture
 def core_bundle(request):
-    print('core_bundle')
     CoreBundle = namedtuple('CoreBundle', ('id', 'version', 'source_directory', 'remote'))
     version_mark = request.node.get_closest_marker('core_bundle_version')
     if not version_mark:
@@ -199,7 +198,13 @@ def f(*args, **kwargs):
 
             res.owmdir = p(res.testdir, DEFAULT_OWM_DIR)
             res.default_context_id = default_context_id
-            res.owm = lambda **kwargs: OWM(owmdir=p(res.testdir, '.owm'), **kwargs)
+
+            def owm(**kwargs):
+                r = OWM(owmdir=p(res.testdir, '.owm'), **kwargs)
+                r.userdir = p(res.test_homedir, '.owmeta')
+                return r
+
+            res.owm = owm
 
             yield res
         finally: