Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Make spree_sample an optional gem

Damian Legawiec2769601ee1ea
diff --git a/bin/build-ci.rb b/bin/build-ci.rb
index 70a9b883ba..9964b40996 100755
--- a/bin/build-ci.rb
+++ b/bin/build-ci.rb
@@ -22,7 +22,7 @@ class Project
end
ALL = %w[api backend core frontend emails sample].map(&method(:new)).freeze
- CORE_GEMS = %w[api core sample].freeze
+ CORE_GEMS = %w[api core].freeze
# Install subproject
#
diff --git a/core/lib/generators/spree/dummy/dummy_generator.rb b/core/lib/generators/spree/dummy/dummy_generator.rb
index 39170b90e8..9cfd25866c 100644
--- a/core/lib/generators/spree/dummy/dummy_generator.rb
+++ b/core/lib/generators/spree/dummy/dummy_generator.rb
@@ -137,7 +137,7 @@ end
end
def gemfile_path
- core_gems = ['spree/core', 'spree/api', 'spree/sample']
+ core_gems = ['spree/core', 'spree/api']
if core_gems.include?(lib_name)
'../../../../../Gemfile'
diff --git a/core/lib/generators/spree/install/install_generator.rb b/core/lib/generators/spree/install/install_generator.rb
index fd97f7974b..417893373d 100644
--- a/core/lib/generators/spree/install/install_generator.rb
+++ b/core/lib/generators/spree/install/install_generator.rb
@@ -9,7 +9,7 @@ module Spree
class InstallGenerator < Rails::Generators::Base
class_option :migrate, type: :boolean, default: true, banner: 'Run Spree migrations'
class_option :seed, type: :boolean, default: true, banner: 'load seed data (migrations must be run)'
- class_option :sample, type: :boolean, default: true, banner: 'load sample data (migrations must be run)'
+ class_option :sample, type: :boolean, default: false, banner: 'load sample data (migrations must be run)'
class_option :install_storefront, type: :boolean, default: false, banner: 'installs default rails storefront'
class_option :install_admin, type: :boolean, default: false, banner: 'installs default rails admin'
class_option :copy_storefront, type: :boolean, default: false, banner: 'copy all storefront views and stylesheets'
@@ -171,6 +171,8 @@ module Spree
end
def load_sample_data
+ return unless Spree::Core::Engine.sample_available?
+
if @load_sample_data
say_status :loading, 'sample data'
silence_stream(STDOUT) do
diff --git a/core/lib/spree/core/components.rb b/core/lib/spree/core/components.rb
index fad2224f91..8b7d069521 100644
--- a/core/lib/spree/core/components.rb
+++ b/core/lib/spree/core/components.rb
@@ -16,6 +16,10 @@ module Spree
def self.emails_available?
@@emails_available ||= ::Rails::Engine.subclasses.map(&:instance).map { |e| e.class.to_s }.include?('Spree::Emails::Engine')
end
+
+ def self.sample_available?
+ @@sample_available ||= ::Rails::Engine.subclasses.map(&:instance).map { |e| e.class.to_s }.include?('SpreeSample::Engine')
+ end
end
end
end
diff --git a/lib/spree.rb b/lib/spree.rb
index 3f4e40307e..034f861b11 100644
--- a/lib/spree.rb
+++ b/lib/spree.rb
@@ -1,3 +1,2 @@
require 'spree_core'
require 'spree_api'
-require 'spree_sample'
diff --git a/sample/spree_sample.gemspec b/sample/spree_sample.gemspec
index db2221e750..dfd05a5e5f 100644
--- a/sample/spree_sample.gemspec
+++ b/sample/spree_sample.gemspec
@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
s.version = Spree.version
s.authors = ['Sean Schofield', 'Spark Solutions']
s.email = '[email protected]'
- s.summary = 'Sample data (including images) for use with Spree.'
- s.description = 'Required dependency for Spree'
+ s.summary = 'Sample data for Spree Commerce'
+ s.description = 'Optional package containing example data of products, stores, shipping methods, categories and others to quickly setup a demo Spree store'
s.homepage = 'https://spreecommerce.org'
s.license = 'BSD-3-Clause'
@@ -23,6 +23,6 @@ Gem::Specification.new do |s|
s.require_path = 'lib'
s.requirements << 'none'
- s.add_dependency 'spree_core', s.version
+ s.add_dependency 'spree_core', ">= #{s.version}"
s.add_dependency 'ffaker', '~> 2.9'
end
diff --git a/spree.gemspec b/spree.gemspec
index 37a8ec7bdd..43550049d7 100644
--- a/spree.gemspec
+++ b/spree.gemspec
@@ -27,6 +27,4 @@ Gem::Specification.new do |s|
s.add_dependency 'spree_core', s.version
s.add_dependency 'spree_api', s.version
- s.add_dependency 'spree_sample', s.version
- s.add_dependency 'spree_cmd', s.version
end