Skip to content

Commit a7d92b1

Browse files
committed
standardrb --fix
This moves this repository to be compliant with standardrb.
1 parent 1ccf9a1 commit a7d92b1

18 files changed

Lines changed: 187 additions & 187 deletions

File tree

Gemfile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,27 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
77
# Specify your gem's dependencies in solidus_dev_support.gemspec
88
gemspec
99

10-
branch = ENV.fetch('SOLIDUS_BRANCH', 'main')
11-
gem 'solidus', github: 'solidusio/solidus', branch: branch
10+
branch = ENV.fetch("SOLIDUS_BRANCH", "main")
11+
gem "solidus", github: "solidusio/solidus", branch: branch
1212

1313
rails_version = ENV.fetch("RAILS_VERSION", "7.0")
14-
gem 'rails', "~> #{rails_version}"
14+
gem "rails", "~> #{rails_version}"
1515

16-
gem 'bundler'
17-
gem 'rake'
16+
gem "bundler"
17+
gem "rake"
1818

1919
# These gems will be used by the temporary extensions generated by tests
2020
group :test do
21-
gem 'mysql2'
22-
gem 'pg'
23-
gem 'solidus_auth_devise'
24-
gem 'sqlite3', rails_version < '7.2' ? '~> 1.4' : '~> 2.0'
21+
gem "mysql2"
22+
gem "pg"
23+
gem "solidus_auth_devise"
24+
gem "sqlite3", (rails_version < "7.2") ? "~> 1.4" : "~> 2.0"
2525
end
2626

2727
# Use a local Gemfile to include development dependencies that might not be
2828
# relevant for the project or for other contributors, e.g.: `gem 'pry-debug'`.
29-
eval_gemfile 'Gemfile-local' if File.exist? 'Gemfile-local'
29+
eval_gemfile "Gemfile-local" if File.exist? "Gemfile-local"
3030

3131
if rails_version == "7.0"
32-
gem 'concurrent-ruby', '< 1.3.5'
32+
gem "concurrent-ruby", "< 1.3.5"
3333
end

bin/setup

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#!/usr/bin/env ruby
2-
require 'fileutils'
2+
require "fileutils"
33
include FileUtils # rubocop:disable Style/MixinUsage
44

5-
GEM_ROOT = File.expand_path('..', __dir__)
5+
GEM_ROOT = File.expand_path("..", __dir__)
66

77
def system(*args)
8-
puts "$ #{args.size == 1 ? args.first : args.shelljoin}"
8+
puts "$ #{(args.size == 1) ? args.first : args.shelljoin}"
99
super
1010
end
1111

@@ -16,5 +16,5 @@ end
1616
cd GEM_ROOT
1717

1818
puts "\n== Installing Ruby dependencies =="
19-
system! %{gem install bundler --conservative}
20-
system! %{bundle check || bundle install}
19+
system! %(gem install bundler --conservative)
20+
system! %(bundle check || bundle install)

bin/solidus

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/usr/bin/env ruby
22

3-
require 'bundler/setup'
3+
require "bundler/setup"
44
load "#{__dir__}/../exe/solidus"

exe/solidus

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env ruby
22
# frozen_string_literal: true
33

4-
require 'solidus_dev_support/solidus_command'
4+
require "solidus_dev_support/solidus_command"
55

66
SolidusDevSupport::SolidusCommand.start

lib/solidus_dev_support.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class Error < StandardError; end
77

88
class << self
99
def reset_spree_preferences_deprecated?
10-
first_version_without_reset = Gem::Requirement.new('>= 2.9')
10+
first_version_without_reset = Gem::Requirement.new(">= 2.9")
1111
first_version_without_reset.satisfied_by?(Spree.solidus_gem_version)
1212
end
1313
end

lib/solidus_dev_support/extension.rb

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
11
# frozen_string_literal: true
22

3-
require 'thor'
4-
require 'pathname'
3+
require "thor"
4+
require "pathname"
55

6-
require 'solidus_dev_support/version'
6+
require "solidus_dev_support/version"
77

88
module SolidusDevSupport
99
class Extension < Thor
1010
include Thor::Actions
11-
PREFIX = 'solidus_'
11+
PREFIX = "solidus_"
1212

1313
default_command :generate
1414

15-
desc 'generate PATH', 'Generates a new Solidus extension'
16-
def generate(raw_path = '.')
15+
desc "generate PATH", "Generates a new Solidus extension"
16+
def generate(raw_path = ".")
1717
self.path = raw_path
1818

1919
empty_directory path
2020

