Update infrastructure

Author: dshevtsov

.gitignore

@@ -24,8 +24,8 @@ _algolia_api_key
 # Docs from different repositories #
 ###################################
 
-/mbi/
-/page-builder/
-/page-builder-migration/
-/guides/m1x/
-/mftf/
+/src/mbi/
+/src/page-builder/
+/src/page-builder-migration/
+/src/guides/m1x/
+/src/mftf/

Docfile.yml

@@ -1,26 +1,26 @@
 content_map:
 -
-  directory: guides/m1x
+  directory: src/guides/m1x
   repository: magento/devdocs-m1
   branch: master
   filter: false
 -
-  directory: mbi
+  directory: src/mbi
   repository: magento/devdocs-mbi
   branch: master
   filter: true
 -
-  directory: mftf
+  directory: src/mftf
   repository: magento/magento2-functional-testing-framework
   branch: master
   filter: true
 -
-  directory: page-builder
+  directory: src/page-builder
   repository: magento/magento2-page-builder
   branch: 1.1-develop
   filter: true
 -
-  directory: page-builder-migration
+  directory: src/page-builder-migration
   repository: magento/magento2-page-builder-data-migration
   branch: 1.0.0-release
   filter: true

_config.yml

@@ -15,6 +15,10 @@ theme: devdocs
 # Base url that forms 
 baseurl: ""
 
+source: src
+
+plugins_dir: ./_plugins
+
 # Parameters for the version switcher. Numeric values must be wrapped in quotes.
 #
 version: "2.3"

_plugins/page-params/github-path.rb

@@ -15,11 +15,16 @@
   # Skip redirects
   next if page.name == 'redirect.html'
 
-  dir = File.dirname page.path
+  dir = File.join(
+    page.site.source,
+    File.dirname(page.path)
+  )
+  
   filename = File.basename page.path
 
   # Change to the parent directory of the page and read full file path
   # from git index.
-  page.data['github_path'] =
-    `cd #{dir} && git ls-files --full-name #{filename}`.strip
+  Dir.chdir(dir) do
+    page.data['github_path'] = `git ls-files --full-name #{filename}`.strip
+  end
 end

_plugins/page-params/last-modified-at.rb

@@ -24,10 +24,14 @@
   # Skip pages created by custom generators like 'mrg_pages'
   next if page.kind_of? Jekyll::PageWithoutAFile
 
-  # Read real path of the page. If this is a symlink read it to get path of the real file with content.
-  real_filepath = File.realpath page.path
-
-  dir = File.dirname real_filepath
+  # Add site.source to the page path
+  file_path = File.join(page.site.source, page.path)
+  
+  # Get real path of the page. If this is a symlink read it to get path of the real file with content.
+  real_filepath = File.realpath(file_path)
+
+  # Get a full path of the directory where the page is stored
+  dir = File.dirname(real_filepath)
 
   # Change directory to the parent directory of the page to read from the corresponding git history.
   Dir.chdir(dir) do

rakelib/update.rake

@@ -13,7 +13,7 @@ namespace :update do
   task :mbi do
     puts 'Updating MBI docs:'.magenta
     abort 'Cannot find the "mbi/" directory' unless Dir.exist? 'mbi'
-    Dir.chdir 'mbi' do
+    Dir.chdir 'src/mbi' do
       sh 'git remote -v'
       sh 'git pull'
       sh 'git status -sb'
@@ -24,7 +24,7 @@ namespace :update do
   task :m1 do
     puts 'Updating Magento 1 docs:'.magenta
     abort 'Cannot find the "mbi/" directory' unless Dir.exist? 'guides/m1x'
-    Dir.chdir 'guides/m1x' do
+    Dir.chdir 'src/guides/m1x' do
       sh 'git remote -v'
       sh 'git pull'
       sh 'git status -sb'
@@ -35,7 +35,7 @@ namespace :update do
   task :pb do
     puts 'Updating Page Builder docs:'.magenta
     abort 'Cannot find the "page-builder" directory' unless Dir.exist? 'page-builder'
-    Dir.chdir 'page-builder' do
+    Dir.chdir 'src/page-builder' do
       sh 'git remote -v'
       sh 'git pull'
       sh 'git status -sb'
@@ -46,7 +46,7 @@ namespace :update do
   task :pbm do
     puts 'Updating Page Builder Migration docs'.magenta
     abort 'Cannot find the "page-builder-migration" directory' unless Dir.exist? 'page-builder-migration'
-    Dir.chdir 'page-builder-migration' do
+    Dir.chdir 'src/page-builder-migration' do
       sh 'git remote -v'
       sh 'git pull'
       sh 'git status -sb'
@@ -57,7 +57,7 @@ namespace :update do
   task :mftf do
     puts 'Updating MFTF docs:'.magenta
     abort 'Cannot find the "mftf" directory' unless Dir.exist? 'mftf'
-    Dir.chdir 'mftf' do
+    Dir.chdir 'src/mftf' do
       sh 'git remote -v'
       sh 'git pull'
       sh 'git status -sb'