solidus_dev_support 2.1.0 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 775cf185474367ed130d07d17702a80fe73b1f30c16c904d3f0ec2a6ae6d030b
-  data.tar.gz: 3cb289f1aa0ac28cae5d1df0f2508acf87c705f07cd706ee4c05f014517d7357
+  metadata.gz: 2909d8c487345aa45ebf8962ace27cbc7d8e2a34eeb2f3eb6ba380913b50c2b4
+  data.tar.gz: a921fad3ec04944509f46f7a113a073b48100971395950525242c48a83b994e4
 SHA512:
-  metadata.gz: 8051cde4fdfb198b4e034fd67204e8f04f0e91eda4d8c92bf1f7a88b62bfd4a3ebb5d3c9e6e253bf52f3d6589efc9c9c866ccf06124cd77adbff0f06bed23f00
-  data.tar.gz: d06396c50c33c207ecbbbc9181a92aa1eeda7daab6f79268128d72b8419d7f755ef923aea33b25505e6faaad187d7bce6428a84b6f2436c5d8ce20702e9aec47
+  metadata.gz: bbb86bd58f06496f53b3c5f4d84ce47b41b9be72135d77aba58ee12b0bffdbc3afef0325fc4ec1dd2926d6cf6a97b11527380372ba28e4adb26719f5d3c9dc4d
+  data.tar.gz: 39e02e67c9b94436456bf5c751196a6b600dac9ac70b7c90488fa5f2793f959c41302cfc8b66ad860c1daac28ea8811e41571fd711f18ba55526ea59133b3fae

data/.mergify.yml

@@ -34,6 +34,8 @@ pull_request_rules:
       - base=master
       - -label="needs changelog label"
       - -label=blocked
+      - "#approved-reviews-by>=1"
+      - -draft
     actions:
       merge:
         method: merge

data/.rubocop.yml

@@ -36,7 +36,6 @@ Style/RedundantRegexpEscape:
 Style/SlicingWithRange:
   Enabled: true
 
-
 AllCops:
   TargetRubyVersion: 2.5
   Exclude:
@@ -44,6 +43,7 @@ AllCops:
     - "vendor/**/*"
     # Generated binstubs
     - bin/rake
+  NewCops: enable
 
 Style/FrozenStringLiteralComment:
   Exclude:

data/CHANGELOG.md

@@ -1,5 +1,69 @@
 # Changelog
 
