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.

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

Make the CI green again #939

Merged
merged 2 commits into from
Aug 26, 2020
+6 −5
Merged

Make the CI green again #939

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da7eaf3
Ensure possible_locations is returned even when HOME env key is not set
yoones Aug 26, 2020
1464a5b
Fixes rubocop alerts
yoones Aug 26, 2020
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
8 changes: 4 additions & 4 deletions .rubocop_todo.yml
View file
Original file line number Diff line number Diff line change
@@ -66,16 +66,16 @@ Metrics/AbcSize:
# Offense count: 2
# Configuration parameters: CountComments.
Metrics/ClassLength:
Max: 292
Max: 305

# Offense count: 7
Metrics/CyclomaticComplexity:
Max: 11
Max: 13

# Offense count: 17
# Configuration parameters: CountComments, ExcludedMethods.
Metrics/MethodLength:
Max: 30
Max: 32

# Offense count: 2
# Configuration parameters: CountComments.
@@ -84,7 +84,7 @@ Metrics/ModuleLength:

# Offense count: 6
Metrics/PerceivedComplexity:
Max: 12
Max: 13

# Offense count: 2
Naming/AccessorMethodName:
3 changes: 2 additions & 1 deletion lib/wicked_pdf.rb
View file
Original file line number Diff line number Diff line change
@@ -332,6 +332,7 @@ def parse_others(options)
def possible_binary_locations
possible_locations = (ENV['PATH'].split(':') + %w[/usr/bin /usr/local/bin]).uniq
possible_locations += %w[~/bin] if ENV.key?('HOME')
possible_locations
end

def find_wkhtmltopdf_binary_path
@@ -350,7 +351,7 @@ def find_wkhtmltopdf_binary_path
def find_xvfb_run_binary_path
possible_locations = possible_binary_locations
path = possible_locations.map { |l| File.expand_path("#{l}/xvfb-run") }.find { |location| File.exist?(location) }
raise StandardError.new('Could not find binary xvfb-run on the system.') unless path
raise StandardError, 'Could not find binary xvfb-run on the system.' unless path
path
end
end