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.

Fixed gemspec `files` declarations to include all the necessary files (#12498)

Damian Legawiec75418deb85c0
diff --git a/Rakefile b/Rakefile
index f0ba487137..238c5575ed 100644
--- a/Rakefile
+++ b/Rakefile
@@ -7,7 +7,7 @@ rescue LoadError
raise "Could not find spree/testing_support/common_rake. You need to run this command using Bundler."
end
-SPREE_GEMS = %w(core api cli emails sample).freeze
+SPREE_GEMS = %w(core api cli emails sample admin storefront).freeze
task default: :test
diff --git a/admin/spree_admin.gemspec b/admin/spree_admin.gemspec
index b81957b1e9..0e8f75184c 100644
--- a/admin/spree_admin.gemspec
+++ b/admin/spree_admin.gemspec
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
s.required_ruby_version = '>= 3.0'
s.required_rubygems_version = '>= 1.8.23'
- s.files = Dir["{app,config,lib,vendor}/**/*", "LICENSE.md", "Rakefile", "README.md"].reject { |f| File.directory?(f) || (f.match(/^spec/) && !f.match(/^spec\/fixtures/)) }
+ s.files = Dir["{app,config,db,lib,vendor}/**/*", "LICENSE.md", "Rakefile", "README.md"].reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
s.require_path = 'lib'
s.add_dependency 'spree_core', ">= #{s.version}"
diff --git a/api/spree_api.gemspec b/api/spree_api.gemspec
index d1f3d0ee8a..a88f91e9f0 100644
--- a/api/spree_api.gemspec
+++ b/api/spree_api.gemspec
@@ -19,8 +19,7 @@ Gem::Specification.new do |s|
s.required_ruby_version = '>= 3.0'
- s.files = Dir["{app,config,db,lib}/**/*", "LICENSE.md", "Rakefile"].reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
- s.executables = s.files.grep(%r{^bin/}).map { |f| File.basename(f) }
+ s.files = Dir["{app,config,db,lib,vendor}/**/*", "LICENSE.md", "Rakefile", "README.md"].reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
s.require_paths = ['lib']
s.add_development_dependency 'jsonapi-rspec'
diff --git a/cli/lib/spree_cli/templates/extension/.rubocop.yml b/cli/lib/spree_cli/templates/extension/.rubocop.yml
index e0959ee25a..0ff174b583 100644
--- a/cli/lib/spree_cli/templates/extension/.rubocop.yml
+++ b/cli/lib/spree_cli/templates/extension/.rubocop.yml
@@ -1,6 +1,6 @@
AllCops:
DisplayCopNames: true
- TargetRubyVersion: 3.0
+ TargetRubyVersion: 3.3
Include:
- '**/Gemfile'
- '**/Rakefile'
diff --git a/cli/lib/spree_cli/templates/extension/README.md b/cli/lib/spree_cli/templates/extension/README.md
index dc2c189191..5aebf61027 100644
--- a/cli/lib/spree_cli/templates/extension/README.md
+++ b/cli/lib/spree_cli/templates/extension/README.md
@@ -10,7 +10,7 @@ This is a <%= human_name %> extension for [Spree Commerce](https://spreecommerce
bundle add <%= file_name %>
```
-2. Copy & run migrations
+2. Run the install generator
```ruby
bundle exec rails g <%= file_name %>:install
diff --git a/cli/lib/spree_cli/templates/extension/extension.gemspec b/cli/lib/spree_cli/templates/extension/extension.gemspec
index c5ec0c03e0..ddfff8bb71 100644
--- a/cli/lib/spree_cli/templates/extension/extension.gemspec
+++ b/cli/lib/spree_cli/templates/extension/extension.gemspec
@@ -16,11 +16,14 @@ Gem::Specification.new do |s|
s.homepage = 'https://github.com/your-github-handle/<%= file_name %>'
s.license = 'AGPL-3.0-or-later'
- s.files = Dir["{app,config,db,lib}/**/*", "LICENSE.md", "Rakefile", "README.md"].reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
+ s.files = Dir["{app,config,db,lib,vendor}/**/*", "LICENSE.md", "Rakefile", "README.md"].reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
s.require_path = 'lib'
s.requirements << 'none'
s.add_dependency 'spree', '>= <%= Gem.loaded_specs['spree_cli'].version %>'
+ s.add_dependency 'spree_storefront', '>= <%= Gem.loaded_specs['spree_cli'].version %>'
+ s.add_dependency 'spree_admin', '>= <%= Gem.loaded_specs['spree_cli'].version %>'
+ s.add_dependency
s.add_dependency 'spree_extension'
s.add_development_dependency 'spree_dev_tools'
diff --git a/cli/spree_cli.gemspec b/cli/spree_cli.gemspec
index 41d841419d..6f400965f1 100644
--- a/cli/spree_cli.gemspec
+++ b/cli/spree_cli.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
"source_code_uri" => "https://github.com/spree/spree/tree/v#{s.version}",
}
- s.files = Dir["{lib}/**/*", "LICENSE.md", "README.md", "Rakefile"].reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
+ s.files = Dir.glob(["{app,config,db,lib,vendor}/**/*", "LICENSE.md", "Rakefile", "README.md"], File::FNM_DOTMATCH).reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
s.bindir = 'bin'
s.executables = Dir['bin/*'].map { |f| File.basename(f) }
s.require_paths = ['lib']
diff --git a/core/spree_core.gemspec b/core/spree_core.gemspec
index b9c00f4509..5428fecbbb 100644
--- a/core/spree_core.gemspec
+++ b/core/spree_core.gemspec
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
s.required_ruby_version = '>= 3.0'
s.required_rubygems_version = '>= 1.8.23'
- s.files = Dir["{app,config,db,lib}/**/*", "LICENSE.md", "Rakefile"].reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
+ s.files = Dir["{app,config,db,lib,vendor}/**/*", "LICENSE.md", "Rakefile", "README.md"].reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
s.require_path = 'lib'
s.add_development_dependency 'i18n-tasks'
diff --git a/emails/spree_emails.gemspec b/emails/spree_emails.gemspec
index ddd4a2e713..e3c5c53e0c 100644
--- a/emails/spree_emails.gemspec
+++ b/emails/spree_emails.gemspec
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
s.required_ruby_version = '>= 3.0'
s.required_rubygems_version = '>= 1.8.23'
- s.files = Dir["{app,config,lib}/**/*", "LICENSE.md", "Rakefile"].reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
+ s.files = Dir["{app,config,db,lib,vendor}/**/*", "LICENSE.md", "Rakefile", "README.md"].reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
s.require_path = 'lib'
s.add_dependency 'spree_core', ">= #{s.version}"
diff --git a/storefront/spree_storefront.gemspec b/storefront/spree_storefront.gemspec
index fcede5862f..5b51160c19 100644
--- a/storefront/spree_storefront.gemspec
+++ b/storefront/spree_storefront.gemspec
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
s.required_ruby_version = '>= 3.0'
s.required_rubygems_version = '>= 1.8.23'
- s.files = Dir['{app,config,lib}/**/*', 'LICENSE.md', 'Rakefile'].reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
+ s.files = Dir["{app,config,db,lib,vendor}/**/*", "LICENSE.md", "Rakefile", "README.md"].reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
s.require_path = 'lib'
s.add_dependency 'spree_core', ">= #{s.version}"