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.

Don't rely on `git` when building gems (#12373)

Damian Legawiece2773883f05f
diff --git a/admin/bin/rails b/admin/bin/rails
new file mode 100755
index 0000000000..39bc8a43c5
--- /dev/null
+++ b/admin/bin/rails
@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+ENGINE_ROOT = File.expand_path('..', __dir__)
+ENGINE_PATH = File.expand_path('../lib/spree/admin/engine', __dir__)
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __dir__)
+
+require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
+require "rails/all"
+require "rails/engine/commands"
diff --git a/admin/spree_admin.gemspec b/admin/spree_admin.gemspec
index 0045810546..694d3d2148 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 = `git ls-files`.split("\n").reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
+ 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.require_path = 'lib'
s.add_dependency 'spree_core', ">= #{s.version}"
diff --git a/api/bin/rails b/api/bin/rails
new file mode 100755
index 0000000000..bc9ae46453
--- /dev/null
+++ b/api/bin/rails
@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+ENGINE_ROOT = File.expand_path('..', __dir__)
+ENGINE_PATH = File.expand_path('../lib/spree/api/engine', __dir__)
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __dir__)
+
+require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
+require "rails/all"
+require "rails/engine/commands"
diff --git a/api/script/rails b/api/script/rails
deleted file mode 100755
index 674d60e6c8..0000000000
--- a/api/script/rails
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-
-ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/spree/api/engine', __FILE__)
-
-require 'rails/all'
-require 'rails/engine/commands'
-
diff --git a/api/spree_api.gemspec b/api/spree_api.gemspec
index 3a52a57643..003d749606 100644
--- a/api/spree_api.gemspec
+++ b/api/spree_api.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
s.required_ruby_version = '>= 3.0'
- s.files = `git ls-files`.split($\).reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
+ 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.require_paths = ['lib']
diff --git a/cli/lib/spree_cli/templates/extension/extension.gemspec b/cli/lib/spree_cli/templates/extension/extension.gemspec
index 3c4d3f1848..c5ec0c03e0 100644
--- a/cli/lib/spree_cli/templates/extension/extension.gemspec
+++ b/cli/lib/spree_cli/templates/extension/extension.gemspec
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
s.homepage = 'https://github.com/your-github-handle/<%= file_name %>'
s.license = 'AGPL-3.0-or-later'
- s.files = `git ls-files`.split("\n").reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
+ s.files = Dir["{app,config,db,lib}/**/*", "LICENSE.md", "Rakefile", "README.md"].reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
s.require_path = 'lib'
s.requirements << 'none'
diff --git a/cli/spree_cli.gemspec b/cli/spree_cli.gemspec
index 8a428dde47..41d841419d 100644
--- a/cli/spree_cli.gemspec
+++ b/cli/spree_cli.gemspec
@@ -19,9 +19,9 @@ Gem::Specification.new do |s|
"source_code_uri" => "https://github.com/spree/spree/tree/v#{s.version}",
}
- s.files = `git ls-files`.split("\n").reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
+ s.files = Dir["{lib}/**/*", "LICENSE.md", "README.md", "Rakefile"].reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
s.bindir = 'bin'
- s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+ s.executables = Dir['bin/*'].map { |f| File.basename(f) }
s.require_paths = ['lib']
s.add_dependency 'thor', '~> 1.0'
diff --git a/core/script/rails b/core/script/rails
deleted file mode 100755
index fa8af90971..0000000000
--- a/core/script/rails
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-
-ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/spree/core/engine', __FILE__)
-
-require 'rails/all'
-require 'rails/engine/commands'
-
diff --git a/core/spree_core.gemspec b/core/spree_core.gemspec
index 0668baae22..b50252082e 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 = `git ls-files`.split("\n").reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
+ s.files = Dir["{app,config,db,lib}/**/*", "LICENSE.md", "Rakefile"].reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
s.require_path = 'lib'
s.add_dependency 'rails', '>= 6.1', '< 8.0'
diff --git a/emails/bin/rails b/emails/bin/rails
new file mode 100755
index 0000000000..c6565fe2f5
--- /dev/null
+++ b/emails/bin/rails
@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+ENGINE_ROOT = File.expand_path('..', __dir__)
+ENGINE_PATH = File.expand_path('../lib/spree/emails/engine', __dir__)
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __dir__)
+
+require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
+require "rails/all"
+require "rails/engine/commands"
diff --git a/emails/script/rails b/emails/script/rails
deleted file mode 100755
index dafc812393..0000000000
--- a/emails/script/rails
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-
-ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/spree/emails/engine', __FILE__)
-
-require 'rails/all'
-require 'rails/engine/commands'
-
diff --git a/emails/spree_emails.gemspec b/emails/spree_emails.gemspec
index d05d8c5a9b..ddd4a2e713 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 = `git ls-files`.split("\n").reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
+ s.files = Dir["{app,config,lib}/**/*", "LICENSE.md", "Rakefile"].reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
s.require_path = 'lib'
s.add_dependency 'spree_core', ">= #{s.version}"
diff --git a/sample/spree_sample.gemspec b/sample/spree_sample.gemspec
index 1d0871a63e..b4c82b0842 100644
--- a/sample/spree_sample.gemspec
+++ b/sample/spree_sample.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
"source_code_uri" => "https://github.com/spree/spree/tree/v#{s.version}",
}
- s.files = `git ls-files`.split("\n").reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
+ s.files = Dir["{db,lib}/**/*", "LICENSE.md", "Rakefile"].reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
s.require_path = 'lib'
s.requirements << 'none'
diff --git a/storefront/spree_storefront.gemspec b/storefront/spree_storefront.gemspec
index f72aa7d9ae..d08fae7874 100644
--- a/storefront/spree_storefront.gemspec
+++ b/storefront/spree_storefront.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 = `git ls-files`.split("\n").reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
+ s.files = Dir["{app,config,lib}/**/*", "LICENSE.md", "Rakefile"].reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
s.require_path = 'lib'
s.add_dependency 'spree_core', ">= #{s.version}"