+## [v2.4.0](https://github.com/solidusio/solidus_dev_support/tree/v2.4.0) (2021-02-05)
+
+[Full Changelog](https://github.com/solidusio/solidus_dev_support/compare/v2.3.0...v2.4.0)
+
+**Implemented enhancements:**
+
+- Improve engine's requires to remove double inclusions [\#165](https://github.com/solidusio/solidus_dev_support/pull/165) ([kennyadsl](https://github.com/kennyadsl))
+- Remove double require of core factories from rails\_helper [\#164](https://github.com/solidusio/solidus_dev_support/pull/164) ([kennyadsl](https://github.com/kennyadsl))
+
+**Fixed bugs:**
+
+- Fix typo in configuration.rb.tt [\#166](https://github.com/solidusio/solidus_dev_support/pull/166) ([brchristian](https://github.com/brchristian))
+
+**Merged pull requests:**
+
+- Rename spree:install to solidus:install in the sandbox template [\#167](https://github.com/solidusio/solidus_dev_support/pull/167) ([blocknotes](https://github.com/blocknotes))
+
+## [v2.3.0](https://github.com/solidusio/solidus_dev_support/tree/v2.3.0) (2021-01-14)
+
+[Full Changelog](https://github.com/solidusio/solidus_dev_support/compare/v2.2.0...v2.3.0)
+
+**Implemented enhancements:**
+
+- Do not raise if source\_code\_uri is missing in the gemspec [\#163](https://github.com/solidusio/solidus_dev_support/pull/163) ([kennyadsl](https://github.com/kennyadsl))
+- Factory bot fixes for latest Solidus 2.11 release [\#162](https://github.com/solidusio/solidus_dev_support/pull/162) ([elia](https://github.com/elia))
+
+**Fixed bugs:**
+
+- use rubocop-rspec 2.x [\#161](https://github.com/solidusio/solidus_dev_support/pull/161) ([ccarruitero](https://github.com/ccarruitero))
+
+## [v2.2.0](https://github.com/solidusio/solidus_dev_support/tree/v2.2.0) (2020-11-27)
+
+[Full Changelog](https://github.com/solidusio/solidus_dev_support/compare/v2.1.0...v2.2.0)
+
+**Implemented enhancements:**
+
+- Improve the URL generation for the gemspec and Readme \(defaulting to the solidusio-contrib organization\), consistently use a file-based Changelog [\#159](https://github.com/solidusio/solidus_dev_support/pull/159) ([elia](https://github.com/elia))
+- Configuration Cleanup [\#158](https://github.com/solidusio/solidus_dev_support/pull/158) ([elia](https://github.com/elia))
+- Refer to Solidus wiki page for gem release info [\#157](https://github.com/solidusio/solidus_dev_support/pull/157) ([spaghetticode](https://github.com/spaghetticode))
+- Upgrade to RuboCop 1.0 [\#156](https://github.com/solidusio/solidus_dev_support/pull/156) ([aldesantis](https://github.com/aldesantis))
+- Add a command to display gem's version [\#154](https://github.com/solidusio/solidus_dev_support/pull/154) ([igorbp](https://github.com/igorbp))
+
+**Fixed bugs:**
+
+- Require "webdrivers" before using it as the default javascript driver [\#152](https://github.com/solidusio/solidus_dev_support/pull/152) ([ccarruitero](https://github.com/ccarruitero))
+
+**Merged pull requests:**
+
+- Don't let mergify mark a PR as red because it's missing a review [\#153](https://github.com/solidusio/solidus_dev_support/pull/153) ([elia](https://github.com/elia))
+
+## [v2.1.0](https://github.com/solidusio/solidus_dev_support/tree/v2.1.0) (2020-10-02)
+
+[Full Changelog](https://github.com/solidusio/solidus_dev_support/compare/v2.0.1...v2.1.0)
+
+**Implemented enhancements:**
+
+- Add standard github\_changelog\_generator configuration [\#151](https://github.com/solidusio/solidus_dev_support/pull/151) ([aldesantis](https://github.com/aldesantis))
+- Move generated factories to `testing\_support/` [\#150](https://github.com/solidusio/solidus_dev_support/pull/150) ([aldesantis](https://github.com/aldesantis))
+- Add extension configuration boilerplate [\#149](https://github.com/solidusio/solidus_dev_support/pull/149) ([aldesantis](https://github.com/aldesantis))
+
+**Fixed bugs:**
+
+- Fix `NewCops: Enable` option for RuboCop [\#148](https://github.com/solidusio/solidus_dev_support/pull/148) ([aldesantis](https://github.com/aldesantis))
+
 ## [v2.0.1](https://github.com/solidusio/solidus_dev_support/tree/v2.0.1) (2020-09-22)
 
 [Full Changelog](https://github.com/solidusio/solidus_dev_support/compare/v2.0.0...v2.0.1)
@@ -10,7 +74,7 @@
 
 ## [v2.0.0](https://github.com/solidusio/solidus_dev_support/tree/v2.0.0) (2020-09-22)
 
-[Full Changelog](https://github.com/solidusio/solidus_dev_support/compare/v1.5.0...v2.0.0)
+[Full Changelog](https://github.com/solidusio/solidus_dev_support/compare/v1.6.0...v2.0.0)
 
 **Breaking changes:**
 
@@ -21,17 +85,26 @@
 - Enable new RuboCop cops automatically [\#143](https://github.com/solidusio/solidus_dev_support/pull/143) ([aldesantis](https://github.com/aldesantis))
 - Don't forcefully close issues via stale-bot [\#139](https://github.com/solidusio/solidus_dev_support/pull/139) ([elia](https://github.com/elia))
 - Add the approximate recommendation for dev-support to the gemspec [\#137](https://github.com/solidusio/solidus_dev_support/pull/137) ([elia](https://github.com/elia))
+
+**Fixed bugs:**
+
+- fix capybara driver declaration [\#141](https://github.com/solidusio/solidus_dev_support/pull/141) ([ccarruitero](https://github.com/ccarruitero))
+- Bump RuboCop to latest 0.90.0 version [\#138](https://github.com/solidusio/solidus_dev_support/pull/138) ([peterberkenbosch](https://github.com/peterberkenbosch))
+- Fix missing backslash in solidus install command [\#135](https://github.com/solidusio/solidus_dev_support/pull/135) ([nirebu](https://github.com/nirebu))
+
+## [v1.6.0](https://github.com/solidusio/solidus_dev_support/tree/v1.6.0) (2020-08-26)
+
+[Full Changelog](https://github.com/solidusio/solidus_dev_support/compare/v1.5.0...v1.6.0)
+
+**Implemented enhancements:**
+
 - Let the extension name include spaces [\#133](https://github.com/solidusio/solidus_dev_support/pull/133) ([elia](https://github.com/elia))
 - Add precompiled badges fro CI and coverage [\#132](https://github.com/solidusio/solidus_dev_support/pull/132) ([elia](https://github.com/elia))
 - Add Changelog Rake task [\#128](https://github.com/solidusio/solidus_dev_support/pull/128) ([tvdeyen](https://github.com/tvdeyen))
 - Readme fixes [\#122](https://github.com/solidusio/solidus_dev_support/pull/122) ([elia](https://github.com/elia))
-- Restore the generic bin/rails command [\#106](https://github.com/solidusio/solidus_dev_support/pull/106) ([elia](https://github.com/elia))
 
 **Fixed bugs:**
 
-- fix capybara driver declaration [\#141](https://github.com/solidusio/solidus_dev_support/pull/141) ([ccarruitero](https://github.com/ccarruitero))
-- Bump RuboCop to latest 0.90.0 version [\#138](https://github.com/solidusio/solidus_dev_support/pull/138) ([peterberkenbosch](https://github.com/peterberkenbosch))
-- Fix missing backslash in solidus install command [\#135](https://github.com/solidusio/solidus_dev_support/pull/135) ([nirebu](https://github.com/nirebu))
 - Don't install a payment-method in the sandbox [\#131](https://github.com/solidusio/solidus_dev_support/pull/131) ([elia](https://github.com/elia))
 - Run extension generator in sandbox [\#127](https://github.com/solidusio/solidus_dev_support/pull/127) ([elia](https://github.com/elia))
 

data/Gemfile

@@ -15,7 +15,6 @@ gem 'rails', '>0.a'
 
 # These gems will be used by the temporary extensions generated by tests
 group :test do
-  gem 'factory_bot', '> 4.10.0'
   gem 'mysql2'
   gem 'pg'
   gem 'solidus_auth_devise'

data/README.md

@@ -232,9 +232,16 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 the tests. You can also run `bin/console` for an interactive prompt that will allow you to
 experiment.
 
-To install this gem onto your local machine, run `bin/rake install`. To release a new
-version, update the version number in `version.rb`, and then run `bin/rake release`, which
-will create a git tag for the version, push git commits and tags, and push the `.gem` file to
+To install this gem onto your local machine, run `bin/rake install`.
+
+To release a new version:
+
+1. update the version number in `version.rb`
+2. update the changelog with `bin/rake changelog`
+3. commit the changes using `Bump SolidusDevSupport to 1.2.3` as the message
+3. run `bin/rake release`
+
+The last command will create a git tag for the version, push git commits and tags, and push the `.gem` file to
 [rubygems.org](https://rubygems.org).
 
 ## Contributing

data/Rakefile

@@ -2,14 +2,16 @@
 
 require "bundler/gem_tasks"
 
-require 'github_changelog_generator/task'
-GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-  config.user = 'solidusio'
-  config.project = 'solidus_dev_support'
-  config.exclude_labels = %w[infrastructure]
-  config.issues = false
-  config.base = "#{__dir__}/OLD_CHANGELOG.md"
-  config.since_tag = 'v1.4.0'
+desc "Update the changelog, specify the version for the unreleased changes appending VERSION=1.2.3 to the command"
+task :changelog do
+  require_relative "lib/solidus_dev_support/version"
+
+  future_release = ENV.fetch("VERSION") {
+    warn "Using current version (#{SolidusDevSupport::VERSION}) for unreleased changes, use VERSION=1.2.3 to select a different one."
+    SolidusDevSupport::VERSION
+  }
+
+  sh "bundle exec github_changelog_generator --project solidus_dev_support --user solidusio --future-release #{future_release}"
 end
 
 require "rspec/core/rake_task"

data/lib/solidus_dev_support/extension.rb

@@ -28,6 +28,7 @@ module SolidusDevSupport
         make_executable bin
       end
 
+      template 'CHANGELOG.md', "#{path}/CHANGELOG.md"
       template 'extension.gemspec', "#{path}/#{file_name}.gemspec"
       template 'Gemfile', "#{path}/Gemfile"
       template 'gitignore', "#{path}/.gitignore"
@@ -50,27 +51,36 @@ module SolidusDevSupport
         @file_name = Thor::Util.snake_case(File.basename(path))
         @file_name = PREFIX + @file_name unless @file_name.start_with?(PREFIX)
 
-        @class_name = Thor::Util.camel_case @file_name
+        @class_name = Thor::Util.camel_case file_name
 
         @root = File.dirname(path)
-        @path = File.join(@root, @file_name)
+        @path = File.join(root, file_name)
+
+        @repo = existing_repo || default_repo
 
         @gemspec = existing_gemspec || default_gemspec
       end
 
+      attr_reader :root, :path, :file_name, :class_name, :gemspec, :repo
+
+      private
+
       def gemspec_path
         @gemspec_path ||= File.join(path, "#{file_name}.gemspec")
       end
 
       def default_gemspec
-        @default_gemspec ||= Gem::Specification.new(@file_name, '0.0.1') do |gem|
+        @default_gemspec ||= Gem::Specification.new(file_name, '0.0.1') do |gem|
           gem.author = git('config user.name', 'TODO: Write your name')
-          gem.description = 'TODO: Write a longer description or delete this line.'
           gem.email = git('config user.email', 'TODO: Write your email address')
-          gem.homepage = default_homepage
-          gem.license = 'BSD-3-Clause'
-          gem.metadata['changelog_uri'] = default_homepage + '/releases'
+
           gem.summary = 'TODO: Write a short summary, because RubyGems requires one.'
+          gem.description = 'TODO: Write a longer description or delete this line.'
+          gem.license = 'BSD-3-Clause'
+
+          gem.metadata['homepage_uri'] = gem.homepage = "https://github.com/#{repo}#readme"
+          gem.metadata['changelog_uri'] = "https://github.com/#{repo}/blob/master/CHANGELOG.md"
+          gem.metadata['source_code_uri'] = "https://github.com/#{repo}"
         end
       end
 
@@ -80,28 +90,26 @@ module SolidusDevSupport
         @existing_gemspec ||= Gem::Specification.load(gemspec_path).tap do |spec|
           spec.author ||= default_gemspec.author
           spec.email ||= default_gemspec.email
-          spec.homepage ||= default_gemspec.homepage
-          spec.license ||= default_gemspec.license
-          spec.metadata['changelog_uri'] ||= default_gemspec.metadata[:changelog_uri]
+
           spec.summary ||= default_gemspec.summary
+          spec.license ||= default_gemspec.license
+
+          spec.homepage ||= default_gemspec.homepage
+          spec.metadata['source_code_uri'] ||= default_gemspec.metadata['source_code_uri']
+          spec.metadata['changelog_uri'] ||= default_gemspec.metadata['changelog_uri']
+          spec.metadata['source_code_uri'] ||= default_gemspec.metadata['source_code_uri']
         end
       end
 
-      def default_homepage
-        @default_homepage ||= git(
-          'remote get-url origin',
-          "git@github.com:#{github_user}/#{file_name}.git"
-        ).sub(
-          %r{^.*github\.com.([^/]+)/([^/.]+).*$},
-          'https://github.com/\1/\2'
-        )
+      def default_repo
+        "solidusio-contrib/#{file_name}"
       end
 
-      def github_user
-        @github_user ||= git('config github.user', '[USERNAME]')
+      def existing_repo
+        git('remote get-url origin')&.sub(%r{^.*github\.com.([^/]+)/([^/.]+).*$}, '\1/\2')
       end
 
-      def git(command, default)
+      def git(command, default = nil)
         result = `git #{command} 2> /dev/null`.strip
         result.empty? ? default : result
       end
@@ -111,8 +119,6 @@ module SolidusDevSupport
         executable = (path.stat.mode | 0o111)
         path.chmod(executable)
       end
-
-      attr_reader :root, :path, :file_name, :class_name, :gemspec
     end
 
     def self.source_root

data/lib/solidus_dev_support/rake_tasks.rb

@@ -76,11 +76,23 @@ module SolidusDevSupport
     def install_changelog_task
       require 'github_changelog_generator/task'
 
-      user, project = gemspec.homepage.split("/")[3..5]
       GitHubChangelogGenerator::RakeTask.new(:changelog) do |config|
-        config.user = user || 'solidus-contrib'
-        config.project = project || gemspec.name
-        config.future_release = "v#{gemspec.version}"
+        require 'octokit'
+        repo = Octokit::Repository.from_url(gemspec.metadata['source_code_uri'] || gemspec.homepage)
+
+        config.user = repo.owner
+        config.project = repo.name
+        config.future_release = "v#{ENV['UNRELEASED_VERSION'] || gemspec.version}"
+
+      rescue Octokit::InvalidRepository
+        warn <<~WARN
+          It won't be possible to automatically generate the CHANGELOG for this extension because the
+          gemspec is missing the `source_code_uri` metadata. Please add this line to the gemspec to
+          enable automatic CHANGELOG generation:
+
+              s.metadata["source_code_uri"] = 'https://github.com/org/repo'
+
+        WARN
       end
     end
   end

data/lib/solidus_dev_support/rspec/capybara.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'webdrivers/chromedriver'
+
 # Allow to override the initial windows size
 CAPYBARA_WINDOW_SIZE = (ENV['CAPYBARA_WINDOW_SIZE'] || '1920x1080').split('x', 2).map(&:to_i)
 

data/lib/solidus_dev_support/rspec/rails_helper.rb

@@ -16,14 +16,12 @@ require 'factory_bot'
 require 'ffaker'
 
 require 'spree/testing_support/authorization_helpers'
-require 'spree/testing_support/factories'
 require 'spree/testing_support/url_helpers'
 require 'spree/testing_support/preferences'
 require 'spree/testing_support/controller_requests'
+require 'solidus_dev_support/testing_support/factories'
 require 'solidus_dev_support/testing_support/preferences'
 
-FactoryBot.find_definitions
-
 RSpec.configure do |config|
   config.infer_spec_type_from_file_location!
 

data/lib/solidus_dev_support/solidus_command.rb

@@ -2,6 +2,7 @@
 
 require 'thor'
 require 'solidus_dev_support/extension'
+require 'spree/core/version'
 
 module SolidusDevSupport
   class SolidusCommand < Thor
@@ -13,6 +14,13 @@ module SolidusDevSupport
     desc 'e', 'Manage solidus extensions (shortcut for "extension")'
     subcommand 'e', Extension
 
+    desc 'version', 'Displays solidus_dev_support version'
+    def version
+      puts "Solidus version #{Spree.solidus_gem_version}"
+      puts "Solidus Dev Support version #{SolidusDevSupport::VERSION}"
+    end
+    map ['-v', '--version'] => :version
+
     def self.exit_on_failure?
       true
     end

data/lib/solidus_dev_support/templates/extension/CHANGELOG.md

@@ -0,0 +1 @@
+# Changelog

data/lib/solidus_dev_support/templates/extension/README.md

@@ -1,13 +1,9 @@
 # <%= class_name.gsub(/(?<=[^A-Z])([A-Z])/, ' \1') %>
 
-<!-- Replace REPO_ORG and uncomment the following to show badges for CI and coverage. -->
+[![CircleCI](https://circleci.com/gh/<%= repo %>.svg?style=shield)](https://circleci.com/gh/<%= repo %>)
+[![codecov](https://codecov.io/gh/<%= repo %>/branch/master/graph/badge.svg)](https://codecov.io/gh/<%= repo %>)
 
-<!--
-[![CircleCI](https://circleci.com/gh/REPO_ORG/<%= file_name %>.svg?style=shield)](https://circleci.com/gh/REPO_ORG/<%= file_name %>)
-[![codecov](https://codecov.io/gh/REPO_ORG/<%= file_name %>/branch/master/graph/badge.svg)](https://codecov.io/gh/REPO_ORG/<%= file_name %>)
--->
-
-[Explain what your extension does.]
+<!-- Explain what your extension does. -->
 
 ## Installation
 
@@ -25,7 +21,7 @@ bin/rails generate <%= file_name %>:install
 
 ## Usage
 
-[Explain how to use your extension once it's been installed.]
+<!-- Explain how to use your extension once it's been installed. -->
 
 ## Development
 
@@ -81,15 +77,7 @@ git commit -m "Update the changelog"
 
 ### Releasing new versions
 
-Your new extension version can be released using `gem-release` like this:
-
-```shell
-bundle exec gem bump -v 1.6.0
-bin/rake changelog
-git commit -a --amend
-git push
-bundle exec gem release
-```
+Please refer to the dedicated [page](https://github.com/solidusio/solidus/wiki/How-to-release-extensions) on Solidus wiki.
 
 ## License
 

data/lib/solidus_dev_support/templates/extension/bin/sandbox.tt

@@ -67,7 +67,7 @@ unbundled bundle install --gemfile Gemfile
 
 unbundled bundle exec rake db:drop db:create
 
-unbundled bundle exec rails generate spree:install \
+unbundled bundle exec rails generate solidus:install \
   --auto-accept \
   --user_class=Spree::User \
   --enforce_available_locales=true \

data/lib/solidus_dev_support/templates/extension/extension.gemspec.tt

@@ -9,12 +9,12 @@ Gem::Specification.new do |spec|
   spec.email = '<%= gemspec.email %>'
 
   spec.summary = '<%= gemspec.summary %>'
-  spec.description = '<%= gemspec.description %>'
-  spec.homepage = '<%= gemspec.homepage %>'
+  <% if gemspec.description %>spec.description = '<%= gemspec.description %>'
+  <% end %>spec.homepage = '<%= gemspec.homepage %>'
   spec.license = '<%= gemspec.license %>'
 
   spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = '<%= gemspec.homepage %>'
+  spec.metadata['source_code_uri'] = '<%= gemspec.metadata["source_code_uri"] %>'
   spec.metadata['changelog_uri'] = '<%= gemspec.metadata["changelog_uri"] %>'
 
   spec.required_ruby_version = Gem::Requirement.new('~> 2.5')

data/lib/solidus_dev_support/templates/extension/lib/%file_name%.rb.tt

@@ -1,20 +1,5 @@
 # frozen_string_literal: true
 
-require 'solidus_core'
-require 'solidus_support'
-
 require '<%=file_name%>/configuration'
 require '<%=file_name%>/version'
 require '<%=file_name%>/engine'
-
-module <%= class_name %>
-  class << self
-    def configuration
-      @configuration ||= Configuration.new
-    end
-
-    def configure
-      yield configuration
-    end
-  end
-end

data/lib/solidus_dev_support/templates/extension/lib/%file_name%/configuration.rb.tt

@@ -2,7 +2,20 @@
 
 module <%= class_name %>
   class Configuration
-    # TODO: Remember to change this with your extension's actual preferences!
-    # attr_accessor :sample_preference
+    # Define here the settings for this extension, e.g.:
+    #
+    # attr_accessor :my_setting
+  end
+
+  class << self
+    def configuration
+      @configuration ||= Configuration.new
+    end
+
+    alias config configuration
+
+    def configure
+      yield configuration
+    end
   end
 end

data/lib/solidus_dev_support/templates/extension/lib/%file_name%/engine.rb.tt

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/core'
-require '<%= file_name %>'
+require 'solidus_core'
+require 'solidus_support'
 
 module <%= class_name %>
   class Engine < Rails::Engine

data/lib/solidus_dev_support/templates/extension/rubocop.yml

@@ -2,4 +2,4 @@ require:
   - solidus_dev_support/rubocop
 
 AllCops:
-  NewCops: Enable
+  NewCops: disable

data/lib/solidus_dev_support/templates/extension/spec/spec_helper.rb.tt

@@ -19,7 +19,7 @@ require 'solidus_dev_support/rspec/feature_helper'
 Dir["#{__dir__}/support/**/*.rb"].sort.each { |f| require f }
 
 # Requires factories defined in lib/<%= file_name %>/testing_support/factories.rb
-require '<%= file_name %>/testing_support/factories'
+SolidusDevSupport::TestingSupport::Factories.load_for(<%= class_name %>::Engine)
 
 RSpec.configure do |config|
   config.infer_spec_type_from_file_location!

data/lib/solidus_dev_support/testing_support/factories.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require 'factory_bot'
+
+Spree::Deprecation.silence do
+  require 'spree/testing_support/factories'
+  puts <<~MSG
+    We are transitioning to a new way of loading factories for extensions.
+    Be sure this extension does not load factories using require but uses
+    the load_for() method in its spec_helper.rb, eg:
+
+      SolidusDevSupport::TestingSupport::Factories.load_for(ExtensionName1::Engine, ExtensionName2::Engine)
+
+    This will load Solidus Core factories right before the ones defined in
+    lib/extension_name/testing_support/factories/*_factory.rb or
+    lib/extension_name/testing_support/factories.rb
+
+    This message will be removed when all extensions are updated.
+  MSG
+end
+
+begin
+  require 'spree/testing_support/factory_bot'
+rescue LoadError
+  # Do nothing, we are testing the extension against an old version of Solidus
+end
+
+module SolidusDevSupport
+  module TestingSupport
+    module Factories
+      def self.load_for(*engines)
+        paths = engines.flat_map do |engine|
+          # Check if the extension has a lib/*/factories.rb. If it does, we emit a
+          # deprecation warning and just use it.
+          obsolete_factories_file = engine.root.glob('lib/*/factories.rb').first # 'lib/*/factories/*_factory.rb'
+          if obsolete_factories_file.present?
+            ActiveSupport::Deprecation.warn <<-WARN.squish, caller(4)
+              SolidusDevSupport::TestingSupport::Factories.load_for() is automatically loading
+              all factories present in #{obsolete_factories_file.dirname.to_s.gsub(engine.root.to_s, '')}/testing_support/factories/.
+              Please move the content of #{obsolete_factories_file.to_s.gsub(engine.root.to_s, '')} to that directory.
+            WARN
+
+            [obsolete_factories_file]
+          else
+            # If there are both a lib/*/testing_support/factories.rb and a lib/*/testing_support/factories/,
+            # we assume that the factories.rb file is only used to load all factories prensent in the directory.
+            # That file can be removed from the extension, in fact, we ignore it and emit a message asking to
+            # remove it.
+            factories_file_or_folder = engine.root.glob('lib/*/testing_support/factories{,.rb}')
+            if factories_file_or_folder.size == 2
+              folder, file = factories_file_or_folder.partition(&:directory?).map(&:first).map { |path| path.to_s.gsub(engine.root.to_s, '') }
+              ActiveSupport::Deprecation.warn <<-WARN.squish, caller(4)
+                SolidusDevSupport::TestingSupport::Factories.load_for() is automatically loading
+                all factories present into #{folder}. You should now safely remove #{file} if it
+                is only used to load ./factories content.
+              WARN
+
+              engine.root.glob('lib/*/testing_support/factories/**/*_factory.rb')
+            else
+              factories_file_or_folder
+            end
+          end
+        end.map { |path| path.sub(/.rb\z/, '').to_s }
+
+        if using_factory_bot_definition_file_paths?
+          FactoryBot.definition_file_paths = [
+            Spree::TestingSupport::FactoryBot.definition_file_paths,
+            paths,
+          ].flatten
+
+          FactoryBot.reload
+        else
+          FactoryBot.find_definitions
+
+          paths.each { |path| require path }
+        end
+      end
+
+      def self.using_factory_bot_definition_file_paths?
+        defined?(Spree::TestingSupport::FactoryBot) &&
+          Spree::TestingSupport::FactoryBot.respond_to?(:definition_file_paths)
+      end
+    end
+  end
+end

data/lib/solidus_dev_support/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SolidusDevSupport
-  VERSION = "2.1.0"
+  VERSION = "2.4.2"
 
   def self.gem_version
     Gem::Version.new(VERSION)

data/solidus_dev_support.gemspec

@@ -32,17 +32,18 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'capybara-screenshot', '~> 1.0'
   spec.add_dependency 'codecov', '~> 0.2'
   spec.add_dependency 'database_cleaner', '~> 1.7'
-  spec.add_dependency 'factory_bot_rails', '~> 5.1'
+  spec.add_dependency 'factory_bot', '~> 4.8'
+  spec.add_dependency 'factory_bot_rails'
   spec.add_dependency 'ffaker', '~> 2.13'
   spec.add_dependency 'gem-release', '~> 2.1'
   spec.add_dependency 'github_changelog_generator', '~> 1.15'
   spec.add_dependency 'puma', '~> 4.3'
   spec.add_dependency 'rspec_junit_formatter'
   spec.add_dependency 'rspec-rails', '~> 4.0.0.beta3'
-  spec.add_dependency 'rubocop', '~> 0.90'
+  spec.add_dependency 'rubocop', '~> 1.0'
   spec.add_dependency 'rubocop-performance', '~> 1.5'
   spec.add_dependency 'rubocop-rails', '~> 2.3'
-  spec.add_dependency 'rubocop-rspec', '~> 1.36'
+  spec.add_dependency 'rubocop-rspec', '~> 2.0'
   spec.add_dependency 'solidus_core', ['>= 2.0', '< 3']
   spec.add_dependency 'webdrivers', '~> 4.4'
 

data/spec/features/create_extension_spec.rb

@@ -3,6 +3,7 @@
 require 'fileutils'
 require 'open3'
 require 'spec_helper'
+require 'spree/core/version'
 
 RSpec.describe 'Create extension' do
   include FileUtils
@@ -13,8 +14,7 @@ RSpec.describe 'Create extension' do
   let(:gemspec_name) { "solidus_#{extension_name}.gemspec" }
   let(:tmp_path) { Pathname.new(gem_root).join('tmp') }
   let(:install_path) { tmp_path.join("solidus_#{extension_name}") }
-
-  class CommandFailed < StandardError; end
+  let(:command_failed_error) { Class.new(StandardError) }
 
   before do
     rm_rf(install_path)
@@ -28,6 +28,7 @@ RSpec.describe 'Create extension' do
 
   it 'checks the create extension process' do
     step :check_solidus_cmd
+    step :check_gem_version
     step :check_create_extension
     step :check_bundle_install
     step :check_default_task
@@ -45,6 +46,21 @@ RSpec.describe 'Create extension' do
     end
   end
 
+  def check_gem_version
+    gem_version_commands = ['version', '--version', '-v']
+    gem_version = SolidusDevSupport::VERSION
+    solidus_version = Spree.solidus_gem_version
+
+    cd(tmp_path) do
+      gem_version_commands.each do |gem_version_cmd|
+        output = `#{solidus_cmd} #{gem_version_cmd}`
+        expect($?).to be_success
+        expect(output).to include("Solidus version #{solidus_version}")
+        expect(output).to include("Solidus Dev Support version #{gem_version}")
+      end
+    end
+  end
+
   def check_create_extension
     cd(tmp_path) do
       output = `#{solidus_cmd} extension #{extension_name}`
@@ -83,7 +99,7 @@ RSpec.describe 'Create extension' do
       open('Gemfile', 'a') { |f| f.puts "gem 'solidus_dev_support', path: '../../..'" }
     end
 
-    expect { bundle_install }.to raise_error(CommandFailed, /invalid gemspec/)
+    expect { bundle_install }.to raise_error(command_failed_error, /invalid gemspec/)
 
     # Update gemspec with the required fields
     gemspec_path = install_path.join(gemspec_name)
@@ -106,11 +122,16 @@ RSpec.describe 'Create extension' do
   end
 
   def check_run_specs
+    install_path.join('lib', 'solidus_test_extension', 'testing_support', 'factories.rb').open('a') do |factories_file|
+      factories_file.write "\n puts 'loading test_extension factories'"
+    end
+
     install_path.join('spec', 'some_spec.rb').write(
       "require 'spec_helper'\nRSpec.describe 'Some test' do it { expect(true).to be_truthy } end\n"
     )
     cd(install_path) do
       output = sh('bundle exec rspec')
+      expect(output).to include('loading test_extension factories')
       expect(output).to include('1 example, 0 failures')
       expect(output).to include(ENV['CODECOV_TOKEN'] ? 'Coverage reports upload successfully' : 'Provide a CODECOV_TOKEN environment variable to enable Codecov uploads')
     end
@@ -144,7 +165,7 @@ RSpec.describe 'Create extension' do
         warn "$ #{command}"
         warn output.to_s
       end
-      raise(CommandFailed, "command failed: #{command}\n#{output}")
+      raise(command_failed_error, "command failed: #{command}\n#{output}")
     end
   end
 

data/spec/lib/extension_spec.rb

@@ -1,33 +1,69 @@
 require 'solidus_dev_support/extension'
 
 RSpec.describe SolidusDevSupport::Extension do
-  describe '#default_homepage' do
-    before do
-      expect(subject).to receive(:git).with('remote get-url origin', any_args).and_return(remote)
-      expect(subject).to receive(:github_user).and_return('[USERNAME]')
-      expect(subject).to receive(:file_name).and_return('solidus_foo_bar')
-    end
+  describe '#path=' do
+    specify 'with an existing extension' do
+      allow(subject).to receive(:git).with('remote get-url origin', any_args).and_return('git@github.com:some_user/solidus_my_ext.git')
+      allow(subject).to receive(:git).with('config user.name', any_args).and_return('John Doe')
+      allow(subject).to receive(:git).with('config user.email', any_args).and_return('john.doe@example.com')
 
-    context 'with a git ssh-style remote' do
-      let(:remote) { 'git@github.com:solidusio-contrib/solidus_extension_dev_tools.git' }
+      allow(File).to receive(:exist?).with('/foo/bar/solidus_my_ext/solidus_my_ext.gemspec').and_return(true)
+      allow(Gem::Specification).to receive(:load).with('/foo/bar/solidus_my_ext/solidus_my_ext.gemspec').and_return(
+        Gem::Specification.new('solidus_my_ext', '0.1.1') do |gem|
+          gem.author = "Jane Doe"
+          gem.email = "jane.doe@example.com"
 
-      it 'generates a github home page value' do
-        expect(subject.default_homepage).to eq('https://github.com/solidusio-contrib/solidus_extension_dev_tools')
-      end
-    end
+          gem.summary = 'This extension is awesome!'
+          gem.license = 'MIT'
 
-    context 'with a git https remote' do
-      let(:remote) { 'https://github.com/solidusio-contrib/solidus_extension_dev_tools.git' }
+          gem.homepage = "some_user.github.io/solidus_my_ext"
+          gem.metadata['changelog_uri'] = "https://github.com/some_user/solidus_my_ext/releases"
+          gem.metadata['source_code_uri'] = "https://github.com/some_user/solidus_my_ext"
+        end
+      )
 
-      it 'generates a github home page value' do
-        expect(subject.default_homepage).to eq('https://github.com/solidusio-contrib/solidus_extension_dev_tools')
+      subject.path = '/foo/bar/solidus_my_ext'
+
+      aggregate_failures do
+        expect(subject.file_name).to eq("solidus_my_ext")
+        expect(subject.class_name).to eq("SolidusMyExt")
+        expect(subject.root).to eq("/foo/bar")
+        expect(subject.path).to eq("/foo/bar/solidus_my_ext")
+        expect(subject.repo).to eq("some_user/solidus_my_ext")
+        expect(subject.gemspec.author).to eq('Jane Doe')
+        expect(subject.gemspec.email).to eq('jane.doe@example.com')
+        expect(subject.gemspec.summary).to eq('This extension is awesome!')
+        expect(subject.gemspec.license).to eq('MIT')
+        expect(subject.gemspec.homepage).to eq("some_user.github.io/solidus_my_ext")
+        expect(subject.gemspec.metadata['changelog_uri']).to eq("https://github.com/some_user/solidus_my_ext/releases")
+        expect(subject.gemspec.metadata['source_code_uri']).to eq("https://github.com/some_user/solidus_my_ext")
       end
     end
-  end
 
-  describe '#default_gemspec' do
-    it 'has a changelog_uri' do
-      expect(subject.default_gemspec.metadata['changelog_uri']).to end_with('/releases')
+    specify 'when creating a new extension' do
+      allow(subject).to receive(:git).with('remote get-url origin', any_args) { |_, default| default }
+      allow(subject).to receive(:git).with('config user.name', any_args).and_return('John Doe')
+      allow(subject).to receive(:git).with('config user.email', any_args).and_return('john.doe@example.com')
+
+      allow(Dir).to receive(:pwd).and_return('/foo/bar')
+
+      subject.path = '/foo/bar/solidus_my_ext'
+
+      aggregate_failures do
+        expect(subject.file_name).to eq("solidus_my_ext")
+        expect(subject.class_name).to eq("SolidusMyExt")
+        expect(subject.root).to eq("/foo/bar")
+        expect(subject.path).to eq("/foo/bar/solidus_my_ext")
+        expect(subject.repo).to eq("solidusio-contrib/solidus_my_ext")
+        expect(subject.gemspec.author).to eq('John Doe')
+        expect(subject.gemspec.email).to eq('john.doe@example.com')
+        expect(subject.gemspec.summary).to eq('TODO: Write a short summary, because RubyGems requires one.')
+        expect(subject.gemspec.description).to eq('TODO: Write a longer description or delete this line.')
+        expect(subject.gemspec.license).to eq('BSD-3-Clause')
+        expect(subject.gemspec.homepage).to eq("https://github.com/solidusio-contrib/solidus_my_ext#readme")
+        expect(subject.gemspec.metadata['changelog_uri']).to eq("https://github.com/solidusio-contrib/solidus_my_ext/blob/master/CHANGELOG.md")
+        expect(subject.gemspec.metadata['source_code_uri']).to eq("https://github.com/solidusio-contrib/solidus_my_ext")
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_dev_support
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.4.2
 platform: ruby
 authors:
 - Alessandro Desantis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-02 00:00:00.000000000 Z
+date: 2021-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -67,19 +67,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: factory_bot_rails
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '4.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '4.8'
+- !ruby/object:Gem::Dependency
+  name: factory_bot_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.90'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.90'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +226,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.36'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.36'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
@@ -323,6 +337,7 @@ files:
 - lib/solidus_dev_support/solidus_command.rb
 - lib/solidus_dev_support/templates/extension/.circleci/config.yml
 - lib/solidus_dev_support/templates/extension/.github/stale.yml
+- lib/solidus_dev_support/templates/extension/CHANGELOG.md
 - lib/solidus_dev_support/templates/extension/CONTRIBUTING.md
 - lib/solidus_dev_support/templates/extension/Gemfile
 - lib/solidus_dev_support/templates/extension/LICENSE
@@ -355,6 +370,7 @@ files:
 - lib/solidus_dev_support/templates/extension/rspec
 - lib/solidus_dev_support/templates/extension/rubocop.yml
 - lib/solidus_dev_support/templates/extension/spec/spec_helper.rb.tt
+- lib/solidus_dev_support/testing_support/factories.rb
 - lib/solidus_dev_support/testing_support/preferences.rb
 - lib/solidus_dev_support/version.rb
 - solidus_dev_support.gemspec
@@ -383,7 +399,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Development tools for Solidus extensions.