21-
directory 'app', "#{path}/app"
22-
directory 'lib', "#{path}/lib"
23-
directory 'bin', "#{path}/bin"
24-
directory '.circleci', "#{path}/.circleci"
25-
directory '.github', "#{path}/.github"
21+
directory "app", "#{path}/app"
22+
directory "lib", "#{path}/lib"
23+
directory "bin", "#{path}/bin"
24+
directory ".circleci", "#{path}/.circleci"
25+
directory ".github", "#{path}/.github"
2626

2727
Dir["#{path}/bin/*"].each do |bin|
2828
make_executable bin
2929
end
3030

31-
template 'CHANGELOG.md', "#{path}/CHANGELOG.md"
32-
template 'extension.gemspec', "#{path}/#{file_name}.gemspec"
33-
template 'Gemfile', "#{path}/Gemfile"
34-
template 'gitignore', "#{path}/.gitignore"
35-
template 'gem_release.yml.tt', "#{path}/.gem_release.yml"
36-
template 'LICENSE', "#{path}/LICENSE"
37-
template 'Rakefile', "#{path}/Rakefile"
38-
template 'README.md', "#{path}/README.md"
39-
template 'config/routes.rb', "#{path}/config/routes.rb"
40-
template 'config/locales/en.yml', "#{path}/config/locales/en.yml"
41-
template 'rspec', "#{path}/.rspec"
42-
template 'spec/spec_helper.rb.tt', "#{path}/spec/spec_helper.rb"
43-
template 'rubocop.yml', "#{path}/.rubocop.yml"
44-
template 'github_changelog_generator', "#{path}/.github_changelog_generator"
31+
template "CHANGELOG.md", "#{path}/CHANGELOG.md"
32+
template "extension.gemspec", "#{path}/#{file_name}.gemspec"
33+
template "Gemfile", "#{path}/Gemfile"
34+
template "gitignore", "#{path}/.gitignore"
35+
template "gem_release.yml.tt", "#{path}/.gem_release.yml"
36+
template "LICENSE", "#{path}/LICENSE"
37+
template "Rakefile", "#{path}/Rakefile"
38+
template "README.md", "#{path}/README.md"
39+
template "config/routes.rb", "#{path}/config/routes.rb"
40+
template "config/locales/en.yml", "#{path}/config/locales/en.yml"
41+
template "rspec", "#{path}/.rspec"
42+
template "spec/spec_helper.rb.tt", "#{path}/spec/spec_helper.rb"
43+
template "rubocop.yml", "#{path}/.rubocop.yml"
44+
template "github_changelog_generator", "#{path}/.github_changelog_generator"
4545
end
4646

4747
no_tasks do
@@ -70,17 +70,17 @@ def gemspec_path
7070
end
7171

7272
def default_gemspec
73-
@default_gemspec ||= Gem::Specification.new(file_name, '0.0.1') do |gem|
74-
gem.author = git('config user.name', 'TODO: Write your name')
75-
gem.email = git('config user.email', 'TODO: Write your email address')
73+
@default_gemspec ||= Gem::Specification.new(file_name, "0.0.1") do |gem|
74+
gem.author = git("config user.name", "TODO: Write your name")
75+
gem.email = git("config user.email", "TODO: Write your email address")
7676

77-
gem.summary = 'TODO: Write a short summary, because RubyGems requires one.'
78-
gem.description = 'TODO: Write a longer description or delete this line.'
79-
gem.license = 'BSD-3-Clause'
77+
gem.summary = "TODO: Write a short summary, because RubyGems requires one."
78+
gem.description = "TODO: Write a longer description or delete this line."
79+
gem.license = "BSD-3-Clause"
8080

81-
gem.metadata['homepage_uri'] = gem.homepage = "https://github.com/#{repo}#readme"
82-
gem.metadata['changelog_uri'] = "https://github.com/#{repo}/blob/main/CHANGELOG.md"
83-
gem.metadata['source_code_uri'] = "https://github.com/#{repo}"
81+
gem.metadata["homepage_uri"] = gem.homepage = "https://github.com/#{repo}#readme"
82+
gem.metadata["changelog_uri"] = "https://github.com/#{repo}/blob/main/CHANGELOG.md"
83+
gem.metadata["source_code_uri"] = "https://github.com/#{repo}"
8484
end
8585
end
8686

@@ -95,9 +95,9 @@ def existing_gemspec
9595
spec.license ||= default_gemspec.license
9696

