Merge branch 'master' into editorial/eav_attribute_options

Author: dobooth

.github/workflows/main.yml

@@ -17,6 +17,6 @@ jobs:
       with:
         ruby-version: 2.6
     - name: Install mdl gem
-      run: gem install mdl -v '0.7.0'
+      run: gem install mdl
     - name: Run mdl
       run: mdl --style=_checks/styles/style-rules-prod --ignore-front-matter --git-recurse -- .

Gemfile

@@ -11,7 +11,7 @@ gem 'wdm', platform: :mswin
 
 group :test do
   gem 'html-proofer'
-  gem 'mdl', '= 0.7.0'
+  gem 'mdl'
   gem 'launchy'
 end
 

Gemfile.lock

@@ -16,6 +16,7 @@ GEM
     algoliasearch (1.27.2)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
+    chef-utils (16.4.41)
     colorator (1.1.0)
     concurrent-ruby (1.1.6)
     em-websocket (0.5.1)
@@ -106,16 +107,19 @@ GEM
     listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    mdl (0.7.0)
-      kramdown (~> 2.0)
-      kramdown-parser-gfm (~> 1.0)
+    mdl (0.11.0)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.1)
       mixlib-cli (~> 2.1, >= 2.1.1)
       mixlib-config (>= 2.2.1, < 4)
+      mixlib-shellout
     mercenary (0.4.0)
     mini_portile2 (2.4.0)
-    mixlib-cli (2.1.6)
-    mixlib-config (3.0.6)
+    mixlib-cli (2.1.8)
+    mixlib-config (3.0.9)
       tomlrb
+    mixlib-shellout (3.1.4)
+      chef-utils
     multipart-post (2.1.1)
     netrc (0.11.0)
     nokogiri (1.10.9)
@@ -178,7 +182,7 @@ DEPENDENCIES
   jekyll-sitemap
   jekyll-titles-from-headings
   launchy
-  mdl (= 0.7.0)
+  mdl
   rake
   wdm
   whatsup_github

Rakefile

@@ -17,6 +17,9 @@ require 'colorator'
 # Require helper methods from the 'lib' directory
 Dir.glob('lib/**/*.rb') { |file| require_relative(file) }
 
+# Instantiate Docfile data for usage in tasks
+@content_map = DocConfig.new.content_map
+
 desc "Same as 'rake', 'rake preview'"
 task default: %w[preview]
 

_checks/styles/style-rules-prod

@@ -35,4 +35,4 @@ rule 'MD038' # Spaces inside code span elements
 exclude_rule 'MD039'
 rule 'MD040' # Fenced code blocks should have a language specified
 exclude_rule 'MD041'
-exclude_rule 'MD046'
+rule 'MD046'

rakelib/multirepo.rake

@@ -7,17 +7,15 @@ namespace :multirepo do
   desc 'Create a file tree for devdocs website and get all required content'
   task :init do
     protocol = ENV['token'] ? "https://#{ENV['token']}@github.com/" : '[email protected]:'
-    content_map = DocConfig.new.content_map
-    content_map.each do |subrepo|
+    @content_map.each do |subrepo|
       repo_url = protocol + subrepo['repository'] + '.git'
       add_subrepo(subrepo['directory'], repo_url , subrepo['branch'], subrepo['filter'])
     end
   end
 
   desc 'Reinitialize subrepositories. CAUTION: This will remove directories and associated git repositories listed in Docfile'
   task reinit: %w[clean] do
-    content_map = DocConfig.new.content_map
-    content_map.each do |subrepo|
+    @content_map.each do |subrepo|
       if subrepo['directory']
         puts "Removing #{subrepo['directory']}".yellow
         sh 'rm', '-rf', subrepo['directory']

rakelib/update.rake

@@ -49,14 +49,21 @@ namespace :update do
   task all: %w[devdocs subrepos]
 
   desc 'Update subrepositories only'
-  task subrepos: %w[mbi pb pbm mftf]
+  task :subrepos do
+    @content_map.each do |subrepo|
+      update_dir subrepo['directory']
+    end
+  end
 end
 
 def update_dir(dir)
   abort "Cannot find the #{dir} directory. You can run 'rake init' to create it and rerun 'rake update:all' again.".red unless Dir.exist? dir
   Dir.chdir dir do
+    puts "Updating #{dir}:".magenta
+
+    next warn "No branch to update" if `git status -sb`.include? 'no branch'
     sh 'git remote -v'
-    sh 'git pull'
+    sh 'git pull --no-recurse-submodules'
     sh 'git status -sb'
   end
 end