From 28fa5b0261b3efef222e8f92f5b3906cccfeb388 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Tue, 27 May 2014 21:02:00 -0500 Subject: [PATCH] Remove some evals from formula DSL The default arguments were removed from these methods long ago, so nothing is standing in the way of using define_method here. --- Library/Homebrew/formula.rb | 8 ++------ Library/Homebrew/resource.rb | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index f0217bb742..19def43374 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -633,12 +633,8 @@ class Formula stable.mirror(val) end - Checksum::TYPES.each do |cksum| - class_eval <<-EOS, __FILE__, __LINE__ + 1 - def #{cksum}(val) - stable.#{cksum}(val) - end - EOS + Checksum::TYPES.each do |type| + define_method(type) { |val| stable.send(type, val) } end def bottle *, &block diff --git a/Library/Homebrew/resource.rb b/Library/Homebrew/resource.rb index 4fabb33e38..6a72a6e997 100644 --- a/Library/Homebrew/resource.rb +++ b/Library/Homebrew/resource.rb @@ -95,12 +95,8 @@ class Resource puts "For your reference the SHA1 is: #{fn.sha1}" end - Checksum::TYPES.each do |cksum| - class_eval <<-EOS, __FILE__, __LINE__ + 1 - def #{cksum}(val) - @checksum = Checksum.new(:#{cksum}, val) - end - EOS + Checksum::TYPES.each do |type| + define_method(type) { |val| @checksum = Checksum.new(type, val) } end def url val=nil, specs={}