9797
spec.homepage ||= default_gemspec.homepage
98-
spec.metadata['source_code_uri'] ||= default_gemspec.metadata['source_code_uri']
99-
spec.metadata['changelog_uri'] ||= default_gemspec.metadata['changelog_uri']
100-
spec.metadata['source_code_uri'] ||= default_gemspec.metadata['source_code_uri']
98+
spec.metadata["source_code_uri"] ||= default_gemspec.metadata["source_code_uri"]
99+
spec.metadata["changelog_uri"] ||= default_gemspec.metadata["changelog_uri"]
100+
spec.metadata["source_code_uri"] ||= default_gemspec.metadata["source_code_uri"]
101101
end
102102
end
103103

@@ -106,7 +106,7 @@ def default_repo
106106
end
107107

108108
def existing_repo
109-
git('remote get-url origin')&.sub(%r{^.*github\.com.([^/]+)/([^/.]+).*$}, '\1/\2')
109+
git("remote get-url origin")&.sub(%r{^.*github\.com.([^/]+)/([^/.]+).*$}, '\1/\2')
110110
end
111111

112112
def git(command, default = nil)

lib/solidus_dev_support/rake_tasks.rb

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: true
22

3-
require 'rake'
4-
require 'pathname'
3+
require "rake"
4+
require "pathname"
55

66
module SolidusDevSupport
77
class RakeTasks
@@ -13,7 +13,7 @@ def self.install(**args)
1313

1414
def initialize(root: Dir.pwd, user_class: "Spree::LegacyUser")
1515
@root = Pathname(root)
16-
@test_app_path = @root.join(ENV.fetch('DUMMY_PATH', 'spec/dummy'))
16+
@test_app_path = @root.join(ENV.fetch("DUMMY_PATH", "spec/dummy"))
1717
@gemspec = Bundler.load_gemspec(@root.glob("{,*}.gemspec").first)
1818
@user_class = user_class
1919
end
@@ -28,24 +28,24 @@ def install
2828
end
2929

3030
def install_test_app_task
31-
require 'rake/clean'
32-
require 'spree/testing_support/extension_rake'
31+
require "rake/clean"
32+
require "spree/testing_support/extension_rake"
3333

34-
ENV['DUMMY_PATH'] = test_app_path.to_s
35-
ENV['LIB_NAME'] = gemspec.name
34+
ENV["DUMMY_PATH"] = test_app_path.to_s
35+
ENV["LIB_NAME"] = gemspec.name
3636

3737
::CLOBBER.include test_app_path
3838

3939
namespace :extension do
4040
# We need to go back to the gem root since the upstream
4141
# extension:test_app changes the working directory to be the dummy app.
4242
task :test_app do
43-
Rake::Task['extension:test_app'].invoke(@user_class)
43+
Rake::Task["extension:test_app"].c(@user_class)
4444
cd root
4545
end
4646

47-
directory ENV.fetch('DUMMY_PATH', nil) do
48-
Rake::Task['extension:test_app'].invoke(@user_class)
47+
directory ENV.fetch("DUMMY_PATH", nil) do
48+
Rake::Task["extension:test_app"].invoke(@user_class)
4949
end
5050
end
5151
end
@@ -59,31 +59,31 @@ def install_dev_app_task
5959
end
6060

6161
def install_rspec_task
62-
require 'rspec/core/rake_task'
62+
require "rspec/core/rake_task"
6363

6464
namespace :extension do
65-
::RSpec::Core::RakeTask.new(:specs, [] => FileList[ENV.fetch('DUMMY_PATH', nil)]) do |t|
65+
::RSpec::Core::RakeTask.new(:specs, [] => FileList[ENV.fetch("DUMMY_PATH", nil)]) do |t|
6666
# Ref: https://circleci.com/docs/2.0/configuration-reference#store_test_results
6767
# Ref: https://github.com/solidusio/circleci-orbs-extensions#test-results-rspec
68-
if ENV['TEST_RESULTS_PATH']
68+
if ENV["TEST_RESULTS_PATH"]
6969
t.rspec_opts =
7070
"--format progress " \
71-
"--format RspecJunitFormatter --out #{ENV['TEST_RESULTS_PATH']}"
71+
"--format RspecJunitFormatter --out #{ENV["TEST_RESULTS_PATH"]}"
7272
end
7373
end
7474
end
7575
end
7676

7777
def install_changelog_task
78-
require 'github_changelog_generator/task'
78+
require "github_changelog_generator/task"
7979

