Extract common method to configure bundle
This commit is contained in:
committed by
Jorge Manrubia
parent
5d32e40756
commit
fb9aa5dfac
@@ -24,9 +24,7 @@ end
|
|||||||
require "rubygems"
|
require "rubygems"
|
||||||
|
|
||||||
require_relative "../lib/fizzy"
|
require_relative "../lib/fizzy"
|
||||||
if Fizzy.saas?
|
Fizzy.configure_bundle
|
||||||
ENV["BUNDLE_WITH"] = [ ENV["BUNDLE_WITH"], "saas" ].compact.join(",")
|
|
||||||
end
|
|
||||||
|
|
||||||
require "bundler/setup"
|
require "bundler/setup"
|
||||||
|
|
||||||
|
|||||||
@@ -2,10 +2,7 @@
|
|||||||
APP_PATH = File.expand_path("../config/application", __dir__)
|
APP_PATH = File.expand_path("../config/application", __dir__)
|
||||||
|
|
||||||
require_relative "../lib/fizzy"
|
require_relative "../lib/fizzy"
|
||||||
|
Fizzy.configure_bundle
|
||||||
if Fizzy.saas?
|
|
||||||
ENV["BUNDLE_WITH"] = [ ENV["BUNDLE_WITH"] , "saas" ].compact.join(",")
|
|
||||||
end
|
|
||||||
|
|
||||||
require_relative "../config/boot"
|
require_relative "../config/boot"
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,12 @@ module Fizzy
|
|||||||
def db_adapter
|
def db_adapter
|
||||||
@db_adapter ||= DbAdapter.new ENV.fetch("DATABASE_ADAPTER", saas? ? "mysql" : "sqlite")
|
@db_adapter ||= DbAdapter.new ENV.fetch("DATABASE_ADAPTER", saas? ? "mysql" : "sqlite")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def configure_bundle
|
||||||
|
if saas?
|
||||||
|
ENV["BUNDLE_WITH"] = [ENV["BUNDLE_WITH"], "saas"].compact.join(",")
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
class DbAdapter
|
class DbAdapter
|
||||||
|
|||||||
Reference in New Issue
Block a user