Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

51069: ri and rdoc options removed from gem (rubygems >3) #51177

Merged
merged 7 commits into from Feb 13, 2019

Conversation

@nullify005
Copy link
Contributor

commented Jan 15, 2019

What does this PR do?

Alters the cli options to the gem command depending on whether rubygems > 3 is installed.

What issues does this PR fix or reference?

#51069

Previous Behavior

For rubygems >3 the gem install command would fail because --no-rdoc or --no-ri have been replaced with the meta --no-document arg.

                File "/usr/lib/python2.7/dist-packages/salt/state.py", line 1905, in call
                  **cdata['kwargs'])
                File "/usr/lib/python2.7/dist-packages/salt/loader.py", line 1830, in wrapper
                  return f(*args, **kwargs)
                File "/usr/lib/python2.7/dist-packages/salt/states/gem.py", line 108, in installed
                  source=source):
                File "/usr/lib/python2.7/dist-packages/salt/modules/gem.py", line 136, in install
                  runas=runas)
                File "/usr/lib/python2.7/dist-packages/salt/modules/gem.py", line 64, in _gem
                  raise CommandExecutionError(ret['stderr'])
              CommandExecutionError: ERROR:  While executing gem ... (OptionParser::InvalidOption)
                  invalid option: --no-rdoc
     Started: 23:50:09.745738

Also noticed that the --pre option had changed a little too to --pre-release

New Behavior

gem installs correctly with rubygems > 3

Tests written?

No

Commits signed with GPG?

No

nullify005 and others added 7 commits Jan 15, 2019
@dwoz
dwoz approved these changes Feb 13, 2019
@dwoz dwoz merged commit c4bbe1a into saltstack:2018.3 Feb 13, 2019
10 checks passed
10 checks passed
WIP Ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint Python lint test has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.