build: refactoring the delegated build, removing awkward create-link script

Author: Sam Kleinman

bin/archive/mongodb_docs_meta.py

@@ -1785,9 +1785,23 @@ outputs:
   - 'manual'
 ---
 redirect-path: '/tutorial/change-user-password'
-url-base: 'tutorial/control-access-to-mongodb-with-authentication'
+url-base: '/tutorial/control-access-to-mongodb-with-authentication'
 type: 'redirect'
 code: 303
 outputs:
   - 'v2.2'
+---
+redirect-path: '/tutorials'
+url-base: '/tutorial'
+type: 'redirect'
+code: 303
+outputs:
+  - 'all'
+---
+redirect-path: '/reference/methods'
+url-base: '/reference/method'
+type: 'redirect'
+code: 303
+outputs:
+  - 'all'
 ...

bin/create-link

@@ -7,10 +7,12 @@
 
 import utils
 from makecloth import MakefileCloth
+from docs_meta import render_paths
 
 # to add a symlink build process, add a tuple to the ``links`` in the builder definitions file.
 
 m = MakefileCloth()
+paths = render_paths('dict')
 
 def make_all_links(links):
     m.comment('each link is created in the root and then moved into place using the "create-link" script.', block='header')
@@ -22,28 +24,20 @@ def make_all_links(links):
     m.comment('meta-targets for testing/integration with rest of the build. must apear at the end', block='footer')
     m.newline(block='footer')
 
-    m.target('.PHONY', 'links clean-links $(public-output)/manual', block='footer')
+    m.target('.PHONY', ['links', 'clean-links', '{0}/manual'.format(paths['public'])], block='footer')
     m.target('links', '$(LINKS)', block='footer')
     m.newline(block='footer')
     m.target('clean-links', block='footer')
     m.job('rm -rf $(LINKS)', True)
 
-def make_link(make_target, link_target, makefile_block):
-    link_location = make_target.rsplit('/', 1)[0] + '/'
+def make_link(link_path, referent, block):
+    if block == 'content':
+        m.append_var('LINKS', link_path)
 
-    if makefile_block == 'use':
-        m.target(link_location, '$(public-branch-output)', makefile_block)
+    m.target(link_path, block=block)
 
-    if makefile_block == 'content':
-        m.target(make_target, '', makefile_block)
-    else:
-        m.append_var('LINKS', make_target, makefile_block)
-        m.target(make_target, link_location, makefile_block)
-
-
-    m.job('@bin/create-link %s $(notdir $@) %s' % ( link_target, link_location), makefile_block)
-    m.msg('[symlink]: created a link at: %s' % make_target, makefile_block)
-    m.newline(block=makefile_block)
+    m.job(job='fab process.input:{0} process.output:{1} process.create_link'.format(referent, link_path), block=block)
+    m.newline(block=block)
 
 def main():
     conf_file = utils.get_conf_file(__file__)

bin/delegated-build

@@ -16,12 +16,4 @@ type: 'structural'
 link-path: '$(public-branch-output)/MongoDB-Manual.epub'
 referent: 'MongoDB-Manual-$(current-branch).epub'
 type: 'content'
----
-link-path: '$(public-branch-output)/tutorials'
-referent: 'tutorial'
-type: 'use'
----
-link-path: '$(public-branch-output)/reference/methods'
-referent: 'method'
-type: 'use'
 ...

bin/htaccess.yaml

@@ -16,7 +16,7 @@ def pdf_makefile(name, tag):
     name_tagged = '-'.join([name, tag])
     name_tagged_pdf = name_tagged + '.pdf'
     name_tagged_branch_pdf = '-'.join([name, tag,  utils.get_branch()]) + '.pdf'
-    
+
     generated_latex = '{0}/latex/{1}.tex'.format(paths['branch-output'], name)
     built_tex = '{0}/latex/{1}.tex'.format(paths['branch-output'], name_tagged)
 
@@ -38,7 +38,7 @@ def pdf_makefile(name, tag):
     m.msg('[pdf]: migrated ' + staged_pdf)
 
     m.target(target=staged_pdf, dependency=staged_pdf_branch)
-    m.job('{0}/create-link {1} {2} {3}'.format(paths['tools'], name_tagged_branch_pdf, name_tagged_pdf, paths['branch-staging']))
+    m.job('fab process.input:{0} process.output:{1} process.create_link'.format(name_tagged_branch_pdf, staged_pdf))
     m.msg('[pdf]: created link for ' + staged_pdf)
 
     m.comment('adding ' + name + '.pdf to the build dependency.')

bin/makecloth/links.py

@@ -49,9 +49,8 @@ def build_texinfo_manual(info):
     m.msg('[build]: migrated $@')
 
     final_output = '$(public-branch-output)/' + info + '-info.tar.gz'
-    m.target(target=final_output,
-             dependency='$(public-branch-output)/' + ofile)
-    m.job('$(build-tools)/create-link $(notdir $<) $(notdir $@) $(dir $@)')
+    m.target(target=final_output, dependency='$(public-branch-output)/' + ofile)
+    m.job('fab process.input:{0} process.output:{1} process.create_link'.format(ofile, final_output))
     m.append_var('INFO_OUTPUT', final_output, block='content')
 
 

bin/makecloth/links.yaml

@@ -15,6 +15,27 @@ def md5_file(file, block_size=2**20):
 
     return md5.hexdigest()
 
+def run_command(cmd, path, output=None):
+    if output is None:
+        try:
+            output = subprocess.DEVNULL
+        except AttributeError:
+             output = open(os.devnull, 'w')
+
+    p = subprocess.Popen(cmd, cwd=path, stdout=output, stderr=output)
+    p.wait()
+
+def get_command_values(cmd, path):
+    p = subprocess.Popen(cmd, cwd=path, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    r = p.communicate()
+    return r[0].decode().split('\n')[:-1]
+
+def log_command_output(cmd, path, logfile, wait=False):
+    with open(logfile, 'a') as f:
+        p = subprocess.Popen(cmd, cwd=path, stdout=f, stderr=f)
+        if wait is True:
+            p.wait()
+
 def shell_value(args, path=None):
     if path is None:
         path = os.getcwd()

bin/makecloth/pdfs.py

@@ -8,6 +8,7 @@
 import git
 import intersphinx
 import process
+import delegated
 
 import fabric
 fabric.state.output.status = False