Fix Ruby warnings.

Fixes Homebrew/homebrew#11966.
This commit is contained in:
Mike McQuaid 2012-04-30 14:17:56 +10:00
parent b6fecf5e1d
commit 995186a72c
6 changed files with 10 additions and 6 deletions

View File

@ -105,7 +105,7 @@ class LanguageModuleDependency < Requirement
def fatal?; true; end def fatal?; true; end
def satisfied? def satisfied?
quiet_system *the_test quiet_system(*the_test)
end end
def message; <<-EOS.undent def message; <<-EOS.undent

View File

@ -355,7 +355,7 @@ class GitDownloadStrategy < AbstractDownloadStrategy
git_args = %w(git clone) git_args = %w(git clone)
git_args << "--depth" << "1" if support_depth? git_args << "--depth" << "1" if support_depth?
git_args << @url << @clone git_args << @url << @clone
safe_system *git_args safe_system(*git_args)
else else
puts "Updating #{@clone}" puts "Updating #{@clone}"
Dir.chdir(@clone) do Dir.chdir(@clone) do

View File

@ -27,6 +27,7 @@ module FileUtils extend self
end end
# A version of mkdir that also changes to that folder in a block. # A version of mkdir that also changes to that folder in a block.
alias mkdir_old mkdir
def mkdir name, &block def mkdir name, &block
FileUtils.mkdir(name) FileUtils.mkdir(name)
if block_given? if block_given?

View File

@ -117,6 +117,7 @@ class Pathname
end end
# extended to support common double extensions # extended to support common double extensions
alias extname_old extname
def extname def extname
return $1 if to_s =~ bottle_regex return $1 if to_s =~ bottle_regex
return $1 if to_s =~ old_bottle_regex return $1 if to_s =~ old_bottle_regex

View File

@ -592,14 +592,14 @@ private
def stable &block def stable &block
raise "url and md5 must be specified in a block" unless block_given? raise "url and md5 must be specified in a block" unless block_given?
instance_eval &block unless ARGV.build_devel? or ARGV.build_head? instance_eval(&block) unless ARGV.build_devel? or ARGV.build_head?
end end
def devel &block def devel &block
raise "url and md5 must be specified in a block" unless block_given? raise "url and md5 must be specified in a block" unless block_given?
if ARGV.build_devel? if ARGV.build_devel?
@mirrors = nil # clear out mirrors from the stable release @mirrors = nil # clear out mirrors from the stable release
instance_eval &block instance_eval(&block)
end end
end end
@ -632,7 +632,7 @@ private
end end
end end
bottle_block.instance_eval &block bottle_block.instance_eval(&block)
@bottle_version, @bottle_url, @bottle_sha1 = bottle_block.data @bottle_version, @bottle_url, @bottle_sha1 = bottle_block.data
end end

View File

@ -19,7 +19,9 @@ class SoftwareSpecification
def initialize url, specs=nil def initialize url, specs=nil
raise "No url provided" if url.nil? raise "No url provided" if url.nil?
@url = url @url = url
unless specs.nil? if specs.nil?
@using = nil
else
# Get download strategy hint, if any # Get download strategy hint, if any
@using = specs.delete :using @using = specs.delete :using
# The rest of the specs are for source control # The rest of the specs are for source control