Skip to content

Commit fcfb48f

Browse files
committed
Added support for Gemfile.local
1 parent 998fa06 commit fcfb48f

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
.bundle
2+
Gemfile.local
3+
Gemfile.local.lock
24
# Rubymine project directory
35
.idea
46
# Sublime Text project directory (not created by ST by default)

lib/msfenv.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@
22
# Use bundler to load dependencies
33
#
44

5-
ENV['BUNDLE_GEMFILE'] ||= ::File.expand_path(::File.join(::File.dirname(__FILE__), "..", "Gemfile"))
5+
gemfile_base = ::File.expand_path(::File.join(::File.dirname(__FILE__), ".."))
6+
if File.readable?(::File.join(gemfile_base,"Gemfile.local"))
7+
ENV['BUNDLE_GEMFILE'] ||= ::File.join(gemfile_base, "Gemfile.local")
8+
else
9+
ENV['BUNDLE_GEMFILE'] ||= ::File.join(gemfile_base, "Gemfile")
10+
end
11+
612
begin
713
require 'bundler/setup'
814
rescue ::LoadError

0 commit comments

Comments
 (0)