Merge pull request #188 from solidusio/elia/solidus-starter-frontend-support

Misc: auth-devise, extracted frontend gem, sqlite

Author: mergify[bot]

.circleci/config.yml

@@ -12,21 +12,25 @@ commands:
     steps:
       - checkout
       - run:
-          command: "gem install bundler -v '>=2' --conservative"
-          no_output_timeout: 20m
+          name: "Update bundler"
+          command: |
+            gem update --system
+            gem --version
+            gem install bundler -v '>=2.3.21' --conservative
+            bundle --version
 
 jobs:
   solidus-master:
-    executor: solidusio_extensions/sqlite-memory
+    executor: solidusio_extensions/sqlite
     steps: ['setup', 'solidusio_extensions/run-tests-solidus-master']
   solidus-current:
-    executor: solidusio_extensions/sqlite-memory
+    executor: solidusio_extensions/sqlite
     steps: ['setup', 'solidusio_extensions/run-tests-solidus-current']
   solidus-older:
-    executor: solidusio_extensions/sqlite-memory
+    executor: solidusio_extensions/sqlite
     steps: ['setup', 'solidusio_extensions/run-tests-solidus-older']
   lint-code:
-    executor: solidusio_extensions/sqlite-memory
+    executor: solidusio_extensions/sqlite
     steps: ['setup', 'solidusio_extensions/lint-code']
 
 workflows:

lib/solidus_dev_support/templates/extension/Gemfile

@@ -6,6 +6,10 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
 gem 'solidus', github: 'solidusio/solidus', branch: branch
 
+# The solidus_frontend gem has been pulled out since v3.2
+gem 'solidus_frontend', github: 'solidusio/solidus_frontend' if branch == 'master'
+gem 'solidus_frontend' if branch >= 'v3.2' # rubocop:disable Bundler/DuplicatedGem
+
 # Needed to help Bundler figure out how to resolve dependencies,
 # otherwise it takes forever to resolve them.
 # See https://github.com/bundler/bundler/issues/6677

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

@@ -1,6 +1,10 @@
 #!/usr/bin/env bash
 
 set -e
+if [ ! -z $DEBUG ]
+then
+  set -x
+fi
 
 case "$DB" in
 postgres|postgresql)
@@ -9,21 +13,36 @@ postgres|postgresql)
 mysql)
   RAILSDB="mysql"
   ;;
-sqlite|'')
+sqlite3|sqlite)
+  RAILSDB="sqlite3"
+  ;;
+'')
+  echo "~~> Use 'export DB=[postgres|mysql|sqlite]' to control the DB adapter"
   RAILSDB="sqlite3"
   ;;
 *)
-  echo "Invalid DB specified: $DB"
+  echo "Invalid value specified for the Solidus sandbox: DB=\"$DB\"."
+  echo "Please use 'postgres', 'mysql', or 'sqlite' instead."
   exit 1
   ;;
 esac
+echo "~~> Using $RAILSDB as the database engine"
 
-if [ ! -z $SOLIDUS_BRANCH ]
+if [ -n $SOLIDUS_BRANCH ]
 then
   BRANCH=$SOLIDUS_BRANCH
 else
+  echo "~~> Use 'export SOLIDUS_BRANCH=[master|v3.2|...]' to control the Solidus branch"
   BRANCH="master"
 fi
+echo "~~> Using branch $BRANCH of solidus"
+
+if [ -z $SOLIDUS_FRONTEND ]
+then
+  echo "~~> Use 'export SOLIDUS_FRONTEND=[solidus_frontend|solidus_starter_frontend]' to control the Solidus frontend"
+  SOLIDUS_FRONTEND="solidus_frontend"
+fi
+echo "~~> Using branch $SOLIDUS_FRONTEND as the solidus frontend"
 
 extension_name="<%= file_name %>"
 
@@ -50,7 +69,6 @@ fi
 cd ./sandbox
 cat <<RUBY >> Gemfile
 gem 'solidus', github: 'solidusio/solidus', branch: '$BRANCH'
-gem 'solidus_auth_devise', '>= 2.1.0'
 gem 'rails-i18n'
 gem 'solidus_i18n'
 
@@ -71,16 +89,14 @@ unbundled bundle exec rails generate solidus:install \
   --auto-accept \
   --user_class=Spree::User \
   --enforce_available_locales=true \
-  --with-authentication=false \
+  --with-authentication=<%= file_name != 'solidus_auth_devise' %> \
   --payment-method=none \
+  --frontend=${SOLIDUS_FRONTEND} \
   $@
 
-unbundled bundle exec rails generate solidus:auth:install
-unbundled bundle exec rails generate ${extension_name}:install
+unbundled bundle exec rails generate solidus:auth:install --auto-run-migrations
+unbundled bundle exec rails generate ${extension_name}:install --auto-run-migrations
 
 echo
 echo "🚀 Sandbox app successfully created for $extension_name!"
-echo "🚀 Using $RAILSDB and Solidus $BRANCH"
-echo "🚀 Use 'export DB=[postgres|mysql|sqlite]' to control the DB adapter"
-echo "🚀 Use 'export SOLIDUS_BRANCH=<BRANCH-NAME>' to control the Solidus version"
-echo "🚀 This app is intended for test purposes."
+echo "🧪 This app is intended for test purposes."

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

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   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')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.5', '< 4')
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.

solidus_dev_support.gemspec

@@ -33,7 +33,7 @@ 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', '~> 4.8'
+  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/features/create_extension_spec.rb

@@ -155,18 +155,22 @@ def check_sandbox
 
   def sh(*args)
     command = args.size == 1 ? args.first : args.shelljoin
-    output, status = with_unbundled_env { Open3.capture2e(command) }
+    output, status = with_unbundled_env do
+      Open3.capture2e({ 'CI' => nil }, command)
+    end
 
-    if status.success?
-      output.to_s
-    else
-      if $DEBUG
-        warn '~' * 80
-        warn "$ #{command}"
-        warn output.to_s
-      end
+    if $DEBUG || ENV['DEBUG']
+      warn '~' * 80
+      warn "$ #{command}"
+      warn output.to_s
+      warn "$ #{command} ~~~~> EXIT STATUS: #{status.exitstatus}"
+    end
+
+    unless status.success?
       raise(command_failed_error, "command failed: #{command}\n#{output}")
     end
+
+    output.to_s
   end
 
   def with_unbundled_env(&block)
@@ -182,11 +186,12 @@ def bundle_install
     # variables doesn't help because commands are run with a clean env.
     bundle_path = "#{gem_root}/vendor/bundle"
 
-    command = 'bundle install'
-    command += " --path=#{bundle_path.shellescape}" if File.exist?(bundle_path)
+    if File.exist?(bundle_path)
+      sh "bundle config set --local path #{bundle_path.shellescape}"
+    end
 
     output = nil
-    cd(install_path) { output = sh command }
+    cd(install_path) { output = sh 'bundle install' }
     output
   end
 end