Skip to content

Commit

Permalink
Bump rubocop-shopify from 1.0.7 to 2.0.1 (#380)
Browse files Browse the repository at this point in the history
* Bump rubocop-shopify from 1.0.7 to 2.0.1

Bumps [rubocop-shopify](https://github.com/Shopify/ruby-style-guide) from 1.0.7 to 2.0.1.
- [Release notes](https://github.com/Shopify/ruby-style-guide/releases)
- [Commits](Shopify/ruby-style-guide@v1.0.7...v2.0.1)

* Remove string literal rule from rubocop config
* Disable extension suggestions

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Adrianna Chang <[email protected]>
  • Loading branch information
dependabot[bot] and adrianna-chang-shopify authored Mar 29, 2021
1 parent 1afd21b commit bcce741
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 19 deletions.
4 changes: 1 addition & 3 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ AllCops:
Exclude:
- test/dummy/db/schema.rb
- vendor/**/*
SuggestExtensions: false

Bundler/OrderedGems:
Enabled: true
Expand All @@ -23,9 +24,6 @@ Style/DocumentationMethod:
- app/**/*.rb
- lib/**/*.rb

Style/StringLiterals:
EnforcedStyle: double_quotes

Style/SymbolArray:
EnforcedStyle: brackets

Expand Down
26 changes: 13 additions & 13 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ GEM
zeitwerk (~> 2.3)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
ast (2.4.1)
ast (2.4.2)
builder (3.2.4)
byebug (11.1.3)
capybara (3.35.3)
Expand Down Expand Up @@ -110,7 +110,7 @@ GEM
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
parallel (1.20.1)
parser (2.7.2.0)
parser (3.0.0.0)
ast (~> 2.4.1)
pry (0.13.1)
coderay (~> 1.1)
Expand Down Expand Up @@ -153,22 +153,22 @@ GEM
thor (~> 1.0)
rainbow (3.0.0)
rake (13.0.3)
regexp_parser (2.0.3)
regexp_parser (2.1.1)
rexml (3.2.4)
rubocop (1.4.2)
rubocop (1.12.0)
parallel (~> 1.10)
parser (>= 2.7.1.5)
parser (>= 3.0.0.0)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8)
regexp_parser (>= 1.8, < 3.0)
rexml
rubocop-ast (>= 1.1.1)
rubocop-ast (>= 1.2.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (1.2.0)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.4.1)
parser (>= 2.7.1.5)
rubocop-shopify (1.0.7)
rubocop (~> 1.4)
ruby-progressbar (1.10.1)
rubocop-shopify (2.0.1)
rubocop (~> 1.11)
ruby-progressbar (1.11.0)
rubyzip (2.3.0)
selenium-webdriver (3.142.7)
childprocess (>= 0.5, < 4.0)
Expand All @@ -184,7 +184,7 @@ GEM
thor (1.1.0)
tzinfo (2.0.4)
concurrent-ruby (~> 1.0)
unicode-display_width (1.7.0)
unicode-display_width (2.0.0)
webdrivers (4.6.0)
nokogiri (~> 1.6)
rubyzip (>= 1.3.0)
Expand Down
6 changes: 3 additions & 3 deletions app/models/maintenance_tasks/progress.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ def text
count = @run.tick_count
total = @run.tick_total
if !total?
"Processed #{pluralize(count, 'item')}."
"Processed #{pluralize(count, "item")}."
elsif over_total?
"Processed #{pluralize(count, 'item')} (expected #{total})."
"Processed #{pluralize(count, "item")} (expected #{total})."
else
percentage = 100.0 * count / total

"Processed #{count} out of #{pluralize(total, 'item')} "\
"Processed #{count} out of #{pluralize(total, "item")} "\
"(#{number_to_percentage(percentage, precision: 0)})."
end
end
Expand Down

0 comments on commit bcce741

Please sign in to comment.