Issue #2109: Tons of linting fixes.

geerlingguy · geerlingguy · commit d5d32b9a12bb · 2020-11-23T16:58:19.000-06:00
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1,4 +1,4 @@
 # These are supported funding model platforms
-
+---
 github: geerlingguy
 patreon: geerlingguy
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,13 +24,21 @@ jobs:
         with:
           python-version: '3.x'
 
+      - name: Set up Ruby.
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6
+
       - name: Install test dependencies.
-        run: pip3 install yamllint ansible-lint
+        run: |
+          pip3 install yamllint
+          gem install rubocop
 
       - name: Lint code.
         run: |
           yamllint .
-          ansible-lint
+          rubocop ./Vagrantfile ./lib/drupalvm \
+            --except Metrics/LineLength,Security/Eval,Style/MutableConstant,Metrics/BlockLength,Metrics/MethodLength,Style/ConditionalAssignment,Style/IfUnlessModifier,Style/CaseLikeIf
 
   molecule:
     name: Molecule
@@ -44,18 +52,21 @@ jobs:
             playbook: converge.yml
           - distro: centos8
             playbook: converge.yml
-          # TODO:
-          #
-          # PHP 7.3
-          # local_config: tests/ubuntu-18-php73.config.yml
-          # DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/bin/drush"
-          # TEST_INSTALLED_EXTRAS: false
-          #
-          # Postgresql
-          # local_config: tests/ubuntu-18-postgresql.config.yml
-          # DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/bin/drush"
-          # config_dir: /var/www/drupalvm/config
-          # TEST_INSTALLED_EXTRAS: false
+
+            # PHP 7.3
+            # local_config: tests/ubuntu-18-php73.config.yml
+            # DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/bin/drush"
+            # TEST_INSTALLED_EXTRAS: false
+            # - distro: ubuntu1804
+            #   playbook: php-7.3.yml
+
+            # Postgresql
+            # local_config: tests/ubuntu-18-postgresql.config.yml
+            # DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/bin/drush"
+            # config_dir: /var/www/drupalvm/config
+            # TEST_INSTALLED_EXTRAS: false
+            # - distro: ubunt1804
+            #   playbook: postgresql.yml
 
     steps:
       - name: Check out the codebase.
