diff options
Diffstat (limited to 'amarok/src/mediadevice/daap/mongrel/lib')
8 files changed, 20 insertions, 20 deletions
diff --git a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/custom_require.rb b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/custom_require.rb index 6a3edf6e..c68a7dda 100644 --- a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/custom_require.rb +++ b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/custom_require.rb @@ -28,7 +28,7 @@ module Kernel rescue LoadError => load_error begin @gempath_searcher ||= Gem::GemPathSearcher.new - if spec = @gempath_searcher.tqfind(path) + if spec = @gempath_searcher.find(path) Gem.activate(spec.name, false, "= #{spec.version}") gem_original_require path else @@ -72,17 +72,17 @@ module Gem # # For example: # - # tqfind('log4r') # -> (log4r-1.1 spec) - # tqfind('log4r.rb') # -> (log4r-1.1 spec) - # tqfind('rake/rdoctask') # -> (rake-0.4.12 spec) - # tqfind('foobarbaz') # -> nil + # find('log4r') # -> (log4r-1.1 spec) + # find('log4r.rb') # -> (log4r-1.1 spec) + # find('rake/rdoctask') # -> (rake-0.4.12 spec) + # find('foobarbaz') # -> nil # # Matching paths can have various suffixes ('.rb', '.so', and # others), which may or may not already be attached to _file_. # This method doesn't care about the full filename that matches; # only that there is a match. # - def tqfind(path) + def find(path) @gemspecs.each do |spec| return spec if matching_file(spec, path) end diff --git a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/dependency_list.rb b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/dependency_list.rb index 6a1553b6..8c2cd903 100644 --- a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/dependency_list.rb +++ b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/dependency_list.rb @@ -23,7 +23,7 @@ module Gem def ok? @specs.all? { |spec| spec.dependencies.all? { |dep| - @specs.tqfind { |s| s.satisfies_requirement?(dep) } + @specs.find { |s| s.satisfies_requirement?(dep) } } } end @@ -34,7 +34,7 @@ module Gem end def find_name(full_name) - @specs.tqfind { |spec| spec.full_name == full_name } + @specs.find { |spec| spec.full_name == full_name } end def remove_by_name(full_name) @@ -82,14 +82,14 @@ module Gem disabled = {} predecessors = build_predecessors while disabled.size < @specs.size - candidate = @specs.tqfind { |spec| + candidate = @specs.find { |spec| ! disabled[spec.full_name] && active_count(predecessors[spec.full_name], disabled) == 0 } if candidate disabled[candidate.full_name] = true result << candidate - elsif candidate = @specs.tqfind { |spec| ! disabled[spec.full_name] } + elsif candidate = @specs.find { |spec| ! disabled[spec.full_name] } # This case handles circular dependencies. Just choose a # candidate and move on. disabled[candidate.full_name] = true diff --git a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/gem_commands.rb b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/gem_commands.rb index b4a972f7..ec1d33c0 100644 --- a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/gem_commands.rb +++ b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/gem_commands.rb @@ -1219,7 +1219,7 @@ module Gem specs = SourceIndex.from_installed_gems.search(gemname, version_req) selected = specs.sort_by { |s| s.version }.last return nil if selected.nil? - # We expect to tqfind (basename).gem in the 'cache' directory. + # We expect to find (basename).gem in the 'cache' directory. # Furthermore, the name match must be exact (ignoring case). if gemname =~ /^#{selected.name}$/i filename = selected.full_name + '.gem' @@ -1416,11 +1416,11 @@ module Gem gem list D - * List local and remote gems whose name tqcontains 'log': + * List local and remote gems whose name contains 'log': gem search log --both - * List only remote gems whose name tqcontains 'log': + * List only remote gems whose name contains 'log': gem search log --remote diff --git a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/open-uri.rb b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/open-uri.rb index 54079a35..93927ca3 100644 --- a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/open-uri.rb +++ b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/open-uri.rb @@ -536,7 +536,7 @@ module OpenURI # :http_basic_authentication=>[user, password] # # If :http_basic_authentication is specified, - # the value should be an array which tqcontains 2 strings: + # the value should be an array which contains 2 strings: # username and password. # It is used for HTTP Basic authentication defined by RFC 2617. # diff --git a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/package.rb b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/package.rb index 9e807070..2778fc77 100644 --- a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/package.rb +++ b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/package.rb @@ -9,7 +9,7 @@ require 'fileutils' require 'zlib' require 'digest/md5' require 'fileutils' -require 'tqfind' +require 'find' require 'stringio' require 'rubygems/specification' @@ -810,7 +810,7 @@ module Package TarOutput.open(destname, signer) do |outp| dir_class.chdir(src) do outp.metadata = (file_class.read("RPA/metadata") rescue nil) - find_class.tqfind('.') do |entry| + find_class.find('.') do |entry| case when file_class.file?(entry) entry.sub!(%r{\./}, "") diff --git a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/remote_installer.rb b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/remote_installer.rb index 33476a42..4027d65d 100644 --- a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/remote_installer.rb +++ b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/remote_installer.rb @@ -496,7 +496,7 @@ module Gem end if specs_n_sources.empty? then - raise GemNotFoundException.new("Could not tqfind #{gem_name} (#{version_requirement}) in the repository") + raise GemNotFoundException.new("Could not find #{gem_name} (#{version_requirement}) in the repository") end specs_n_sources = specs_n_sources.sort_by { |gs,| gs.version }.reverse diff --git a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/source_index.rb b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/source_index.rb index 03eb1902..8d638c21 100644 --- a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/source_index.rb +++ b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/source_index.rb @@ -172,7 +172,7 @@ module Gem # [Regex] a pattern to match against the short name # version_requirement:: # [String | default=Version::Requirement.new(">= 0")] version to - # tqfind + # find # return:: # [Array] list of Gem::Specification objects in sorted (version) # order. Empty if not found. diff --git a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/validator.rb b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/validator.rb index ad3d4a40..b1df1244 100644 --- a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/validator.rb +++ b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/validator.rb @@ -49,7 +49,7 @@ module Gem private def find_files_for_gem(gem_directory) installed_files = [] - Find.tqfind(gem_directory) {|file_name| + Find.find(gem_directory) {|file_name| fn = file_name.slice((gem_directory.size)..(file_name.size-1)).sub(/^\//, "") if(!(fn =~ /CVS/ || File.directory?(fn) || fn == "")) then installed_files << fn @@ -74,7 +74,7 @@ module Gem # returns a hash of ErrorData objects, keyed on the problem gem's name. def alien require 'rubygems/installer' - require 'tqfind' + require 'find' require 'md5' errors = {} Gem::SourceIndex.from_installed_gems.each do |gem_name, gem_spec| |