Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix __FILE__ and __dir__ in primary Gemfiles #193

Merged
merged 2 commits into from
Feb 3, 2022
Merged

Fix __FILE__ and __dir__ in primary Gemfiles #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d38b830
failing test for __FILE__ in Gemfiles
indirect Feb 2, 2022
f31d909
fix instance_eval to point to the file
indirect Feb 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions lib/appraisal/gemfile.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,17 @@ module Appraisal
# Load bundler Gemfiles and merge dependencies
class Gemfile < BundlerDSL
def load(path)
if File.exist?(path)
run(IO.read(path))
end
run(IO.read(path), path) if File.exist?(path)
end

def run(definitions)
instance_eval(definitions, __FILE__, __LINE__) if definitions
def run(definitions, path, line = 1)
instance_eval(definitions, path, line) if definitions
end

def dup
Gemfile.new.tap do |gemfile|
gemfile.git_sources = @git_sources
gemfile.run(for_dup)
gemfile.run(for_dup, __FILE__, __LINE__)
end
end
end
Expand Down
9 changes: 9 additions & 0 deletions spec/appraisal/gemfile_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,4 +430,13 @@
expect(gemfile.to_s).to eq %(gem "bacon", git: "../path/bacon_pancake")
end
end

it "preserves the Gemfile's __FILE__" do
gemfile = Appraisal::Gemfile.new
Tempfile.open do |tmpfile|
tmpfile.write "__FILE__"
tmpfile.rewind
expect(gemfile.load(tmpfile.path)).to include(File.dirname(tmpfile.path))
end
end
end