diff --git a/.travis.yml b/.travis.yml
diff --git a/.yamllint b/.yamllint
@@ -0,0 +1,19 @@
+---
+extends: default
+
+rules:
+  line-length:
+    max: 200
+    level: warning
+  truthy:
+    allowed-values: ['true', 'false', 'yes', 'no']
+  braces:
+    min-spaces-inside: 1
+    max-spaces-inside: 1
+    min-spaces-inside-empty: -1
+    max-spaces-inside-empty: -1
+
+ignore: |
+  */stale.yml
+  */.travis.yml
+  provisioning/roles/
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 ![Drupal VM Logo](https://raw.githubusercontent.com/geerlingguy/drupal-vm/master/docs/images/drupal-vm-logo.png)
 
-[![Build Status](https://travis-ci.com/geerlingguy/drupal-vm.svg?branch=master)](https://travis-ci.com/geerlingguy/drupal-vm) [![Documentation Status](https://readthedocs.org/projects/drupal-vm/badge/?version=latest)](http://docs.drupalvm.com) [![Packagist](https://img.shields.io/packagist/v/geerlingguy/drupal-vm.svg)](https://packagist.org/packages/geerlingguy/drupal-vm) [![Docker Automated build](https://img.shields.io/docker/automated/geerlingguy/drupal-vm.svg?maxAge=2592000)](https://hub.docker.com/r/geerlingguy/drupal-vm/) [![](https://images.microbadger.com/badges/image/geerlingguy/drupal-vm.svg)](https://microbadger.com/images/geerlingguy/drupal-vm "Get your own image badge on microbadger.com") [![irc://irc.freenode.net/drupal-vm](https://img.shields.io/badge/irc.freenode.net-%23drupal--vm-brightgreen.svg)](https://riot.im/app/#/room/#drupal-vm:matrix.org)
+[![CI](https://github.com/geerlingguy/drupal-vm/workflows/CI/badge.svg?event=push)](https://github.com/geerlingguy/drupal-vm/actions?query=workflow%3ACI) [![Documentation Status](https://readthedocs.org/projects/drupal-vm/badge/?version=latest)](http://docs.drupalvm.com) [![Packagist](https://img.shields.io/packagist/v/geerlingguy/drupal-vm.svg)](https://packagist.org/packages/geerlingguy/drupal-vm) [![Docker Automated build](https://img.shields.io/docker/automated/geerlingguy/drupal-vm.svg?maxAge=2592000)](https://hub.docker.com/r/geerlingguy/drupal-vm/) [![](https://images.microbadger.com/badges/image/geerlingguy/drupal-vm.svg)](https://microbadger.com/images/geerlingguy/drupal-vm "Get your own image badge on microbadger.com") [![irc://irc.freenode.net/drupal-vm](https://img.shields.io/badge/irc.freenode.net-%23drupal--vm-brightgreen.svg)](https://riot.im/app/#/room/#drupal-vm:matrix.org)
 
 [Drupal VM](https://www.drupalvm.com/) is a VM for Drupal, built with Ansible.
 
diff --git a/default.config.yml b/default.config.yml
@@ -95,7 +95,7 @@ drupal_major_version: 9
 drupal_domain: "{{ vagrant_hostname }}"
 drupal_site_name: "Drupal"
 drupal_install_profile: standard
-drupal_enable_modules: [ 'devel' ]
+drupal_enable_modules: ['devel']
 drupal_account_name: admin
 drupal_account_pass: admin
 
@@ -285,7 +285,7 @@ composer_global_packages: []
 # reference the directory where your `config.yml` is.
 pre_provision_scripts: []
 post_provision_scripts: []
-  # - "{{ playbook_dir }}/../examples/scripts/configure-solr.sh"
+# - "{{ playbook_dir }}/../examples/scripts/configure-solr.sh"
 
 # MySQL Configuration.
 mysql_root_password: root
diff --git a/example.docker-compose.yml b/example.docker-compose.yml
@@ -1,3 +1,4 @@
+---
 version: "3"
 
 services:
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -1,3 +1,4 @@
+---
 site_name: Drupal VM Documentation
 
 repo_url: https://github.com/geerlingguy/drupal-vm
@@ -9,69 +10,69 @@ extra_javascript:
 
 markdown_extensions:
   - toc:
-      permalink: True
+      permalink: true
 
 pages:
   - Home: 'index.md'
   - Getting Started:
-    - Installation:
-      - 'macOS': 'getting-started/installation-macos.md'
-      - 'Windows': 'getting-started/installation-windows.md'
-      - 'Linux': 'getting-started/installation-linux.md'
-    - 'Configuring Drupal VM': 'getting-started/configure-drupalvm.md'
-    - 'Syncing Folders': 'getting-started/syncing-folders.md'
+      - Installation:
+          - 'macOS': 'getting-started/installation-macos.md'
+          - 'Windows': 'getting-started/installation-windows.md'
+          - 'Linux': 'getting-started/installation-linux.md'
+      - 'Configuring Drupal VM': 'getting-started/configure-drupalvm.md'
+      - 'Syncing Folders': 'getting-started/syncing-folders.md'
   - Building your codebase:
-    - 'Using a local Drupal codebase': 'deployment/local-codebase.md'
-    - 'Using a composer package': 'deployment/composer-package.md'
-    - 'Using composer.json': 'deployment/composer.md'
-    - 'Using a Drush Make file': 'deployment/drush-make.md'
-    - 'Drupal VM as a Composer Dependency': 'deployment/composer-dependency.md'
-    - 'Deploying Drupal via Git': 'deployment/git.md'
+      - 'Using a local Drupal codebase': 'deployment/local-codebase.md'
+      - 'Using a composer package': 'deployment/composer-package.md'
+      - 'Using composer.json': 'deployment/composer.md'
+      - 'Using a Drush Make file': 'deployment/drush-make.md'
+      - 'Drupal VM as a Composer Dependency': 'deployment/composer-dependency.md'
+      - 'Deploying Drupal via Git': 'deployment/git.md'
   - Basic configurations:
-    - 'Using different base OSes': 'configurations/base-os.md'
-    - 'Using a different PHP version': 'configurations/php.md'
-    - Webservers:
-      - 'Apache': 'configurations/webservers-apache.md'
-      - 'Nginx': 'configurations/webservers-nginx.md'
-    - Databases:
-      - 'Connect to the MySQL Database': 'configurations/databases-mysql.md'
-      - 'Use MariaDB instead of MySQL': 'configurations/databases-mariadb.md'
-      - 'Use PostgreSQL instead of MySQL': 'configurations/databases-postgresql.md'
+      - 'Using different base OSes': 'configurations/base-os.md'
+      - 'Using a different PHP version': 'configurations/php.md'
+      - Webservers:
+          - 'Apache': 'configurations/webservers-apache.md'
+          - 'Nginx': 'configurations/webservers-nginx.md'
+      - Databases:
+          - 'Connect to the MySQL Database': 'configurations/databases-mysql.md'
+          - 'Use MariaDB instead of MySQL': 'configurations/databases-mariadb.md'
+          - 'Use PostgreSQL instead of MySQL': 'configurations/databases-postgresql.md'
   - Installed extras:
-    - 'adminer (Database UI)': 'extras/adminer.md'
-    - 'blackfire (Profiling tool)': 'extras/blackfire.md'
-    - 'drupalconsole (Drupal CLI)': 'extras/drupal-console.md'
-    - 'drush (Drupal CLI)': 'extras/drush.md'
-    - 'elasticsearch (Search engine)': 'extras/elasticsearch.md'
-    - 'java': 'extras/java.md'
-    - 'mailhog (Mail catcher)': 'extras/mailhog.md'
-    - 'memcached (In-memory cache)': 'extras/memcached.md'
-    - 'newrelic (Performance monitoring)': 'extras/newrelic.md'
-    - 'nodejs': 'extras/nodejs.md'
-    - 'pimpmylog (Log viewer)': 'extras/pimpmylog.md'
-    - 'redis (In-memory database)': 'extras/redis.md'
-    - 'ruby': 'extras/ruby.md'
-    - 'selenium (BDD with Behat)': 'extras/selenium.md'
-    - 'solr (Search engine)': 'extras/solr.md'
-    - 'tideways (Profiling tool)': 'extras/tideways.md'
-    - 'upload-progress': 'extras/upload-progress.md'
-    - 'varnish (Caching reverse proxy)': 'extras/varnish.md'
-    - 'xdebug (Debugging tool)': 'extras/xdebug.md'
-    - 'xhprof (Profiling tool)': 'extras/xhprof.md'
+      - 'adminer (Database UI)': 'extras/adminer.md'
+      - 'blackfire (Profiling tool)': 'extras/blackfire.md'
+      - 'drupalconsole (Drupal CLI)': 'extras/drupal-console.md'
+      - 'drush (Drupal CLI)': 'extras/drush.md'
+      - 'elasticsearch (Search engine)': 'extras/elasticsearch.md'
+      - 'java': 'extras/java.md'
+      - 'mailhog (Mail catcher)': 'extras/mailhog.md'
+      - 'memcached (In-memory cache)': 'extras/memcached.md'
+      - 'newrelic (Performance monitoring)': 'extras/newrelic.md'
+      - 'nodejs': 'extras/nodejs.md'
+      - 'pimpmylog (Log viewer)': 'extras/pimpmylog.md'
+      - 'redis (In-memory database)': 'extras/redis.md'
+      - 'ruby': 'extras/ruby.md'
+      - 'selenium (BDD with Behat)': 'extras/selenium.md'
+      - 'solr (Search engine)': 'extras/solr.md'
+      - 'tideways (Profiling tool)': 'extras/tideways.md'
+      - 'upload-progress': 'extras/upload-progress.md'
+      - 'varnish (Caching reverse proxy)': 'extras/varnish.md'
+      - 'xdebug (Debugging tool)': 'extras/xdebug.md'
+      - 'xhprof (Profiling tool)': 'extras/xhprof.md'
   - Extending Drupal VM:
-    - 'Adding Vagrant plugins Vagrantfile.local': 'extending/vagrantfile.md'
-    - 'Passing on CLI arguments to ansible': 'extending/ansible-args.md'
-    - 'Pre- and Post-Provision Scripts': 'extending/scripts.md'
+      - 'Adding Vagrant plugins Vagrantfile.local': 'extending/vagrantfile.md'
+      - 'Passing on CLI arguments to ansible': 'extending/ansible-args.md'
+      - 'Pre- and Post-Provision Scripts': 'extending/scripts.md'
   - Other Information:
-    - 'Networking Notes': 'other/networking.md'
-    - 'Vagrant LXC provider': 'other/vagrant-lxc.md'
-    - 'Improving Performance': 'other/performance.md'
-    - 'Docker': 'other/docker.md'
-    - 'Custom Vagrant Base Box': 'other/custom-base-box.md'
-    - 'BigPipe with Drupal VM': 'other/bigpipe.md'
-    - 'Drupal multisite': 'deployment/multisite.md'
-    - 'Drupal 6 Notes': 'other/drupal-6.md'
-    - 'Drupal VM Management Tools': 'other/management-tools.md'
-    - 'Emulating Acquia Cloud environment': 'other/acquia.md'
-    - 'Deploying to a production environment': 'other/production.md'
-    - 'Wordpress or other applications': 'other/wordpress-other-applications.md'
+      - 'Networking Notes': 'other/networking.md'
+      - 'Vagrant LXC provider': 'other/vagrant-lxc.md'
+      - 'Improving Performance': 'other/performance.md'
+      - 'Docker': 'other/docker.md'
+      - 'Custom Vagrant Base Box': 'other/custom-base-box.md'
+      - 'BigPipe with Drupal VM': 'other/bigpipe.md'
+      - 'Drupal multisite': 'deployment/multisite.md'
+      - 'Drupal 6 Notes': 'other/drupal-6.md'
+      - 'Drupal VM Management Tools': 'other/management-tools.md'
+      - 'Emulating Acquia Cloud environment': 'other/acquia.md'
+      - 'Deploying to a production environment': 'other/production.md'
+      - 'Wordpress or other applications': 'other/wordpress-other-applications.md'
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
@@ -38,7 +38,7 @@
     - { role: geerlingguy.firewall, when: firewall_enabled }
     - { role: geerlingguy.git }
     - { role: geerlingguy.postfix }
-    - { role: geerlingguy.apache, when: drupalvm_webserver == 'apache', tags: ['webserver']}
+    - { role: geerlingguy.apache, when: drupalvm_webserver == 'apache', tags: ['webserver'] }
     - { role: geerlingguy.apache-php-fpm, when: drupalvm_webserver == 'apache', tags: ['webserver'] }
     - { role: geerlingguy.nginx, when: drupalvm_webserver == 'nginx', tags: ['webserver'] }
     - { role: geerlingguy.php-versions, when: php_version != '', tags: ['php', 'xdebug', 'database'] }
diff --git a/provisioning/templates/drush.yml b/provisioning/templates/drush.yml
@@ -1,3 +1,4 @@
+---
 drush:
   paths:
     alias-path:

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+---`
`1`	`2`	`version: "3"`
`2`	`3`
`3`	`4`	`services:`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+---`
`1`	`2`	`drush:`
`2`	`3`	`paths:`
`3`	`4`	`alias-path:`