Anchor relative paths to the site config file.

Fixes #39
handroll · Sep 22, 2015 · a83908a · a83908a
1 parent a94a060
commit a83908a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/handroll/configuration.py b/handroll/configuration.py
@@ -52,9 +52,14 @@ def load_from_file(self, config_file):
             self.parser.readfp(f)
             if self.parser.has_option('site', 'domain'):
                 self._domain = self.parser.get('site', 'domain')
+
             if self.parser.has_option('site', 'outdir'):
-                self.outdir = os.path.abspath(os.path.expanduser(
-                    self.parser.get('site', 'outdir')))
+                outdir = os.path.expanduser(self.parser.get('site', 'outdir'))
+                if not os.path.isabs(outdir):
+                    path = os.path.dirname(config_file)
+                    outdir = os.path.abspath(os.sep.join([path, outdir]))
+                self.outdir = outdir
+
             if self.parser.has_section('site'):
                 self._find_extensions(self.parser)
 

diff --git a/handroll/tests/test_configuration.py b/handroll/tests/test_configuration.py
@@ -48,7 +48,7 @@ def test_build_config_from_file(self):
 
         config = configuration.build_config(f.name, args)
 
-        expected = os.path.join(os.getcwd(), 'out')
+        expected = os.path.join(os.path.dirname(f.name), 'out')
         self.assertEqual(expected, config.outdir)
 
     def test_finds_active_extensions(self):
@@ -97,4 +97,7 @@ def test_converts_relative_paths(self):
             f.write(conf_file.encode('utf-8'))
         config = configuration.Configuration()
         config.load_from_file(f.name)
-        self.assertEqual(os.path.abspath('..'), config.outdir)
+        # Relative output directories are anchored to the site config file.
+        self.assertEqual(
+            os.path.dirname(os.path.dirname(f.name)),
+            config.outdir)