Various Rubocop and lint fixes #164
Conversation
|
I did some initial cleanup of metadata and dropping older versions, but the acceptance tests will fail because they try to install ancient Ruby versions. |
|
I updated the ruby versions, let's see if this passes now (or at least fails in a different way) |
bastelfreak
force-pushed
the
modulesync
branch
8 times, most recently
from
fa9a74c to
9261660
Compare
bastelfreak
force-pushed
the
modulesync
branch
4 times, most recently
from
187ba88 to
0be4110
Compare
|
This Pr now also contains: |
bastelfreak
force-pushed
the
modulesync
branch
2 times, most recently
from
03bbc66 to
4167e8c
Compare
|
it now passes on centos 7 not nowhere else :( |
|
Should we mark the Passenger test on Debian/Ubuntu as pending just to get it to pass? |
|
I think that's a good idea. you want to do that? otherwise I can take a look later. |
|
I guess neither of us had time for this in the past 3 weeks. |
bastelfreak
force-pushed
the
modulesync
branch
2 times, most recently
from
c7388eb to
822c1d9
Compare
bastelfreak
force-pushed
the
modulesync
branch
from
bb54285 to
2d507c5
Compare
Solaris is not supported by the gnupg module and we cannot test it. cherry-picked from voxpupuli#164
Solaris is not supported by the gnupg module and we cannot test it. cherry-picked from voxpupuli#164
bastelfreak
force-pushed
the
modulesync
branch
from
2d507c5 to
e61e009
Compare
This was dropped by accident in af82679
bastelfreak
force-pushed
the
modulesync
branch
from
e61e009 to
0240fb2
Compare
| $gnupg_key_id = false | ||
| } | ||
| # sadly the gpg module is ages old and doesn't support long key ids | ||
| $gnupg_key_id = [ |
There was a problem hiding this comment.
we should probably rename this to $gnupg_key_ids?
| if resource[:proxy_url] && !resource[:proxy_url].empty? | ||
| command << '--http-proxy' << resource[:proxy_url] | ||
| end | ||
| command << '--http-proxy' << resource[:proxy_url] if resource[:proxy_url] && !resource[:proxy_url].empty? |
There was a problem hiding this comment.
I think I disagree with Rubocop on this change. It makes the line very long.
| before => Exec['system-rvm'], | ||
| include gnupg | ||
|
|
||
| # https keys are downloaded with wget |
There was a problem hiding this comment.
Should there be a require on the package somewhere? like gnupg_key?
| r.stdout.should =~ Regexp.new(Regexp.escape(ruby27_version)) | ||
| r.stdout.should =~ Regexp.new(Regexp.escape(ruby26_version)) |
There was a problem hiding this comment.
Also, much easier is to just use String.include? instead of using a regex:
| r.stdout.should =~ Regexp.new(Regexp.escape(ruby27_version)) | |
| r.stdout.should =~ Regexp.new(Regexp.escape(ruby26_version)) | |
| expect(r.stdout).to include(ruby27_version) | |
| expect(r.stdout).to include(ruby26_version) |
Though the old code was checking that it was at the start of a line with some indenting. That could be more explicit.
|
My PR #178 is failing due to rubocop, which will be fixed by this PR. @bastelfreak Any help needed? Some mentioned things will be changed by my PR (if accepted). |
|
I'll merge this now and improve it in a further PR. |
modulesync 4.0.0