8080
GitHubChangelogGenerator::RakeTask.new(:changelog) do |config|
81-
require 'octokit'
82-
repo = Octokit::Repository.from_url(gemspec.metadata['source_code_uri'] || gemspec.homepage)
81+
require "octokit"
82+
repo = Octokit::Repository.from_url(gemspec.metadata["source_code_uri"] || gemspec.homepage)
8383

8484
config.user = repo.owner
8585
config.project = repo.name
86-
config.future_release = "v#{ENV.fetch('UNRELEASED_VERSION') { gemspec.version }}"
86+
config.future_release = "v#{ENV.fetch("UNRELEASED_VERSION") { gemspec.version }}"
8787
rescue Octokit::InvalidRepository
8888
warn <<~WARN
8989
It won't be possible to automatically generate the CHANGELOG for this extension because the
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# frozen_string_literal: true
22

33
# Allow to override the initial windows size
4-
CAPYBARA_WINDOW_SIZE = ENV.fetch('CAPYBARA_WINDOW_SIZE', '1920x1080').split('x', 2).map(&:to_i)
4+
CAPYBARA_WINDOW_SIZE = ENV.fetch("CAPYBARA_WINDOW_SIZE", "1920x1080").split("x", 2).map(&:to_i)
55
CAPYBARA_WINDOW_WIDTH = CAPYBARA_WINDOW_SIZE[0]
66
CAPYBARA_WINDOW_HEIGHT = CAPYBARA_WINDOW_SIZE[1]
77

8-
Capybara.javascript_driver = ENV.fetch('CAPYBARA_JAVASCRIPT_DRIVER', "solidus_chrome_headless").to_sym
8+
Capybara.javascript_driver = ENV.fetch("CAPYBARA_JAVASCRIPT_DRIVER", "solidus_chrome_headless").to_sym
99
Capybara.default_max_wait_time = 10
10-
Capybara.server = :puma, { Silent: true } # A fix for rspec/rspec-rails#1897
10+
Capybara.server = :puma, {Silent: true} # A fix for rspec/rspec-rails#1897
1111

1212
Capybara.drivers[:selenium_chrome_headless].tap do |original_driver|
1313
Capybara.register_driver :solidus_chrome_headless do |app|
@@ -19,10 +19,10 @@
1919
end
2020
end
2121

22-
require 'capybara-screenshot/rspec'
22+
require "capybara-screenshot/rspec"
2323

2424
Capybara::Screenshot.register_driver(:solidus_chrome_headless) do |driver, path|
2525
driver.browser.save_screenshot(path)
2626
end
2727

28-
require 'spree/testing_support/capybara_ext'
28+
require "spree/testing_support/capybara_ext"

lib/solidus_dev_support/rspec/coverage.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,23 @@
99
# Note that things may not work properly if you don't include this at the very top!
1010
#
1111

12-
require 'simplecov'
13-
SimpleCov.start('rails') do
12+
require "simplecov"
13+
SimpleCov.start("rails") do
1414
add_filter %r{^/lib/generators/.*/install/install_generator.rb}
1515
add_filter %r{^/lib/.*/factories.rb}
1616
add_filter %r{^/lib/.*/version.rb}
1717
end
1818

19-
if ENV['CODECOV_TOKEN']
20-
require 'codecov'
19+
if ENV["CODECOV_TOKEN"]
20+
require "codecov"
2121
SimpleCov.formatter = SimpleCov::Formatter::Codecov
2222
warn <<~WARN
2323
DEPRECATION WARNING: The Codecov ruby uploader is deprecated.
2424
Please use the Codecov CLI uploader to upload code coverage reports.
2525
See https://docs.codecov.com/docs/deprecated-uploader-migration-guide#ruby-uploader for more information on upgrading.
2626
WARN
27-
elsif ENV['CODECOV_COVERAGE_PATH']
28-
require 'simplecov-cobertura'
27+
elsif ENV["CODECOV_COVERAGE_PATH"]
28+
require "simplecov-cobertura"
2929
SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
3030
else
3131
warn "Provide a CODECOV_COVERAGE_PATH environment variable to enable Codecov uploads"

lib/solidus_dev_support/rspec/feature_helper.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
# require 'solidus_dev_support/rspec/feature_helper'
88
#
99

10-
require 'solidus_dev_support/rspec/rails_helper'
11-
require 'solidus_dev_support/rspec/capybara'
10+
require "solidus_dev_support/rspec/rails_helper"
11+
require "solidus_dev_support/rspec/capybara"
1212

1313
dev_support_assets_preload = ->(*) {
1414
if Rails.application.respond_to?(:precompiled_assets)

0 commit comments

Comments
 (0)