openstack/puppet-openstack-integration
Code Issues Proposed changes

Replace gem --no-ri and --no-rdoc with --no-document

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

Change-Id: I199e980fe13d4932e7d3f9f484ea3dc25e58f01c
(cherry picked from commit ddb24d6a06)
This commit is contained in:
Tobias Urdin
2020-09-01 17:57:17 +02:00
parent a640aadc4b
commit a9ad4441e4
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
all-in-one.sh
View File

@@ -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

2
install_modules.sh
View File

@@ -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/

2
playbooks/prepare-node-integration.yaml
View File

@@ -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

2
playbooks/run-beaker-tests.yaml
View File

@@ -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

12
playbooks/run-lint-tests.yaml
View File

@@ -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

2
playbooks/run-syntax-tests.yaml
View File

@@ -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

2
playbooks/run-unit-tests.yaml
View File

@@ -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