From ddb24d6a06d5f03d3de99c764a6bbff76859455a Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Tue, 1 Sep 2020 17:57:17 +0200
Subject: [PATCH] Replace gem --no-ri and --no-rdoc with --no-document

The --no-ri and --no-rdoc option is removed in later versions.

Change-Id: I199e980fe13d4932e7d3f9f484ea3dc25e58f01c
---
 all-in-one.sh                           |  2 +-
 install_modules.sh                      |  2 +-
 playbooks/prepare-node-integration.yaml |  2 +-
 playbooks/run-beaker-tests.yaml         |  2 +-
 playbooks/run-lint-tests.yaml           | 12 ++++++------
 playbooks/run-syntax-tests.yaml         |  2 +-
 playbooks/run-unit-tests.yaml           |  2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/all-in-one.sh b/all-in-one.sh
index b76d48799..75dcb6969 100755
--- a/all-in-one.sh
+++ b/all-in-one.sh
@@ -64,7 +64,7 @@ print_header 'Install Bundler'
 mkdir -p .bundled_gems
 export GEM_HOME=`pwd`/.bundled_gems
 ruby <<EOF
-cmd = 'gem install --no-user-install bundler --no-rdoc --no-ri --verbose'
+cmd = 'gem install --no-user-install bundler --no-document --verbose'
 if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0') then
     cmd += ' -v 1.17.3'
 end
diff --git a/install_modules.sh b/install_modules.sh
index 493ab67ce..2e6e53905 100755
--- a/install_modules.sh
+++ b/install_modules.sh
@@ -2,7 +2,7 @@
 
 set -ex
 
-GEM_INSTALL_CMD="gem install --no-user-install --minimal-dep --verbose --no-ri --no-rdoc"
+GEM_INSTALL_CMD="gem install --no-user-install --minimal-dep --verbose --no-document"
 
 if [ -n "${GEM_HOME}" ]; then
     GEM_BIN_DIR=${GEM_HOME}/bin/
diff --git a/playbooks/prepare-node-integration.yaml b/playbooks/prepare-node-integration.yaml
index c4116bcdd..6d85e376d 100644
--- a/playbooks/prepare-node-integration.yaml
+++ b/playbooks/prepare-node-integration.yaml
@@ -36,7 +36,7 @@
       shell:
         cmd: |
           ruby <<EOF
-          cmd = 'gem install bundler --no-rdoc --no-ri --verbose --no-user-install'
+          cmd = 'gem install bundler --no-document --verbose --no-user-install'
           if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0') then
               cmd += ' -v 1.17.3'
           end
diff --git a/playbooks/run-beaker-tests.yaml b/playbooks/run-beaker-tests.yaml
index 1bc954ecd..c4508bae4 100644
--- a/playbooks/run-beaker-tests.yaml
+++ b/playbooks/run-beaker-tests.yaml
@@ -51,7 +51,7 @@
           export GEM_BIN_DIR=$GEM_HOME/bin
           if [ -f Gemfile ]; then
             ruby <<EOF
-          cmd = 'gem install bundler --no-rdoc --no-ri --verbose --no-user-install --bindir=${GEM_BIN_DIR}'
+          cmd = 'gem install bundler --no-document --verbose --no-user-install --bindir=${GEM_BIN_DIR}'
           if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0') then
               cmd += ' -v 1.17.3'
           end
diff --git a/playbooks/run-lint-tests.yaml b/playbooks/run-lint-tests.yaml
index cd8097e04..14a6a53ee 100644
--- a/playbooks/run-lint-tests.yaml
+++ b/playbooks/run-lint-tests.yaml
@@ -22,7 +22,7 @@
           export GEM_BIN_DIR=$GEM_HOME/bin
           if [ -f Gemfile ]; then
             ruby <<EOF
-          cmd = 'gem install bundler --no-rdoc --no-ri --verbose --no-user-install --bindir=${GEM_BIN_DIR}'
+          cmd = 'gem install bundler --no-document --verbose --no-user-install --bindir=${GEM_BIN_DIR}'
           if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0') then
               cmd += ' -v 1.17.3'
           end
@@ -34,11 +34,11 @@
               $GEM_BIN_DIR/bundle exec rake metadata_lint 2>&1
             fi
           else
-            gem install rake -n ./.bundled_gems/ --no-ri --no-rdoc --no-user-install
-            gem install puppet-lint -n ./.bundled_gems/ --no-ri --no-rdoc --no-user-install
-            gem install metadata-json-lint -n ./.bundled_gems/ --no-ri --no-rdoc --no-user-install
-            gem install puppetlabs_spec_helper -n ./.bundled_gems/ --no-ri --no-rdoc --no-user-install
-            gem install puppet -n ./.bundled_gems/ --no-ri --no-rdoc --no-user-install
+            gem install rake -n ./.bundled_gems/ --no-document --no-user-install
+            gem install puppet-lint -n ./.bundled_gems/ --no-document --no-user-install
+            gem install metadata-json-lint -n ./.bundled_gems/ --no-document --no-user-install
+            gem install puppetlabs_spec_helper -n ./.bundled_gems/ --no-document --no-user-install
+            gem install puppet -n ./.bundled_gems/ --no-document --no-user-install
             ./.bundled_gems/rake lint 2>&1
             if [ -f metadata.json ]; then
               ./.bundled_gems/metadata-json-lint
diff --git a/playbooks/run-syntax-tests.yaml b/playbooks/run-syntax-tests.yaml
index 4ef2a398f..6d58ab7a1 100644
--- a/playbooks/run-syntax-tests.yaml
+++ b/playbooks/run-syntax-tests.yaml
@@ -7,7 +7,7 @@
           export GEM_HOME=`pwd`/.bundled_gems
           export GEM_BIN_DIR=$GEM_HOME/bin
           ruby <<EOF
-          cmd = 'gem install bundler --no-rdoc --no-ri --verbose --no-user-install --bindir=${GEM_BIN_DIR}'
+          cmd = 'gem install bundler --no-document --verbose --no-user-install --bindir=${GEM_BIN_DIR}'
           if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0') then
               cmd += ' -v 1.17.3'
           end
diff --git a/playbooks/run-unit-tests.yaml b/playbooks/run-unit-tests.yaml
index afde0cc07..630d9161b 100644
--- a/playbooks/run-unit-tests.yaml
+++ b/playbooks/run-unit-tests.yaml
@@ -19,7 +19,7 @@
           export GEM_HOME=`pwd`/.bundled_gems
           export GEM_BIN_DIR=$GEM_HOME/bin
           ruby <<EOF
-          cmd = 'gem install bundler --no-rdoc --no-ri --verbose --no-user-install --bindir=${GEM_BIN_DIR}'
+          cmd = 'gem install bundler --no-document --verbose --no-user-install --bindir=${GEM_BIN_DIR}'
           if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0') then
               cmd += ' -v 1.17.3'
           end