Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Ruby 3 support #615

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.

Sign up for GitHub

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

Merged
NARKOZ merged 10 commits into from
May 17, 2021
Merged

Ruby 3 support #615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a3dab99
Remove warning: instance variable @json_output not initialized
atog May 7, 2021
ed5baa3
Ruby 3 support.
atog May 7, 2021
37fa4b7
Need to remove the original one, duh.
atog May 12, 2021
07ee05c
Remove trailing whitespace
atog May 14, 2021
bdb78ca
Use normalcase for variable numbers.
atog May 14, 2021
8041f8b
Prefer single-quoted strings when you don't need string interpolation…
atog May 14, 2021
5a85c97
Do not use parentheses for method calls with no arguments
atog May 14, 2021
1d92c3b
Refactored out use of `eval`.
atog May 14, 2021
c4a6e57
Add empty line after guard clause
atog May 16, 2021
b75b04e
As suggested, use Gem::Version to compare Ruby version numbers.
atog May 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions lib/gitlab.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,18 @@ def self.client(options = {})
Gitlab::Client.new(options)
end

# Delegate to Gitlab::Client
def self.method_missing(method, *args, &block)
return super unless client.respond_to?(method)

client.send(method, *args, &block)
if Gem::Version.new(RUBY_VERSION).release >= Gem::Version.new('3.0.0')
def self.method_missing(method, *args, **keywargs, &block)
return super unless client.respond_to?(method)

client.send(method, *args, **keywargs, &block)
end
else
def self.method_missing(method, *args, &block)
return super unless client.respond_to?(method)

client.send(method, *args, &block)
end
end

# Delegate to Gitlab::Client
Expand Down
2 changes: 1 addition & 1 deletion lib/gitlab/cli.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def self.run(cmd, args = [])
# Helper method that checks whether we want to get the output as json
# @return [nil]
def self.render_output(cmd, args, data)
if @json_output
if defined?(@json_output) && @json_output
output_json(cmd, args, data)
else
output_table(cmd, args, data)
Expand Down
10 changes: 5 additions & 5 deletions lib/gitlab/help.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,15 @@ def namespace(cmd)
# Massage output from 'ri'.
def change_help_output!(cmd, output_str)
output_str = +output_str
output_str.gsub!(/#{cmd}\((.*?)\)/m, "#{cmd} \1")
output_str.gsub!(/,\s*/, ' ')
output_str.gsub!(/#{cmd}(\(.*?\))/m, "#{cmd}\\1")
output_str.gsub!(/,\s*/, ', ')

# Ensure @option descriptions are on a single line
output_str.gsub!(/\n\[/, " \[")
output_str.gsub!(/\s(@)/, "\n@")
output_str.gsub!(/(\])\n(:)/, '\1 \2')
output_str.gsub!(/(:.*)(\n)(.*\.)/, '\1 \3')
output_str.gsub!(/\{(.+)\}/, '"{\1}"')
output_str.gsub!(/(\])\n(:)/, '\\1 \\2')
output_str.gsub!(/(:.*)(\n)(.*\.)/, '\\1 \\3')
output_str.gsub!(/\{(.+)\}/, '"{\\1}"')
end
end
end
2 changes: 1 addition & 1 deletion spec/gitlab/client/build_variables_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

describe '.create_variable' do
before do
stub_post('/projects/3/variables', 'variable')
stub_post('/projects/3/variables', 'variable', { masked: true })
@variable = Gitlab.create_variable(3, 'NEW_VARIABLE', 'new value')
end

Expand Down
4 changes: 2 additions & 2 deletions spec/gitlab/client/users_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@
describe 'create' do
before do
stub_post('/users/2/impersonation_tokens', 'impersonation_create')
@token = Gitlab.create_user_impersonation_token(2, 'mytoken', scopes)
@token = Gitlab.create_user_impersonation_token(2, 'mytoken', ['api'])
end

it 'gets the correct resource' do
Expand All @@ -614,7 +614,7 @@

it 'removes a token' do
expect(a_delete('/users/2/impersonation_tokens/2')).to have_been_made
expect(@token).to be_empty
expect(@token.to_hash).to be_empty
end
end
end