diff --git a/CHANGELOG b/CHANGELOG index a2557917..09248c18 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,7 @@ N.B.: You *must* run ruby bundle - rake upgrade_instiki + ruby bundle exec rake upgrade_instiki after installing the new software, to enjoy the benefits of this new version. diff --git a/Gemfile b/Gemfile index 79b9a314..fb74bead 100644 --- a/Gemfile +++ b/Gemfile @@ -7,5 +7,7 @@ gem "rubyzip" gem "RedCloth", ">=4.0.0" gem "erubis" gem "nokogiri" -gem "rake", "~>0.8.7" +gem "rake" +gem "rdoc" gem "json" +#gem "themes_for_rails" diff --git a/UPGRADING b/UPGRADING index b232de78..6eabda39 100644 --- a/UPGRADING +++ b/UPGRADING @@ -11,7 +11,7 @@ At a minimum, you need to backup your database. After installing the new software and restoring your database, you need to run ruby bundle - rake upgrade_instiki + ruby bundle exec rake upgrade_instiki from the commandline, to complete the upgrade. Doing a diff --git a/lib/chunks/chunk.rb b/lib/chunks/chunk.rb index c1a8e2ac..0a4b96db 100644 --- a/lib/chunks/chunk.rb +++ b/lib/chunks/chunk.rb @@ -48,11 +48,14 @@ module Chunk # chunk for it, and replace the occurance of the chunk # in this content with its mask. def self.apply_to(content) - content.gsub!( self.pattern ) do |match| + text = content.to_str + text.gsub!( self.pattern ) do |match| +# content.replace text new_chunk = self.new($~, content) content.add_chunk(new_chunk) new_chunk.mask - end + end + content.replace text end # should contain only [a-z0-9] @@ -61,7 +64,7 @@ module Chunk end def unmask - @content.sub!(mask){|s| s.replace @unmask_text} + @content.replace @content.sub(mask){|s| s.replace @unmask_text} end def rendered? @@ -73,7 +76,7 @@ module Chunk end def revert - @content.sub!(mask){|s| s.replace @text} + @content.replace @content.sub(mask){|s| s.replace @text} # unregister @content.delete_chunk(self) end diff --git a/lib/chunks/engines.rb b/lib/chunks/engines.rb index 9c7d07d0..1c72b266 100644 --- a/lib/chunks/engines.rb +++ b/lib/chunks/engines.rb @@ -114,7 +114,7 @@ module Engines class Mixed < AbstractEngine def mask @content.as_utf8 - redcloth = OldRedCloth.new(@content, @content.options[:engine_opts]) + redcloth = OldRedCloth.new(@content.to_str, @content.options[:engine_opts]) redcloth.filter_html = false redcloth.no_span_caps = false html = redcloth.to_html @@ -123,8 +123,7 @@ module Engines class RDoc < AbstractEngine def mask - @content.as_utf8 - html = RDocSupport::RDocFormatter.new(@content).to_html + html = RDocSupport::RDocFormatter.new(@content.as_utf8.to_str).to_html end end diff --git a/lib/chunks/literal.rb b/lib/chunks/literal.rb index 35adabcd..da17c9b9 100644 --- a/lib/chunks/literal.rb +++ b/lib/chunks/literal.rb @@ -30,9 +30,9 @@ module Literal # A literal chunk that protects equations from wiki rendering. class Math < AbstractLiteral - MATH_START = '(\${1,2}|' + Regexp.escape('\[') + '|\\begin\{equation\})' - MATH_END = '(\${1,2}|' + Regexp.escape('\]') + '|\\end\{equation\})' - MATH_PATTERN = Regexp.new(MATH_START + '([^$]|\\\$)+?' + MATH_END, Regexp::MULTILINE) + MATH_START = "(?:\\\\\\[|\\${1,2}|\\\\begin\\{equation\\})" + MATH_END = "(?:\\\\\\]|\\${1,2}|\\\\end\\{equation\\})" + MATH_PATTERN = Regexp.new( '(' + MATH_START + "(?:\\\\\\$|(?!\\$|\\\\\\]|\\\\end\\{equation\\}).)+?" + MATH_END + ')', Regexp::MULTILINE) def self.pattern() MATH_PATTERN end end diff --git a/lib/chunks/wiki.rb b/lib/chunks/wiki.rb index 193183b8..1f76b8a6 100644 --- a/lib/chunks/wiki.rb +++ b/lib/chunks/wiki.rb @@ -34,7 +34,8 @@ module WikiChunk end def self.apply_to(content) - content.as_utf8.gsub!( self.pattern ) do |matched_text| + text = content.as_utf8.to_str + text.gsub!( self.pattern ) do |matched_text| chunk = self.new($~, content) if chunk.textile_url? # do not substitute @@ -44,6 +45,7 @@ module WikiChunk chunk.mask end end + content.replace text end def textile_url? diff --git a/lib/rdocsupport.rb b/lib/rdocsupport.rb index b518a651..5f53c2bf 100644 --- a/lib/rdocsupport.rb +++ b/lib/rdocsupport.rb @@ -39,7 +39,7 @@ class RDocMarkup < SM::SimpleMarkup end def convert(text, handler) - super.sub(/^

\n/, '').sub(/<\/p>$/, '') + super.sub(/^\n{0,1}

\n{0,1}/, '').sub(/\n{0,1}<\/p>\n{0,1}$/, '') end end diff --git a/lib/tasks/upgrade_instiki.rake b/lib/tasks/upgrade_instiki.rake index 35b66954..c77add8f 100644 --- a/lib/tasks/upgrade_instiki.rake +++ b/lib/tasks/upgrade_instiki.rake @@ -31,4 +31,4 @@ class InstikiUpgrade end end -end \ No newline at end of file +end diff --git a/lib/wiki_content.rb b/lib/wiki_content.rb index 2f538443..a757501a 100644 --- a/lib/wiki_content.rb +++ b/lib/wiki_content.rb @@ -208,7 +208,8 @@ class WikiContent < ActiveSupport::SafeBuffer @options[:engine].apply_to(self) as_utf8 # unmask in one go. $~[1] is the chunk id - gsub!(MASK_RE[ACTIVE_CHUNKS]) do + text = self.to_str + text.gsub!(MASK_RE[ACTIVE_CHUNKS]) do chunk = @chunks_by_id[$~[1].to_i] if chunk.nil? # if we match a chunkmask that existed in the original content string @@ -218,7 +219,7 @@ class WikiContent < ActiveSupport::SafeBuffer chunk.unmask_text end end - self.replace xhtml_sanitize(self) + self.replace xhtml_sanitize(text) self.html_safe end diff --git a/rakefile.rb b/rakefile.rb index cffd19f0..b0fe9317 100755 --- a/rakefile.rb +++ b/rakefile.rb @@ -1,10 +1,17 @@ # Add your own tasks in files placed in lib/tasks ending in .rake, # for example lib/tasks/switchtower.rake, and they will automatically be available to Rake. -require(File.join(File.dirname(__FILE__), 'config', 'boot')) +require File.join(File.dirname(__FILE__), 'config', 'boot') require 'rake' +class Rails::Application + include Rake::DSL if defined?(Rake::DSL) +end require 'rake/testtask' -require 'rake/rdoctask' +begin + require 'rdoc/task' +rescue LoadError + require 'rake/rdoctask' +end -require 'tasks/rails' \ No newline at end of file +require 'tasks/rails' diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb index e1c5a050..3c8ab806 100644 --- a/test/functional/wiki_controller_test.rb +++ b/test/functional/wiki_controller_test.rb @@ -123,7 +123,7 @@ class WikiControllerTest < ActionController::TestCase r = process 'edit', 'web' => 'wiki1', 'id' => 'With : Special /> symbols' assert_response(:success) - xml = REXML::Document.new(r.body) + xml = REXML::Document.new(r.body.to_str) form = REXML::XPath.first(xml, '//form') assert_equal '/wiki1/save/With+%3A+Special+%2F%3E+symbols', form.attributes['action'] end diff --git a/test/unit/page_renderer_test.rb b/test/unit/page_renderer_test.rb index 60a48848..c17fd4cb 100644 --- a/test/unit/page_renderer_test.rb +++ b/test/unit/page_renderer_test.rb @@ -414,7 +414,7 @@ END_THM :author => Author.new('DavidHeinemeierHansson')) assert_equal "hello that Smart Engine GUI" + - "?\n\n", + "?", x_test_renderer(@revision).display_content end diff --git a/vendor/plugins/bundler/bin/bundle b/vendor/plugins/bundler/bin/bundle index d6bad547..3d7e4838 100755 --- a/vendor/plugins/bundler/bin/bundle +++ b/vendor/plugins/bundler/bin/bundle @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby # # This file was generated by RubyGems. # @@ -7,8 +7,6 @@ # require 'rubygems' -Gem.use_paths File.join(File.dirname(File.dirname(__FILE__))), Gem.path -Gem.refresh version = ">= 0" diff --git a/vendor/plugins/bundler/cache/bundler-1.0.15.gem b/vendor/plugins/bundler/cache/bundler-1.0.15.gem new file mode 100644 index 00000000..f64a9b2f Binary files /dev/null and b/vendor/plugins/bundler/cache/bundler-1.0.15.gem differ diff --git a/vendor/plugins/bundler/cache/bundler-1.0.7.gem b/vendor/plugins/bundler/cache/bundler-1.0.7.gem deleted file mode 100644 index 1cf9452e..00000000 Binary files a/vendor/plugins/bundler/cache/bundler-1.0.7.gem and /dev/null differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler.html similarity index 80% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler.html index 29e77abd..1a14b739 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler.html @@ -83,6 +83,9 @@

  • lib/bundler/rubygems_ext.rb
    • +
  • lib/bundler/rubygems_integration.rb
    • +
  • lib/bundler/runtime.rb
    • @@ -189,6 +192,8 @@
  • CLASS Bundler::Resolver
    • +
  • CLASS Bundler::RubygemsIntegration
    • +
  • CLASS Bundler::Runtime
  • CLASS Bundler::Settings
    • @@ -286,6 +291,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -395,16 +404,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • @@ -536,6 +557,21 @@ versions of bundler and we are unsure how to handle this better.

    Attributes

    +
    + + +
    + rubygems[R] +
    + +
    + + + +
    +
    +
    @@ -599,10 +635,10 @@ versions of bundler and we are unsure how to handle this better. 
    -     # File lib/bundler.rb, line 166
-166:     def app_cache
-167:       root.join("vendor/cache")
-168:     end
    + # File lib/bundler.rb, line 174 +174: def app_cache +175: root.join("vendor/cache") +176: end
    @@ -633,12 +669,12 @@ versions of bundler and we are unsure how to handle this better. 
    -     # File lib/bundler.rb, line 160
-160:     def app_config_path
-161:       ENV['BUNDLE_APP_CONFIG'] ?
-162:         Pathname.new(ENV['BUNDLE_APP_CONFIG']).expand_path(root) :
-163:         root.join('.bundle')
-164:     end
    + # File lib/bundler.rb, line 168 +168: def app_config_path +169: ENV['BUNDLE_APP_CONFIG'] ? +170: Pathname.new(ENV['BUNDLE_APP_CONFIG']).expand_path(root) : +171: root.join('.bundle') +172: end
    @@ -669,15 +705,15 @@ versions of bundler and we are unsure how to handle this better. 
    -    # File lib/bundler.rb, line 86
-86:     def bin_path
-87:       @bin_path ||= begin
-88:         path = settings[:bin] || "bin"
-89:         path = Pathname.new(path).expand_path(root)
-90:         FileUtils.mkdir_p(path)
-91:         Pathname.new(path).expand_path
-92:       end
-93:     end
    + # File lib/bundler.rb, line 92 +92: def bin_path +93: @bin_path ||= begin +94: path = settings[:bin] || "bin" +95: path = Pathname.new(path).expand_path(root) +96: FileUtils.mkdir_p(path) +97: Pathname.new(path).expand_path +98: end +99: end
    @@ -708,11 +744,10 @@ versions of bundler and we are unsure how to handle this better. 
    -    # File lib/bundler.rb, line 81
-81:     def bundle_path
-82:       # STDERR.puts settings.path
-83:       @bundle_path ||= Pathname.new(settings.path).expand_path(root)
-84:     end
    + # File lib/bundler.rb, line 88 +88: def bundle_path +89: @bundle_path ||= Pathname.new(settings.path).expand_path(root) +90: end
    @@ -743,10 +778,10 @@ versions of bundler and we are unsure how to handle this better. 
    -     # File lib/bundler.rb, line 152
-152:     def cache
-153:       bundle_path.join("cache/bundler")
-154:     end
    + # File lib/bundler.rb, line 160 +160: def cache +161: bundle_path.join("cache/bundler") +162: end
    @@ -777,13 +812,13 @@ versions of bundler and we are unsure how to handle this better. 
    -    # File lib/bundler.rb, line 70
-70:     def configure
-71:       @configured ||= begin
-72:         configure_gem_home_and_path
-73:         true
-74:       end
-75:     end
    + # File lib/bundler.rb, line 77 +77: def configure +78: @configured ||= begin +79: configure_gem_home_and_path +80: true +81: end +82: end
    @@ -814,10 +849,10 @@ versions of bundler and we are unsure how to handle this better. 
    -     # File lib/bundler.rb, line 186
-186:     def default_gemfile
-187:       SharedHelpers.default_gemfile
-188:     end
    + # File lib/bundler.rb, line 194 +194: def default_gemfile +195: SharedHelpers.default_gemfile +196: end
    @@ -848,10 +883,10 @@ versions of bundler and we are unsure how to handle this better. 
    -     # File lib/bundler.rb, line 190
-190:     def default_lockfile
-191:       SharedHelpers.default_lockfile
-192:     end
    + # File lib/bundler.rb, line 198 +198: def default_lockfile +199: SharedHelpers.default_lockfile +200: end
    @@ -882,15 +917,15 @@ versions of bundler and we are unsure how to handle this better. 
    -     # File lib/bundler.rb, line 123
-123:     def definition(unlock = nil)
-124:       @definition = nil if unlock
-125:       @definition ||= begin
-126:         configure
-127:         upgrade_lockfile
-128:         Definition.build(default_gemfile, default_lockfile, unlock)
-129:       end
-130:     end
    + # File lib/bundler.rb, line 131 +131: def definition(unlock = nil) +132: @definition = nil if unlock +133: @definition ||= begin +134: configure +135: upgrade_lockfile +136: Definition.build(default_gemfile, default_lockfile, unlock) +137: end +138: end
    @@ -921,10 +956,10 @@ versions of bundler and we are unsure how to handle this better. 
    -     # File lib/bundler.rb, line 119
-119:     def environment
-120:       Bundler::Environment.new(root, definition)
-121:     end
    + # File lib/bundler.rb, line 127 +127: def environment +128: Bundler::Environment.new(root, definition) +129: end
    @@ -955,10 +990,10 @@ versions of bundler and we are unsure how to handle this better. 
    -     # File lib/bundler.rb, line 140
-140:     def home
-141:       bundle_path.join("bundler")
-142:     end
    + # File lib/bundler.rb, line 148 +148: def home +149: bundle_path.join("bundler") +150: end
    @@ -989,10 +1024,10 @@ versions of bundler and we are unsure how to handle this better. 
    -     # File lib/bundler.rb, line 144
-144:     def install_path
-145:       home.join("gems")
-146:     end
    + # File lib/bundler.rb, line 152 +152: def install_path +153: home.join("gems") +154: end
    @@ -1023,10 +1058,10 @@ versions of bundler and we are unsure how to handle this better. 
    -     # File lib/bundler.rb, line 115
-115:     def load
-116:       @load ||= Runtime.new(root, definition)
-117:     end
    + # File lib/bundler.rb, line 123 +123: def load +124: @load ||= Runtime.new(root, definition) +125: end
    @@ -1057,32 +1092,33 @@ versions of bundler and we are unsure how to handle this better. 
    -     # File lib/bundler.rb, line 221
-221:     def load_gemspec(file)
-222:       path = Pathname.new(file)
-223:       # Eval the gemspec from its parent directory
-224:       Dir.chdir(path.dirname) do
-225:         begin
-226:           Gem::Specification.from_yaml(path.basename)
-227:           # Raises ArgumentError if the file is not valid YAML
-228:         rescue ArgumentError, SyntaxError, Gem::EndOfYAMLException, Gem::Exception
-229:           begin
-230:             eval(File.read(path.basename), TOPLEVEL_BINDING, path.expand_path.to_s)
-231:           rescue LoadError => e
-232:             original_line = e.backtrace.find { |line| line.include?(path.to_s) }
-233:             msg  = "There was a LoadError while evaluating #{path.basename}:\n  #{e.message}"
-234:             msg << " from\n  #{original_line}" if original_line
-235:             msg << "\n"
-236: 
-237:             if RUBY_VERSION >= "1.9.0"
-238:               msg << "\nDoes it try to require a relative path? That doesn't work in Ruby 1.9."
-239:             end
-240: 
-241:             raise GemspecError, msg
-242:           end
-243:         end
-244:       end
-245:     end
    + # File lib/bundler.rb, line 229 +229: def load_gemspec(file) +230: path = Pathname.new(file) +231: # Eval the gemspec from its parent directory +232: Dir.chdir(path.dirname.to_s) do +233: contents = File.read(path.basename.to_s) +234: begin +235: Gem::Specification.from_yaml(contents) +236: # Raises ArgumentError if the file is not valid YAML +237: rescue ArgumentError, SyntaxError, Gem::EndOfYAMLException, Gem::Exception +238: begin +239: eval(contents, TOPLEVEL_BINDING, path.expand_path.to_s) +240: rescue LoadError => e +241: original_line = e.backtrace.find { |line| line.include?(path.to_s) } +242: msg = "There was a LoadError while evaluating #{path.basename}:\n #{e.message}" +243: msg << " from\n #{original_line}" if original_line +244: msg << "\n" +245: +246: if RUBY_VERSION >= "1.9.0" +247: msg << "\nDoes it try to require a relative path? That doesn't work in Ruby 1.9." +248: end +249: +250: raise GemspecError, msg +251: end +252: end +253: end +254: end
    @@ -1113,14 +1149,14 @@ versions of bundler and we are unsure how to handle this better. 
    -     # File lib/bundler.rb, line 205
-205:     def mkdir_p(path)
-206:       if requires_sudo?
-207:         sudo "mkdir -p '#{path}'" unless File.exist?(path)
-208:       else
-209:         FileUtils.mkdir_p(path)
-210:       end
-211:     end
    + # File lib/bundler.rb, line 213 +213: def mkdir_p(path) +214: if requires_sudo? +215: sudo "mkdir -p '#{path}'" unless File.exist?(path) +216: else +217: FileUtils.mkdir_p(path) +218: end +219: end
    @@ -1151,10 +1187,10 @@ versions of bundler and we are unsure how to handle this better. 
    -     # File lib/bundler.rb, line 217
-217:     def read_file(file)
-218:       File.open(file, "rb") { |f| f.read }
-219:     end
    + # File lib/bundler.rb, line 225 +225: def read_file(file) +226: File.open(file, "rb") { |f| f.read } +227: end
    @@ -1185,10 +1221,10 @@ versions of bundler and we are unsure how to handle this better. 
    -     # File lib/bundler.rb, line 111
-111:     def require(*groups)
-112:       setup(*groups).require(*groups)
-113:     end
    + # File lib/bundler.rb, line 119 +119: def require(*groups) +120: setup(*groups).require(*groups) +121: end
    @@ -1219,17 +1255,17 @@ versions of bundler and we are unsure how to handle this better. 
    -     # File lib/bundler.rb, line 194
-194:     def requires_sudo?
-195:       return @requires_sudo if @checked_for_sudo
-196: 
-197:       path = bundle_path
-198:       path = path.parent until path.exist?
-199:       sudo_present = !(`which sudo` rescue '').empty?
-200: 
-201:       @checked_for_sudo = true
-202:       @requires_sudo = settings.allow_sudo? && !File.writable?(path) && sudo_present
-203:     end
    + # File lib/bundler.rb, line 202 +202: def requires_sudo? +203: return @requires_sudo if defined?(@checked_for_sudo) && @checked_for_sudo +204: +205: path = bundle_path +206: path = path.parent until path.exist? +207: sudo_present = !(`which sudo` rescue '').empty? +208: +209: @checked_for_sudo = true +210: @requires_sudo = settings.allow_sudo? && !File.writable?(path) && sudo_present +211: end
    @@ -1260,10 +1296,10 @@ versions of bundler and we are unsure how to handle this better. 
    -     # File lib/bundler.rb, line 156
-156:     def root
-157:       default_gemfile.dirname.expand_path
-158:     end
    + # File lib/bundler.rb, line 164 +164: def root +165: default_gemfile.dirname.expand_path +166: end
    @@ -1294,10 +1330,10 @@ versions of bundler and we are unsure how to handle this better. 
    -     # File lib/bundler.rb, line 132
-132:     def ruby_scope
-133:       "#{Gem.ruby_engine}/#{Gem::ConfigMap[:ruby_version]}"
-134:     end
    + # File lib/bundler.rb, line 140 +140: def ruby_scope +141: "#{Bundler.rubygems.ruby_engine}/#{Gem::ConfigMap[:ruby_version]}" +142: end
    @@ -1328,10 +1364,10 @@ versions of bundler and we are unsure how to handle this better. 
    -     # File lib/bundler.rb, line 174
-174:     def settings
-175:       @settings ||= Settings.new(app_config_path)
-176:     end
    + # File lib/bundler.rb, line 182 +182: def settings +183: @settings ||= Settings.new(app_config_path) +184: end
    @@ -1362,22 +1398,24 @@ versions of bundler and we are unsure how to handle this better. 
    -     # File lib/bundler.rb, line 95
- 95:     def setup(*groups)
- 96:       return @setup if defined?(@setup) && @setup
- 97: 
- 98:       if groups.empty?
- 99:         # Load all groups, but only once
-100:         @setup = load.setup
-101:       else
-102:         # Figure out which groups haven't been loaded yet
-103:         unloaded = groups - (@completed_groups || [])
-104:         # Record groups that are now loaded
-105:         @completed_groups = groups | (@completed_groups || [])
-106:         # Load any groups that are not yet loaded
-107:         unloaded.any? ? load.setup(*unloaded) : load
-108:       end
-109:     end
    + # File lib/bundler.rb, line 101 +101: def setup(*groups) +102: # Just return if all groups are already loaded +103: return @setup if defined?(@setup) +104: +105: if groups.empty? +106: # Load all groups, but only once +107: @setup = load.setup +108: else +109: @completed_groups ||= [] +110: # Figure out which groups haven't been loaded yet +111: unloaded = groups - @completed_groups +112: # Record groups that are now loaded +113: @completed_groups = groups +114: # Load any groups that are not yet loaded +115: unloaded.any? ? load.setup(*unloaded) : load +116: end +117: end
    @@ -1408,10 +1446,10 @@ versions of bundler and we are unsure how to handle this better. 
    -     # File lib/bundler.rb, line 148
-148:     def specs_path
-149:       bundle_path.join("specifications")
-150:     end
    + # File lib/bundler.rb, line 156 +156: def specs_path +157: bundle_path.join("specifications") +158: end
    @@ -1442,10 +1480,10 @@ versions of bundler and we are unsure how to handle this better. 
    -     # File lib/bundler.rb, line 213
-213:     def sudo(str)
-214:       `sudo -p 'Enter your password to install the bundled RubyGems to your system: ' #{str}`
-215:     end
    + # File lib/bundler.rb, line 221 +221: def sudo(str) +222: `sudo -p 'Enter your password to install the bundled RubyGems to your system: ' #{str}` +223: end
    @@ -1476,10 +1514,10 @@ versions of bundler and we are unsure how to handle this better. 
    -     # File lib/bundler.rb, line 170
-170:     def tmp
-171:       user_bundle_path.join("tmp", Process.pid.to_s)
-172:     end
    + # File lib/bundler.rb, line 178 +178: def tmp +179: user_bundle_path.join("tmp", Process.pid.to_s) +180: end
    @@ -1510,10 +1548,10 @@ versions of bundler and we are unsure how to handle this better. 
    -    # File lib/bundler.rb, line 77
-77:     def ui
-78:       @ui ||= UI.new
-79:     end
    + # File lib/bundler.rb, line 84 +84: def ui +85: @ui ||= UI.new +86: end
    @@ -1544,10 +1582,10 @@ versions of bundler and we are unsure how to handle this better. 
    -     # File lib/bundler.rb, line 136
-136:     def user_bundle_path
-137:       Pathname.new(Gem.user_home).join(".bundler")
-138:     end
    + # File lib/bundler.rb, line 144 +144: def user_bundle_path +145: Pathname.new(Bundler.rubygems.user_home).join(".bundler") +146: end
    @@ -1578,14 +1616,14 @@ versions of bundler and we are unsure how to handle this better. 
    -     # File lib/bundler.rb, line 178
-178:     def with_clean_env
-179:       bundled_env = ENV.to_hash
-180:       ENV.replace(ORIGINAL_ENV)
-181:       yield
-182:     ensure
-183:       ENV.replace(bundled_env.to_hash)
-184:     end
    + # File lib/bundler.rb, line 186 +186: def with_clean_env +187: bundled_env = ENV.to_hash +188: ENV.replace(ORIGINAL_ENV) +189: yield +190: ensure +191: ENV.replace(bundled_env.to_hash) +192: end
    @@ -1622,20 +1660,23 @@ versions of bundler and we are unsure how to handle this better. 
    -     # File lib/bundler.rb, line 249
-249:     def configure_gem_home_and_path
-250:       if settings[:disable_shared_gems]
-251:         ENV['GEM_PATH'] = ''
-252:         ENV['GEM_HOME'] = File.expand_path(bundle_path, root)
-253:       elsif Gem.dir != bundle_path.to_s
-254:         paths = [Gem.dir, Gem.path].flatten.compact.uniq.reject{|p| p.empty? }
-255:         ENV["GEM_PATH"] = paths.join(File::PATH_SEPARATOR)
-256:         ENV["GEM_HOME"] = bundle_path.to_s
-257:       end
-258: 
-259:       FileUtils.mkdir_p bundle_path.to_s
-260:       Gem.clear_paths
-261:     end
    + # File lib/bundler.rb, line 258 +258: def configure_gem_home_and_path +259: if settings[:disable_shared_gems] +260: ENV['GEM_PATH'] = '' +261: ENV['GEM_HOME'] = File.expand_path(bundle_path, root) +262: elsif Bundler.rubygems.gem_dir != bundle_path.to_s +263: possibles = [Bundler.rubygems.gem_dir, Bundler.rubygems.gem_path] +264: paths = possibles.flatten.compact.uniq.reject { |p| p.empty? } +265: ENV["GEM_PATH"] = paths.join(File::PATH_SEPARATOR) +266: ENV["GEM_HOME"] = bundle_path.to_s +267: end +268: +269: # TODO: This mkdir_p is only needed for JRuby <= 1.5 and should go away (GH #602) +270: FileUtils.mkdir_p bundle_path.to_s rescue nil +271: +272: Bundler.rubygems.clear_paths +273: end
    @@ -1666,14 +1707,14 @@ versions of bundler and we are unsure how to handle this better. 
    -     # File lib/bundler.rb, line 263
-263:     def upgrade_lockfile
-264:       lockfile = default_lockfile
-265:       if lockfile.exist? && lockfile.read(3) == "---"
-266:         Bundler.ui.warn "Detected Gemfile.lock generated by 0.9, deleting..."
-267:         lockfile.rmtree
-268:       end
-269:     end
    + # File lib/bundler.rb, line 275 +275: def upgrade_lockfile +276: lockfile = default_lockfile +277: if lockfile.exist? && lockfile.read(3) == "---" +278: Bundler.ui.warn "Detected Gemfile.lock generated by 0.9, deleting..." +279: lockfile.rmtree +280: end +281: end
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/BundlerError.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/BundlerError.html similarity index 89% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/BundlerError.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/BundlerError.html index 048980e0..e0d72d02 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/BundlerError.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/BundlerError.html @@ -88,6 +88,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -197,16 +201,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • @@ -326,10 +342,10 @@ 
    -    # File lib/bundler.rb, line 32
-32:     def self.status_code(code = nil)
-33:       define_method(:status_code) { code }
-34:     end
    + # File lib/bundler.rb, line 39 +39: def self.status_code(code = nil) +40: define_method(:status_code) { code } +41: end
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/CLI.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/CLI.html similarity index 72% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/CLI.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/CLI.html index 464ea28c..13acf6bd 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/CLI.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/CLI.html @@ -139,6 +139,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -248,16 +252,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • @@ -377,14 +393,14 @@ 
    -    # File lib/bundler/cli.rb, line 13
-13:     def initialize(*)
-14:       super
-15:       the_shell = (options["no-color"] ? Thor::Shell::Basic.new : shell)
-16:       Bundler.ui = UI::Shell.new(the_shell)
-17:       Bundler.ui.debug! if options["verbose"]
-18:       Gem::DefaultUserInteraction.ui = UI::RGProxy.new(Bundler.ui)
-19:     end
    + # File lib/bundler/cli.rb, line 11 +11: def initialize(*) +12: super +13: the_shell = (options["no-color"] ? Thor::Shell::Basic.new : shell) +14: Bundler.ui = UI::Shell.new(the_shell) +15: Bundler.ui.debug! if options["verbose"] +16: Bundler.rubygems.ui = UI::RGProxy.new(Bundler.ui) +17: end
    @@ -415,10 +431,10 @@ 
    -     # File lib/bundler/cli.rb, line 499
-499:     def self.source_root
-500:       File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
-501:     end
    + # File lib/bundler/cli.rb, line 501 +501: def self.source_root +502: File.expand_path(File.join(File.dirname(__FILE__), 'templates')) +503: end
    @@ -455,17 +471,17 @@ 
    -     # File lib/bundler/cli.rb, line 308
-308:     def cache
-309:       Bundler.definition.resolve_with_cache!
-310:       Bundler.load.cache
-311:       Bundler.settings[:no_prune] = true if options[:no_prune]
-312:       Bundler.load.lock
-313:     rescue GemNotFound => e
-314:       Bundler.ui.error(e.message)
-315:       Bundler.ui.warn "Run `bundle install` to install missing gems."
-316:       exit 128
-317:     end
    + # File lib/bundler/cli.rb, line 307 +307: def cache +308: Bundler.definition.resolve_with_cache! +309: Bundler.load.cache +310: Bundler.settings[:no_prune] = true if options["no-prune"] +311: Bundler.load.lock +312: rescue GemNotFound => e +313: Bundler.ui.error(e.message) +314: Bundler.ui.warn "Run `bundle install` to install missing gems." +315: exit 128 +316: end
    @@ -496,27 +512,27 @@ 
    -     # File lib/bundler/cli.rb, line 99
- 99:     def check
-100:       ENV['BUNDLE_GEMFILE'] = File.expand_path(options[:gemfile]) if options[:gemfile]
-101:       begin
-102:         not_installed = Bundler.definition.missing_specs
-103:       rescue GemNotFound, VersionConflict
-104:         Bundler.ui.error "Your Gemfile's dependencies could not be satisfied"
-105:         Bundler.ui.warn  "Install missing gems with `bundle install`"
-106:         exit 1
-107:       end
-108: 
-109:       if not_installed.any?
-110:         Bundler.ui.error "The following gems are missing"
-111:         not_installed.each { |s| Bundler.ui.error " * #{s.name} (#{s.version})" }
-112:         Bundler.ui.warn "Install missing gems with `bundle install`"
-113:         exit 1
-114:       else
-115:         Bundler.load.lock
-116:         Bundler.ui.info "The Gemfile's dependencies are satisfied"
-117:       end
-118:     end
    + # File lib/bundler/cli.rb, line 97 + 97: def check + 98: ENV['BUNDLE_GEMFILE'] = File.expand_path(options[:gemfile]) if options[:gemfile] + 99: begin +100: not_installed = Bundler.definition.missing_specs +101: rescue GemNotFound, VersionConflict +102: Bundler.ui.error "Your Gemfile's dependencies could not be satisfied" +103: Bundler.ui.warn "Install missing gems with `bundle install`" +104: exit 1 +105: end +106: +107: if not_installed.any? +108: Bundler.ui.error "The following gems are missing" +109: not_installed.each { |s| Bundler.ui.error " * #{s.name} (#{s.version})" } +110: Bundler.ui.warn "Install missing gems with `bundle install`" +111: exit 1 +112: else +113: Bundler.load.lock +114: Bundler.ui.info "The Gemfile's dependencies are satisfied" +115: end +116: end
    @@ -547,50 +563,50 @@ 
    -     # File lib/bundler/cli.rb, line 370
-370:     def config(name = nil, *args)
-371:       values = ARGV.dup
-372:       values.shift # remove config
-373:       values.shift # remove the name
-374: 
-375:       unless name
-376:         Bundler.ui.confirm "Settings are listed in order of priority. The top value will be used.\n"
-377: 
-378:         Bundler.settings.all.each do |setting|
-379:           Bundler.ui.confirm "#{setting}"
-380:           with_padding do
-381:             Bundler.settings.pretty_values_for(setting).each do |line|
-382:               Bundler.ui.info line
-383:             end
-384:           end
-385:           Bundler.ui.confirm ""
-386:         end
-387:         return
-388:       end
-389: 
-390:       if values.empty?
-391:         Bundler.ui.confirm "Settings for `#{name}` in order of priority. The top value will be used"
-392:         with_padding do
-393:           Bundler.settings.pretty_values_for(name).each { |line| Bundler.ui.info line }
-394:         end
-395:       else
-396:         locations = Bundler.settings.locations(name)
-397: 
-398:         if local = locations[:local]
-399:           Bundler.ui.info "Your application has set #{name} to #{local.inspect}. This will override the "              "system value you are currently setting"
-400:         end
-401: 
-402:         if global = locations[:global]
-403:           Bundler.ui.info "You are replacing the current system value of #{name}, which is currently #{global}"
-404:         end
-405: 
-406:         if env = locations[:env]
-407:           Bundler.ui.info "You have set a bundler environment variable for #{env}. This will take precedence "              "over the system value you are setting"
-408:         end
-409: 
-410:         Bundler.settings.set_global(name, values.join(" "))
-411:       end
-412:     end
    + # File lib/bundler/cli.rb, line 369 +369: def config(name = nil, *args) +370: values = ARGV.dup +371: values.shift # remove config +372: values.shift # remove the name +373: +374: unless name +375: Bundler.ui.confirm "Settings are listed in order of priority. The top value will be used.\n" +376: +377: Bundler.settings.all.each do |setting| +378: Bundler.ui.confirm "#{setting}" +379: with_padding do +380: Bundler.settings.pretty_values_for(setting).each do |line| +381: Bundler.ui.info line +382: end +383: end +384: Bundler.ui.confirm "" +385: end +386: return +387: end +388: +389: if values.empty? +390: Bundler.ui.confirm "Settings for `#{name}` in order of priority. The top value will be used" +391: with_padding do +392: Bundler.settings.pretty_values_for(name).each { |line| Bundler.ui.info line } +393: end +394: else +395: locations = Bundler.settings.locations(name) +396: +397: if local = locations[:local] +398: Bundler.ui.info "Your application has set #{name} to #{local.inspect}. This will override the " "system value you are currently setting" +399: end +400: +401: if global = locations[:global] +402: Bundler.ui.info "You are replacing the current system value of #{name}, which is currently #{global}" +403: end +404: +405: if env = locations[:env] +406: Bundler.ui.info "You have set a bundler environment variable for #{env}. This will take precedence " "over the system value you are setting" +407: end +408: +409: Bundler.settings.set_global(name, values.join(" ")) +410: end +411: end
    @@ -621,15 +637,14 @@ 
    -     # File lib/bundler/cli.rb, line 432
-432:     def console(group = nil)
-433:       require 'bundler/setup'
-434:       group ? Bundler.require(:default, group) : Bundler.require
-435:       ARGV.clear
-436: 
-437:       require 'irb'
-438:       IRB.start
-439:     end
    + # File lib/bundler/cli.rb, line 431 +431: def console(group = nil) +432: group ? Bundler.require(:default, *(group.split.map! {|g| g.to_sym })) : Bundler.require +433: ARGV.clear +434: +435: require 'irb' +436: IRB.start +437: end
    @@ -660,24 +675,24 @@ 
    -     # File lib/bundler/cli.rb, line 340
-340:     def exec(*)
-341:       ARGV.delete("exec")
-342: 
-343:       Bundler.setup
-344: 
-345:       begin
-346:         # Run
-347:         Kernel.exec(*ARGV)
-348:       rescue Errno::EACCES
-349:         Bundler.ui.error "bundler: not executable: #{ARGV.first}"
-350:         exit 126
-351:       rescue Errno::ENOENT
-352:         Bundler.ui.error "bundler: command not found: #{ARGV.first}"
-353:         Bundler.ui.warn  "Install missing gem binaries with `bundle install`"
-354:         exit 127
-355:       end
-356:     end
    + # File lib/bundler/cli.rb, line 339 +339: def exec(*) +340: ARGV.delete("exec") +341: +342: Bundler.setup +343: +344: begin +345: # Run +346: Kernel.exec(*ARGV) +347: rescue Errno::EACCES +348: Bundler.ui.error "bundler: not executable: #{ARGV.first}" +349: exit 126 +350: rescue Errno::ENOENT +351: Bundler.ui.error "bundler: command not found: #{ARGV.first}" +352: Bundler.ui.warn "Install missing gem binaries with `bundle install`" +353: exit 127 +354: end +355: end
    @@ -708,26 +723,30 @@ 
    -     # File lib/bundler/cli.rb, line 479
-479:     def gem(name)
-480:       target = File.join(Dir.pwd, name)
-481:       constant_name = name.split('_').map{|p| p.capitalize}.join
-482:       constant_name = constant_name.split('-').map{|q| q.capitalize}.join('::') if constant_name =~ /-/
-483:       constant_array = constant_name.split('::')
-484:       FileUtils.mkdir_p(File.join(target, 'lib', name))
-485:       opts = {:name => name, :constant_name => constant_name, :constant_array => constant_array}
-486:       template(File.join("newgem/Gemfile.tt"),               File.join(target, "Gemfile"),                opts)
-487:       template(File.join("newgem/Rakefile.tt"),              File.join(target, "Rakefile"),               opts)
-488:       template(File.join("newgem/gitignore.tt"),             File.join(target, ".gitignore"),             opts)
-489:       template(File.join("newgem/newgem.gemspec.tt"),        File.join(target, "#{name}.gemspec"),        opts)
-490:       template(File.join("newgem/lib/newgem.rb.tt"),         File.join(target, "lib/#{name}.rb"),         opts)
-491:       template(File.join("newgem/lib/newgem/version.rb.tt"), File.join(target, "lib/#{name}/version.rb"), opts)
-492:       if options[:bin]
-493:         template(File.join("newgem/bin/newgem.tt"),          File.join(target, 'bin', name),              opts)
-494:       end
-495:       Bundler.ui.info "Initializating git repo in #{target}"
-496:       Dir.chdir(target) { `git init`; `git add .` }
-497:     end
    + # File lib/bundler/cli.rb, line 477 +477: def gem(name) +478: target = File.join(Dir.pwd, name) +479: constant_name = name.split('_').map{|p| p.capitalize}.join +480: constant_name = constant_name.split('-').map{|q| q.capitalize}.join('::') if constant_name =~ /-/ +481: constant_array = constant_name.split('::') +482: git_author_name = `git config user.name`.chomp +483: git_author_email = `git config user.email`.chomp +484: author_name = git_author_name.empty? ? "TODO: Write your name" : git_author_name +485: author_email = git_author_email.empty? ? "TODO: Write your email address" : git_author_email +486: FileUtils.mkdir_p(File.join(target, 'lib', name)) +487: opts = {:name => name, :constant_name => constant_name, :constant_array => constant_array, :author_name => author_name, :author_email => author_email} +488: template(File.join("newgem/Gemfile.tt"), File.join(target, "Gemfile"), opts) +489: template(File.join("newgem/Rakefile.tt"), File.join(target, "Rakefile"), opts) +490: template(File.join("newgem/gitignore.tt"), File.join(target, ".gitignore"), opts) +491: template(File.join("newgem/newgem.gemspec.tt"), File.join(target, "#{name}.gemspec"), opts) +492: template(File.join("newgem/lib/newgem.rb.tt"), File.join(target, "lib/#{name}.rb"), opts) +493: template(File.join("newgem/lib/newgem/version.rb.tt"), File.join(target, "lib/#{name}/version.rb"), opts) +494: if options[:bin] +495: template(File.join("newgem/bin/newgem.tt"), File.join(target, 'bin', name), opts) +496: end +497: Bundler.ui.info "Initializating git repo in #{target}" +498: Dir.chdir(target) { `git init`; `git add .` } +499: end
    @@ -758,38 +777,38 @@ 
    -    # File lib/bundler/cli.rb, line 27
-27:     def help(cli = nil)
-28:       case cli
-29:       when "gemfile" then command = "gemfile.5"
-30:       when nil       then command = "bundle"
-31:       else command = "bundle-#{cli}"
-32:       end
-33: 
-34:       manpages = %(
-35:           bundle
-36:           bundle-config
-37:           bundle-exec
-38:           bundle-install
-39:           bundle-package
-40:           bundle-update
-41:           gemfile.5)
-42: 
-43:       if manpages.include?(command)
-44:         root = File.expand_path("../man", __FILE__)
-45: 
-46:         if have_groff? && root !~ %{^file:/.+!/META-INF/jruby.home/.+}
-47:           groff   = "groff -Wall -mtty-char -mandoc -Tascii"
-48:           pager   = ENV['MANPAGER'] || ENV['PAGER'] || 'more'
-49: 
-50:           Kernel.exec "#{groff} #{root}/#{command} | #{pager}"
-51:         else
-52:           puts File.read("#{root}/#{command}.txt")
-53:         end
-54:       else
-55:         super
-56:       end
-57:     end
    + # File lib/bundler/cli.rb, line 25 +25: def help(cli = nil) +26: case cli +27: when "gemfile" then command = "gemfile.5" +28: when nil then command = "bundle" +29: else command = "bundle-#{cli}" +30: end +31: +32: manpages = %( +33: bundle +34: bundle-config +35: bundle-exec +36: bundle-install +37: bundle-package +38: bundle-update +39: gemfile.5) +40: +41: if manpages.include?(command) +42: root = File.expand_path("../man", __FILE__) +43: +44: if have_groff? && root !~ %{^file:/.+!/META-INF/jruby.home/.+} +45: groff = "groff -Wall -mtty-char -mandoc -Tascii" +46: pager = ENV['MANPAGER'] || ENV['PAGER'] || 'less -R' +47: +48: Kernel.exec "#{groff} #{root}/#{command} | #{pager}" +49: else +50: puts File.read("#{root}/#{command}.txt") +51: end +52: else +53: super +54: end +55: end
    @@ -820,31 +839,31 @@ 
    -    # File lib/bundler/cli.rb, line 66
-66:     def init
-67:       opts = options.dup
-68:       if File.exist?("Gemfile")
-69:         Bundler.ui.error "Gemfile already exists at #{Dir.pwd}/Gemfile"
-70:         exit 1
-71:       end
-72: 
-73:       if opts[:gemspec]
-74:         gemspec = File.expand_path(opts[:gemspec])
-75:         unless File.exist?(gemspec)
-76:           Bundler.ui.error "Gem specification #{gemspec} doesn't exist"
-77:           exit 1
-78:         end
-79:         spec = Gem::Specification.load(gemspec)
-80:         puts "Writing new Gemfile to #{Dir.pwd}/Gemfile"
-81:         File.open('Gemfile', 'wb') do |file|
-82:           file << "# Generated from #{gemspec}\n"
-83:           file << spec.to_gemfile
-84:         end
-85:       else
-86:         puts "Writing new Gemfile to #{Dir.pwd}/Gemfile"
-87:         FileUtils.cp(File.expand_path('../templates/Gemfile', __FILE__), 'Gemfile')
-88:       end
-89:     end
    + # File lib/bundler/cli.rb, line 64 +64: def init +65: opts = options.dup +66: if File.exist?("Gemfile") +67: Bundler.ui.error "Gemfile already exists at #{Dir.pwd}/Gemfile" +68: exit 1 +69: end +70: +71: if opts[:gemspec] +72: gemspec = File.expand_path(opts[:gemspec]) +73: unless File.exist?(gemspec) +74: Bundler.ui.error "Gem specification #{gemspec} doesn't exist" +75: exit 1 +76: end +77: spec = Gem::Specification.load(gemspec) +78: puts "Writing new Gemfile to #{Dir.pwd}/Gemfile" +79: File.open('Gemfile', 'wb') do |file| +80: file << "# Generated from #{gemspec}\n" +81: file << spec.to_gemfile +82: end +83: else +84: puts "Writing new Gemfile to #{Dir.pwd}/Gemfile" +85: FileUtils.cp(File.expand_path('../templates/Gemfile', __FILE__), 'Gemfile') +86: end +87: end
    @@ -875,93 +894,94 @@ 
    -     # File lib/bundler/cli.rb, line 157
-157:     def install(path = nil)
-158:       opts = options.dup
-159:       opts[:without] ||= []
-160:       if opts[:without].size == 1
-161:         opts[:without].map!{|g| g.split(" ") }
-162:         opts[:without].flatten!
-163:       end
-164:       opts[:without].map!{|g| g.to_sym }
+     # File lib/bundler/cli.rb, line 153
+153:     def install(path = nil)
+154:       opts = options.dup
+155:       opts[:without] ||= []
+156:       if opts[:without].size == 1
+157:         opts[:without].map!{|g| g.split(" ") }
+158:         opts[:without].flatten!
+159:       end
+160:       opts[:without].map!{|g| g.to_sym }
+161: 
+162:       # Can't use Bundler.settings for this because settings needs gemfile.dirname
+163:       ENV['BUNDLE_GEMFILE'] = File.expand_path(opts[:gemfile]) if opts[:gemfile]
+164:       ENV['RB_USER_INSTALL'] = '1' if Bundler::FREEBSD
 165: 
-166:       ENV['BUNDLE_GEMFILE'] = File.expand_path(opts[:gemfile]) if opts[:gemfile]
-167:       ENV['RB_USER_INSTALL'] = '1' if Bundler::FREEBSD
+166:       # Just disable color in deployment mode
+167:       Bundler.ui.shell = Thor::Shell::Basic.new if opts[:deployment]
 168: 
-169:       # Just disable color in deployment mode
-170:       Bundler.ui.shell = Thor::Shell::Basic.new if opts[:deployment]
-171: 
-172:       if opts[:production]
-173:         opts[:deployment] = true
-174:         Bundler.ui.warn "The --production option is deprecated, and will be removed in "                          "the final release of Bundler 1.0. Please use --deployment instead."
-175:       end
-176: 
-177:       if (path || opts[:path] || opts[:deployment]) && opts[:system]
-178:         Bundler.ui.error "You have specified both a path to install your gems to, \n"                           "as well as --system. Please choose."
-179:         exit 1
-180:       end
-181: 
-182:       if path && opts[:path]
-183:         Bundler.ui.error "You have specified a path via `bundle install #{path}` as well as\n"                           "by `bundle install --path #{options[:path]}`. These options are\n"                           "equivalent, so please use one or the other."
-184:         exit 1
-185:       end
-186: 
-187:       if opts["disable-shared-gems"]
-188:         Bundler.ui.error "The disable-shared-gem option is no longer available.\n\n"                           "Instead, use `bundle install` to install to your system,\n"                           "or `bundle install --path path/to/gems` to install to an isolated\n"                           "location. Bundler will resolve relative paths relative to\n"                           "your `Gemfile`."
-189:         exit 1
-190:       end
-191: 
-192:       if opts[:deployment] || opts[:frozen]
-193:         unless Bundler.default_lockfile.exist?
-194:           flag = opts[:deployment] ? '--deployment' : '--frozen'
-195:           raise ProductionError, "The #{flag} flag requires a Gemfile.lock. Please make "                                   "sure you have checked your Gemfile.lock into version control "                                   "before deploying."
-196:         end
-197: 
-198:         if Bundler.root.join("vendor/cache").exist?
-199:           opts[:local] = true
-200:         end
-201: 
-202:         Bundler.settings[:frozen] = '1'
-203:       end
-204: 
-205:       # Can't use Bundler.settings for this because settings needs gemfile.dirname
-206:       Bundler.settings[:path] = nil if opts[:system]
-207:       Bundler.settings[:path] = "vendor/bundle" if opts[:deployment]
-208:       Bundler.settings[:path] = path if path
-209:       Bundler.settings[:path] = opts[:path] if opts[:path]
-210:       Bundler.settings[:bin] = opts["binstubs"] if opts[:binstubs]
-211:       Bundler.settings[:disable_shared_gems] = '1' if Bundler.settings[:path]
-212:       Bundler.settings.without = opts[:without] unless opts[:without].empty?
-213:       Bundler.ui.be_quiet! if opts[:quiet]
-214: 
-215:       Installer.install(Bundler.root, Bundler.definition, opts)
-216:       Bundler.load.cache if Bundler.root.join("vendor/cache").exist?
-217: 
-218:       if Bundler.settings[:path]
-219:         relative_path = Bundler.settings[:path]
-220:         relative_path = "./" + relative_path unless relative_path[0] == //
+169:       if (path || opts[:path] || opts[:deployment]) && opts[:system]
+170:         Bundler.ui.error "You have specified both a path to install your gems to, \n"                           "as well as --system. Please choose."
+171:         exit 1
+172:       end
+173: 
+174:       if path && opts[:path]
+175:         Bundler.ui.error "You have specified a path via `bundle install #{path}` as well as\n"                           "by `bundle install --path #{options[:path]}`. These options are\n"                           "equivalent, so please use one or the other."
+176:         exit 1
+177:       end
+178: 
+179:       if opts["disable-shared-gems"]
+180:         Bundler.ui.error "The disable-shared-gem option is no longer available.\n\n"                           "Instead, use `bundle install` to install to your system,\n"                           "or `bundle install --path path/to/gems` to install to an isolated\n"                           "location. Bundler will resolve relative paths relative to\n"                           "your `Gemfile`."
+181:         exit 1
+182:       end
+183: 
+184:       if opts[:deployment] || opts[:frozen]
+185:         unless Bundler.default_lockfile.exist?
+186:           flag = opts[:deployment] ? '--deployment' : '--frozen'
+187:           raise ProductionError, "The #{flag} flag requires a Gemfile.lock. Please make "                                   "sure you have checked your Gemfile.lock into version control "                                   "before deploying."
+188:         end
+189: 
+190:         if Bundler.root.join("vendor/cache").exist?
+191:           opts[:local] = true
+192:         end
+193: 
+194:         Bundler.settings[:frozen] = '1'
+195:       end
+196: 
+197:       # When install is called with --no-deployment, disable deployment mode
+198:       if opts[:deployment] == false
+199:         Bundler.settings.delete(:frozen)
+200:         opts[:system] = true
+201:       end
+202: 
+203:       Bundler.settings[:path] = nil if opts[:system]
+204:       Bundler.settings[:path] = "vendor/bundle" if opts[:deployment]
+205:       Bundler.settings[:path] = path if path
+206:       Bundler.settings[:path] = opts[:path] if opts[:path]
+207:       Bundler.settings[:bin] = opts["binstubs"] if opts[:binstubs]
+208:       Bundler.settings[:no_prune] = true if opts["no-prune"]
+209:       Bundler.settings[:disable_shared_gems] = Bundler.settings[:path] ? '1' : nil
+210:       Bundler.settings.without = opts[:without] unless opts[:without].empty?
+211:       Bundler.ui.be_quiet! if opts[:quiet]
+212: 
+213:       Installer.install(Bundler.root, Bundler.definition, opts)
+214:       Bundler.load.cache if Bundler.root.join("vendor/cache").exist? && !options["no-cache"]
+215: 
+216:       if Bundler.settings[:path]
+217:         relative_path = File.expand_path(Bundler.settings[:path]).sub(/^#{File.expand_path('.')}/, '.')
+218:         Bundler.ui.confirm "Your bundle is complete! " +
+219:           "It was installed into #{relative_path}"
+220:       else
 221:         Bundler.ui.confirm "Your bundle is complete! " +
-222:           "It was installed into #{relative_path}"
-223:       else
-224:         Bundler.ui.confirm "Your bundle is complete! " +
-225:           "Use `bundle show [gemname]` to see where a bundled gem is installed."
-226:       end
-227: 
-228:       if path
-229:         Bundler.ui.warn "The path argument to `bundle install` is deprecated. " +
-230:           "It will be removed in version 1.1. " +
-231:           "Please use `bundle install --path #{path}` instead."
-232:       end
-233:     rescue GemNotFound => e
-234:       if opts[:local]
-235:         Bundler.ui.warn "Some gems seem to be missing from your vendor/cache directory."
-236:       end
-237: 
-238:       if Bundler.definition.no_sources?
-239:         Bundler.ui.warn "Your Gemfile doesn't have any sources. You can add one with a line like 'source :rubygems'"
-240:       end
-241:       raise e
-242:     end
    +222: "Use `bundle show [gemname]` to see where a bundled gem is installed." +223: end +224: +225: if path +226: Bundler.ui.warn "The path argument to `bundle install` is deprecated. " + +227: "It will be removed in version 1.1. " + +228: "Please use `bundle install --path #{path}` instead." +229: end +230: rescue GemNotFound => e +231: if opts[:local] && Bundler.app_cache.exist? +232: Bundler.ui.warn "Some gems seem to be missing from your vendor/cache directory." +233: end +234: +235: if Bundler.definition.no_sources? +236: Bundler.ui.warn "Your Gemfile doesn't have any sources. You can add one with a line like 'source :rubygems'" +237: end +238: raise e +239: end
    @@ -992,10 +1012,10 @@ 
    -     # File lib/bundler/cli.rb, line 278
-278:     def lock
-279:       Bundler.ui.warn "Lock is deprecated. Your bundle is now locked whenever you run `bundle install`."
-280:     end
    + # File lib/bundler/cli.rb, line 277 +277: def lock +278: Bundler.ui.warn "Lock is deprecated. Your bundle is now locked whenever you run `bundle install`." +279: end
    @@ -1026,20 +1046,20 @@ 
    -     # File lib/bundler/cli.rb, line 417
-417:     def open(name)
-418:       editor = [ENV['BUNDLER_EDITOR'], ENV['VISUAL'], ENV['EDITOR']].find{|e| !e.nil? && !e.empty? }
-419:       if editor
-420:         gem_path = locate_gem(name)
-421:         Dir.chdir(gem_path) do
-422:           command = "#{editor} #{gem_path}"
-423:           success = system(command)
-424:           Bundler.ui.info "Could not run '#{command}'" unless success
-425:         end
-426:       else
-427:         Bundler.ui.info("To open a bundled gem, set $EDITOR or $BUNDLER_EDITOR")
-428:       end
-429:     end
    + # File lib/bundler/cli.rb, line 416 +416: def open(name) +417: editor = [ENV['BUNDLER_EDITOR'], ENV['VISUAL'], ENV['EDITOR']].find{|e| !e.nil? && !e.empty? } +418: if editor +419: gem_path = locate_gem(name) +420: Dir.chdir(gem_path) do +421: command = "#{editor} #{gem_path}" +422: success = system(command) +423: Bundler.ui.info "Could not run '#{command}'" unless success +424: end +425: else +426: Bundler.ui.info("To open a bundled gem, set $EDITOR or $BUNDLER_EDITOR") +427: end +428: end
    @@ -1070,12 +1090,12 @@ 
    -     # File lib/bundler/cli.rb, line 327
-327:     def package
-328:       install
-329:       # TODO: move cache contents here now that all bundles are locked
-330:       Bundler.load.cache
-331:     end
    + # File lib/bundler/cli.rb, line 326 +326: def package +327: install +328: # TODO: move cache contents here now that all bundles are locked +329: Bundler.load.cache +330: end
    @@ -1106,19 +1126,19 @@ 
    -     # File lib/bundler/cli.rb, line 292
-292:     def show(gem_name = nil)
-293:       Bundler.load.lock
-294: 
-295:       if gem_name
-296:         Bundler.ui.info locate_gem(gem_name)
-297:       else
-298:         Bundler.ui.info "Gems included by the bundle:"
-299:         Bundler.load.specs.sort_by { |s| s.name }.each do |s|
-300:           Bundler.ui.info "  * #{s.name} (#{s.version}#{s.git_version})"
-301:         end
-302:       end
-303:     end
    + # File lib/bundler/cli.rb, line 291 +291: def show(gem_name = nil) +292: Bundler.load.lock +293: +294: if gem_name +295: Bundler.ui.info locate_gem(gem_name) +296: else +297: Bundler.ui.info "Gems included by the bundle:" +298: Bundler.load.specs.sort_by { |s| s.name }.each do |s| +299: Bundler.ui.info " * #{s.name} (#{s.version}#{s.git_version})" +300: end +301: end +302: end
    @@ -1149,10 +1169,10 @@ 
    -     # File lib/bundler/cli.rb, line 283
-283:     def unlock
-284:       Bundler.ui.warn "Unlock is deprecated. To update to newer gem versions, use `bundle update`."
-285:     end
    + # File lib/bundler/cli.rb, line 282 +282: def unlock +283: Bundler.ui.warn "Unlock is deprecated. To update to newer gem versions, use `bundle update`." +284: end
    @@ -1183,22 +1203,23 @@ 
    -     # File lib/bundler/cli.rb, line 261
-261:     def update(*gems)
-262:       sources = Array(options[:source])
-263: 
-264:       if gems.empty? && sources.empty?
-265:         # We're doing a full update
-266:         Bundler.definition(true)
-267:       else
-268:         Bundler.definition(:gems => gems, :sources => sources)
-269:       end
-270: 
-271:       Installer.install Bundler.root, Bundler.definition, "update" => true
-272:       Bundler.load.cache if Bundler.root.join("vendor/cache").exist?
-273:       Bundler.ui.confirm "Your bundle is updated! " +
-274:         "Use `bundle show [gemname]` to see where a bundled gem is installed."
-275:     end
    + # File lib/bundler/cli.rb, line 259 +259: def update(*gems) +260: sources = Array(options[:source]) +261: +262: if gems.empty? && sources.empty? +263: # We're doing a full update +264: Bundler.definition(true) +265: else +266: Bundler.definition(:gems => gems, :sources => sources) +267: end +268: +269: opts = {"update" => true, "local" => options[:local]} +270: Installer.install Bundler.root, Bundler.definition, opts +271: Bundler.load.cache if Bundler.root.join("vendor/cache").exist? +272: Bundler.ui.confirm "Your bundle is updated! " + +273: "Use `bundle show [gemname]` to see where a bundled gem is installed." +274: end
    @@ -1229,10 +1250,10 @@ 
    -     # File lib/bundler/cli.rb, line 442
-442:     def version
-443:       Bundler.ui.info "Bundler version #{Bundler::VERSION}"
-444:     end
    + # File lib/bundler/cli.rb, line 440 +440: def version +441: Bundler.ui.info "Bundler version #{Bundler::VERSION}" +442: end
    @@ -1263,27 +1284,27 @@ 
    -     # File lib/bundler/cli.rb, line 456
-456:     def viz
-457:       output_file = File.expand_path(options[:file])
-458:       graph = Graph.new( Bundler.load )
-459: 
-460:       begin
-461:         graph.viz(output_file, options[:version], options[:requirements])
-462:         Bundler.ui.info output_file
-463:       rescue LoadError => e
-464:         Bundler.ui.error e.inspect
-465:         Bundler.ui.warn "Make sure you have the graphviz ruby gem. You can install it with:"
-466:         Bundler.ui.warn "`gem install ruby-graphviz`"
-467:       rescue StandardError => e
-468:         if e.message =~ /GraphViz not installed or dot not in PATH/
-469:           Bundler.ui.error e.message
-470:           Bundler.ui.warn "The ruby graphviz gem requires GraphViz to be installed"
-471:         else
-472:           raise
-473:         end
-474:       end
-475:     end
    + # File lib/bundler/cli.rb, line 454 +454: def viz +455: output_file = File.expand_path(options[:file]) +456: graph = Graph.new( Bundler.load ) +457: +458: begin +459: graph.viz(output_file, options[:version], options[:requirements]) +460: Bundler.ui.info output_file +461: rescue LoadError => e +462: Bundler.ui.error e.inspect +463: Bundler.ui.warn "Make sure you have the graphviz ruby gem. You can install it with:" +464: Bundler.ui.warn "`gem install ruby-graphviz`" +465: rescue StandardError => e +466: if e.message =~ /GraphViz not installed or dot not in PATH/ +467: Bundler.ui.error e.message +468: Bundler.ui.warn "The ruby graphviz gem requires GraphViz to be installed" +469: else +470: raise +471: end +472: end +473: end
    @@ -1320,10 +1341,10 @@ 
    -     # File lib/bundler/cli.rb, line 505
-505:     def have_groff?
-506:       !(`which groff` rescue '').empty?
-507:     end
    + # File lib/bundler/cli.rb, line 507 +507: def have_groff? +508: !(`which groff` rescue '').empty? +509: end
    @@ -1354,15 +1375,15 @@ 
    -     # File lib/bundler/cli.rb, line 509
-509:     def locate_gem(name)
-510:       spec = Bundler.load.specs.find{|s| s.name == name }
-511:       raise GemNotFound, "Could not find gem '#{name}' in the current bundle." unless spec
-512:       if spec.name == 'bundler'
-513:         return File.expand_path('../../../', __FILE__)
-514:       end
-515:       spec.full_gem_path
-516:     end
    + # File lib/bundler/cli.rb, line 511 +511: def locate_gem(name) +512: spec = Bundler.load.specs.find{|s| s.name == name } +513: raise GemNotFound, "Could not find gem '#{name}' in the current bundle." unless spec +514: if spec.name == 'bundler' +515: return File.expand_path('../../../', __FILE__) +516: end +517: spec.full_gem_path +518: end
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Definition.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Definition.html similarity index 87% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Definition.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Definition.html index 3ba98e5b..36de290c 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Definition.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Definition.html @@ -157,6 +157,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -266,16 +270,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • @@ -520,7 +536,7 @@ 61: @unlock[:gems] ||= [] 62: @unlock[:sources] ||= [] 63: -64: current_platform = Gem.platforms.map { |p| generic(p) }.compact.last +64: current_platform = Bundler.rubygems.platforms.map { |p| generic(p) }.compact.last 65: @new_platform = !@platforms.include?(current_platform) 66: @platforms |= [current_platform] 67: @@ -586,7 +602,7 @@
    ensure_equivalent_gemfile_and_lockfile() + class="method-args">(explicit_flag = false) click to toggle source
    @@ -601,60 +617,65 @@ id="ensure-equivalent-gemfile-and-lockfile-source"> 
          # File lib/bundler/definition.rb, line 238
-238:     def ensure_equivalent_gemfile_and_lockfile
+238:     def ensure_equivalent_gemfile_and_lockfile(explicit_flag = false)
 239:       changes = false
 240: 
-241:       msg = "You have modified your Gemfile in development but did not check\n"              "the resulting snapshot (Gemfile.lock) into version control"
+241:       msg = "You are trying to install in deployment mode after changing\n"              "your Gemfile. Run `bundle install` elsewhere and add the\n"              "updated Gemfile.lock to version control."
 242: 
-243:       added =   []
-244:       deleted = []
-245:       changed = []
+243:       unless explicit_flag
+244:         msg += "\n\nIf this is a development machine, remove the Gemfile "                 "freeze \nby running `bundle install --no-deployment`."
+245:       end
 246: 
-247:       if @locked_sources != @sources
-248:         new_sources = @sources - @locked_sources
-249:         deleted_sources = @locked_sources - @sources
+247:       added =   []
+248:       deleted = []
+249:       changed = []
 250: 
-251:         if new_sources.any?
-252:           added.concat new_sources.map { |source| "* source: #{source}" }
-253:         end
+251:       if @locked_sources != @sources
+252:         new_sources = @sources - @locked_sources
+253:         deleted_sources = @locked_sources - @sources
 254: 
-255:         if deleted_sources.any?
-256:           deleted.concat deleted_sources.map { |source| "* source: #{source}" }
+255:         if new_sources.any?
+256:           added.concat new_sources.map { |source| "* source: #{source}" }
 257:         end
 258: 
-259:         changes = true
-260:       end
-261: 
-262:       both_sources = Hash.new { |h,k| h[k] = ["no specified source", "no specified source"] }
-263:       @dependencies.each { |d| both_sources[d.name][0] = d.source if d.source }
-264:       @locked_deps.each  { |d| both_sources[d.name][1] = d.source if d.source }
-265:       both_sources.delete_if { |k,v| v[0] == v[1] }
-266: 
-267:       if @dependencies != @locked_deps
-268:         new_deps = @dependencies - @locked_deps
-269:         deleted_deps = @locked_deps - @dependencies
+259:         if deleted_sources.any?
+260:           deleted.concat deleted_sources.map { |source| "* source: #{source}" }
+261:         end
+262: 
+263:         changes = true
+264:       end
+265: 
+266:       both_sources = Hash.new { |h,k| h[k] = ["no specified source", "no specified source"] }
+267:       @dependencies.each { |d| both_sources[d.name][0] = d.source if d.source }
+268:       @locked_deps.each  { |d| both_sources[d.name][1] = d.source if d.source }
+269:       both_sources.delete_if { |k,v| v[0] == v[1] }
 270: 
-271:         if new_deps.any?
-272:           added.concat new_deps.map { |d| "* #{pretty_dep(d)}" }
-273:         end
+271:       if @dependencies != @locked_deps
+272:         new_deps = @dependencies - @locked_deps
+273:         deleted_deps = @locked_deps - @dependencies
 274: 
-275:         if deleted_deps.any?
-276:           deleted.concat deleted_deps.map { |d| "* #{pretty_dep(d)}" }
+275:         if new_deps.any?
+276:           added.concat new_deps.map { |d| "* #{pretty_dep(d)}" }
 277:         end
 278: 
-279:         both_sources.each do |name, sources|
-280:           changed << "* #{name} from `#{sources[0]}` to `#{sources[1]}`"
+279:         if deleted_deps.any?
+280:           deleted.concat deleted_deps.map { |d| "* #{pretty_dep(d)}" }
 281:         end
 282: 
-283:         changes = true
-284:       end
-285: 
-286:       msg << "\n\nYou have added to the Gemfile:\n"     << added.join("\n") if added.any?
-287:       msg << "\n\nYou have deleted from the Gemfile:\n" << deleted.join("\n") if deleted.any?
-288:       msg << "\n\nYou have changed in the Gemfile:\n"   << changed.join("\n") if changed.any?
+283:         both_sources.each do |name, sources|
+284:           changed << "* #{name} from `#{sources[0]}` to `#{sources[1]}`"
+285:         end
+286: 
+287:         changes = true
+288:       end
 289: 
-290:       raise ProductionError, msg if added.any? || deleted.any? || changed.any?
-291:     end
    +290: msg << "\n\nYou have added to the Gemfile:\n" << added.join("\n") if added.any? +291: msg << "\n\nYou have deleted from the Gemfile:\n" << deleted.join("\n") if deleted.any? +292: msg << "\n\nYou have changed in the Gemfile:\n" << changed.join("\n") if changed.any? +293: msg << "\n" +294: +295: raise ProductionError, msg if added.any? || deleted.any? || changed.any? +296: end @@ -1285,7 +1306,7 @@ 225: 226: handled = [] 227: dependencies. -228: sort_by { |d| d.name }. +228: sort_by { |d| d.to_s }. 229: each do |dep| 230: next if handled.include?(dep.name) 231: out << dep.to_lock @@ -1330,14 +1351,14 @@ 
    -     # File lib/bundler/definition.rb, line 320
-320:     def converge_dependencies
-321:       (@dependencies + @locked_deps).each do |dep|
-322:         if dep.source
-323:           dep.source = @sources.find { |s| dep.source == s }
-324:         end
-325:       end
-326:     end
    + # File lib/bundler/definition.rb, line 327 +327: def converge_dependencies +328: (@dependencies + @locked_deps).each do |dep| +329: if dep.source +330: dep.source = @sources.find { |s| dep.source == s } +331: end +332: end +333: end
    @@ -1372,68 +1393,70 @@ generated 
    -     # File lib/bundler/definition.rb, line 331
-331:     def converge_locked_specs
-332:       deps = []
-333: 
-334:       # Build a list of dependencies that are the same in the Gemfile
-335:       # and Gemfile.lock. If the Gemfile modified a dependency, but
-336:       # the gem in the Gemfile.lock still satisfies it, this is fine
-337:       # too.
-338:       @dependencies.each do |dep|
-339:         locked_dep = @locked_deps.find { |d| dep == d }
+     # File lib/bundler/definition.rb, line 338
+338:     def converge_locked_specs
+339:       deps = []
 340: 
-341:         if in_locked_deps?(dep, locked_dep) || satisfies_locked_spec?(dep)
-342:           deps << dep
-343:         elsif dep.source.is_a?(Source::Path) && dep.current_platform? && (!locked_dep || dep.source != locked_dep.source)
-344:           @locked_specs.each do |s|
-345:             @unlock[:gems] << s.name if s.source == dep.source
-346:           end
+341:       # Build a list of dependencies that are the same in the Gemfile
+342:       # and Gemfile.lock. If the Gemfile modified a dependency, but
+343:       # the gem in the Gemfile.lock still satisfies it, this is fine
+344:       # too.
+345:       @dependencies.each do |dep|
+346:         locked_dep = @locked_deps.find { |d| dep == d }
 347: 
-348:           dep.source.unlock! if dep.source.respond_to?(:unlock!)
-349:           dep.source.specs.each { |s| @unlock[:gems] << s.name }
-350:         end
-351:       end
-352: 
-353:       converged = []
-354:       @locked_specs.each do |s|
-355:         s.source = @sources.find { |src| s.source == src }
-356: 
-357:         # Don't add a spec to the list if its source is expired. For example,
-358:         # if you change a Git gem to Rubygems.
-359:         next if s.source.nil? || @unlock[:sources].include?(s.name)
-360:         # If the spec is from a path source and it doesn't exist anymore
-361:         # then we just unlock it.
-362: 
-363:         # Path sources have special logic
-364:         if s.source.instance_of?(Source::Path)
-365:           other = s.source.specs[s].first
-366: 
-367:           # If the spec is no longer in the path source, unlock it. This
-368:           # commonly happens if the version changed in the gemspec
-369:           next unless other
-370:           # If the dependencies of the path source have changed, unlock it
-371:           next unless s.dependencies.sort == other.dependencies.sort
-372:         end
+348:         if in_locked_deps?(dep, locked_dep) || satisfies_locked_spec?(dep)
+349:           deps << dep
+350:         elsif dep.source.is_a?(Source::Path) && dep.current_platform? && (!locked_dep || dep.source != locked_dep.source)
+351:           @locked_specs.each do |s|
+352:             @unlock[:gems] << s.name if s.source == dep.source
+353:           end
+354: 
+355:           dep.source.unlock! if dep.source.respond_to?(:unlock!)
+356:           dep.source.specs.each { |s| @unlock[:gems] << s.name }
+357:         end
+358:       end
+359: 
+360:       converged = []
+361:       @locked_specs.each do |s|
+362:         s.source = @sources.find { |src| s.source == src }
+363: 
+364:         # Don't add a spec to the list if its source is expired. For example,
+365:         # if you change a Git gem to Rubygems.
+366:         next if s.source.nil? || @unlock[:sources].include?(s.name)
+367:         # If the spec is from a path source and it doesn't exist anymore
+368:         # then we just unlock it.
+369: 
+370:         # Path sources have special logic
+371:         if s.source.instance_of?(Source::Path)
+372:           other = s.source.specs[s].first
 373: 
-374:         converged << s
-375:       end
-376: 
-377:       resolve = SpecSet.new(converged)
-378:       resolve = resolve.for(expand_dependencies(deps, true), @unlock[:gems])
-379:       diff    = @locked_specs.to_a - resolve.to_a
-380: 
-381:       # Now, we unlock any sources that do not have anymore gems pinned to it
-382:       @sources.each do |source|
-383:         next unless source.respond_to?(:unlock!)
-384: 
-385:         unless resolve.any? { |s| s.source == source }
-386:           source.unlock! if !diff.empty? && diff.any? { |s| s.source == source }
-387:         end
-388:       end
+374:           # If the spec is no longer in the path source, unlock it. This
+375:           # commonly happens if the version changed in the gemspec
+376:           next unless other
+377: 
+378:           deps2 = other.dependencies.select { |d| d.type != :development }
+379:           # If the dependencies of the path source have changed, unlock it
+380:           next unless s.dependencies.sort == deps2.sort
+381:         end
+382: 
+383:         converged << s
+384:       end
+385: 
+386:       resolve = SpecSet.new(converged)
+387:       resolve = resolve.for(expand_dependencies(deps, true), @unlock[:gems])
+388:       diff    = @locked_specs.to_a - resolve.to_a
 389: 
-390:       resolve
-391:     end
    +390: # Now, we unlock any sources that do not have anymore gems pinned to it +391: @sources.each do |source| +392: next unless source.respond_to?(:unlock!) +393: +394: unless resolve.any? { |s| s.source == source } +395: source.unlock! if !diff.empty? && diff.any? { |s| s.source == source } +396: end +397: end +398: +399: resolve +400: end
    @@ -1464,23 +1487,23 @@ generated 
    -     # File lib/bundler/definition.rb, line 303
-303:     def converge_sources
-304:       locked_gem = @locked_sources.find { |s| Source::Rubygems === s }
-305:       actual_gem = @sources.find { |s| Source::Rubygems === s }
-306: 
-307:       if locked_gem && actual_gem
-308:         locked_gem.merge_remotes actual_gem
-309:       end
-310: 
-311:       @sources.map! do |source|
-312:         @locked_sources.find { |s| s == source } || source
-313:       end
-314: 
-315:       @sources.each do |source|
-316:         source.unlock! if source.respond_to?(:unlock!) && @unlock[:sources].include?(source.name)
-317:       end
-318:     end
    + # File lib/bundler/definition.rb, line 310 +310: def converge_sources +311: locked_gem = @locked_sources.find { |s| Source::Rubygems === s } +312: actual_gem = @sources.find { |s| Source::Rubygems === s } +313: +314: if locked_gem && actual_gem +315: locked_gem.merge_remotes actual_gem +316: end +317: +318: @sources.map! do |source| +319: @locked_sources.find { |s| s == source } || source +320: end +321: +322: @sources.each do |source| +323: source.unlock! if source.respond_to?(:unlock!) && @unlock[:sources].include?(source.name) +324: end +325: end
    @@ -1511,17 +1534,17 @@ generated 
    -     # File lib/bundler/definition.rb, line 405
-405:     def expand_dependencies(dependencies, remote = false)
-406:       deps = []
-407:       dependencies.each do |dep|
-408:         dep = Dependency.new(dep, ">= 0") unless dep.respond_to?(:name)
-409:         dep.gem_platforms(@platforms).each do |p|
-410:           deps << DepProxy.new(dep, p) if remote || p == generic(Gem::Platform.local)
-411:         end
-412:       end
-413:       deps
-414:     end
    + # File lib/bundler/definition.rb, line 414 +414: def expand_dependencies(dependencies, remote = false) +415: deps = [] +416: dependencies.each do |dep| +417: dep = Dependency.new(dep, ">= 0") unless dep.respond_to?(:name) +418: dep.gem_platforms(@platforms).each do |p| +419: deps << DepProxy.new(dep, p) if remote || p == generic(Gem::Platform.local) +420: end +421: end +422: deps +423: end
    @@ -1552,10 +1575,10 @@ generated 
    -     # File lib/bundler/definition.rb, line 401
-401:     def expanded_dependencies
-402:       @expanded_dependencies ||= expand_dependencies(dependencies, @remote)
-403:     end
    + # File lib/bundler/definition.rb, line 410 +410: def expanded_dependencies +411: @expanded_dependencies ||= expand_dependencies(dependencies, @remote) +412: end
    @@ -1586,10 +1609,10 @@ generated 
    -     # File lib/bundler/definition.rb, line 393
-393:     def in_locked_deps?(dep, d)
-394:       d && dep.source == d.source
-395:     end
    + # File lib/bundler/definition.rb, line 402 +402: def in_locked_deps?(dep, d) +403: d && dep.source == d.source +404: end
    @@ -1620,13 +1643,13 @@ generated 
    -     # File lib/bundler/definition.rb, line 296
-296:     def pretty_dep(dep, source = false)
-297:       msg  = "#{dep.name}"
-298:       msg << " (#{dep.requirement})" unless dep.requirement == Gem::Requirement.default
-299:       msg << " from the `#{dep.source}` source" if source && dep.source
-300:       msg
-301:     end
    + # File lib/bundler/definition.rb, line 303 +303: def pretty_dep(dep, source = false) +304: msg = "#{dep.name}" +305: msg << " (#{dep.requirement})" unless dep.requirement == Gem::Requirement.default +306: msg << " from the `#{dep.source}` source" if source && dep.source +307: msg +308: end
    @@ -1657,12 +1680,12 @@ generated 
    -     # File lib/bundler/definition.rb, line 423
-423:     def requested_dependencies
-424:       groups = self.groups - Bundler.settings.without
-425:       groups.map! { |g| g.to_sym }
-426:       dependencies.reject { |d| !d.should_include? || (d.groups & groups).empty? }
-427:     end
    + # File lib/bundler/definition.rb, line 432 +432: def requested_dependencies +433: groups = self.groups - Bundler.settings.without +434: groups.map! { |g| g.to_sym } +435: dependencies.reject { |d| !d.should_include? || (d.groups & groups).empty? } +436: end
    @@ -1693,10 +1716,10 @@ generated 
    -     # File lib/bundler/definition.rb, line 397
-397:     def satisfies_locked_spec?(dep)
-398:       @locked_specs.any? { |s| s.satisfies?(dep) && (!dep.source || s.source == dep.source) }
-399:     end
    + # File lib/bundler/definition.rb, line 406 +406: def satisfies_locked_spec?(dep) +407: @locked_specs.any? { |s| s.satisfies?(dep) && (!dep.source || s.source == dep.source) } +408: end
    @@ -1727,13 +1750,13 @@ generated 
    -     # File lib/bundler/definition.rb, line 416
-416:     def sorted_sources
-417:       @sources.sort_by do |s|
-418:         # Place GEM at the top
-419:         [ s.is_a?(Source::Rubygems) ? 1 : 0, s.to_s ]
-420:       end
-421:     end
    + # File lib/bundler/definition.rb, line 425 +425: def sorted_sources +426: @sources.sort_by do |s| +427: # Place GEM at the top +428: [ s.is_a?(Source::Rubygems) ? 1 : 0, s.to_s ] +429: end +430: end
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/DepProxy.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/DepProxy.html similarity index 89% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/DepProxy.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/DepProxy.html index e12de967..22b3adee 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/DepProxy.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/DepProxy.html @@ -100,6 +100,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -209,16 +213,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • @@ -389,10 +405,10 @@ 
    -     # File lib/bundler/rubygems_ext.rb, line 153
-153:     def initialize(dep, platform)
-154:       @dep, @__platform, @required_by = dep, platform, []
-155:     end
    + # File lib/bundler/rubygems_ext.rb, line 167 +167: def initialize(dep, platform) +168: @dep, @__platform, @required_by = dep, platform, [] +169: end
    @@ -429,10 +445,10 @@ 
    -     # File lib/bundler/rubygems_ext.rb, line 161
-161:     def ==(o)
-162:       dep == o.dep && __platform == o.__platform
-163:     end
    + # File lib/bundler/rubygems_ext.rb, line 175 +175: def ==(o) +176: dep == o.dep && __platform == o.__platform +177: end
    @@ -496,10 +512,10 @@ 
    -     # File lib/bundler/rubygems_ext.rb, line 157
-157:     def hash
-158:       @hash ||= dep.hash
-159:     end
    + # File lib/bundler/rubygems_ext.rb, line 171 +171: def hash +172: @hash ||= dep.hash +173: end
    @@ -530,10 +546,10 @@ 
    -     # File lib/bundler/rubygems_ext.rb, line 171
-171:     def to_s
-172:       @dep.to_s
-173:     end
    + # File lib/bundler/rubygems_ext.rb, line 185 +185: def to_s +186: @dep.to_s +187: end
    @@ -564,10 +580,10 @@ 
    -     # File lib/bundler/rubygems_ext.rb, line 167
-167:     def type
-168:       @dep.type
-169:     end
    + # File lib/bundler/rubygems_ext.rb, line 181 +181: def type +182: @dep.type +183: end
    @@ -604,10 +620,10 @@ 
    -     # File lib/bundler/rubygems_ext.rb, line 177
-177:     def method_missing(*args)
-178:       @dep.send(*args)
-179:     end
    + # File lib/bundler/rubygems_ext.rb, line 191 +191: def method_missing(*args) +192: @dep.send(*args) +193: end
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Dependency.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Dependency.html similarity index 78% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Dependency.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Dependency.html index 6fd7be9d..f88a9e96 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Dependency.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Dependency.html @@ -93,6 +93,8 @@
  • #mswin?
    • +
  • #rbx?
    • +
  • #ruby?
  • #ruby_18?
    • @@ -120,6 +122,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -229,16 +235,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • @@ -421,20 +439,20 @@ 
    -    # File lib/bundler/dependency.rb, line 25
-25:     def initialize(name, version, options = {}, &blk)
-26:       super(name, version)
-27: 
-28:       @autorequire = nil
-29:       @groups      = Array(options["group"] || :default).map { |g| g.to_sym }
-30:       @source      = options["source"]
-31:       @platforms   = Array(options["platforms"])
-32:       @env         = options["env"]
-33: 
-34:       if options.key?('require')
-35:         @autorequire = Array(options['require'] || [])
-36:       end
-37:     end
    + # File lib/bundler/dependency.rb, line 26 +26: def initialize(name, version, options = {}, &blk) +27: super(name, version) +28: +29: @autorequire = nil +30: @groups = Array(options["group"] || :default).map { |g| g.to_sym } +31: @source = options["source"] +32: @platforms = Array(options["platforms"]) +33: @env = options["env"] +34: +35: if options.key?('require') +36: @autorequire = Array(options['require'] || []) +37: end +38: end
    @@ -471,17 +489,17 @@ 
    -    # File lib/bundler/dependency.rb, line 55
-55:     def current_env?
-56:       return true unless @env
-57:       if Hash === @env
-58:         @env.all? do |key, val|
-59:           ENV[key.to_s] && (String === val ? ENV[key.to_s] == val : ENV[key.to_s] =~ val)
-60:         end
-61:       else
-62:         ENV[@env.to_s]
-63:       end
-64:     end
    + # File lib/bundler/dependency.rb, line 56 +56: def current_env? +57: return true unless @env +58: if Hash === @env +59: @env.all? do |key, val| +60: ENV[key.to_s] && (String === val ? ENV[key.to_s] == val : ENV[key.to_s] =~ val) +61: end +62: else +63: ENV[@env.to_s] +64: end +65: end
    @@ -512,11 +530,11 @@ 
    -    # File lib/bundler/dependency.rb, line 66
-66:     def current_platform?
-67:       return true if @platforms.empty?
-68:       @platforms.any? { |p| send("#{p}?") }
-69:     end
    + # File lib/bundler/dependency.rb, line 67 +67: def current_platform? +68: return true if @platforms.empty? +69: @platforms.any? { |p| send("#{p}?") } +70: end
    @@ -547,18 +565,18 @@ 
    -    # File lib/bundler/dependency.rb, line 39
-39:     def gem_platforms(valid_platforms)
-40:       return valid_platforms if @platforms.empty?
-41: 
-42:       platforms = []
-43:       @platforms.each do |p|
-44:         platform = PLATFORM_MAP[p]
-45:         next unless valid_platforms.include?(platform)
-46:         platforms |= [platform]
-47:       end
-48:       platforms
-49:     end
    + # File lib/bundler/dependency.rb, line 40 +40: def gem_platforms(valid_platforms) +41: return valid_platforms if @platforms.empty? +42: +43: platforms = [] +44: @platforms.each do |p| +45: platform = PLATFORM_MAP[p] +46: next unless valid_platforms.include?(platform) +47: platforms |= [platform] +48: end +49: platforms +50: end
    @@ -589,10 +607,10 @@ 
    -    # File lib/bundler/dependency.rb, line 51
-51:     def should_include?
-52:       current_env? && current_platform?
-53:     end
    + # File lib/bundler/dependency.rb, line 52 +52: def should_include? +53: current_env? && current_platform? +54: end
    @@ -623,18 +641,19 @@ 
    -    # File lib/bundler/dependency.rb, line 71
-71:     def to_lock
-72:       out = "  #{name}"
-73: 
-74:       unless requirement == Gem::Requirement.default
-75:         out << " (#{requirement.to_s})"
-76:       end
-77: 
-78:       out << '!' if source
+    # File lib/bundler/dependency.rb, line 72
+72:     def to_lock
+73:       out = "  #{name}"
+74: 
+75:       unless requirement == Gem::Requirement.default
+76:         reqs = requirement.requirements.map{|o,v| "#{o} #{v}" }
+77:         out << " (#{reqs.join(', ')})"
+78:       end
 79: 
-80:       out << "\n"
-81:     end
    +80: out << '!' if source +81: +82: out << "\n" +83: end
    @@ -671,10 +690,10 @@ 
    -     # File lib/bundler/dependency.rb, line 109
-109:     def jruby?
-110:       defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
-111:     end
    + # File lib/bundler/dependency.rb, line 115 +115: def jruby? +116: defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby" +117: end
    @@ -705,10 +724,10 @@ 
    -     # File lib/bundler/dependency.rb, line 117
-117:     def mingw?
-118:       Bundler::WINDOWS && Gem::Platform.local.os == "mingw32"
-119:     end
    + # File lib/bundler/dependency.rb, line 123 +123: def mingw? +124: Bundler::WINDOWS && Gem::Platform.local.os == "mingw32" +125: end
    @@ -739,10 +758,10 @@ 
    -     # File lib/bundler/dependency.rb, line 121
-121:     def mingw_18?
-122:       mingw? && RUBY_VERSION < "1.9"
-123:     end
    + # File lib/bundler/dependency.rb, line 127 +127: def mingw_18? +128: mingw? && RUBY_VERSION < "1.9" +129: end
    @@ -773,10 +792,10 @@ 
    -     # File lib/bundler/dependency.rb, line 125
-125:     def mingw_19?
-126:       mingw? && RUBY_VERSION >= "1.9"
-127:     end
    + # File lib/bundler/dependency.rb, line 131 +131: def mingw_19? +132: mingw? && RUBY_VERSION >= "1.9" +133: end
    @@ -807,10 +826,10 @@ 
    -    # File lib/bundler/dependency.rb, line 97
-97:     def mri?
-98:       !mswin? && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby")
-99:     end
    + # File lib/bundler/dependency.rb, line 99 + 99: def mri? +100: !mswin? && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby") +101: end
    @@ -841,10 +860,10 @@ 
    -     # File lib/bundler/dependency.rb, line 101
-101:     def mri_18?
-102:       mri? && RUBY_VERSION < "1.9"
-103:     end
    + # File lib/bundler/dependency.rb, line 103 +103: def mri_18? +104: mri? && RUBY_VERSION < "1.9" +105: end
    @@ -875,10 +894,10 @@ 
    -     # File lib/bundler/dependency.rb, line 105
-105:     def mri_19?
-106:       mri? && RUBY_VERSION >= "1.9"
-107:     end
    + # File lib/bundler/dependency.rb, line 107 +107: def mri_19? +108: mri? && RUBY_VERSION >= "1.9" +109: end
    @@ -909,10 +928,44 @@ 
    -     # File lib/bundler/dependency.rb, line 113
-113:     def mswin?
-114:       Bundler::WINDOWS
-115:     end
    + # File lib/bundler/dependency.rb, line 119 +119: def mswin? +120: Bundler::WINDOWS +121: end +
    + + + + + + + + + +
    + + +
    + + rbx?() + click to toggle source + +
    + +
    + + + + + +
    +
    +     # File lib/bundler/dependency.rb, line 111
+111:     def rbx?
+112:       ruby? && defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx"
+113:     end
    @@ -943,10 +996,10 @@ 
    -    # File lib/bundler/dependency.rb, line 85
-85:     def ruby?
-86:       !mswin? && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby" || RUBY_ENGINE == "rbx")
-87:     end
    + # File lib/bundler/dependency.rb, line 87 +87: def ruby? +88: !mswin? && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby" || RUBY_ENGINE == "rbx") +89: end
    @@ -977,10 +1030,10 @@ 
    -    # File lib/bundler/dependency.rb, line 89
-89:     def ruby_18?
-90:       ruby? && RUBY_VERSION < "1.9"
-91:     end
    + # File lib/bundler/dependency.rb, line 91 +91: def ruby_18? +92: ruby? && RUBY_VERSION < "1.9" +93: end
    @@ -1011,10 +1064,10 @@ 
    -    # File lib/bundler/dependency.rb, line 93
-93:     def ruby_19?
-94:       ruby? && RUBY_VERSION >= "1.9"
-95:     end
    + # File lib/bundler/dependency.rb, line 95 +95: def ruby_19? +96: ruby? && RUBY_VERSION >= "1.9" +97: end
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Deployment.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Deployment.html similarity index 91% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Deployment.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Deployment.html index 8d091501..4bb94137 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Deployment.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Deployment.html @@ -88,6 +88,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -197,16 +201,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • @@ -328,7 +344,7 @@ 
         # File lib/bundler/deployment.rb, line 3
  3:     def self.define_task(context, task_method = :task, opts = {})
- 4:       if context.is_a?(Capistrano::Configuration)
+ 4:       if defined?(Capistrano) && context.is_a?(Capistrano::Configuration)
  5:         context_name = "capistrano"
  6:         role_default = "{:except => {:no_release => true}}"
  7:       else
@@ -336,7 +352,7 @@
  9:         role_default = "[:app]"
 10:       end
 11: 
-12:       roles = context.fetch(:bundle_roles, nil)
+12:       roles = context.fetch(:bundle_roles, false)
 13:       opts[:roles] = roles if roles
 14: 
 15:       context.send :namespace, :bundle do
@@ -353,7 +369,7 @@
 26:           args << bundle_flags.to_s
 27:           args << "--without #{bundle_without.join(" ")}" unless bundle_without.empty?
 28: 
-29:           run "#{bundle_cmd} install #{args.join(' ')}"
+29:           run "cd #{context.fetch(:current_release)} && #{bundle_cmd} install #{args.join(' ')}"
 30:         end
 31:       end
 32:     end
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/DeprecatedError.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/DeprecatedError.html similarity index 90% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/DeprecatedError.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/DeprecatedError.html index 24575ae5..516a0087 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/DeprecatedError.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/DeprecatedError.html @@ -79,6 +79,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -188,16 +192,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Dsl.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Dsl.html similarity index 78% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Dsl.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Dsl.html index a91eef53..01923d49 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Dsl.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Dsl.html @@ -120,6 +120,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -229,16 +233,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • @@ -372,19 +388,19 @@ Deprecated methods 
    -     # File lib/bundler/dsl.rb, line 147
-147:     def self.deprecate(name, replacement = nil)
-148:       define_method(name) do |*|
-149:         message = "'#{name}' has been removed from the Gemfile DSL, "
-150:         if replacement
-151:           message << "and has been replaced with '#{replacement}'."
-152:         else
-153:           message << "and is no longer supported."
-154:         end
-155:         message << "\nSee the README for more information on upgrading from Bundler 0.8."
-156:         raise DeprecatedError, message
-157:       end
-158:     end
    + # File lib/bundler/dsl.rb, line 144 +144: def self.deprecate(name, replacement = nil) +145: define_method(name) do |*| +146: message = "'#{name}' has been removed from the Gemfile DSL, " +147: if replacement +148: message << "and has been replaced with '#{replacement}'." +149: else +150: message << "and is no longer supported." +151: end +152: message << "\nSee the README for more information on upgrading from Bundler 0.8." +153: raise DeprecatedError, message +154: end +155: end
    @@ -497,13 +513,13 @@ Deprecated methods 
    -     # File lib/bundler/dsl.rb, line 138
-138:     def env(name)
-139:       @env, old = name, @env
-140:       yield
-141:     ensure
-142:       @env = old
-143:     end
    + # File lib/bundler/dsl.rb, line 135 +135: def env(name) +136: @env, old = name, @env +137: yield +138: ensure +139: @env = old +140: end
    @@ -534,31 +550,31 @@ Deprecated methods 
    -    # File lib/bundler/dsl.rb, line 50
-50:     def gem(name, *args)
-51:       if name.is_a?(Symbol)
-52:         raise GemfileError, %{You need to specify gem names as Strings. Use 'gem "#{name.to_s}"' instead.}
-53:       end
+    # File lib/bundler/dsl.rb, line 47
+47:     def gem(name, *args)
+48:       if name.is_a?(Symbol)
+49:         raise GemfileError, %{You need to specify gem names as Strings. Use 'gem "#{name.to_s}"' instead.}
+50:       end
+51: 
+52:       options = Hash === args.last ? args.pop : {}
+53:       version = args || [">= 0"]
 54: 
-55:       options = Hash === args.last ? args.pop : {}
-56:       version = args || [">= 0"]
+55:       _deprecated_options(options)
+56:       _normalize_options(name, version, options)
 57: 
-58:       _deprecated_options(options)
-59:       _normalize_options(name, version, options)
-60: 
-61:       dep = Dependency.new(name, version, options)
-62: 
-63:       if current = @dependencies.find { |d| d.name == dep.name }
-64:         if current.requirement != dep.requirement
-65:           raise DslError, "You cannot specify the same gem twice with different version requirements. "                            "You specified: #{current.name} (#{current.requirement}) and "                            "#{dep.name} (#{dep.requirement})"
-66:         end
-67: 
-68:         if current.source != dep.source
-69:           raise DslError, "You cannot specify the same gem twice coming from different sources. You "                            "specified that #{dep.name} (#{dep.requirement}) should come from "                            "#{current.source || 'an unspecfied source'} and #{dep.source}"
-70:         end
-71:       end
-72:       @dependencies << Dependency.new(name, version, options)
-73:     end
    +58: dep = Dependency.new(name, version, options) +59: +60: if current = @dependencies.find { |d| d.name == dep.name } +61: if current.requirement != dep.requirement +62: raise DslError, "You cannot specify the same gem twice with different version requirements. " "You specified: #{current.name} (#{current.requirement}) and " "#{dep.name} (#{dep.requirement})" +63: end +64: +65: if current.source != dep.source +66: raise DslError, "You cannot specify the same gem twice coming from different sources. You " "specified that #{dep.name} (#{dep.requirement}) should come from " "#{current.source || 'an unspecfied source'} and #{dep.source}" +67: end +68: end +69: @dependencies << Dependency.new(name, version, options) +70: end
    @@ -599,23 +615,20 @@ Deprecated methods 29: 30: case gemspecs.size 31: when 1 -32: spec = Gem::Specification.load(gemspecs.first) +32: spec = Bundler.load_gemspec(gemspecs.first) 33: raise InvalidOption, "There was an error loading the gemspec at #{gemspecs.first}." unless spec 34: gem spec.name, :path => path -35: spec.runtime_dependencies.each do |dep| -36: gem dep.name, *dep.requirement.as_list -37: end -38: group(development_group) do -39: spec.development_dependencies.each do |dep| -40: gem dep.name, *dep.requirement.as_list -41: end -42: end -43: when 0 -44: raise InvalidOption, "There are no gemspecs at #{path}." -45: else -46: raise InvalidOption, "There are multiple gemspecs at #{path}. Please use the :name option to specify which one." -47: end -48: end +35: group(development_group) do +36: spec.development_dependencies.each do |dep| +37: gem dep.name, *dep.requirement.as_list +38: end +39: end +40: when 0 +41: raise InvalidOption, "There are no gemspecs at #{path}." +42: else +43: raise InvalidOption, "There are multiple gemspecs at #{path}. Please use the :name option to specify which one." +44: end +45: end @@ -646,15 +659,15 @@ Deprecated methods 
    -     # File lib/bundler/dsl.rb, line 102
-102:     def git(uri, options = {}, source_options = {}, &blk)
-103:       unless block_given?
-104:         msg = "You can no longer specify a git source by itself. Instead, \n"                "either use the :git option on a gem, or specify the gems that \n"                "bundler should find in the git source by passing a block to \n"                "the git method, like: \n\n"                "  git 'git://github.com/rails/rails.git' do\n"                "    gem 'rails'\n"                "  end"
-105:         raise DeprecatedError, msg
-106:       end
-107: 
-108:       source Source::Git.new(_normalize_hash(options).merge("uri" => uri)), source_options, &blk
-109:     end
    + # File lib/bundler/dsl.rb, line 99 + 99: def git(uri, options = {}, source_options = {}, &blk) +100: unless block_given? +101: msg = "You can no longer specify a git source by itself. Instead, \n" "either use the :git option on a gem, or specify the gems that \n" "bundler should find in the git source by passing a block to \n" "the git method, like: \n\n" " git 'git://github.com/rails/rails.git' do\n" " gem 'rails'\n" " end" +102: raise DeprecatedError, msg +103: end +104: +105: source Source::Git.new(_normalize_hash(options).merge("uri" => uri)), source_options, &blk +106: end
    @@ -685,13 +698,13 @@ Deprecated methods 
    -     # File lib/bundler/dsl.rb, line 123
-123:     def group(*args, &blk)
-124:       @groups.concat args
-125:       yield
-126:     ensure
-127:       args.each { @groups.pop }
-128:     end
    + # File lib/bundler/dsl.rb, line 120 +120: def group(*args, &blk) +121: @groups.concat args +122: yield +123: ensure +124: args.each { @groups.pop } +125: end
    @@ -722,10 +735,10 @@ Deprecated methods 
    -     # File lib/bundler/dsl.rb, line 98
- 98:     def path(path, options = {}, source_options = {}, &blk)
- 99:       source Source::Path.new(_normalize_hash(options).merge("path" => Pathname.new(path))), source_options, &blk
-100:     end
    + # File lib/bundler/dsl.rb, line 95 +95: def path(path, options = {}, source_options = {}, &blk) +96: source Source::Path.new(_normalize_hash(options).merge("path" => Pathname.new(path))), source_options, &blk +97: end
    @@ -785,13 +798,13 @@ Deprecated methods 
    -     # File lib/bundler/dsl.rb, line 130
-130:     def platforms(*platforms)
-131:       @platforms.concat platforms
-132:       yield
-133:     ensure
-134:       platforms.each { @platforms.pop }
-135:     end
    + # File lib/bundler/dsl.rb, line 127 +127: def platforms(*platforms) +128: @platforms.concat platforms +129: yield +130: ensure +131: platforms.each { @platforms.pop } +132: end
    @@ -826,25 +839,25 @@ Deprecated methods 
    -    # File lib/bundler/dsl.rb, line 79
-79:     def source(source, options = {})
-80:       case source
-81:       when :gemcutter, :rubygems, :rubyforge then
-82:         rubygems_source "http://rubygems.org"
+    # File lib/bundler/dsl.rb, line 76
+76:     def source(source, options = {})
+77:       case source
+78:       when :gemcutter, :rubygems, :rubyforge then
+79:         rubygems_source "http://rubygems.org"
+80:         return
+81:       when String
+82:         rubygems_source source
 83:         return
-84:       when String
-85:         rubygems_source source
-86:         return
-87:       end
+84:       end
+85: 
+86:       @source = source
+87:       options[:prepend] ? @sources.unshift(@source) : @sources << @source
 88: 
-89:       @source = source
-90:       options[:prepend] ? @sources.unshift(@source) : @sources << @source
-91: 
-92:       yield if block_given?
-93:       @source
-94:     ensure
-95:       @source = nil
-96:     end
    +89: yield if block_given? +90: @source +91: ensure +92: @source = nil +93: end
    @@ -875,12 +888,12 @@ Deprecated methods 
    -     # File lib/bundler/dsl.rb, line 117
-117:     def to_definition(lockfile, unlock)
-118:       @sources << @rubygems_source
-119:       @sources.uniq!
-120:       Definition.new(lockfile, @dependencies, @sources, unlock)
-121:     end
    + # File lib/bundler/dsl.rb, line 114 +114: def to_definition(lockfile, unlock) +115: @sources << @rubygems_source +116: @sources.uniq! +117: Definition.new(lockfile, @dependencies, @sources, unlock) +118: end
    @@ -917,18 +930,18 @@ Deprecated methods 
    -     # File lib/bundler/dsl.rb, line 234
-234:     def _deprecated_options(options)
-235:       if options.include?(:require_as)
-236:         raise DeprecatedError, "Please replace :require_as with :require"
-237:       elsif options.include?(:vendored_at)
-238:         raise DeprecatedError, "Please replace :vendored_at with :path"
-239:       elsif options.include?(:only)
-240:         raise DeprecatedError, "Please replace :only with :group"
-241:       elsif options.include?(:except)
-242:         raise DeprecatedError, "The :except option is no longer supported"
-243:       end
-244:     end
    + # File lib/bundler/dsl.rb, line 231 +231: def _deprecated_options(options) +232: if options.include?(:require_as) +233: raise DeprecatedError, "Please replace :require_as with :require" +234: elsif options.include?(:vendored_at) +235: raise DeprecatedError, "Please replace :vendored_at with :path" +236: elsif options.include?(:only) +237: raise DeprecatedError, "Please replace :only with :group" +238: elsif options.include?(:except) +239: raise DeprecatedError, "The :except option is no longer supported" +240: end +241: end
    @@ -959,17 +972,17 @@ Deprecated methods 
    -     # File lib/bundler/dsl.rb, line 175
-175:     def _normalize_hash(opts)
-176:       # Cannot modify a hash during an iteration in 1.9
-177:       opts.keys.each do |k|
-178:         next if String === k
-179:         v = opts[k]
-180:         opts.delete(k)
-181:         opts[k.to_s] = v
-182:       end
-183:       opts
-184:     end
    + # File lib/bundler/dsl.rb, line 172 +172: def _normalize_hash(opts) +173: # Cannot modify a hash during an iteration in 1.9 +174: opts.keys.each do |k| +175: next if String === k +176: v = opts[k] +177: opts.delete(k) +178: opts[k.to_s] = v +179: end +180: opts +181: end
    @@ -1000,54 +1013,54 @@ Deprecated methods 
    -     # File lib/bundler/dsl.rb, line 186
-186:     def _normalize_options(name, version, opts)
-187:       _normalize_hash(opts)
-188: 
-189:       invalid_keys = opts.keys - %(group groups git path name branch ref tag require submodules platform platforms)
-190:       if invalid_keys.any?
-191:         plural = invalid_keys.size > 1
-192:         message = "You passed #{invalid_keys.map{|k| ':'+k }.join(", ")} "
-193:         if plural
-194:           message << "as options for gem '#{name}', but they are invalid."
-195:         else
-196:           message << "as an option for gem '#{name}', but it is invalid."
-197:         end
-198:         raise InvalidOption, message
-199:       end
-200: 
-201:       groups = @groups.dup
-202:       opts["group"] = opts.delete("groups") || opts["group"]
-203:       groups.concat Array(opts.delete("group"))
-204:       groups = [:default] if groups.empty?
-205: 
-206:       platforms = @platforms.dup
-207:       opts["platforms"] = opts["platform"] || opts["platforms"]
-208:       platforms.concat Array(opts.delete("platforms"))
-209:       platforms.map! { |p| p.to_sym }
-210:       platforms.each do |p|
-211:         next if VALID_PLATFORMS.include?(p)
-212:         raise DslError, "`#{p}` is not a valid platform. The available options are: #{VALID_PLATFORMS.inspect}"
-213:       end
-214: 
-215:       # Normalize git and path options
-216:       ["git", "path"].each do |type|
-217:         if param = opts[type]
-218:           if version.first && version.first =~ /^\s*=?\s*(\d[^\s]*)\s*$/
-219:             options = opts.merge("name" => name, "version" => $1)
-220:           else
-221:             options = opts.dup
-222:           end
-223:           source = send(type, param, options, :prepend => true) {}
-224:           opts["source"] = source
-225:         end
-226:       end
-227: 
-228:       opts["source"]  ||= @source
-229:       opts["env"]     ||= @env
-230:       opts["platforms"] = platforms.dup
-231:       opts["group"]     = groups
-232:     end
    + # File lib/bundler/dsl.rb, line 183 +183: def _normalize_options(name, version, opts) +184: _normalize_hash(opts) +185: +186: invalid_keys = opts.keys - %(group groups git path name branch ref tag require submodules platform platforms) +187: if invalid_keys.any? +188: plural = invalid_keys.size > 1 +189: message = "You passed #{invalid_keys.map{|k| ':'+k }.join(", ")} " +190: if plural +191: message << "as options for gem '#{name}', but they are invalid." +192: else +193: message << "as an option for gem '#{name}', but it is invalid." +194: end +195: raise InvalidOption, message +196: end +197: +198: groups = @groups.dup +199: opts["group"] = opts.delete("groups") || opts["group"] +200: groups.concat Array(opts.delete("group")) +201: groups = [:default] if groups.empty? +202: +203: platforms = @platforms.dup +204: opts["platforms"] = opts["platform"] || opts["platforms"] +205: platforms.concat Array(opts.delete("platforms")) +206: platforms.map! { |p| p.to_sym } +207: platforms.each do |p| +208: next if VALID_PLATFORMS.include?(p) +209: raise DslError, "`#{p}` is not a valid platform. The available options are: #{VALID_PLATFORMS.inspect}" +210: end +211: +212: # Normalize git and path options +213: ["git", "path"].each do |type| +214: if param = opts[type] +215: if version.first && version.first =~ /^\s*=?\s*(\d[^\s]*)\s*$/ +216: options = opts.merge("name" => name, "version" => $1) +217: else +218: options = opts.dup +219: end +220: source = send(type, param, options, :prepend => true) {} +221: opts["source"] = source +222: end +223: end +224: +225: opts["source"] ||= @source +226: opts["env"] ||= @env +227: opts["platforms"] = platforms.dup +228: opts["group"] = groups +229: end
    @@ -1078,11 +1091,11 @@ Deprecated methods 
    -     # File lib/bundler/dsl.rb, line 170
-170:     def rubygems_source(source)
-171:       @rubygems_source.add_remote source
-172:       @sources << @rubygems_source
-173:     end
    + # File lib/bundler/dsl.rb, line 167 +167: def rubygems_source(source) +168: @rubygems_source.add_remote source +169: @sources << @rubygems_source +170: end
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/DslError.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/DslError.html similarity index 90% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/DslError.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/DslError.html index 05fe1e35..e5c96788 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/DslError.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/DslError.html @@ -79,6 +79,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -188,16 +192,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Environment.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Environment.html similarity index 94% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Environment.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Environment.html index a38eac98..c33e7d58 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Environment.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Environment.html @@ -104,6 +104,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -213,16 +217,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/GemHelper.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/GemHelper.html similarity index 77% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/GemHelper.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/GemHelper.html index 821e8f4d..7e2c8b9d 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/GemHelper.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/GemHelper.html @@ -113,6 +113,17 @@ +
    +

    Included Modules

    + +
    +
    @@ -124,6 +135,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -233,16 +248,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • @@ -399,7 +426,7 @@
    install_tasks(opts = nil) + class="method-args">(opts = {}) click to toggle source
    @@ -413,11 +440,11 @@ 
    -    # File lib/bundler/gem_helper.rb, line 7
- 7:     def self.install_tasks(opts = nil)
- 8:       dir = File.dirname(Rake.application.rakefile_location)
- 9:       self.new(dir, opts && opts[:name]).install
-10:     end
    + # File lib/bundler/gem_helper.rb, line 9 + 9: def self.install_tasks(opts = {}) +10: dir = opts[:dir] || Dir.pwd +11: self.new(dir, opts[:name]).install +12: end
    @@ -448,15 +475,15 @@ 
    -    # File lib/bundler/gem_helper.rb, line 14
-14:     def initialize(base, name = nil)
-15:       Bundler.ui = UI::Shell.new(Thor::Base.shell.new)
-16:       @base = base
-17:       gemspecs = name ? [File.join(base, "#{name}.gemspec")] : Dir[File.join(base, "*.gemspec")]
-18:       raise "Unable to determine name from existing gemspec. Use :name => 'gemname' in #install_tasks to manually set it." unless gemspecs.size == 1
-19:       @spec_path = gemspecs.first
-20:       @gemspec = Bundler.load_gemspec(@spec_path)
-21:     end
    + # File lib/bundler/gem_helper.rb, line 16 +16: def initialize(base, name = nil) +17: Bundler.ui = UI::Shell.new(Thor::Base.shell.new) +18: @base = base +19: gemspecs = name ? [File.join(base, "#{name}.gemspec")] : Dir[File.join(base, "*.gemspec")] +20: raise "Unable to determine name from existing gemspec. Use :name => 'gemname' in #install_tasks to manually set it." unless gemspecs.size == 1 +21: @spec_path = gemspecs.first +22: @gemspec = Bundler.load_gemspec(@spec_path) +23: end
    @@ -493,18 +520,18 @@ 
    -    # File lib/bundler/gem_helper.rb, line 40
-40:     def build_gem
-41:       file_name = nil
-42:       sh("gem build #{spec_path}") { |out, code|
-43:         raise out unless out[/Successfully/]
-44:         file_name = File.basename(built_gem_path)
-45:         FileUtils.mkdir_p(File.join(base, 'pkg'))
-46:         FileUtils.mv(built_gem_path, 'pkg')
-47:         Bundler.ui.confirm "#{name} #{version} built to pkg/#{file_name}"
-48:       }
-49:       File.join(base, 'pkg', file_name)
-50:     end
    + # File lib/bundler/gem_helper.rb, line 42 +42: def build_gem +43: file_name = nil +44: sh("gem build '#{spec_path}'") { |out, code| +45: raise out unless out[/Successfully/] +46: file_name = File.basename(built_gem_path) +47: FileUtils.mkdir_p(File.join(base, 'pkg')) +48: FileUtils.mv(built_gem_path, 'pkg') +49: Bundler.ui.confirm "#{name} #{version} built to pkg/#{file_name}" +50: } +51: File.join(base, 'pkg', file_name) +52: end
    @@ -535,23 +562,23 @@ 
    -    # File lib/bundler/gem_helper.rb, line 23
-23:     def install
-24:       desc "Build #{name}-#{version}.gem into the pkg directory"
-25:       task 'build' do
-26:         build_gem
-27:       end
-28: 
-29:       desc "Build and install #{name}-#{version}.gem into system gems"
-30:       task 'install' do
-31:         install_gem
-32:       end
-33: 
-34:       desc "Create tag #{version_tag} and build and push #{name}-#{version}.gem to Rubygems"
-35:       task 'release' do
-36:         release_gem
-37:       end
-38:     end
    + # File lib/bundler/gem_helper.rb, line 25 +25: def install +26: desc "Build #{name}-#{version}.gem into the pkg directory" +27: task 'build' do +28: build_gem +29: end +30: +31: desc "Build and install #{name}-#{version}.gem into system gems" +32: task 'install' do +33: install_gem +34: end +35: +36: desc "Create tag #{version_tag} and build and push #{name}-#{version}.gem to Rubygems" +37: task 'release' do +38: release_gem +39: end +40: end
    @@ -582,13 +609,13 @@ 
    -    # File lib/bundler/gem_helper.rb, line 52
-52:     def install_gem
-53:       built_gem_path = build_gem
-54:       out, code = sh_with_code("gem install #{built_gem_path}")
-55:       raise "Couldn't install gem, run `gem install #{built_gem_path}' for more detailed output" unless out[/Successfully installed/]
-56:       Bundler.ui.confirm "#{name} (#{version}) installed"
-57:     end
    + # File lib/bundler/gem_helper.rb, line 54 +54: def install_gem +55: built_gem_path = build_gem +56: out, _ = sh_with_code("gem install '#{built_gem_path}'") +57: raise "Couldn't install gem, run `gem install #{built_gem_path}' for more detailed output" unless out[/Successfully installed/] +58: Bundler.ui.confirm "#{name} (#{version}) installed" +59: end
    @@ -619,16 +646,16 @@ 
    -    # File lib/bundler/gem_helper.rb, line 59
-59:     def release_gem
-60:       guard_clean
-61:       guard_already_tagged
-62:       built_gem_path = build_gem
-63:       tag_version {
-64:         git_push
-65:         rubygem_push(built_gem_path)
-66:       }
-67:     end
    + # File lib/bundler/gem_helper.rb, line 61 +61: def release_gem +62: guard_clean +63: guard_already_tagged +64: built_gem_path = build_gem +65: tag_version { +66: git_push +67: rubygem_push(built_gem_path) +68: } +69: end
    @@ -665,10 +692,10 @@ 
    -    # File lib/bundler/gem_helper.rb, line 76
-76:     def built_gem_path
-77:       Dir[File.join(base, "#{name}-*.gem")].sort_by{|f| File.mtime(f)}.last
-78:     end
    + # File lib/bundler/gem_helper.rb, line 78 +78: def built_gem_path +79: Dir[File.join(base, "#{name}-*.gem")].sort_by{|f| File.mtime(f)}.last +80: end
    @@ -699,11 +726,10 @@ 
    -     # File lib/bundler/gem_helper.rb, line 102
-102:     def clean?
-103:       out, code = sh_with_code("git diff --exit-code")
-104:       code == 0
-105:     end
    + # File lib/bundler/gem_helper.rb, line 104 +104: def clean? +105: sh_with_code("git diff --exit-code")[1] == 0 +106: end
    @@ -734,12 +760,12 @@ 
    -    # File lib/bundler/gem_helper.rb, line 80
-80:     def git_push
-81:       perform_git_push
-82:       perform_git_push ' --tags'
-83:       Bundler.ui.confirm "Pushed git commits and tags"
-84:     end
    + # File lib/bundler/gem_helper.rb, line 82 +82: def git_push +83: perform_git_push +84: perform_git_push ' --tags' +85: Bundler.ui.confirm "Pushed git commits and tags" +86: end
    @@ -770,12 +796,12 @@ 
    -    # File lib/bundler/gem_helper.rb, line 92
-92:     def guard_already_tagged
-93:       if sh('git tag').split(/\n/).include?(version_tag)
-94:         raise("This tag has already been committed to the repo.")
-95:       end
-96:     end
    + # File lib/bundler/gem_helper.rb, line 94 +94: def guard_already_tagged +95: if sh('git tag').split(/\n/).include?(version_tag) +96: raise("This tag has already been committed to the repo.") +97: end +98: end
    @@ -806,10 +832,10 @@ 
    -     # File lib/bundler/gem_helper.rb, line 98
- 98:     def guard_clean
- 99:       clean? or raise("There are files that need to be committed first.")
-100:     end
    + # File lib/bundler/gem_helper.rb, line 100 +100: def guard_clean +101: clean? or raise("There are files that need to be committed first.") +102: end
    @@ -840,10 +866,10 @@ 
    -     # File lib/bundler/gem_helper.rb, line 125
-125:     def name
-126:       gemspec.name
-127:     end
    + # File lib/bundler/gem_helper.rb, line 126 +126: def name +127: gemspec.name +128: end
    @@ -874,12 +900,12 @@ 
    -    # File lib/bundler/gem_helper.rb, line 86
-86:     def perform_git_push(options = '')
-87:       cmd = "git push #{options}"
-88:       out, code = sh_with_code(cmd)
-89:       raise "Couldn't git push. `#{cmd}' failed with the following output:\n\n#{out}\n" unless code == 0
-90:     end
    + # File lib/bundler/gem_helper.rb, line 88 +88: def perform_git_push(options = '') +89: cmd = "git push #{options}" +90: out, code = sh_with_code(cmd) +91: raise "Couldn't git push. `#{cmd}' failed with the following output:\n\n#{out}\n" unless code == 0 +92: end
    @@ -910,12 +936,12 @@ 
    -    # File lib/bundler/gem_helper.rb, line 70
-70:     def rubygem_push(path)
-71:       out, status = sh("gem push #{path}")
-72:       raise "Gem push failed due to lack of RubyGems.org credentials." if out[/Enter your RubyGems.org credentials/]
-73:       Bundler.ui.confirm "Pushed #{name} #{version} to rubygems.org"
-74:     end
    + # File lib/bundler/gem_helper.rb, line 72 +72: def rubygem_push(path) +73: out, _ = sh("gem push '#{path}'") +74: raise "Gem push failed due to lack of RubyGems.org credentials." if out[/Enter your RubyGems.org credentials/] +75: Bundler.ui.confirm "Pushed #{name} #{version} to rubygems.org" +76: end
    @@ -946,11 +972,11 @@ 
    -     # File lib/bundler/gem_helper.rb, line 129
-129:     def sh(cmd, &block)
-130:       out, code = sh_with_code(cmd, &block)
-131:       code == 0 ? out : raise(out.empty? ? "Running `#{cmd}' failed. Run this command directly for more detailed output." : out)
-132:     end
    + # File lib/bundler/gem_helper.rb, line 130 +130: def sh(cmd, &block) +131: out, code = sh_with_code(cmd, &block) +132: code == 0 ? out : raise(out.empty? ? "Running `#{cmd}' failed. Run this command directly for more detailed output." : out) +133: end
    @@ -981,19 +1007,19 @@ 
    -     # File lib/bundler/gem_helper.rb, line 134
-134:     def sh_with_code(cmd, &block)
-135:       cmd << " 2>&1"
-136:       outbuf = ''
-137:       Bundler.ui.debug(cmd)
-138:       Dir.chdir(base) {
-139:         outbuf = `#{cmd}`
-140:         if $? == 0
-141:           block.call(outbuf) if block
-142:         end
-143:       }
-144:       [outbuf, $?]
-145:     end
    + # File lib/bundler/gem_helper.rb, line 135 +135: def sh_with_code(cmd, &block) +136: cmd << " 2>&1" +137: outbuf = '' +138: Bundler.ui.debug(cmd) +139: Dir.chdir(base) { +140: outbuf = `#{cmd}` +141: if $? == 0 +142: block.call(outbuf) if block +143: end +144: } +145: [outbuf, $?] +146: end
    @@ -1024,16 +1050,16 @@ 
    -     # File lib/bundler/gem_helper.rb, line 107
-107:     def tag_version
-108:       sh "git tag -a -m \"Version #{version}\" #{version_tag}"
-109:       Bundler.ui.confirm "Tagged #{version_tag}"
-110:       yield if block_given?
-111:     rescue
-112:       Bundler.ui.error "Untagged #{version_tag} due to error"
-113:       sh_with_code "git tag -d #{version_tag}"
-114:       raise
-115:     end
    + # File lib/bundler/gem_helper.rb, line 108 +108: def tag_version +109: sh "git tag -a -m \"Version #{version}\" #{version_tag}" +110: Bundler.ui.confirm "Tagged #{version_tag}" +111: yield if block_given? +112: rescue +113: Bundler.ui.error "Untagged #{version_tag} due to error" +114: sh_with_code "git tag -d #{version_tag}" +115: raise +116: end
    @@ -1064,10 +1090,10 @@ 
    -     # File lib/bundler/gem_helper.rb, line 117
-117:     def version
-118:       gemspec.version
-119:     end
    + # File lib/bundler/gem_helper.rb, line 118 +118: def version +119: gemspec.version +120: end
    @@ -1098,10 +1124,10 @@ 
    -     # File lib/bundler/gem_helper.rb, line 121
-121:     def version_tag
-122:       "v#{version}"
-123:     end
    + # File lib/bundler/gem_helper.rb, line 122 +122: def version_tag +123: "v#{version}" +124: end
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/GemHelpers.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/GemHelpers.html similarity index 88% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/GemHelpers.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/GemHelpers.html index 88ddac07..4a00a189 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/GemHelpers.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/GemHelpers.html @@ -81,6 +81,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -190,16 +194,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • @@ -336,17 +352,17 @@ 
    -     # File lib/bundler/rubygems_ext.rb, line 193
-193:     def generic(p)
-194:       return p if p == Gem::Platform::RUBY
-195: 
-196:       GENERIC_CACHE[p] ||= begin
-197:         found = GENERICS.find do |p2|
-198:           p2.is_a?(Gem::Platform) && p.os == p2.os
-199:         end
-200:         found || Gem::Platform::RUBY
-201:       end
-202:     end
    + # File lib/bundler/rubygems_ext.rb, line 207 +207: def generic(p) +208: return p if p == Gem::Platform::RUBY +209: +210: GENERIC_CACHE[p] ||= begin +211: found = GENERICS.find do |p2| +212: p2.is_a?(Gem::Platform) && p.os == p2.os +213: end +214: found || Gem::Platform::RUBY +215: end +216: end
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/GemNotFound.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/GemNotFound.html similarity index 90% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/GemNotFound.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/GemNotFound.html index 4374e0c5..bee2a584 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/GemNotFound.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/GemNotFound.html @@ -79,6 +79,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -188,16 +192,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/GemfileError.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/GemfileError.html similarity index 90% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/GemfileError.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/GemfileError.html index c1b7b5bf..b9dddc22 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/GemfileError.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/GemfileError.html @@ -79,6 +79,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -188,16 +192,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/GemfileNotFound.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/GemfileNotFound.html similarity index 90% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/GemfileNotFound.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/GemfileNotFound.html index d8170784..55dc3110 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/GemfileNotFound.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/GemfileNotFound.html @@ -79,6 +79,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -188,16 +192,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/GemspecError.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/GemspecError.html similarity index 90% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/GemspecError.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/GemspecError.html index af69f980..ef0877ff 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/GemspecError.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/GemspecError.html @@ -79,6 +79,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -188,16 +192,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/GitError.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/GitError.html similarity index 90% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/GitError.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/GitError.html index 47a84c22..e6d3912d 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/GitError.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/GitError.html @@ -79,6 +79,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -188,16 +192,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Graph.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Graph.html similarity index 95% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Graph.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Graph.html index ae998e50..f94fa579 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Graph.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Graph.html @@ -96,6 +96,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -205,16 +209,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • @@ -557,7 +573,7 @@ 83: 84: # For gems in Gemfile, add details 85: @env.current_dependencies.each do |dependency| - 86: node = @nodes[dependency.name] + 86: next unless node = @nodes[dependency.name] 87: node.is_user = true 88: 89: dependency.groups.each do |group| diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/GraphNode.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/GraphNode.html similarity index 92% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/GraphNode.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/GraphNode.html index e730dc9b..185b6148 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/GraphNode.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/GraphNode.html @@ -88,6 +88,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -197,16 +201,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Index.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Index.html similarity index 94% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Index.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Index.html index 27708501..8bf92678 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Index.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Index.html @@ -129,6 +129,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -238,16 +242,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • @@ -853,7 +869,7 @@ 104: def same_version?(a, b) 105: regex = /^(.*?)(?:\.0)*$/ 106: -107: ret = a.to_s[regex, 1] == b.to_s[regex, 1] +107: a.to_s[regex, 1] == b.to_s[regex, 1] 108: end @@ -889,18 +905,17 @@ 115: def search_by_dependency(dependency) 116: @cache[dependency.hash] ||= begin 117: specs = @specs[dependency.name] -118: -119: wants_prerelease = dependency.requirement.prerelease? -120: only_prerelease = specs.all? {|spec| spec.version.prerelease? } -121: found = specs.select { |spec| dependency.matches_spec?(spec) && Gem::Platform.match(spec.platform) } -122: -123: unless wants_prerelease || only_prerelease -124: found.reject! { |spec| spec.version.prerelease? } -125: end -126: -127: found.sort_by {|s| [s.version, s.platform.to_s == 'ruby' ? "\00"" : s.platform.to_s] } -128: end -129: end +118: found = specs.select { |spec| dependency.matches_spec?(spec) && Gem::Platform.match(spec.platform) } +119: +120: wants_prerelease = dependency.requirement.prerelease? +121: only_prerelease = specs.all? {|spec| spec.version.prerelease? } +122: unless wants_prerelease || only_prerelease +123: found.reject! { |spec| spec.version.prerelease? } +124: end +125: +126: found.sort_by {|s| [s.version, s.platform.to_s == 'ruby' ? "\00"" : s.platform.to_s] } +127: end +128: end diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Installer.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Installer.html similarity index 77% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Installer.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Installer.html index 2ae200ee..18da2f8a 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Installer.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Installer.html @@ -92,6 +92,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -201,16 +205,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • @@ -374,61 +390,62 @@ 
         # File lib/bundler/installer.rb, line 12
 12:     def run(options)
-13:       if Bundler.settings[:frozen]
-14:         @definition.ensure_equivalent_gemfile_and_lockfile
-15:       end
-16: 
-17:       if dependencies.empty?
-18:         Bundler.ui.warn "The Gemfile specifies no dependencies"
-19:         return
-20:       end
-21: 
-22:       if Bundler.default_lockfile.exist? && !options["update"]
-23:         begin
-24:           tmpdef = Definition.build(Bundler.default_gemfile, Bundler.default_lockfile, nil)
-25:           local = true unless tmpdef.new_platform? || tmpdef.missing_specs.any?
-26:         rescue BundlerError
-27:         end
+13:       # Create the BUNDLE_PATH directory
+14:       begin
+15:         Bundler.bundle_path.mkpath unless Bundler.bundle_path.exist?
+16:       rescue Errno::EEXIST
+17:         raise PathError, "Could not install to path `#{Bundler.settings[:path]}` " +
+18:           "because of an invalid symlink. Remove the symlink so the directory can be created."
+19:       end
+20: 
+21:       if Bundler.settings[:frozen]
+22:         @definition.ensure_equivalent_gemfile_and_lockfile(options[:deployment])
+23:       end
+24: 
+25:       if dependencies.empty?
+26:         Bundler.ui.warn "The Gemfile specifies no dependencies"
+27:         return
 28:       end
 29: 
-30:       # Since we are installing, we can resolve the definition
-31:       # using remote specs
-32:       unless local
-33:         options["local"] ?
-34:           @definition.resolve_with_cache! :
-35:           @definition.resolve_remotely!
+30:       if Bundler.default_lockfile.exist? && !options["update"]
+31:         begin
+32:           tmpdef = Definition.build(Bundler.default_gemfile, Bundler.default_lockfile, nil)
+33:           local = true unless tmpdef.new_platform? || tmpdef.missing_specs.any?
+34:         rescue BundlerError
+35:         end
 36:       end
 37: 
-38:       # Ensure that BUNDLE_PATH exists
-39:       Bundler.mkdir_p(Bundler.bundle_path) unless File.exist?(Bundler.bundle_path)
-40: 
-41:       # Must install gems in the order that the resolver provides
-42:       # as dependencies might actually affect the installation of
-43:       # the gem.
-44:       specs.each do |spec|
-45:         spec.source.fetch(spec) if spec.source.respond_to?(:fetch)
-46: 
-47:         # unless requested_specs.include?(spec)
-48:         #   Bundler.ui.debug "  * Not in requested group; skipping."
-49:         #   next
-50:         # end
+38:       # Since we are installing, we can resolve the definition
+39:       # using remote specs
+40:       unless local
+41:         options["local"] ?
+42:           @definition.resolve_with_cache! :
+43:           @definition.resolve_remotely!
+44:       end
+45: 
+46:       # Must install gems in the order that the resolver provides
+47:       # as dependencies might actually affect the installation of
+48:       # the gem.
+49:       specs.each do |spec|
+50:         spec.source.fetch(spec) if spec.source.respond_to?(:fetch)
 51: 
-52:         begin
-53:           old_args = Gem::Command.build_args
-54:           Gem::Command.build_args = [Bundler.settings["build.#{spec.name}"]]
-55:           spec.source.install(spec)
-56:           Bundler.ui.debug "from #{spec.loaded_from} "
-57:         ensure
-58:           Gem::Command.build_args = old_args
-59:         end
-60: 
-61:         Bundler.ui.info ""
-62:         generate_bundler_executable_stubs(spec) if Bundler.settings[:bin]
-63:         FileUtils.rm_rf(Bundler.tmp)
-64:       end
-65: 
-66:       lock
-67:     end
    +52: # unless requested_specs.include?(spec) +53: # Bundler.ui.debug " * Not in requested group; skipping." +54: # next +55: # end +56: +57: Bundler.rubygems.with_build_args [Bundler.settings["build.#{spec.name}"]] do +58: spec.source.install(spec) +59: Bundler.ui.debug "from #{spec.loaded_from} " +60: end +61: +62: Bundler.ui.info "" +63: generate_bundler_executable_stubs(spec) if Bundler.settings[:bin] +64: FileUtils.rm_rf(Bundler.tmp) +65: end +66: +67: lock +68: end @@ -465,20 +482,20 @@ 
    -    # File lib/bundler/installer.rb, line 71
-71:     def generate_bundler_executable_stubs(spec)
-72:       bin_path = Bundler.bin_path
-73:       template = File.read(File.expand_path('../templates/Executable', __FILE__))
-74:       relative_gemfile_path = Bundler.default_gemfile.relative_path_from(bin_path)
-75:       ruby_command = Thor::Util.ruby_command
-76: 
-77:       spec.executables.each do |executable|
-78:         next if executable == "bundle"
-79:         File.open "#{bin_path}/#{executable}", 'w', 0755 do |f|
-80:           f.puts ERB.new(template, nil, '-').result(binding)
-81:         end
-82:       end
-83:     end
    + # File lib/bundler/installer.rb, line 72 +72: def generate_bundler_executable_stubs(spec) +73: bin_path = Bundler.bin_path +74: template = File.read(File.expand_path('../templates/Executable', __FILE__)) +75: relative_gemfile_path = Bundler.default_gemfile.relative_path_from(bin_path) +76: ruby_command = Thor::Util.ruby_command +77: +78: spec.executables.each do |executable| +79: next if executable == "bundle" +80: File.open "#{bin_path}/#{executable}", 'w', 0755 do |f| +81: f.puts ERB.new(template, nil, '-').result(binding) +82: end +83: end +84: end
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/InvalidOption.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/InvalidOption.html similarity index 90% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/InvalidOption.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/InvalidOption.html index ea762079..ca5de448 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/InvalidOption.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/InvalidOption.html @@ -79,6 +79,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -188,16 +192,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/InvalidSpecSet.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/InvalidSpecSet.html similarity index 90% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/InvalidSpecSet.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/InvalidSpecSet.html index 9e6b29db..98ee51e4 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/InvalidSpecSet.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/InvalidSpecSet.html @@ -79,6 +79,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -188,16 +192,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/LazySpecification.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/LazySpecification.html similarity index 95% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/LazySpecification.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/LazySpecification.html index 46ec8bbb..a9b23bb6 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/LazySpecification.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/LazySpecification.html @@ -113,6 +113,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -222,16 +226,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • @@ -627,7 +643,7 @@ 36: out = " #{name} (#{version}-#{platform})\n" 37: end 38: -39: dependencies.sort_by {|d| d.name }.each do |dep| +39: dependencies.sort_by {|d| d.to_s }.each do |dep| 40: next if dep.type == :development 41: out << " #{dep.to_lock}\n" 42: end diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/LockfileParser.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/LockfileParser.html similarity index 96% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/LockfileParser.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/LockfileParser.html index 655580ea..0fbc40ce 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/LockfileParser.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/LockfileParser.html @@ -96,6 +96,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -205,16 +209,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/MatchPlatform.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/MatchPlatform.html similarity index 89% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/MatchPlatform.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/MatchPlatform.html index 5e54de18..786571e6 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/MatchPlatform.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/MatchPlatform.html @@ -92,6 +92,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -201,16 +205,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • @@ -330,12 +346,12 @@ 
    -     # File lib/bundler/rubygems_ext.rb, line 208
-208:     def match_platform(p)
-209:       Gem::Platform::RUBY == platform or
-210:       platform.nil? or p == platform or
-211:       generic(Gem::Platform.new(platform)) == p
-212:     end
    + # File lib/bundler/rubygems_ext.rb, line 222 +222: def match_platform(p) +223: Gem::Platform::RUBY == platform or +224: platform.nil? or p == platform or +225: generic(Gem::Platform.new(platform)) == p +226: end
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/PathError.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/PathError.html similarity index 90% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/PathError.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/PathError.html index 59979f5d..7d7807f5 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/PathError.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/PathError.html @@ -79,6 +79,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -188,16 +192,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/ProductionError.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/ProductionError.html similarity index 90% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/ProductionError.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/ProductionError.html index 871ee1aa..a0e5e6cd 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/ProductionError.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/ProductionError.html @@ -79,6 +79,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -188,16 +192,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/RemoteSpecification.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/RemoteSpecification.html similarity index 94% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/RemoteSpecification.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/RemoteSpecification.html index 98894a63..7b0fd6aa 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/RemoteSpecification.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/RemoteSpecification.html @@ -109,6 +109,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -218,16 +222,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Resolver.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Resolver.html similarity index 97% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Resolver.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Resolver.html index a258b26a..c4dee7a6 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Resolver.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Resolver.html @@ -121,6 +121,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -230,16 +234,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • @@ -577,7 +593,7 @@ If the list of dependencies can be resolved, a 
          # File lib/bundler/resolver.rb, line 409
 409:     def error_message
-410:       output = errors.inject("") do |o, (conflict, (origin, requirement))|
+410:       errors.inject("") do |o, (conflict, (origin, requirement))|
 411: 
 412:         # origin is the SpecSet of specs from the Gemfile that is conflicted with
 413:         if origin
@@ -592,7 +608,7 @@ If the list of dependencies can be resolved, a
 422:             o << "  Current Bundler version:\n"
 423:             newer_bundler_required = requirement.requirement > Gem::Requirement.new(origin.version)
 424:           # If the origin is a LockfileParser, it does not respond_to :required_by
-425:           elsif !origin.respond_to?(:required_by) || !(required_by = origin.required_by.first)
+425:           elsif !origin.respond_to?(:required_by) || !(origin.required_by.first)
 426:             o << "  In snapshot (Gemfile.lock):\n"
 427:           end
 428: 
diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Resolver/SpecGroup.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Resolver/SpecGroup.html
similarity index 95%
rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Resolver/SpecGroup.html
rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Resolver/SpecGroup.html
index e37a38ca..c8611f71 100644
--- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Resolver/SpecGroup.html
+++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Resolver/SpecGroup.html
@@ -117,6 +117,10 @@
 				
 					
  • bundle
    • 
 				
+					
  • bundle-benchmark
    • 
+				
+					
  • bundle-benchmark.txt
    • 
+				
 					
  • bundle-config
    • 
 				
 					
  • bundle-config.txt
    • 
@@ -226,16 +230,28 @@
 				
 					
  • Bundler::Resolver::SpecGroup
    • 
 				
+					
  • Bundler::RubygemsIntegration
    • 
+				
+					
  • Bundler::RubygemsIntegration::AlmostModern
    • 
+				
+					
  • Bundler::RubygemsIntegration::Deprecate
    • 
+				
+					
  • Bundler::RubygemsIntegration::Gem
    • 
+				
+					
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • 
+				
+					
  • Bundler::RubygemsIntegration::Legacy
    • 
+				
+					
  • Bundler::RubygemsIntegration::Modern
    • 
+				
+					
  • Bundler::RubygemsIntegration::Transitional
    • 
+				
 					
  • Bundler::Runtime
    • 
 				
 					
  • Bundler::Settings
    • 
 				
 					
  • Bundler::SharedHelpers
    • 
 				
-					
  • Bundler::SharedHelpers::Gem
    • 
-				
-					
  • Bundler::SharedHelpers::Gem::SourceIndex
    • 
-				
 					
  • Bundler::Source
    • 
 				
 					
  • Bundler::Source::Git
    • 
diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/RubygemsIntegration.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/RubygemsIntegration.html
new file mode 100644
index 00000000..e2d1be05
--- /dev/null
+++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/RubygemsIntegration.html
@@ -0,0 +1,1619 @@
+
+
+
+
+	
+
+	Class: Bundler::RubygemsIntegration
+
+	
+
+	
+	
+	
+	
+
+
+
+
+	
    
+		
    
+			
    
+        
    
+          Home
+          Classes
+          Methods
+        
    
+			
    
+		
    
+
+		
    
+			
    
+				
    In Files
    
+				
    
+					
+				
    
+			
    
+
+			
+		
    
+
+		
+
+		
    
+			
+			
+			
+			
+
+			
    
+				
    Class Index
+					[+]
    
+				
    
+				
    
+					Quicksearch
+					
+				
    
+				
    
+
+				
+				
+			
    
+
+			
+		
    
+	
    
+
+	
    
+		
    Bundler::RubygemsIntegration
    
+
+		
    
+			
+		
    
+
+		
+		
+		
    
+			
    Constants
    
+			
    
+			
+				
    Deprecate
    
+				
+				
    
+				
+			
+				
    Deprecate
    
+				
+				
    
+				
+			
+			
    
+		
    
+		
+
+		
+		
+
+		
+		
+		
    
+			
    Public Class Methods
    
+
+		
+			
    
+				
+
+				
    
+				
+					new()
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +   # File lib/bundler/rubygems_integration.rb, line 3
+3:     def initialize
+4:       # Work around a RubyGems bug
+5:       configuration
+6:     end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+		
    
+	
+		
    
+			
    Public Instance Methods
    
+
+		
+			
    
+				
+
+				
    
+				
+					bin_path(gem, bin, ver)
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +    # File lib/bundler/rubygems_integration.rb, line 72
+72:     def bin_path(gem, bin, ver)
+73:       Gem.bin_path(gem, bin, ver)
+74:     end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+			
    
+				
+
+				
    
+				
+					clear_paths()
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +    # File lib/bundler/rubygems_integration.rb, line 68
+68:     def clear_paths
+69:       Gem.clear_paths
+70:     end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+			
    
+				
+
+				
    
+				
+					configuration()
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +    # File lib/bundler/rubygems_integration.rb, line 24
+24:     def configuration
+25:       Gem.configuration
+26:     end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+			
    
+				
+
+				
    
+				
+					download_gem(spec, uri, path)
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +     # File lib/bundler/rubygems_integration.rb, line 103
+103:     def download_gem(spec, uri, path)
+104:       Gem::RemoteFetcher.fetcher.download(spec, uri, path)
+105:     end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+			
    
+				
+
+				
    
+				
+					fetch_specs(all, pre, &blk)
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +    # File lib/bundler/rubygems_integration.rb, line 85
+85:     def fetch_specs(all, pre, &blk)
+86:       Gem::SpecFetcher.new.list(all, pre).each(&blk)
+87:     end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+			
    
+				
+
+				
    
+				
+					gem_bindir()
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +    # File lib/bundler/rubygems_integration.rb, line 52
+52:     def gem_bindir
+53:       Gem.bindir
+54:     end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+			
    
+				
+
+				
    
+				
+					gem_dir()
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +    # File lib/bundler/rubygems_integration.rb, line 48
+48:     def gem_dir
+49:       Gem.dir
+50:     end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+			
    
+				
+
+				
    
+				
+					gem_path()
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +    # File lib/bundler/rubygems_integration.rb, line 60
+60:     def gem_path
+61:       Gem.path
+62:     end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+			
    
+				
+
+				
    
+				
+					inflate(obj)
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +    # File lib/bundler/rubygems_integration.rb, line 36
+36:     def inflate(obj)
+37:       Gem.inflate(obj)
+38:     end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+			
    
+				
+
+				
    
+				
+					loaded_specs(name)
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +    # File lib/bundler/rubygems_integration.rb, line 8
+ 8:     def loaded_specs(name)
+ 9:       Gem.loaded_specs[name]
+10:     end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+			
    
+				
+
+				
    
+				
+					mark_loaded(spec)
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +    # File lib/bundler/rubygems_integration.rb, line 12
+12:     def mark_loaded(spec)
+13:       Gem.loaded_specs[spec.name] = spec
+14:     end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+			
    
+				
+
+				
    
+				
+					marshal_spec_dir()
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +    # File lib/bundler/rubygems_integration.rb, line 64
+64:     def marshal_spec_dir
+65:       Gem::MARSHAL_SPEC_DIR
+66:     end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+			
    
+				
+
+				
    
+				
+					path(obj)
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +    # File lib/bundler/rubygems_integration.rb, line 16
+16:     def path(obj)
+17:       obj.to_s
+18:     end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+			
    
+				
+
+				
    
+				
+					platforms()
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +    # File lib/bundler/rubygems_integration.rb, line 20
+20:     def platforms
+21:       Gem.platforms
+22:     end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+			
    
+				
+
+				
    
+				
+					preserve_paths()
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +    # File lib/bundler/rubygems_integration.rb, line 76
+76:     def preserve_paths
+77:       # this is a no-op outside of Rubygems 1.8
+78:       yield
+79:     end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+			
    
+				
+
+				
    
+				
+					read_binary(path)
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +    # File lib/bundler/rubygems_integration.rb, line 32
+32:     def read_binary(path)
+33:       Gem.read_binary(path)
+34:     end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+			
    
+				
+
+				
    
+				
+					replace_bin_path(specs)
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
    
+Used to make bin stubs that are not created by bundler work under bundler.
+The new Gem.bin_path only considers gems in specs
+
    
+					
+
+					
+					
    
+
    +     # File lib/bundler/rubygems_integration.rb, line 204
+204:     def replace_bin_path(specs)
+205:       gem_class = (class << Gem ; self ; end)
+206:       gem_class.send(:remove_method, :bin_path)
+207:       gem_class.send(:define_method, :bin_path) do |name, *args|
+208:         exec_name, *reqs = args
+209: 
+210:         if exec_name == 'bundle'
+211:           return ENV['BUNDLE_BIN_PATH']
+212:         end
+213: 
+214:         spec = nil
+215: 
+216:         if exec_name
+217:           spec = specs.find { |s| s.executables.include?(exec_name) }
+218:           spec or raise Gem::Exception, "can't find executable #{exec_name}"
+219:         else
+220:           spec = specs.find  { |s| s.name == name }
+221:           exec_name = spec.default_executable or raise Gem::Exception, "no default executable for #{spec.full_name}"
+222:         end
+223: 
+224:         gem_bin = File.join(spec.full_gem_path, spec.bindir, exec_name)
+225:         gem_from_path_bin = File.join(File.dirname(spec.loaded_from), spec.bindir, exec_name)
+226:         File.exist?(gem_bin) ? gem_bin : gem_from_path_bin
+227:       end
+228:     end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+			
    
+				
+
+				
    
+				
+					replace_entrypoints(specs)
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
    
+Replace or hook into Rubygems to provide a bundlerized view of the world.
+
    
+					
+
+					
+					
    
+
    +     # File lib/bundler/rubygems_integration.rb, line 240
+240:     def replace_entrypoints(specs)
+241:       reverse_rubygems_kernel_mixin
+242: 
+243:       replace_gem(specs)
+244: 
+245:       stub_rubygems(specs)
+246: 
+247:       replace_bin_path(specs)
+248:       replace_refresh
+249: 
+250:       Gem.clear_paths
+251:     end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+			
    
+				
+
+				
    
+				
+					replace_gem(specs)
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +     # File lib/bundler/rubygems_integration.rb, line 119
+119:     def replace_gem(specs)
+120:       executables = specs.map { |s| s.executables }.flatten
+121: 
+122:       ::Kernel.send(:define_method, :gem) do |dep, *reqs|
+123:         if executables.include? File.basename(caller.first.split(':').first)
+124:           return
+125:         end
+126:         opts = reqs.last.is_a?(Hash) ? reqs.pop : {}
+127: 
+128:         unless dep.respond_to?(:name) && dep.respond_to?(:requirement)
+129:           dep = Gem::Dependency.new(dep, reqs)
+130:         end
+131: 
+132:         spec = specs.find  { |s| s.name == dep.name }
+133: 
+134:         if spec.nil?
+135: 
+136:           e = Gem::LoadError.new "#{dep.name} is not part of the bundle. Add it to Gemfile."
+137:           e.name = dep.name
+138:           if e.respond_to?(:requirement=)
+139:             e.requirement = dep.requirement
+140:           else
+141:             e.version_requirement = dep.requirement
+142:           end
+143:           raise e
+144:         elsif dep !~ spec
+145:           e = Gem::LoadError.new "can't activate #{dep}, already activated #{spec.full_name}. "                                   "Make sure all dependencies are added to Gemfile."
+146:           e.name = dep.name
+147:           if e.respond_to?(:requirement=)
+148:             e.requirement = dep.requirement
+149:           else
+150:             e.version_requirement = dep.requirement
+151:           end
+152:           raise e
+153:         end
+154: 
+155:         true
+156:       end
+157:     end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+			
    
+				
+
+				
    
+				
+					replace_refresh()
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
    
+Because Bundler has a static view of what
+specs are available, we don’t reflesh, so stub it out.
+
    
+					
+
+					
+					
    
+
    +     # File lib/bundler/rubygems_integration.rb, line 232
+232:     def replace_refresh
+233:       gem_class = (class << Gem ; self ; end)
+234:       gem_class.send(:remove_method, :refresh)
+235:       gem_class.send(:define_method, :refresh) { }
+236:     end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+			
    
+				
+
+				
    
+				
+					reverse_rubygems_kernel_mixin()
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +     # File lib/bundler/rubygems_integration.rb, line 107
+107:     def reverse_rubygems_kernel_mixin
+108:       # Disable rubygems' gem activation system
+109:       ::Kernel.class_eval do
+110:         if private_method_defined?(:gem_original_require)
+111:           alias rubygems_require require
+112:           alias require gem_original_require
+113:         end
+114: 
+115:         undef gem
+116:       end
+117:     end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+			
    
+				
+
+				
    
+				
+					ruby_engine()
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +    # File lib/bundler/rubygems_integration.rb, line 28
+28:     def ruby_engine
+29:       Gem.ruby_engine
+30:     end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+			
    
+				
+
+				
    
+				
+					sources()
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +    # File lib/bundler/rubygems_integration.rb, line 44
+44:     def sources
+45:       Gem.sources
+46:     end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+			
    
+				
+
+				
    
+				
+					sources=(val)
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +    # File lib/bundler/rubygems_integration.rb, line 40
+40:     def sources=(val)
+41:       Gem.sources = val
+42:     end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+			
    
+				
+
+				
    
+				
+					spec_from_gem(path)
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +     # File lib/bundler/rubygems_integration.rb, line 99
+ 99:     def spec_from_gem(path)
+100:       Gem::Format.from_file_by_path(path).spec
+101:     end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+			
    
+				
+
+				
    
+				
+					stub_source_index137(specs)
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +     # File lib/bundler/rubygems_integration.rb, line 170
+170:     def stub_source_index137(specs)
+171:       # Rubygems versions lower than 1.7 use SourceIndex#from_gems_in
+172:       source_index_class = (class << Gem::SourceIndex ; self ; end)
+173:       source_index_class.send(:remove_method, :from_gems_in)
+174:       source_index_class.send(:define_method, :from_gems_in) do |*args|
+175:         source_index = Gem::SourceIndex.new
+176:         source_index.spec_dirs = *args
+177:         source_index.add_specs(*specs)
+178:         source_index
+179:       end
+180:     end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+			
    
+				
+
+				
    
+				
+					stub_source_index170(specs)
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +     # File lib/bundler/rubygems_integration.rb, line 182
+182:     def stub_source_index170(specs)
+183:       Gem::SourceIndex.send(:define_method, :initialize) do |*args|
+184:         @gems = {}
+185:         # You're looking at this thinking: Oh! This is how I make those
+186:         # rubygems deprecations go away!
+187:         #
+188:         # You'd be correct BUT using of this method in production code
+189:         # must be approved by the rubygems team itself!
+190:         #
+191:         # This is your warning. If you use this and don't have approval
+192:         # we can't protect you.
+193:         #
+194:         Deprecate.skip_during do
+195:           self.spec_dirs = *args
+196:           add_specs(*specs)
+197:         end
+198:       end
+199:     end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+			
    
+				
+
+				
    
+				
+					ui=(obj)
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +    # File lib/bundler/rubygems_integration.rb, line 81
+81:     def ui=(obj)
+82:       Gem::DefaultUserInteraction.ui = obj
+83:     end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+			
    
+				
+
+				
    
+				
+					user_home()
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +    # File lib/bundler/rubygems_integration.rb, line 56
+56:     def user_home
+57:       Gem.user_home
+58:     end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+			
    
+				
+
+				
    
+				
+					with_build_args(args)
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +    # File lib/bundler/rubygems_integration.rb, line 89
+89:     def with_build_args(args)
+90:       old_args = Gem::Command.build_args
+91:       begin
+92:         Gem::Command.build_args = args
+93:         yield
+94:       ensure
+95:         Gem::Command.build_args = old_args
+96:       end
+97:     end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+		
    
+	
+
+	
    
+
+
+	
    
+	
+		
    Disabled; run with --debug to generate this.
    
+	
+	
    
+
+	
    
+		
    [Validate]
    
+		
    Generated with the Darkfish
+			Rdoc Generator 1.1.6.
    
+	
    
+
+
+
+
diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/RubygemsIntegration/AlmostModern.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/RubygemsIntegration/AlmostModern.html
new file mode 100644
index 00000000..51dc0397
--- /dev/null
+++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/RubygemsIntegration/AlmostModern.html
@@ -0,0 +1,388 @@
+
+
+
+
+	
+
+	Class: Bundler::RubygemsIntegration::AlmostModern
+
+	
+
+	
+	
+	
+	
+
+
+
+
+	
    
+		
    
+			
    
+        
    
+          Home
+          Classes
+          Methods
+        
    
+			
    
+		
    
+
+		
    
+			
    
+				
    In Files
    
+				
    
+					
+				
    
+			
    
+
+			
+		
    
+
+		
    
+
+			
+			
+			
+			
+
+			
+			
+
+			
+			
+			
    
+				
    Methods
    
+				
+			
    
+			
+
+			
+			
+		
    
+
+		
    
+			
+			
+			
+			
+
+			
    
+				
    Class Index
+					[+]
    
+				
    
+				
    
+					Quicksearch
+					
+				
    
+				
    
+
+				
+				
+			
    
+
+			
+		
    
+	
    
+
+	
    
+		
    Bundler::RubygemsIntegration::AlmostModern
    
+
+		
    
+			
    
+Rubygems 1.8.0 to 1.8.4
+
    
+
+		
    
+
+		
+		
+
+		
+		
+
+		
+		
+		
    
+			
    Public Instance Methods
    
+
+		
+			
    
+				
+
+				
    
+				
+					preserve_paths()
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
    
+Rubygems [>= 1.8.0, < 1.8.5] has a bug that changes Gem.dir whenever you
+call Gem::Installer#install with an :install_dir set. We have to change it
+back for our sudo mode to work.
+
    
+					
+
+					
+					
    
+
    +     # File lib/bundler/rubygems_integration.rb, line 301
+301:       def preserve_paths
+302:         old_dir, old_path = gem_dir, gem_path
+303:         yield
+304:         Gem.use_paths(old_dir, old_path)
+305:       end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+		
    
+	
+
+	
    
+
+
+	
    
+	
+		
    Disabled; run with --debug to generate this.
    
+	
+	
    
+
+	
    
+		
    [Validate]
    
+		
    Generated with the Darkfish
+			Rdoc Generator 1.1.6.
    
+	
    
+
+
+
+
diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/RubygemsIntegration/Deprecate.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/RubygemsIntegration/Deprecate.html
new file mode 100644
index 00000000..3771dc64
--- /dev/null
+++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/RubygemsIntegration/Deprecate.html
@@ -0,0 +1,377 @@
+
+
+
+
+	
+
+	Class: Bundler::RubygemsIntegration::Deprecate
+
+	
+
+	
+	
+	
+	
+
+
+
+
+	
    
+		
    
+			
    
+        
    
+          Home
+          Classes
+          Methods
+        
    
+			
    
+		
    
+
+		
    
+			
    
+				
    In Files
    
+				
    
+					
+				
    
+			
    
+
+			
+		
    
+
+		
    
+
+			
+			
+			
    
+				
    Parent
    
+				
+				
    Object
    
+				
+			
    
+			
+
+			
+			
+
+			
+			
+			
    
+				
    Methods
    
+				
+			
    
+			
+
+			
+			
+		
    
+
+		
    
+			
+			
+			
+			
+
+			
    
+				
    Class Index
+					[+]
    
+				
    
+				
    
+					Quicksearch
+					
+				
    
+				
    
+
+				
+				
+			
    
+
+			
+		
    
+	
    
+
+	
    
+		
    Bundler::RubygemsIntegration::Deprecate
    
+
+		
    
+			
+		
    
+
+		
+		
+
+		
+		
+
+		
+		
+		
    
+			
    Public Instance Methods
    
+
+		
+			
    
+				
+
+				
    
+				
+					skip_during()
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +     # File lib/bundler/rubygems_integration.rb, line 166
+166:         def skip_during; yield; end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+		
    
+	
+
+	
    
+
+
+	
    
+	
+		
    Disabled; run with --debug to generate this.
    
+	
+	
    
+
+	
    
+		
    [Validate]
    
+		
    Generated with the Darkfish
+			Rdoc Generator 1.1.6.
    
+	
    
+
+
+
+
diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/SharedHelpers/Gem.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/RubygemsIntegration/Gem.html
similarity index 87%
rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/SharedHelpers/Gem.html
rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/RubygemsIntegration/Gem.html
index 610c3432..90f1ab40 100644
--- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/SharedHelpers/Gem.html
+++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/RubygemsIntegration/Gem.html
@@ -5,7 +5,7 @@
 
 	
 
-	Module: Bundler::SharedHelpers::Gem
+	Module: Bundler::RubygemsIntegration::Gem
 
 	
 
@@ -38,8 +38,8 @@
 				
    
 					
 				
    
@@ -72,6 +72,10 @@
 				
 					
  • bundle
    • 
 				
+					
  • bundle-benchmark
    • 
+				
+					
  • bundle-benchmark.txt
    • 
+				
 					
  • bundle-config
    • 
 				
 					
  • bundle-config.txt
    • 
@@ -181,16 +185,28 @@
 				
 					
  • Bundler::Resolver::SpecGroup
    • 
 				
+					
  • Bundler::RubygemsIntegration
    • 
+				
+					
  • Bundler::RubygemsIntegration::AlmostModern
    • 
+				
+					
  • Bundler::RubygemsIntegration::Deprecate
    • 
+				
+					
  • Bundler::RubygemsIntegration::Gem
    • 
+				
+					
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • 
+				
+					
  • Bundler::RubygemsIntegration::Legacy
    • 
+				
+					
  • Bundler::RubygemsIntegration::Modern
    • 
+				
+					
  • Bundler::RubygemsIntegration::Transitional
    • 
+				
 					
  • Bundler::Runtime
    • 
 				
 					
  • Bundler::Settings
    • 
 				
 					
  • Bundler::SharedHelpers
    • 
 				
-					
  • Bundler::SharedHelpers::Gem
    • 
-				
-					
  • Bundler::SharedHelpers::Gem::SourceIndex
    • 
-				
 					
  • Bundler::Source
    • 
 				
 					
  • Bundler::Source::Git
    • 
@@ -272,7 +288,7 @@
 	
 
 	
    
-		
    Bundler::SharedHelpers::Gem
    
+		
    Bundler::RubygemsIntegration::Gem
    
 
 		
    
 			
diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/SharedHelpers/Gem/SourceIndex.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/RubygemsIntegration/Gem/SourceIndex.html
similarity index 86%
rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/SharedHelpers/Gem/SourceIndex.html
rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/RubygemsIntegration/Gem/SourceIndex.html
index b3d1472f..b0366ccb 100644
--- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/SharedHelpers/Gem/SourceIndex.html
+++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/RubygemsIntegration/Gem/SourceIndex.html
@@ -5,7 +5,7 @@
 
 	
 
-	Module: Bundler::SharedHelpers::Gem::SourceIndex
+	Module: Bundler::RubygemsIntegration::Gem::SourceIndex
 
 	
 
@@ -38,8 +38,8 @@
 				
    
 					
 				
    
@@ -72,6 +72,10 @@
 				
 					
  • bundle
    • 
 				
+					
  • bundle-benchmark
    • 
+				
+					
  • bundle-benchmark.txt
    • 
+				
 					
  • bundle-config
    • 
 				
 					
  • bundle-config.txt
    • 
@@ -181,16 +185,28 @@
 				
 					
  • Bundler::Resolver::SpecGroup
    • 
 				
+					
  • Bundler::RubygemsIntegration
    • 
+				
+					
  • Bundler::RubygemsIntegration::AlmostModern
    • 
+				
+					
  • Bundler::RubygemsIntegration::Deprecate
    • 
+				
+					
  • Bundler::RubygemsIntegration::Gem
    • 
+				
+					
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • 
+				
+					
  • Bundler::RubygemsIntegration::Legacy
    • 
+				
+					
  • Bundler::RubygemsIntegration::Modern
    • 
+				
+					
  • Bundler::RubygemsIntegration::Transitional
    • 
+				
 					
  • Bundler::Runtime
    • 
 				
 					
  • Bundler::Settings
    • 
 				
 					
  • Bundler::SharedHelpers
    • 
 				
-					
  • Bundler::SharedHelpers::Gem
    • 
-				
-					
  • Bundler::SharedHelpers::Gem::SourceIndex
    • 
-				
 					
  • Bundler::Source
    • 
 				
 					
  • Bundler::Source::Git
    • 
@@ -272,7 +288,7 @@
 	
    
 
 	
    
-		
    Bundler::SharedHelpers::Gem::SourceIndex
    
+		
    Bundler::RubygemsIntegration::Gem::SourceIndex
    
 
 		
    
 			
diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/RubygemsIntegration/Legacy.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/RubygemsIntegration/Legacy.html
new file mode 100644
index 00000000..70366007
--- /dev/null
+++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/RubygemsIntegration/Legacy.html
@@ -0,0 +1,454 @@
+
+
+
+
+	
+
+	Class: Bundler::RubygemsIntegration::Legacy
+
+	
+
+	
+	
+	
+	
+
+
+
+
+	
    
+		
    
+			
    
+        
    
+          Home
+          Classes
+          Methods
+        
    
+			
    
+		
    
+
+		
    
+			
    
+				
    In Files
    
+				
    
+					
+				
    
+			
    
+
+			
+		
    
+
+		
    
+
+			
+			
+			
    
+				
    Parent
    
+				
+				
    Bundler::RubygemsIntegration
    
+				
+			
    
+			
+
+			
+			
+
+			
+			
+			
    
+				
    Methods
    
+				
+			
    
+			
+
+			
+			
+		
    
+
+		
    
+			
+			
+			
+			
+
+			
    
+				
    Class Index
+					[+]
    
+				
    
+				
    
+					Quicksearch
+					
+				
    
+				
    
+
+				
+				
+			
    
+
+			
+		
    
+	
    
+
+	
    
+		
    Bundler::RubygemsIntegration::Legacy
    
+
+		
    
+			
    
+Rubygems versions 1.3.6 through 1.6.2
+
    
+
+		
    
+
+		
+		
+
+		
+		
+
+		
+		
+		
    
+			
    Public Instance Methods
    
+
+		
+			
    
+				
+
+				
    
+				
+					all_specs()
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +     # File lib/bundler/rubygems_integration.rb, line 259
+259:       def all_specs
+260:         Gem.source_index.gems.values
+261:       end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+			
    
+				
+
+				
    
+				
+					find_name(name)
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +     # File lib/bundler/rubygems_integration.rb, line 263
+263:       def find_name(name)
+264:         Gem.source_index.find_name(name)
+265:       end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+			
    
+				
+
+				
    
+				
+					stub_rubygems(specs)
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +     # File lib/bundler/rubygems_integration.rb, line 255
+255:       def stub_rubygems(specs)
+256:         stub_source_index137(specs)
+257:       end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+		
    
+	
+
+	
    
+
+
+	
    
+	
+		
    Disabled; run with --debug to generate this.
    
+	
+	
    
+
+	
    
+		
    [Validate]
    
+		
    Generated with the Darkfish
+			Rdoc Generator 1.1.6.
    
+	
    
+
+
+
+
diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/RubygemsIntegration/Modern.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/RubygemsIntegration/Modern.html
new file mode 100644
index 00000000..8cd8d7a8
--- /dev/null
+++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/RubygemsIntegration/Modern.html
@@ -0,0 +1,460 @@
+
+
+
+
+	
+
+	Class: Bundler::RubygemsIntegration::Modern
+
+	
+
+	
+	
+	
+	
+
+
+
+
+	
    
+		
    
+			
    
+        
    
+          Home
+          Classes
+          Methods
+        
    
+			
    
+		
    
+
+		
    
+			
    
+				
    In Files
    
+				
    
+					
+				
    
+			
    
+
+			
+		
    
+
+		
    
+
+			
+			
+			
    
+				
    Parent
    
+				
+				
    Bundler::RubygemsIntegration
    
+				
+			
    
+			
+
+			
+			
+
+			
+			
+			
    
+				
    Methods
    
+				
+			
    
+			
+
+			
+			
+		
    
+
+		
    
+			
+			
+			
+			
+
+			
    
+				
    Class Index
+					[+]
    
+				
    
+				
    
+					Quicksearch
+					
+				
    
+				
    
+
+				
+				
+			
    
+
+			
+		
    
+	
    
+
+	
    
+		
    Bundler::RubygemsIntegration::Modern
    
+
+		
    
+			
    
+Rubygems 1.8.5
+
    
+
+		
    
+
+		
+		
+
+		
+		
+
+		
+		
+		
    
+			
    Public Instance Methods
    
+
+		
+			
    
+				
+
+				
    
+				
+					all_specs()
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +     # File lib/bundler/rubygems_integration.rb, line 287
+287:       def all_specs
+288:         Gem::Specification.to_a
+289:       end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+			
    
+				
+
+				
    
+				
+					find_name(name)
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +     # File lib/bundler/rubygems_integration.rb, line 291
+291:       def find_name(name)
+292:         Gem::Specification.find_all_by_name name
+293:       end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+			
    
+				
+
+				
    
+				
+					stub_rubygems(specs)
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +     # File lib/bundler/rubygems_integration.rb, line 277
+277:       def stub_rubygems(specs)
+278:         Gem::Specification.all = specs
+279: 
+280:         Gem.post_reset {
+281:           Gem::Specification.all = specs
+282:         }
+283: 
+284:         stub_source_index170(specs)
+285:       end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+		
    
+	
+
+	
    
+
+
+	
    
+	
+		
    Disabled; run with --debug to generate this.
    
+	
+	
    
+
+	
    
+		
    [Validate]
    
+		
    Generated with the Darkfish
+			Rdoc Generator 1.1.6.
    
+	
    
+
+
+
+
diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/RubygemsIntegration/Transitional.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/RubygemsIntegration/Transitional.html
new file mode 100644
index 00000000..f8ca2f27
--- /dev/null
+++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/RubygemsIntegration/Transitional.html
@@ -0,0 +1,382 @@
+
+
+
+
+	
+
+	Class: Bundler::RubygemsIntegration::Transitional
+
+	
+
+	
+	
+	
+	
+
+
+
+
+	
    
+		
    
+			
    
+        
    
+          Home
+          Classes
+          Methods
+        
    
+			
    
+		
    
+
+		
    
+			
    
+				
    In Files
    
+				
    
+					
+				
    
+			
    
+
+			
+		
    
+
+		
    
+
+			
+			
+			
+			
+
+			
+			
+
+			
+			
+			
    
+				
    Methods
    
+				
+			
    
+			
+
+			
+			
+		
    
+
+		
    
+			
+			
+			
+			
+
+			
    
+				
    Class Index
+					[+]
    
+				
    
+				
    
+					Quicksearch
+					
+				
    
+				
    
+
+				
+				
+			
    
+
+			
+		
    
+	
    
+
+	
    
+		
    Bundler::RubygemsIntegration::Transitional
    
+
+		
    
+			
    
+Rubygems 1.7
+
    
+
+		
    
+
+		
+		
+
+		
+		
+
+		
+		
+		
    
+			
    Public Instance Methods
    
+
+		
+			
    
+				
+
+				
    
+				
+					stub_rubygems(specs)
+					click to toggle source
+				
+				
    
+
+				
    
+					
+					
+					
+
+					
+					
    
+
    +     # File lib/bundler/rubygems_integration.rb, line 270
+270:       def stub_rubygems(specs)
+271:         stub_source_index170(specs)
+272:       end
    
+					
    
+					
+				
    
+
+				
+
+				
+			
    
+
+		
+		
    
+	
+
+	
    
+
+
+	
    
+	
+		
    Disabled; run with --debug to generate this.
    
+	
+	
    
+
+	
    
+		
    [Validate]
    
+		
    Generated with the Darkfish
+			Rdoc Generator 1.1.6.
    
+	
    
+
+
+
+
diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Runtime.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Runtime.html
similarity index 74%
rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Runtime.html
rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Runtime.html
index 6f40cdf7..669ecb5b 100644
--- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Runtime.html
+++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Runtime.html
@@ -111,6 +111,10 @@
 				
 					
  • bundle
    • 
 				
+					
  • bundle-benchmark
    • 
+				
+					
  • bundle-benchmark.txt
    • 
+				
 					
  • bundle-config
    • 
 				
 					
  • bundle-config.txt
    • 
@@ -220,16 +224,28 @@
 				
 					
  • Bundler::Resolver::SpecGroup
    • 
 				
+					
  • Bundler::RubygemsIntegration
    • 
+				
+					
  • Bundler::RubygemsIntegration::AlmostModern
    • 
+				
+					
  • Bundler::RubygemsIntegration::Deprecate
    • 
+				
+					
  • Bundler::RubygemsIntegration::Gem
    • 
+				
+					
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • 
+				
+					
  • Bundler::RubygemsIntegration::Legacy
    • 
+				
+					
  • Bundler::RubygemsIntegration::Modern
    • 
+				
+					
  • Bundler::RubygemsIntegration::Transitional
    • 
+				
 					
  • Bundler::Runtime
    • 
 				
 					
  • Bundler::Settings
    • 
 				
 					
  • Bundler::SharedHelpers
    • 
 				
-					
  • Bundler::SharedHelpers::Gem
    • 
-				
-					
  • Bundler::SharedHelpers::Gem::SourceIndex
    • 
-				
 					
  • Bundler::Source
    • 
 				
 					
  • Bundler::Source::Git
    • 
@@ -361,17 +377,17 @@
 					
    
 
    -    # File lib/bundler/runtime.rb, line 83
-83:     def cache
-84:       FileUtils.mkdir_p(cache_path)
-85: 
-86:       Bundler.ui.info "Updating .gem files in vendor/cache"
-87:       specs.each do |spec|
-88:         next if spec.name == 'bundler'
-89:         spec.source.cache(spec) if spec.source.respond_to?(:cache)
-90:       end
-91:       prune_cache unless Bundler.settings[:no_prune]
-92:     end
    
+    # File lib/bundler/runtime.rb, line 87
+87:     def cache
+88:       FileUtils.mkdir_p(cache_path) unless File.exists?(cache_path)
+89: 
+90:       Bundler.ui.info "Updating .gem files in vendor/cache"
+91:       specs.each do |spec|
+92:         next if spec.name == 'bundler'
+93:         spec.source.cache(spec) if spec.source.respond_to?(:cache)
+94:       end
+95:       prune_cache unless Bundler.settings[:no_prune]
+96:     end
    @@ -402,14 +418,14 @@ 
    -    # File lib/bundler/runtime.rb, line 73
-73:     def dependencies_for(*groups)
-74:       if groups.empty?
-75:         dependencies
-76:       else
-77:         dependencies.select { |d| (groups & d.groups).any? }
-78:       end
-79:     end
    + # File lib/bundler/runtime.rb, line 77 +77: def dependencies_for(*groups) +78: if groups.empty? +79: dependencies +80: else +81: dependencies.select { |d| (groups & d.groups).any? } +82: end +83: end
    @@ -440,30 +456,30 @@ 
    -     # File lib/bundler/runtime.rb, line 94
- 94:     def prune_cache
- 95:       FileUtils.mkdir_p(cache_path)
- 96: 
- 97:       resolve = @definition.resolve
- 98:       cached  = Dir["#{cache_path}/*.gem"]
- 99: 
-100:       cached = cached.delete_if do |path|
-101:         spec = Gem::Format.from_file_by_path(path).spec
-102: 
-103:         resolve.any? do |s|
-104:           s.name == spec.name && s.version == spec.version && !s.source.is_a?(Bundler::Source::Git)
-105:         end
-106:       end
-107: 
-108:       if cached.any?
-109:         Bundler.ui.info "Removing outdated .gem files from vendor/cache"
-110: 
-111:         cached.each do |path|
-112:           Bundler.ui.info "  * #{File.basename(path)}"
-113:           File.delete(path)
-114:         end
-115:       end
-116:     end
    + # File lib/bundler/runtime.rb, line 98 + 98: def prune_cache + 99: FileUtils.mkdir_p(cache_path) unless File.exists?(cache_path) +100: +101: resolve = @definition.resolve +102: cached = Dir["#{cache_path}/*.gem"] +103: +104: cached = cached.delete_if do |path| +105: spec = Bundler.rubygems.spec_from_gem path +106: +107: resolve.any? do |s| +108: s.name == spec.name && s.version == spec.version && !s.source.is_a?(Bundler::Source::Git) +109: end +110: end +111: +112: if cached.any? +113: Bundler.ui.info "Removing outdated .gem files from vendor/cache" +114: +115: cached.each do |path| +116: Bundler.ui.info " * #{File.basename(path)}" +117: File.delete(path) +118: end +119: end +120: end
    @@ -494,32 +510,32 @@ 
    -    # File lib/bundler/runtime.rb, line 47
-47:     def require(*groups)
-48:       groups.map! { |g| g.to_sym }
-49:       groups = [:default] if groups.empty?
-50: 
-51:       @definition.dependencies.each do |dep|
-52:         # Skip the dependency if it is not in any of the requested
-53:         # groups
-54:         next unless ((dep.groups & groups).any? && dep.current_platform?)
-55: 
-56:         required_file = nil
-57: 
-58:         begin
-59:           # Loop through all the specified autorequires for the
-60:           # dependency. If there are none, use the dependency's name
-61:           # as the autorequire.
-62:           Array(dep.autorequire || dep.name).each do |file|
-63:             required_file = file
-64:             Kernel.require file
-65:           end
-66:         rescue LoadError => e
-67:           REGEXPS.find { |r| r =~ e.message }
-68:           raise if dep.autorequire || $1 != required_file
-69:         end
-70:       end
-71:     end
    + # File lib/bundler/runtime.rb, line 51 +51: def require(*groups) +52: groups.map! { |g| g.to_sym } +53: groups = [:default] if groups.empty? +54: +55: @definition.dependencies.each do |dep| +56: # Skip the dependency if it is not in any of the requested +57: # groups +58: next unless ((dep.groups & groups).any? && dep.current_platform?) +59: +60: required_file = nil +61: +62: begin +63: # Loop through all the specified autorequires for the +64: # dependency. If there are none, use the dependency's name +65: # as the autorequire. +66: Array(dep.autorequire || dep.name).each do |file| +67: required_file = file +68: Kernel.require file +69: end +70: rescue LoadError => e +71: REGEXPS.find { |r| r =~ e.message } +72: raise if dep.autorequire || $1 != required_file +73: end +74: end +75: end
    @@ -558,7 +574,7 @@ 11: specs = groups.any? ? @definition.specs_for(groups) : requested_specs 12: 13: setup_environment -14: cripple_rubygems(specs) +14: Bundler.rubygems.replace_entrypoints(specs) 15: 16: # Activate the specs 17: specs.each do |spec| @@ -566,22 +582,26 @@ 19: raise GemNotFound, "#{spec.full_name} is missing. Run `bundle` to get it." 20: end 21: -22: if activated_spec = Gem.loaded_specs[spec.name] and activated_spec.version != spec.version +22: if activated_spec = Bundler.rubygems.loaded_specs(spec.name) and activated_spec.version != spec.version 23: e = Gem::LoadError.new "You have already activated #{activated_spec.name} #{activated_spec.version}, " "but your Gemfile requires #{spec.name} #{spec.version}. Consider using bundle exec." 24: e.name = spec.name -25: e.version_requirement = Gem::Requirement.new(spec.version.to_s) -26: raise e -27: end -28: -29: Gem.loaded_specs[spec.name] = spec -30: load_paths = spec.load_paths.reject {|path| $LOAD_PATH.include?(path)} -31: $LOAD_PATH.unshift(*load_paths) -32: end -33: -34: lock -35: -36: self -37: end +25: if e.respond_to?(:requirement=) +26: e.requirement = Gem::Requirement.new(spec.version.to_s) +27: else +28: e.version_requirement = Gem::Requirement.new(spec.version.to_s) +29: end +30: raise e +31: end +32: +33: Bundler.rubygems.mark_loaded(spec) +34: load_paths = spec.load_paths.reject {|path| $LOAD_PATH.include?(path)} +35: $LOAD_PATH.unshift(*load_paths) +36: end +37: +38: lock +39: +40: self +41: end @@ -618,10 +638,10 @@ 
    -     # File lib/bundler/runtime.rb, line 120
-120:     def cache_path
-121:       root.join("vendor/cache")
-122:     end
    + # File lib/bundler/runtime.rb, line 124 +124: def cache_path +125: root.join("vendor/cache") +126: end
    @@ -652,30 +672,30 @@ 
    -     # File lib/bundler/runtime.rb, line 124
-124:     def setup_environment
-125:       begin
-126:         ENV["BUNDLE_BIN_PATH"] = Gem.bin_path("bundler", "bundle", VERSION)
-127:       rescue Gem::GemNotFoundException
-128:         ENV["BUNDLE_BIN_PATH"] = File.expand_path("../../../bin/bundle", __FILE__)
-129:       end
-130: 
-131:       # Set PATH
-132:       paths = (ENV["PATH"] || "").split(File::PATH_SEPARATOR)
-133:       paths.unshift "#{Bundler.bundle_path}/bin"
-134:       ENV["PATH"] = paths.uniq.join(File::PATH_SEPARATOR)
-135: 
-136:       # Set BUNDLE_GEMFILE
-137:       ENV["BUNDLE_GEMFILE"] = default_gemfile.to_s
-138: 
-139:       # Set RUBYOPT
-140:       rubyopt = [ENV["RUBYOPT"]].compact
-141:       if rubyopt.empty? || rubyopt.first !~ /-rbundler\/setup/
-142:         rubyopt.unshift "-rbundler/setup"
-143:         rubyopt.unshift "-I#{File.expand_path('../..', __FILE__)}"
-144:         ENV["RUBYOPT"] = rubyopt.join(' ')
-145:       end
-146:     end
    + # File lib/bundler/runtime.rb, line 128 +128: def setup_environment +129: begin +130: ENV["BUNDLE_BIN_PATH"] = Bundler.rubygems.bin_path("bundler", "bundle", VERSION) +131: rescue Gem::GemNotFoundException +132: ENV["BUNDLE_BIN_PATH"] = File.expand_path("../../../bin/bundle", __FILE__) +133: end +134: +135: # Set PATH +136: paths = (ENV["PATH"] || "").split(File::PATH_SEPARATOR) +137: paths.unshift "#{Bundler.bundle_path}/bin" +138: ENV["PATH"] = paths.uniq.join(File::PATH_SEPARATOR) +139: +140: # Set BUNDLE_GEMFILE +141: ENV["BUNDLE_GEMFILE"] = default_gemfile.to_s +142: +143: # Set RUBYOPT +144: rubyopt = [ENV["RUBYOPT"]].compact +145: if rubyopt.empty? || rubyopt.first !~ /-rbundler\/setup/ +146: rubyopt.unshift "-rbundler/setup" +147: rubyopt.unshift "-I#{File.expand_path('../..', __FILE__)}" +148: ENV["RUBYOPT"] = rubyopt.join(' ') +149: end +150: end
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Settings.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Settings.html similarity index 95% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Settings.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Settings.html index a01b47a6..255836a2 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Settings.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Settings.html @@ -118,6 +118,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -227,16 +231,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • @@ -542,7 +558,7 @@ 
         # File lib/bundler/settings.rb, line 18
 18:     def delete(key)
-19:       @local_config
+19:       @local_config.delete(key_for(key))
 20:     end
    @@ -624,7 +640,7 @@ ENV[“BUNDLE_PATH“] 79: if path = self[:path] 80: "#{path}/#{Bundler.ruby_scope}" 81: else -82: Gem.dir +82: Bundler.rubygems.gem_dir 83: end 84: end @@ -819,7 +835,7 @@ ENV[“BUNDLE_PATH“] 
          # File lib/bundler/settings.rb, line 108
 108:     def global_config_file
-109:       file = ENV["BUNDLE_CONFIG"] || File.join(Gem.user_home, ".bundle/config")
+109:       file = ENV["BUNDLE_CONFIG"] || File.join(Bundler.rubygems.user_home, ".bundle/config")
 110:       Pathname.new(file)
 111:     end
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/SharedHelpers.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/SharedHelpers.html new file mode 100644 index 00000000..94099072 --- /dev/null +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/SharedHelpers.html @@ -0,0 +1,572 @@ + + + + + + + Module: Bundler::SharedHelpers + + + + + + + + + + + +
    +
    +
    +

    + Home + Classes + Methods +

    +
    +
    + +
    +
    +

    In Files

    +
    + +
    +
    + + +
    + +
    + + + + + + + + + + + + + + +
    + +
    + + + + + +
    +

    Class Index + [+]

    +
    +
    + Quicksearch + +
    +
    + + + +
    + + +
    +
    + +
    +

    Bundler::SharedHelpers

    + +
    + +
    + + + + + + +
    +

    Attributes

    + + +
    + + + + +
    + gem_loaded[RW] +
    + +
    + + + +
    +
    + +
    + + + + +
    +

    Public Instance Methods

    + + +
    + + +
    + + default_gemfile() + click to toggle source + +
    + +
    + + + + + +
    +
    +    # File lib/bundler/shared_helpers.rb, line 20
+20:     def default_gemfile
+21:       gemfile = find_gemfile
+22:       raise GemfileNotFound, "Could not locate Gemfile" unless gemfile
+23:       Pathname.new(gemfile)
+24:     end
    +
    + +
    + + + + +
    + + +
    + + +
    + + default_lockfile() + click to toggle source + +
    + +
    + + + + + +
    +
    +    # File lib/bundler/shared_helpers.rb, line 26
+26:     def default_lockfile
+27:       Pathname.new("#{default_gemfile}.lock")
+28:     end
    +
    + +
    + + + + +
    + + +
    + + +
    + + in_bundle?() + click to toggle source + +
    + +
    + + + + + +
    +
    +    # File lib/bundler/shared_helpers.rb, line 30
+30:     def in_bundle?
+31:       find_gemfile
+32:     end
    +
    + +
    + + + + +
    + + +
    + +
    +

    Private Instance Methods

    + + +
    + + +
    + + clean_load_path() + click to toggle source + +
    + +
    + + + + + +
    +
    +    # File lib/bundler/shared_helpers.rb, line 56
+56:     def clean_load_path
+57:       # handle 1.9 where system gems are always on the load path
+58:       if defined?(::Gem)
+59:         me = File.expand_path("../../", __FILE__)
+60:         $LOAD_PATH.reject! do |p|
+61:           next if File.expand_path(p) =~ /^#{Regexp.escape(me)}/
+62:           p != File.dirname(__FILE__) &&
+63:             Bundler.rubygems.gem_path.any?{|gp| p =~ /^#{Regexp.escape(gp)}/ }
+64:         end
+65:         $LOAD_PATH.uniq!
+66:       end
+67:     end
    +
    + +
    + + + + +
    + + +
    + + +
    + + find_gemfile() + click to toggle source + +
    + +
    + + + + + +
    +
    +    # File lib/bundler/shared_helpers.rb, line 36
+36:     def find_gemfile
+37:       given = ENV['BUNDLE_GEMFILE']
+38:       return given if given && !given.empty?
+39: 
+40:       previous = nil
+41:       current  = File.expand_path(Dir.pwd)
+42: 
+43:       until !File.directory?(current) || current == previous
+44:         if ENV['BUNDLE_SPEC_RUN']
+45:           # avoid stepping above the tmp directory when testing
+46:           return nil if File.file?(File.join(current, 'bundler.gemspec'))
+47:         end
+48: 
+49:         # otherwise return the Gemfile if it's there
+50:         filename = File.join(current, 'Gemfile')
+51:         return filename if File.file?(filename)
+52:         current, previous = File.expand_path("..", current), current
+53:       end
+54:     end
    +
    + +
    + + + + +
    + + +
    + + +
    + + +
    + +

    Disabled; run with --debug to generate this.

    + +
    + +
    +

    [Validate]

    +

    Generated with the Darkfish + Rdoc Generator 1.1.6.

    +
    + + + + diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Source.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Source.html similarity index 90% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Source.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Source.html index ba913796..a4e0128f 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Source.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Source.html @@ -85,6 +85,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -194,16 +198,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Source/Git.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Source/Git.html similarity index 71% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Source/Git.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Source/Git.html index 8212026a..81fbd802 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Source/Git.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Source/Git.html @@ -117,6 +117,8 @@
  • #unlock!
    • +
  • #uri_escaped
    • +
  • #uri_hash
    • @@ -136,6 +138,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -245,16 +251,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • @@ -440,10 +458,10 @@ 
    -     # File lib/bundler/source.rb, line 476
-476:       def self.from_lock(options)
-477:         new(options.merge("uri" => options.delete("remote")))
-478:       end
    + # File lib/bundler/source.rb, line 489 +489: def self.from_lock(options) +490: new(options.merge("uri" => options.delete("remote"))) +491: end
    @@ -474,19 +492,19 @@ 
    -     # File lib/bundler/source.rb, line 463
-463:       def initialize(options)
-464:         super
-465: 
-466:         # stringify options that could be set as symbols
-467:         %(ref branch tag revision).each{|k| options[k] = options[k].to_s if options[k] }
-468: 
-469:         @uri        = options["uri"]
-470:         @ref        = options["ref"] || options["branch"] || options["tag"] || 'master'
-471:         @revision   = options["revision"]
-472:         @submodules = options["submodules"]
-473:         @update     = false
-474:       end
    + # File lib/bundler/source.rb, line 476 +476: def initialize(options) +477: super +478: +479: # stringify options that could be set as symbols +480: %(ref branch tag revision).each{|k| options[k] = options[k].to_s if options[k] } +481: +482: @uri = options["uri"] +483: @ref = options["ref"] || options["branch"] || options["tag"] || 'master' +484: @revision = options["revision"] +485: @submodules = options["submodules"] +486: @update = false +487: end
    @@ -552,15 +570,15 @@ 
    -     # File lib/bundler/source.rb, line 491
-491:       def eql?(o)
-492:         Git === o            &&
-493:         uri == o.uri         &&
-494:         ref == o.ref         &&
-495:         name == o.name       &&
-496:         version == o.version &&
-497:         submodules == o.submodules
-498:       end
    + # File lib/bundler/source.rb, line 504 +504: def eql?(o) +505: Git === o && +506: uri == o.uri && +507: ref == o.ref && +508: name == o.name && +509: version == o.version && +510: submodules == o.submodules +511: end
    @@ -595,17 +613,17 @@ 
    -     # File lib/bundler/source.rb, line 538
-538:       def install(spec)
-539:         Bundler.ui.info "Using #{spec.name} (#{spec.version}) from #{to_s} "
-540: 
-541:         unless @installed
-542:           Bundler.ui.debug "  * Checking out revision: #{ref}"
-543:           checkout if allow_git_ops?
-544:           @installed = true
-545:         end
-546:         generate_bin(spec)
-547:       end
    + # File lib/bundler/source.rb, line 551 +551: def install(spec) +552: Bundler.ui.info "Using #{spec.name} (#{spec.version}) from #{to_s} " +553: +554: unless @installed +555: Bundler.ui.debug " * Checking out revision: #{ref}" +556: checkout if allow_git_ops? +557: @installed = true +558: end +559: generate_bin(spec) +560: end
    @@ -636,12 +654,12 @@ 
    -     # File lib/bundler/source.rb, line 549
-549:       def load_spec_files
-550:         super
-551:       rescue PathError, GitError
-552:         raise GitError, "#{to_s} is not checked out. Please run `bundle install`"
-553:       end
    + # File lib/bundler/source.rb, line 562 +562: def load_spec_files +563: super +564: rescue PathError, GitError +565: raise GitError, "#{to_s} is not checked out. Please run `bundle install`" +566: end
    @@ -672,10 +690,10 @@ 
    -     # File lib/bundler/source.rb, line 507
-507:       def name
-508:         File.basename(@uri, '.git')
-509:       end
    + # File lib/bundler/source.rb, line 520 +520: def name +521: File.basename(@uri, '.git') +522: end
    @@ -706,18 +724,18 @@ 
    -     # File lib/bundler/source.rb, line 511
-511:       def path
-512:         @install_path ||= begin
-513:           git_scope = "#{base_name}-#{shortref_for_path(revision)}"
-514: 
-515:           if Bundler.requires_sudo?
-516:             Bundler.user_bundle_path.join(Bundler.ruby_scope).join(git_scope)
-517:           else
-518:             Bundler.install_path.join(git_scope)
-519:           end
-520:         end
-521:       end
    + # File lib/bundler/source.rb, line 524 +524: def path +525: @install_path ||= begin +526: git_scope = "#{base_name}-#{shortref_for_path(revision)}" +527: +528: if Bundler.requires_sudo? +529: Bundler.user_bundle_path.join(Bundler.ruby_scope).join(git_scope) +530: else +531: Bundler.install_path.join(git_scope) +532: end +533: end +534: end
    @@ -750,16 +768,16 @@ TODO: actually cache git specs 
    -     # File lib/bundler/source.rb, line 528
-528:       def specs
-529:         if allow_git_ops? && !@update
-530:           # Start by making sure the git cache is up to date
-531:           cache
-532:           checkout
-533:           @update = true
-534:         end
-535:         local_specs
-536:       end
    + # File lib/bundler/source.rb, line 541 +541: def specs +542: if allow_git_ops? && !@update +543: # Start by making sure the git cache is up to date +544: cache +545: checkout +546: @update = true +547: end +548: local_specs +549: end
    @@ -790,17 +808,17 @@ TODO: actually cache git specs 
    -     # File lib/bundler/source.rb, line 480
-480:       def to_lock
-481:         out = "GIT\n"
-482:         out << "  remote: #{@uri}\n"
-483:         out << "  revision: #{revision}\n"
-484:         %(ref branch tag submodules).each do |opt|
-485:           out << "  #{opt}: #{options[opt]}\n" if options[opt]
-486:         end
-487:         out << "  glob: #{@glob}\n" unless @glob == DEFAULT_GLOB
-488:         out << "  specs:\n"
-489:       end
    + # File lib/bundler/source.rb, line 493 +493: def to_lock +494: out = "GIT\n" +495: out << " remote: #{@uri}\n" +496: out << " revision: #{revision}\n" +497: %(ref branch tag submodules).each do |opt| +498: out << " #{opt}: #{options[opt]}\n" if options[opt] +499: end +500: out << " glob: #{@glob}\n" unless @glob == DEFAULT_GLOB +501: out << " specs:\n" +502: end
    @@ -831,11 +849,11 @@ TODO: actually cache git specs 
    -     # File lib/bundler/source.rb, line 502
-502:       def to_s
-503:         sref = options["ref"] ? shortref_for_display(options["ref"]) : ref
-504:         "#{uri} (at #{sref})"
-505:       end
    + # File lib/bundler/source.rb, line 515 +515: def to_s +516: sref = options["ref"] ? shortref_for_display(options["ref"]) : ref +517: "#{uri} (at #{sref})" +518: end
    @@ -866,10 +884,10 @@ TODO: actually cache git specs 
    -     # File lib/bundler/source.rb, line 523
-523:       def unlock!
-524:         @revision = nil
-525:       end
    + # File lib/bundler/source.rb, line 536 +536: def unlock! +537: @revision = nil +538: end
    @@ -906,10 +924,10 @@ TODO: actually cache git specs 
    -     # File lib/bundler/source.rb, line 647
-647:       def allow_git_ops?
-648:         @allow_remote || @allow_cached
-649:       end
    + # File lib/bundler/source.rb, line 676 +676: def allow_git_ops? +677: @allow_remote || @allow_cached +678: end
    @@ -940,10 +958,10 @@ TODO: actually cache git specs 
    -     # File lib/bundler/source.rb, line 572
-572:       def base_name
-573:         File.basename(uri.sub(%{^(\w+://)?([^/:]+:)},''), ".git")
-574:       end
    + # File lib/bundler/source.rb, line 587 +587: def base_name +588: File.basename(uri.sub(%{^(\w+://)?([^/:]+:)},''), ".git") +589: end
    @@ -974,20 +992,20 @@ TODO: actually cache git specs 
    -     # File lib/bundler/source.rb, line 608
-608:       def cache
-609:         if cached?
-610:           return if has_revision_cached?
-611:           Bundler.ui.info "Updating #{uri}"
-612:           in_cache do
-613:             git %fetch --force --quiet --tags "#{uri}" refs/heads/*:refs/heads/*|
-614:           end
-615:         else
-616:           Bundler.ui.info "Fetching #{uri}"
-617:           FileUtils.mkdir_p(cache_path.dirname)
-618:           git %clone "#{uri}" "#{cache_path}" --bare --no-hardlinks|
-619:         end
-620:       end
    + # File lib/bundler/source.rb, line 636 +636: def cache +637: if cached? +638: return if has_revision_cached? +639: Bundler.ui.info "Updating #{uri}" +640: in_cache do +641: git %fetch --force --quiet --tags #{uri_escaped} "refs/heads/*:refs/heads/*"| +642: end +643: else +644: Bundler.ui.info "Fetching #{uri}" +645: FileUtils.mkdir_p(cache_path.dirname) +646: git %clone #{uri_escaped} "#{cache_path}" --bare --no-hardlinks| +647: end +648: end
    @@ -1018,18 +1036,18 @@ TODO: actually cache git specs 
    -     # File lib/bundler/source.rb, line 596
-596:       def cache_path
-597:         @cache_path ||= begin
-598:           git_scope = "#{base_name}-#{uri_hash}"
-599: 
-600:           if Bundler.requires_sudo?
-601:             Bundler.user_bundle_path.join("cache/git", git_scope)
-602:           else
-603:             Bundler.cache.join("git", git_scope)
-604:           end
-605:         end
-606:       end
    + # File lib/bundler/source.rb, line 624 +624: def cache_path +625: @cache_path ||= begin +626: git_scope = "#{base_name}-#{uri_hash}" +627: +628: if Bundler.requires_sudo? +629: Bundler.user_bundle_path.join("cache/git", git_scope) +630: else +631: Bundler.cache.join("git", git_scope) +632: end +633: end +634: end
    @@ -1060,10 +1078,10 @@ TODO: actually cache git specs 
    -     # File lib/bundler/source.rb, line 661
-661:       def cached?
-662:         cache_path.exist?
-663:       end
    + # File lib/bundler/source.rb, line 690 +690: def cached? +691: cache_path.exist? +692: end
    @@ -1094,23 +1112,24 @@ TODO: actually cache git specs 
    -     # File lib/bundler/source.rb, line 622
-622:       def checkout
-623:         unless File.exist?(path.join(".git"))
-624:           FileUtils.mkdir_p(path.dirname)
-625:           FileUtils.rm_rf(path)
-626:           git %clone --no-checkout "#{cache_path}" "#{path}"|
-627:         end
-628:         Dir.chdir(path) do
-629:           git %fetch --force --quiet --tags "#{cache_path}"|
-630:           git "reset --hard #{revision}"
-631: 
-632:           if @submodules
-633:             git "submodule init"
-634:             git "submodule update"
-635:           end
-636:         end
-637:       end
    + # File lib/bundler/source.rb, line 650 +650: def checkout +651: unless File.exist?(path.join(".git")) +652: FileUtils.mkdir_p(path.dirname) +653: FileUtils.rm_rf(path) +654: git %clone --no-checkout "#{cache_path}" "#{path}"| +655: File.chmod((0777 & ~File.umask), path) +656: end +657: Dir.chdir(path) do +658: git %fetch --force --quiet --tags "#{cache_path}"| +659: git "reset --hard #{revision}" +660: +661: if @submodules +662: git "submodule init" +663: git "submodule update" +664: end +665: end +666: end
    @@ -1141,19 +1160,21 @@ TODO: actually cache git specs 
    -     # File lib/bundler/source.rb, line 557
-557:       def git(command)
-558:         if allow_git_ops?
-559:           out = %{git #{command}}
-560: 
-561:           if $? != 0
-562:             raise GitError, "An error has occurred in git when running `git #{command}`. Cannot complete bundling."
-563:           end
-564:           out
-565:         else
-566:           raise GitError, "Bundler is trying to run a `git #{command}` at runtime. You probably need to run `bundle install`. However, "                            "this error message could probably be more useful. Please submit a ticket at http://github.com/carlhuda/bundler/issues "                            "with steps to reproduce as well as the following\n\nCALLER: #{caller.join("\n")}"
-567:         end
-568:       end
    + # File lib/bundler/source.rb, line 570 +570: def git(command) +571: if allow_git_ops? +572: out = %{git #{command}} +573: +574: if $?.exitstatus != 0 +575: msg = "Git error: command `git #{command}` in directory #{Dir.pwd} has failed." +576: msg << "\nIf this error persists you could try removing the cache directory '#{cache_path}'" if cached? +577: raise GitError, msg +578: end +579: out +580: else +581: raise GitError, "Bundler is trying to run a `git #{command}` at runtime. You probably need to run `bundle install`. However, " "this error message could probably be more useful. Please submit a ticket at http://github.com/carlhuda/bundler/issues " "with steps to reproduce as well as the following\n\nCALLER: #{caller.join("\n")}" +582: end +583: end
    @@ -1184,14 +1205,14 @@ TODO: actually cache git specs 
    -     # File lib/bundler/source.rb, line 639
-639:       def has_revision_cached?
-640:         return unless @revision
-641:         in_cache { git %cat-file -e #{@revision}| }
-642:         true
-643:       rescue GitError
-644:         false
-645:       end
    + # File lib/bundler/source.rb, line 668 +668: def has_revision_cached? +669: return unless @revision +670: in_cache { git %cat-file -e #{@revision}| } +671: true +672: rescue GitError +673: false +674: end
    @@ -1222,11 +1243,11 @@ TODO: actually cache git specs 
    -     # File lib/bundler/source.rb, line 665
-665:       def in_cache(&blk)
-666:         cache unless cached?
-667:         Dir.chdir(cache_path, &blk)
-668:       end
    + # File lib/bundler/source.rb, line 694 +694: def in_cache(&blk) +695: cache unless cached? +696: Dir.chdir(cache_path, &blk) +697: end
    @@ -1257,16 +1278,16 @@ TODO: actually cache git specs 
    -     # File lib/bundler/source.rb, line 651
-651:       def revision
-652:         @revision ||= begin
-653:           if allow_git_ops?
-654:             in_cache { git("rev-parse #{ref}").strip }
-655:           else
-656:             raise GitError, "The git source #{uri} is not yet checked out. Please run `bundle install` before trying to start your application"
-657:           end
-658:         end
-659:       end
    + # File lib/bundler/source.rb, line 680 +680: def revision +681: @revision ||= begin +682: if allow_git_ops? +683: in_cache { git("rev-parse #{ref}").strip } +684: else +685: raise GitError, "The git source #{uri} is not yet checked out. Please run `bundle install` before trying to start your application" +686: end +687: end +688: end
    @@ -1297,10 +1318,10 @@ TODO: actually cache git specs 
    -     # File lib/bundler/source.rb, line 576
-576:       def shortref_for_display(ref)
-577:         ref[0..6]
-578:       end
    + # File lib/bundler/source.rb, line 591 +591: def shortref_for_display(ref) +592: ref[0..6] +593: end
    @@ -1331,10 +1352,54 @@ TODO: actually cache git specs 
    -     # File lib/bundler/source.rb, line 580
-580:       def shortref_for_path(ref)
-581:         ref[0..11]
-582:       end
    + # File lib/bundler/source.rb, line 595 +595: def shortref_for_path(ref) +596: ref[0..11] +597: end +
    + + + + + + + + + +
    + + +
    + + uri_escaped() + click to toggle source + +
    + +
    + +

    +Escape the URI for git commands +

    + + + +
    +
    +     # File lib/bundler/source.rb, line 612
+612:       def uri_escaped
+613:         if Bundler::WINDOWS
+614:           # Windows quoting requires double quotes only, with double quotes
+615:           # inside the string escaped by being doubled.
+616:           '"' + uri.gsub('"') {|s| '""'} + '"'
+617:         else
+618:           # Bash requires single quoted strings, with the single quotes escaped
+619:           # by ending the string, escaping the quote, and restarting the string.
+620:           "'" + uri.gsub("'") {|s| "'\\''"} + "'"
+621:         end
+622:       end
    @@ -1365,18 +1430,18 @@ TODO: actually cache git specs 
    -     # File lib/bundler/source.rb, line 584
-584:       def uri_hash
-585:         if uri =~ %{^\w+://(\w+@)?}
-586:           # Downcase the domain component of the URI
-587:           # and strip off a trailing slash, if one is present
-588:           input = URI.parse(uri).normalize.to_s.sub(%{/$},'')
-589:         else
-590:           # If there is no URI scheme, assume it is an ssh/git URI
-591:           input = uri
-592:         end
-593:         Digest::SHA1.hexdigest(input)
-594:       end
    + # File lib/bundler/source.rb, line 599 +599: def uri_hash +600: if uri =~ %{^\w+://(\w+@)?} +601: # Downcase the domain component of the URI +602: # and strip off a trailing slash, if one is present +603: input = URI.parse(uri).normalize.to_s.sub(%{/$},'') +604: else +605: # If there is no URI scheme, assume it is an ssh/git URI +606: input = uri +607: end +608: Digest::SHA1.hexdigest(input) +609: end
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Source/Path.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Source/Path.html similarity index 78% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Source/Path.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Source/Path.html index 1a110fcd..a82f3938 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Source/Path.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Source/Path.html @@ -129,6 +129,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -238,16 +242,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • @@ -451,10 +467,10 @@ Kind of a hack, but needed for the lock file parser 
    -     # File lib/bundler/source.rb, line 297
-297:       def self.from_lock(options)
-298:         new(options.merge("path" => options.delete("remote")))
-299:       end
    + # File lib/bundler/source.rb, line 309 +309: def self.from_lock(options) +310: new(options.merge("path" => options.delete("remote"))) +311: end
    @@ -485,22 +501,22 @@ Kind of a hack, but needed for the lock file parser 
    -     # File lib/bundler/source.rb, line 273
-273:       def initialize(options)
-274:         @options = options
-275:         @glob = options["glob"] || DEFAULT_GLOB
-276: 
-277:         @allow_cached = false
-278:         @allow_remote = false
-279: 
-280:         if options["path"]
-281:           @path = Pathname.new(options["path"])
-282:           @path = @path.expand_path(Bundler.root) unless @path.relative?
-283:         end
-284: 
-285:         @name = options["name"]
-286:         @version = options["version"]
-287:       end
    + # File lib/bundler/source.rb, line 285 +285: def initialize(options) +286: @options = options +287: @glob = options["glob"] || DEFAULT_GLOB +288: +289: @allow_cached = false +290: @allow_remote = false +291: +292: if options["path"] +293: @path = Pathname.new(options["path"]) +294: @path = @path.expand_path(Bundler.root) unless @path.relative? +295: end +296: +297: @name = options["name"] +298: @version = options["version"] +299: end
    @@ -566,12 +582,12 @@ Kind of a hack, but needed for the lock file parser 
    -     # File lib/bundler/source.rb, line 407
-407:       def cache(spec)
-408:         unless path.expand_path(Bundler.root).to_s.index(Bundler.root.to_s) == 0
-409:           Bundler.ui.warn "  * #{spec.name} at `#{path}` will not be cached."
-410:         end
-411:       end
    + # File lib/bundler/source.rb, line 420 +420: def cache(spec) +421: unless path.expand_path(Bundler.root).to_s.index(Bundler.root.to_s) == 0 +422: Bundler.ui.warn " * #{spec.name} at `#{path}` will not be cached." +423: end +424: end
    @@ -602,10 +618,10 @@ Kind of a hack, but needed for the lock file parser 
    -     # File lib/bundler/source.rb, line 293
-293:       def cached!
-294:         @allow_cached = true
-295:       end
    + # File lib/bundler/source.rb, line 305 +305: def cached! +306: @allow_cached = true +307: end
    @@ -636,13 +652,12 @@ Kind of a hack, but needed for the lock file parser 
    -     # File lib/bundler/source.rb, line 316
-316:       def eql?(o)
-317:         o.instance_of?(Path) &&
-318:         path.expand_path(Bundler.root) == o.path.expand_path(Bundler.root) &&
-319:         name == o.name &&
-320:         version == o.version
-321:       end
    + # File lib/bundler/source.rb, line 328 +328: def eql?(o) +329: o.instance_of?(Path) && +330: path.expand_path(Bundler.root) == o.path.expand_path(Bundler.root) && +331: version == o.version +332: end
    @@ -677,10 +692,10 @@ Kind of a hack, but needed for the lock file parser 
    -     # File lib/bundler/source.rb, line 312
-312:       def hash
-313:         self.class.hash
-314:       end
    + # File lib/bundler/source.rb, line 324 +324: def hash +325: self.class.hash +326: end
    @@ -711,16 +726,16 @@ Kind of a hack, but needed for the lock file parser 
    -     # File lib/bundler/source.rb, line 395
-395:       def install(spec)
-396:         Bundler.ui.info "Using #{spec.name} (#{spec.version}) from #{to_s} "
-397:         # Let's be honest, when we're working from a path, we can't
-398:         # really expect native extensions to work because the whole point
-399:         # is to just be able to modify what's in that path and go. So, let's
-400:         # not put ourselves through the pain of actually trying to generate
-401:         # the full gem.
-402:         Installer.new(spec).generate_bin
-403:       end
    + # File lib/bundler/source.rb, line 408 +408: def install(spec) +409: Bundler.ui.info "Using #{spec.name} (#{spec.version}) from #{to_s} " +410: # Let's be honest, when we're working from a path, we can't +411: # really expect native extensions to work because the whole point +412: # is to just be able to modify what's in that path and go. So, let's +413: # not put ourselves through the pain of actually trying to generate +414: # the full gem. +415: Installer.new(spec).generate_bin +416: end
    @@ -751,42 +766,44 @@ Kind of a hack, but needed for the lock file parser 
    -     # File lib/bundler/source.rb, line 329
-329:       def load_spec_files
-330:         index = Index.new
-331: 
-332:         expanded_path = path.expand_path(Bundler.root)
-333: 
-334:         if File.directory?(expanded_path)
-335:           Dir["#{expanded_path}/#{@glob}"].each do |file|
-336:             spec = Bundler.load_gemspec(file)
-337:             if spec
-338:               spec.loaded_from = file.to_s
-339:               spec.source = self
-340:               index << spec
-341:             end
-342:           end
-343: 
-344:           if index.empty? && @name && @version
-345:             index << Gem::Specification.new do |s|
-346:               s.name     = @name
-347:               s.source   = self
-348:               s.version  = Gem::Version.new(@version)
-349:               s.platform = Gem::Platform::RUBY
-350:               s.summary  = "Fake gemspec for #{@name}"
-351:               s.relative_loaded_from = "#{@name}.gemspec"
-352:               if expanded_path.join("bin").exist?
-353:                 binaries = expanded_path.join("bin").children.map{|c| c.basename.to_s }
-354:                 s.executables = binaries
-355:               end
-356:             end
-357:           end
-358:         else
-359:           raise PathError, "The path `#{expanded_path}` does not exist."
-360:         end
-361: 
-362:         index
-363:       end
    + # File lib/bundler/source.rb, line 340 +340: def load_spec_files +341: index = Index.new +342: +343: expanded_path = path.expand_path(Bundler.root) +344: +345: if File.directory?(expanded_path) +346: Dir["#{expanded_path}/#{@glob}"].each do |file| +347: spec = Bundler.load_gemspec(file) +348: if spec +349: spec.loaded_from = file.to_s +350: spec.source = self +351: index << spec +352: end +353: end +354: +355: if index.empty? && @name && @version +356: index << Gem::Specification.new do |s| +357: s.name = @name +358: s.source = self +359: s.version = Gem::Version.new(@version) +360: s.platform = Gem::Platform::RUBY +361: s.summary = "Fake gemspec for #{@name}" +362: s.relative_loaded_from = "#{@name}.gemspec" +363: s.authors = ["no one"] +364: if expanded_path.join("bin").exist? +365: binaries = expanded_path.join("bin").children +366: binaries.reject!{|p| File.directory?(p) } +367: s.executables = binaries.map{|c| c.basename.to_s } +368: end +369: end +370: end +371: else +372: raise PathError, "The path `#{expanded_path}` does not exist." +373: end +374: +375: index +376: end
    @@ -817,10 +834,10 @@ Kind of a hack, but needed for the lock file parser 
    -     # File lib/bundler/source.rb, line 365
-365:       def local_specs
-366:         @local_specs ||= load_spec_files
-367:       end
    + # File lib/bundler/source.rb, line 378 +378: def local_specs +379: @local_specs ||= load_spec_files +380: end
    @@ -855,10 +872,10 @@ Kind of a hack, but needed for the lock file parser 
    -     # File lib/bundler/source.rb, line 325
-325:       def name
-326:         File.basename(@path.to_s)
-327:       end
    + # File lib/bundler/source.rb, line 336 +336: def name +337: File.basename(path.expand_path(Bundler.root).to_s) +338: end
    @@ -889,10 +906,10 @@ Kind of a hack, but needed for the lock file parser 
    -     # File lib/bundler/source.rb, line 289
-289:       def remote!
-290:         @allow_remote = true
-291:       end
    + # File lib/bundler/source.rb, line 301 +301: def remote! +302: @allow_remote = true +303: end
    @@ -952,13 +969,13 @@ Kind of a hack, but needed for the lock file parser 
    -     # File lib/bundler/source.rb, line 301
-301:       def to_lock
-302:         out = "PATH\n"
-303:         out << "  remote: #{relative_path}\n"
-304:         out << "  glob: #{@glob}\n" unless @glob == DEFAULT_GLOB
-305:         out << "  specs:\n"
-306:       end
    + # File lib/bundler/source.rb, line 313 +313: def to_lock +314: out = "PATH\n" +315: out << " remote: #{relative_path}\n" +316: out << " glob: #{@glob}\n" unless @glob == DEFAULT_GLOB +317: out << " specs:\n" +318: end
    @@ -989,10 +1006,10 @@ Kind of a hack, but needed for the lock file parser 
    -     # File lib/bundler/source.rb, line 308
-308:       def to_s
-309:         "source at #{@path}"
-310:       end
    + # File lib/bundler/source.rb, line 320 +320: def to_s +321: "source at #{@path}" +322: end
    @@ -1029,37 +1046,37 @@ Kind of a hack, but needed for the lock file parser 
    -     # File lib/bundler/source.rb, line 423
-423:       def generate_bin(spec)
-424:         gem_dir  = Pathname.new(spec.full_gem_path)
-425: 
-426:         # Some gem authors put absolute paths in their gemspec
-427:         # and we have to save them from themselves
-428:         spec.files = spec.files.map do |p|
-429:           next if File.directory?(p)
-430:           begin
-431:             Pathname.new(p).relative_path_from(gem_dir).to_s
-432:           rescue ArgumentError
-433:             p
-434:           end
-435:         end.compact
-436: 
-437:         gem_file = Dir.chdir(gem_dir){ Gem::Builder.new(spec).build }
+     # File lib/bundler/source.rb, line 436
+436:       def generate_bin(spec)
+437:         gem_dir  = Pathname.new(spec.full_gem_path)
 438: 
-439:         installer = Installer.new(spec, :env_shebang => false)
-440:         installer.build_extensions
-441:         installer.generate_bin
-442:       rescue Gem::InvalidSpecificationException => e
-443:         Bundler.ui.warn "\n#{spec.name} at #{spec.full_gem_path} did not have a valid gemspec.\n"                          "This prevents bundler from installing bins or native extensions, but "                          "that may not affect its functionality."
-444: 
-445:         if !spec.extensions.empty? && !spec.email.empty?
-446:           Bundler.ui.warn "If you need to use this package without installing it from a gem "                            "repository, please contact #{spec.email} and ask them "                            "to modify their .gemspec so it can work with `gem build`."
-447:         end
-448: 
-449:         Bundler.ui.warn "The validation message from Rubygems was:\n  #{e.message}"
-450:       ensure
-451:         Dir.chdir(gem_dir){ FileUtils.rm_rf(gem_file) if gem_file && File.exist?(gem_file) }
-452:       end
    +439: # Some gem authors put absolute paths in their gemspec +440: # and we have to save them from themselves +441: spec.files = spec.files.map do |p| +442: next if File.directory?(p) +443: begin +444: Pathname.new(p).relative_path_from(gem_dir).to_s +445: rescue ArgumentError +446: p +447: end +448: end.compact +449: +450: gem_file = Dir.chdir(gem_dir){ Gem::Builder.new(spec).build } +451: +452: installer = Installer.new(spec, :env_shebang => false) +453: installer.build_extensions +454: installer.generate_bin +455: rescue Gem::InvalidSpecificationException => e +456: Bundler.ui.warn "\n#{spec.name} at #{spec.full_gem_path} did not have a valid gemspec.\n" "This prevents bundler from installing bins or native extensions, but " "that may not affect its functionality." +457: +458: if !spec.extensions.empty? && !spec.email.empty? +459: Bundler.ui.warn "If you need to use this package without installing it from a gem " "repository, please contact #{spec.email} and ask them " "to modify their .gemspec so it can work with `gem build`." +460: end +461: +462: Bundler.ui.warn "The validation message from Rubygems was:\n #{e.message}" +463: ensure +464: Dir.chdir(gem_dir){ FileUtils.rm_rf(gem_file) if gem_file && File.exist?(gem_file) } +465: end
    @@ -1090,14 +1107,14 @@ Kind of a hack, but needed for the lock file parser 
    -     # File lib/bundler/source.rb, line 415
-415:       def relative_path
-416:         if path.to_s.include?(Bundler.root.to_s)
-417:           return path.relative_path_from(Bundler.root)
-418:         end
-419: 
-420:         path
-421:       end
    + # File lib/bundler/source.rb, line 428 +428: def relative_path +429: if path.to_s.include?(Bundler.root.to_s) +430: return path.relative_path_from(Bundler.root) +431: end +432: +433: path +434: end
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Source/Path/Installer.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Source/Path/Installer.html similarity index 83% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Source/Path/Installer.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Source/Path/Installer.html index cc6763f4..fd60d21f 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Source/Path/Installer.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Source/Path/Installer.html @@ -90,6 +90,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -199,16 +203,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • @@ -328,15 +344,15 @@ 
    -     # File lib/bundler/source.rb, line 370
-370:         def initialize(spec, options = {})
-371:           @spec              = spec
-372:           @bin_dir           = Bundler.requires_sudo? ? "#{Bundler.tmp}/bin" : "#{Gem.dir}/bin"
-373:           @gem_dir           = spec.full_gem_path
-374:           @wrappers          = options[:wrappers] || true
-375:           @env_shebang       = options[:env_shebang] || true
-376:           @format_executable = options[:format_executable] || false
-377:         end
    + # File lib/bundler/source.rb, line 383 +383: def initialize(spec, options = {}) +384: @spec = spec +385: @bin_dir = Bundler.requires_sudo? ? "#{Bundler.tmp}/bin" : "#{Bundler.rubygems.gem_dir}/bin" +386: @gem_dir = Bundler.rubygems.path(spec.full_gem_path) +387: @wrappers = options[:wrappers] || true +388: @env_shebang = options[:env_shebang] || true +389: @format_executable = options[:format_executable] || false +390: end
    @@ -373,21 +389,21 @@ 
    -     # File lib/bundler/source.rb, line 379
-379:         def generate_bin
-380:           return if spec.executables.nil? || spec.executables.empty?
-381: 
-382:           if Bundler.requires_sudo?
-383:             FileUtils.mkdir_p("#{Bundler.tmp}/bin") unless File.exist?("#{Bundler.tmp}/bin")
-384:           end
-385:           super
-386:           if Bundler.requires_sudo?
-387:             Bundler.mkdir_p "#{Gem.dir}/bin"
-388:             spec.executables.each do |exe|
-389:               Bundler.sudo "cp -R #{Bundler.tmp}/bin/#{exe} #{Gem.dir}/bin/"
-390:             end
-391:           end
-392:         end
    + # File lib/bundler/source.rb, line 392 +392: def generate_bin +393: return if spec.executables.nil? || spec.executables.empty? +394: +395: if Bundler.requires_sudo? +396: FileUtils.mkdir_p("#{Bundler.tmp}/bin") unless File.exist?("#{Bundler.tmp}/bin") +397: end +398: super +399: if Bundler.requires_sudo? +400: Bundler.mkdir_p "#{Bundler.rubygems.gem_dir}/bin" +401: spec.executables.each do |exe| +402: Bundler.sudo "cp -R #{Bundler.tmp}/bin/#{exe} #{Bundler.rubygems.gem_dir}/bin/" +403: end +404: end +405: end
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Source/Rubygems.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Source/Rubygems.html similarity index 69% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Source/Rubygems.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Source/Rubygems.html index 2f148092..565167b7 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/Source/Rubygems.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/Source/Rubygems.html @@ -138,6 +138,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -247,16 +251,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • @@ -400,12 +416,12 @@ TODO: Refactor this class 
    -    # File lib/bundler/source.rb, line 46
-46:       def self.from_lock(options)
-47:         s = new(options)
-48:         Array(options["remote"]).each { |r| s.add_remote(r) }
-49:         s
-50:       end
    + # File lib/bundler/source.rb, line 51 +51: def self.from_lock(options) +52: s = new(options) +53: Array(options["remote"]).each { |r| s.add_remote(r) } +54: s +55: end
    @@ -436,16 +452,20 @@ TODO: Refactor this class 
    -    # File lib/bundler/source.rb, line 14
-14:       def initialize(options = {})
-15:         @options = options
-16:         @remotes = (options["remotes"] || []).map { |r| normalize_uri(r) }
-17:         @allow_remote = false
-18:         @allow_cached = false
-19:         # Hardcode the paths for now
-20:         @caches = [ Bundler.app_cache ] + Gem.path.map { |p| File.expand_path("#{p}/cache") }
-21:         @spec_fetch_map = {}
-22:       end
    + # File lib/bundler/source.rb, line 15 +15: def initialize(options = {}) +16: @options = options +17: @remotes = (options["remotes"] || []).map { |r| normalize_uri(r) } +18: @allow_remote = false +19: @allow_cached = false +20: +21: # Hardcode the paths for now +22: @caches = [ Bundler.app_cache ] + Bundler.rubygems.gem_path.map do |x| +23: File.expand_path("#{x}/cache") +24: end +25: +26: @spec_fetch_map = {} +27: end
    @@ -511,10 +531,10 @@ TODO: Refactor this class 
    -     # File lib/bundler/source.rb, line 123
-123:       def add_remote(source)
-124:         @remotes << normalize_uri(source)
-125:       end
    + # File lib/bundler/source.rb, line 130 +130: def add_remote(source) +131: @remotes << normalize_uri(source) +132: end
    @@ -545,14 +565,14 @@ TODO: Refactor this class 
    -     # File lib/bundler/source.rb, line 115
-115:       def cache(spec)
-116:         cached_path = cached_gem(spec)
-117:         raise GemNotFound, "Missing gem file '#{spec.full_name}.gem'." unless cached_path
-118:         return if File.dirname(cached_path) == Bundler.app_cache.to_s
-119:         Bundler.ui.info "  * #{File.basename(cached_path)}"
-120:         FileUtils.cp(cached_path, Bundler.app_cache)
-121:       end
    + # File lib/bundler/source.rb, line 122 +122: def cache(spec) +123: cached_path = cached_gem(spec) +124: raise GemNotFound, "Missing gem file '#{spec.full_name}.gem'." unless cached_path +125: return if File.dirname(cached_path) == Bundler.app_cache.to_s +126: Bundler.ui.info " * #{File.basename(cached_path)}" +127: FileUtils.cp(cached_path, Bundler.app_cache) +128: end
    @@ -583,10 +603,10 @@ TODO: Refactor this class 
    -    # File lib/bundler/source.rb, line 28
-28:       def cached!
-29:         @allow_cached = true
-30:       end
    + # File lib/bundler/source.rb, line 33 +33: def cached! +34: @allow_cached = true +35: end
    @@ -617,10 +637,10 @@ TODO: Refactor this class 
    -    # File lib/bundler/source.rb, line 36
-36:       def eql?(o)
-37:         Rubygems === o
-38:       end
    + # File lib/bundler/source.rb, line 41 +41: def eql?(o) +42: Rubygems === o +43: end
    @@ -655,15 +675,15 @@ TODO: Refactor this class 
    -    # File lib/bundler/source.rb, line 68
-68:       def fetch(spec)
-69:         spec, uri = @spec_fetch_map[spec.full_name]
-70:         if spec
-71:           path = download_gem_from_uri(spec, uri)
-72:           s = Gem::Format.from_file_by_path(path).spec
-73:           spec.__swap__(s)
-74:         end
-75:       end
    + # File lib/bundler/source.rb, line 73 +73: def fetch(spec) +74: spec, uri = @spec_fetch_map[spec.full_name] +75: if spec +76: path = download_gem_from_uri(spec, uri) +77: s = Bundler.rubygems.spec_from_gem(path) +78: spec.__swap__(s) +79: end +80: end
    @@ -694,10 +714,10 @@ TODO: Refactor this class 
    -    # File lib/bundler/source.rb, line 32
-32:       def hash
-33:         Rubygems.hash
-34:       end
    + # File lib/bundler/source.rb, line 37 +37: def hash +38: Rubygems.hash +39: end
    @@ -728,40 +748,42 @@ TODO: Refactor this class 
    -     # File lib/bundler/source.rb, line 77
- 77:       def install(spec)
- 78:         path = cached_gem(spec)
- 79: 
- 80:         if installed_specs[spec].any?
- 81:           Bundler.ui.info "Using #{spec.name} (#{spec.version}) "
- 82:           return
- 83:         end
- 84: 
- 85:         Bundler.ui.info "Installing #{spec.name} (#{spec.version}) "
- 86: 
- 87:         install_path = Bundler.requires_sudo? ? Bundler.tmp : Gem.dir
- 88:         options = { :install_dir         => install_path,
- 89:                     :ignore_dependencies => true,
- 90:                     :wrappers            => true,
- 91:                     :env_shebang         => true }
- 92:         options.merge!(:bin_dir => "#{install_path}/bin") unless spec.executables.nil? || spec.executables.empty?
- 93: 
- 94:         installer = Gem::Installer.new path, options
- 95:         installer.install
- 96: 
- 97:         # SUDO HAX
- 98:         if Bundler.requires_sudo?
- 99:           sudo "mkdir -p #{Gem.dir}/gems #{Gem.dir}/specifications"
-100:           sudo "cp -R #{Bundler.tmp}/gems/#{spec.full_name} #{Gem.dir}/gems/"
-101:           sudo "cp -R #{Bundler.tmp}/specifications/#{spec.full_name}.gemspec #{Gem.dir}/specifications/"
-102:           spec.executables.each do |exe|
-103:             sudo "mkdir -p #{Gem.bindir}"
-104:             sudo "cp -R #{Bundler.tmp}/bin/#{exe} #{Gem.bindir}"
-105:           end
-106:         end
-107: 
-108:         spec.loaded_from = "#{Gem.dir}/specifications/#{spec.full_name}.gemspec"
-109:       end
    + # File lib/bundler/source.rb, line 82 + 82: def install(spec) + 83: if installed_specs[spec].any? + 84: Bundler.ui.info "Using #{spec.name} (#{spec.version}) " + 85: return + 86: end + 87: + 88: Bundler.ui.info "Installing #{spec.name} (#{spec.version}) " + 89: path = cached_gem(spec) + 90: + 91: Bundler.rubygems.preserve_paths do + 92: + 93: install_path = Bundler.requires_sudo? ? Bundler.tmp : Bundler.rubygems.gem_dir + 94: options = { :install_dir => install_path, + 95: :ignore_dependencies => true, + 96: :wrappers => true, + 97: :env_shebang => true } + 98: options.merge!(:bin_dir => "#{install_path}/bin") unless spec.executables.nil? || spec.executables.empty? + 99: +100: installer = Gem::Installer.new path, options +101: installer.install +102: end +103: +104: # SUDO HAX +105: if Bundler.requires_sudo? +106: sudo "mkdir -p #{Bundler.rubygems.gem_dir}/gems #{Bundler.rubygems.gem_dir}/specifications" +107: sudo "cp -R #{Bundler.tmp}/gems/#{spec.full_name} #{Bundler.rubygems.gem_dir}/gems/" +108: sudo "cp -R #{Bundler.tmp}/specifications/#{spec.full_name}.gemspec #{Bundler.rubygems.gem_dir}/specifications/" +109: spec.executables.each do |exe| +110: sudo "mkdir -p #{Bundler.rubygems.gem_bindir}" +111: sudo "cp -R #{Bundler.tmp}/bin/#{exe} #{Bundler.rubygems.gem_bindir}" +112: end +113: end +114: +115: spec.loaded_from = "#{Bundler.rubygems.gem_dir}/specifications/#{spec.full_name}.gemspec" +116: end
    @@ -792,13 +814,13 @@ TODO: Refactor this class 
    -     # File lib/bundler/source.rb, line 127
-127:       def merge_remotes(source)
-128:         @remotes = []
-129:         source.remotes.each do |r|
-130:           add_remote r.to_s
-131:         end
-132:       end
    + # File lib/bundler/source.rb, line 134 +134: def merge_remotes(source) +135: @remotes = [] +136: source.remotes.each do |r| +137: add_remote r.to_s +138: end +139: end
    @@ -858,10 +880,10 @@ TODO: Refactor this class 
    -    # File lib/bundler/source.rb, line 42
-42:       def options
-43:         { "remotes" => @remotes.map { |r| r.to_s } }
-44:       end
    + # File lib/bundler/source.rb, line 47 +47: def options +48: { "remotes" => @remotes.map { |r| r.to_s } } +49: end
    @@ -892,10 +914,10 @@ TODO: Refactor this class 
    -    # File lib/bundler/source.rb, line 24
-24:       def remote!
-25:         @allow_remote = true
-26:       end
    + # File lib/bundler/source.rb, line 29 +29: def remote! +30: @allow_remote = true +31: end
    @@ -926,10 +948,10 @@ TODO: Refactor this class 
    -    # File lib/bundler/source.rb, line 64
-64:       def specs
-65:         @specs ||= fetch_specs
-66:       end
    + # File lib/bundler/source.rb, line 69 +69: def specs +70: @specs ||= fetch_specs +71: end
    @@ -960,10 +982,10 @@ TODO: Refactor this class 
    -     # File lib/bundler/source.rb, line 111
-111:       def sudo(str)
-112:         Bundler.sudo(str)
-113:       end
    + # File lib/bundler/source.rb, line 118 +118: def sudo(str) +119: Bundler.sudo(str) +120: end
    @@ -994,12 +1016,12 @@ TODO: Refactor this class 
    -    # File lib/bundler/source.rb, line 52
-52:       def to_lock
-53:         out = "GEM\n"
-54:         out << remotes.map {|r| "  remote: #{r}\n" }.join
-55:         out << "  specs:\n"
-56:       end
    + # File lib/bundler/source.rb, line 57 +57: def to_lock +58: out = "GEM\n" +59: out << remotes.map {|r| " remote: #{r}\n" }.join +60: out << " specs:\n" +61: end
    @@ -1030,11 +1052,11 @@ TODO: Refactor this class 
    -    # File lib/bundler/source.rb, line 58
-58:       def to_s
-59:         remote_names = self.remotes.map { |r| r.to_s }.join(', ')
-60:         "rubygems repository #{remote_names}"
-61:       end
    + # File lib/bundler/source.rb, line 63 +63: def to_s +64: remote_names = self.remotes.map { |r| r.to_s }.join(', ') +65: "rubygems repository #{remote_names}" +66: end
    @@ -1075,11 +1097,15 @@ TODO: Refactor this class 
    -     # File lib/bundler/source.rb, line 136
-136:       def cached_gem(spec)
-137:         possibilities = @caches.map { |p| "#{p}/#{spec.full_name}.gem" }
-138:         possibilities.find { |p| File.exist?(p) }
-139:       end
    + # File lib/bundler/source.rb, line 143 +143: def cached_gem(spec) +144: possibilities = @caches.map { |p| "#{p}/#{spec.file_name}" } +145: cached_gem = possibilities.find { |p| File.exist?(p) } +146: unless cached_gem +147: raise Bundler::GemNotFound, "Could not find #{spec.file_name} for installation" +148: end +149: cached_gem +150: end
    @@ -1110,28 +1136,28 @@ TODO: Refactor this class 
    -     # File lib/bundler/source.rb, line 186
-186:       def cached_specs
-187:         @cached_specs ||= begin
-188:           idx = installed_specs.dup
-189: 
-190:           path = Bundler.app_cache
-191:           Dir["#{path}/*.gem"].each do |gemfile|
-192:             next if gemfile =~ /bundler\-[\d\.]+?\.gem/
-193: 
-194:             begin
-195:               s ||= Gem::Format.from_file_by_path(gemfile).spec
-196:             rescue Gem::Package::FormatError
-197:               raise GemspecError, "Could not read gem at #{gemfile}. It may be corrupted."
-198:             end
-199: 
-200:             s.source = self
-201:             idx << s
-202:           end
-203:         end
-204: 
-205:         idx
-206:       end
    + # File lib/bundler/source.rb, line 198 +198: def cached_specs +199: @cached_specs ||= begin +200: idx = installed_specs.dup +201: +202: path = Bundler.app_cache +203: Dir["#{path}/*.gem"].each do |gemfile| +204: next if gemfile =~ /^bundler\-[\d\.]+?\.gem/ +205: +206: begin +207: s ||= Bundler.rubygems.spec_from_gem(gemfile) +208: rescue Gem::Package::FormatError +209: raise GemspecError, "Could not read gem at #{gemfile}. It may be corrupted." +210: end +211: +212: s.source = self +213: idx << s +214: end +215: end +216: +217: idx +218: end
    @@ -1162,23 +1188,23 @@ TODO: Refactor this class 
    -     # File lib/bundler/source.rb, line 247
-247:       def download_gem_from_uri(spec, uri)
-248:         spec.fetch_platform
-249: 
-250:         download_path = Bundler.requires_sudo? ? Bundler.tmp : Gem.dir
-251:         gem_path = "#{Gem.dir}/cache/#{spec.full_name}.gem"
-252: 
-253:         FileUtils.mkdir_p("#{download_path}/cache")
-254:         Gem::RemoteFetcher.fetcher.download(spec, uri, download_path)
-255: 
-256:         if Bundler.requires_sudo?
-257:           sudo "mkdir -p #{Gem.dir}/cache"
-258:           sudo "mv #{Bundler.tmp}/cache/#{spec.full_name}.gem #{gem_path}"
-259:         end
-260: 
-261:         gem_path
-262:       end
    + # File lib/bundler/source.rb, line 259 +259: def download_gem_from_uri(spec, uri) +260: spec.fetch_platform +261: +262: download_path = Bundler.requires_sudo? ? Bundler.tmp : Bundler.rubygems.gem_dir +263: gem_path = "#{Bundler.rubygems.gem_dir}/cache/#{spec.full_name}.gem" +264: +265: FileUtils.mkdir_p("#{download_path}/cache") +266: Bundler.rubygems.download_gem(spec, uri, download_path) +267: +268: if Bundler.requires_sudo? +269: sudo "mkdir -p #{Bundler.rubygems.gem_dir}/cache" +270: sudo "mv #{Bundler.tmp}/cache/#{spec.full_name}.gem #{gem_path}" +271: end +272: +273: gem_path +274: end
    @@ -1209,21 +1235,21 @@ TODO: Refactor this class 
    -     # File lib/bundler/source.rb, line 232
-232:       def fetch_all_remote_specs(&blk)
-233:         begin
-234:           # Fetch all specs, minus prerelease specs
-235:           Gem::SpecFetcher.new.list(true, false).each(&blk)
-236:           # Then fetch the prerelease specs
-237:           begin
-238:             Gem::SpecFetcher.new.list(false, true).each(&blk)
-239:           rescue Gem::RemoteFetcher::FetchError
-240:             Bundler.ui.warn "Could not fetch prerelease specs from #{self}"
-241:           end
-242:         rescue Gem::RemoteFetcher::FetchError
-243:           Bundler.ui.warn "Could not reach #{self}"
-244:         end
-245:       end
    + # File lib/bundler/source.rb, line 244 +244: def fetch_all_remote_specs(&blk) +245: begin +246: # Fetch all specs, minus prerelease specs +247: Gem::SpecFetcher.new.list(true, false).each(&blk) +248: # Then fetch the prerelease specs +249: begin +250: Gem::SpecFetcher.new.list(false, true).each(&blk) +251: rescue Gem::RemoteFetcher::FetchError +252: Bundler.ui.warn "Could not fetch prerelease specs from #{self}" +253: end +254: rescue Gem::RemoteFetcher::FetchError +255: Bundler.ui.warn "Could not reach #{self}" +256: end +257: end
    @@ -1254,14 +1280,14 @@ TODO: Refactor this class 
    -     # File lib/bundler/source.rb, line 149
-149:       def fetch_specs
-150:         Index.build do |idx|
-151:           idx.use installed_specs
-152:           idx.use cached_specs if @allow_cached || @allow_remote
-153:           idx.use remote_specs if @allow_remote
-154:         end
-155:       end
    + # File lib/bundler/source.rb, line 160 +160: def fetch_specs +161: Index.build do |idx| +162: idx.use installed_specs +163: idx.use cached_specs if @allow_cached || @allow_remote +164: idx.use remote_specs if @allow_remote +165: end +166: end
    @@ -1292,35 +1318,36 @@ TODO: Refactor this class 
    -     # File lib/bundler/source.rb, line 157
-157:       def installed_specs
-158:         @installed_specs ||= begin
-159:           idx = Index.new
-160:           have_bundler = false
-161:           Gem.source_index.to_a.reverse.each do |dont_use_this_var, spec|
-162:             next if spec.name == 'bundler' && spec.version.to_s != VERSION
-163:             have_bundler = true if spec.name == 'bundler'
-164:             spec.source = self
-165:             idx << spec
-166:           end
-167: 
-168:           # Always have bundler locally
-169:           unless have_bundler
-170:            # We're running bundler directly from the source
-171:            # so, let's create a fake gemspec for it (it's a path)
-172:            # gemspec
-173:            bundler = Gem::Specification.new do |s|
-174:              s.name     = 'bundler'
-175:              s.version  = VERSION
-176:              s.platform = Gem::Platform::RUBY
-177:              s.source   = self
-178:              s.loaded_from = File.expand_path("..", __FILE__)
-179:            end
-180:            idx << bundler
-181:           end
-182:           idx
-183:         end
-184:       end
    + # File lib/bundler/source.rb, line 168 +168: def installed_specs +169: @installed_specs ||= begin +170: idx = Index.new +171: have_bundler = false +172: Bundler.rubygems.all_specs.reverse.each do |spec| +173: next if spec.name == 'bundler' && spec.version.to_s != VERSION +174: have_bundler = true if spec.name == 'bundler' +175: spec.source = self +176: idx << spec +177: end +178: +179: # Always have bundler locally +180: unless have_bundler +181: # We're running bundler directly from the source +182: # so, let's create a fake gemspec for it (it's a path) +183: # gemspec +184: bundler = Gem::Specification.new do |s| +185: s.name = 'bundler' +186: s.version = VERSION +187: s.platform = Gem::Platform::RUBY +188: s.source = self +189: s.authors = ["bundler team"] +190: s.loaded_from = File.expand_path("..", __FILE__) +191: end +192: idx << bundler +193: end +194: idx +195: end +196: end
    @@ -1351,14 +1378,14 @@ TODO: Refactor this class 
    -     # File lib/bundler/source.rb, line 141
-141:       def normalize_uri(uri)
-142:         uri = uri.to_s
-143:         uri = "#{uri}/" unless uri =~ %/$'
-144:         uri = URI(uri)
-145:         raise ArgumentError, "The source must be an absolute URI" unless uri.absolute?
-146:         uri
-147:       end
    + # File lib/bundler/source.rb, line 152 +152: def normalize_uri(uri) +153: uri = uri.to_s +154: uri = "#{uri}/" unless uri =~ %/$' +155: uri = URI(uri) +156: raise ArgumentError, "The source must be an absolute URI" unless uri.absolute? +157: uri +158: end
    @@ -1389,30 +1416,30 @@ TODO: Refactor this class 
    -     # File lib/bundler/source.rb, line 208
-208:       def remote_specs
-209:         @remote_specs ||= begin
-210:           idx     = Index.new
-211:           old     = Gem.sources
-212: 
-213:           remotes.each do |uri|
-214:             Bundler.ui.info "Fetching source index for #{uri}"
-215:             Gem.sources = ["#{uri}"]
-216:             fetch_all_remote_specs do |n,v|
-217:               v.each do |name, version, platform|
-218:                 next if name == 'bundler'
-219:                 spec = RemoteSpecification.new(name, version, platform, uri)
-220:                 spec.source = self
-221:                 @spec_fetch_map[spec.full_name] = [spec, uri]
-222:                 idx << spec
-223:               end
-224:             end
-225:           end
-226:           idx
-227:         ensure
-228:           Gem.sources = old
-229:         end
-230:       end
    + # File lib/bundler/source.rb, line 220 +220: def remote_specs +221: @remote_specs ||= begin +222: idx = Index.new +223: old = Bundler.rubygems.sources +224: +225: remotes.each do |uri| +226: Bundler.ui.info "Fetching source index for #{uri}" +227: Gem.sources = ["#{uri}"] +228: fetch_all_remote_specs do |n,v| +229: v.each do |name, version, platform| +230: next if name == 'bundler' +231: spec = RemoteSpecification.new(name, version, platform, uri) +232: spec.source = self +233: @spec_fetch_map[spec.full_name] = [spec, uri] +234: idx << spec +235: end +236: end +237: end +238: idx +239: ensure +240: Bundler.rubygems.sources = old +241: end +242: end
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/SpecSet.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/SpecSet.html similarity index 97% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/SpecSet.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/SpecSet.html index 063c6519..1f00de65 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/SpecSet.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/SpecSet.html @@ -131,6 +131,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -240,16 +244,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/UI.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/UI.html similarity index 88% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/UI.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/UI.html index 79604162..f73b3f30 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/UI.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/UI.html @@ -107,6 +107,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -216,16 +220,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • @@ -345,9 +361,9 @@ 
    -    # File lib/bundler/ui.rb, line 15
-15:     def confirm(message)
-16:     end
    + # File lib/bundler/ui.rb, line 17 +17: def confirm(message) +18: end
    @@ -378,9 +394,9 @@ 
    -   # File lib/bundler/ui.rb, line 6
-6:     def debug(message)
-7:     end
    + # File lib/bundler/ui.rb, line 8 +8: def debug(message) +9: end
    @@ -411,9 +427,9 @@ 
    -    # File lib/bundler/ui.rb, line 9
- 9:     def error(message)
-10:     end
    + # File lib/bundler/ui.rb, line 11 +11: def error(message) +12: end
    @@ -444,9 +460,9 @@ 
    -    # File lib/bundler/ui.rb, line 12
-12:     def info(message)
-13:     end
    + # File lib/bundler/ui.rb, line 14 +14: def info(message) +15: end
    @@ -477,9 +493,9 @@ 
    -   # File lib/bundler/ui.rb, line 3
-3:     def warn(message)
-4:     end
    + # File lib/bundler/ui.rb, line 5 +5: def warn(message) +6: end
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/UI/RGProxy.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/UI/RGProxy.html similarity index 86% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/UI/RGProxy.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/UI/RGProxy.html index 0d110ad1..f6d4ea30 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/UI/RGProxy.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/UI/RGProxy.html @@ -55,7 +55,7 @@

    Parent

    -

    Gem::SilentUI

    +

    ::Gem::SilentUI

    @@ -90,6 +90,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -199,16 +203,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • @@ -328,10 +344,11 @@ 
    -    # File lib/bundler/ui.rb, line 57
-57:       def initialize(ui)
-58:         @ui = ui
-59:       end
    + # File lib/bundler/ui.rb, line 59 +59: def initialize(ui) +60: @ui = ui +61: super() +62: end
    @@ -368,14 +385,14 @@ 
    -    # File lib/bundler/ui.rb, line 61
-61:       def say(message)
-62:         if message =~ /native extensions/
-63:           @ui.info "with native extensions "
-64:         else
-65:           @ui.debug(message)
-66:         end
-67:       end
    + # File lib/bundler/ui.rb, line 64 +64: def say(message) +65: if message =~ /native extensions/ +66: @ui.info "with native extensions " +67: else +68: @ui.debug(message) +69: end +70: end
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/UI/Shell.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/UI/Shell.html similarity index 86% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/UI/Shell.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/UI/Shell.html index f95be95b..9fa334b9 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/UI/Shell.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/UI/Shell.html @@ -102,6 +102,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -211,16 +215,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • @@ -363,12 +379,12 @@ 
    -    # File lib/bundler/ui.rb, line 21
-21:       def initialize(shell)
-22:         @shell = shell
-23:         @quiet = false
-24:         @debug = ENV['DEBUG']
-25:       end
    + # File lib/bundler/ui.rb, line 23 +23: def initialize(shell) +24: @shell = shell +25: @quiet = false +26: @debug = ENV['DEBUG'] +27: end
    @@ -405,10 +421,10 @@ 
    -    # File lib/bundler/ui.rb, line 47
-47:       def be_quiet!
-48:         @quiet = true
-49:       end
    + # File lib/bundler/ui.rb, line 49 +49: def be_quiet! +50: @quiet = true +51: end
    @@ -439,10 +455,10 @@ 
    -    # File lib/bundler/ui.rb, line 35
-35:       def confirm(msg)
-36:         @shell.say(msg, :green) if !@quiet
-37:       end
    + # File lib/bundler/ui.rb, line 37 +37: def confirm(msg) +38: @shell.say(msg, :green) if !@quiet +39: end
    @@ -473,10 +489,10 @@ 
    -    # File lib/bundler/ui.rb, line 27
-27:       def debug(msg)
-28:         @shell.say(msg) if @debug && !@quiet
-29:       end
    + # File lib/bundler/ui.rb, line 29 +29: def debug(msg) +30: @shell.say(msg) if @debug && !@quiet +31: end
    @@ -507,10 +523,10 @@ 
    -    # File lib/bundler/ui.rb, line 51
-51:       def debug!
-52:         @debug = true
-53:       end
    + # File lib/bundler/ui.rb, line 53 +53: def debug! +54: @debug = true +55: end
    @@ -541,10 +557,10 @@ 
    -    # File lib/bundler/ui.rb, line 43
-43:       def error(msg)
-44:         @shell.say(msg, :red)
-45:       end
    + # File lib/bundler/ui.rb, line 45 +45: def error(msg) +46: @shell.say(msg, :red) +47: end
    @@ -575,10 +591,10 @@ 
    -    # File lib/bundler/ui.rb, line 31
-31:       def info(msg)
-32:         @shell.say(msg) if !@quiet
-33:       end
    + # File lib/bundler/ui.rb, line 33 +33: def info(msg) +34: @shell.say(msg) if !@quiet +35: end
    @@ -609,10 +625,10 @@ 
    -    # File lib/bundler/ui.rb, line 39
-39:       def warn(msg)
-40:         @shell.say(msg, :yellow)
-41:       end
    + # File lib/bundler/ui.rb, line 41 +41: def warn(msg) +42: @shell.say(msg, :yellow) +43: end
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/VersionConflict.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/VersionConflict.html similarity index 89% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/VersionConflict.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/VersionConflict.html index 4631a772..62c73a92 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/VersionConflict.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Bundler/VersionConflict.html @@ -88,6 +88,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -197,16 +201,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • @@ -350,11 +366,11 @@ Internal errors, should be rescued 
    -    # File lib/bundler.rb, line 57
-57:     def initialize(conflicts, msg = nil)
-58:       super(msg)
-59:       @conflicts = conflicts
-60:     end
    + # File lib/bundler.rb, line 64 +64: def initialize(conflicts, msg = nil) +65: super(msg) +66: @conflicts = conflicts +67: end
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/File.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/File.html similarity index 90% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/File.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/File.html index a17908a8..b07ea696 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/File.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/File.html @@ -79,6 +79,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -188,16 +192,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Gem.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Gem.html similarity index 90% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Gem.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Gem.html index a49a73a0..d3ee4aae 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Gem.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Gem.html @@ -93,6 +93,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -202,16 +206,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Gem/Dependency.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Gem/Dependency.html similarity index 79% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Gem/Dependency.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Gem/Dependency.html index ee148122..e04d8d25 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Gem/Dependency.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/Gem/Dependency.html @@ -75,6 +75,8 @@

    Methods

    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/source_rb.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/source_rb.html similarity index 88% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/source_rb.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/source_rb.html index c1c1ec5b..8712dbb0 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/source_rb.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/source_rb.html @@ -6,7 +6,7 @@ - File: source.rb [bundler-1.0.7 Documentation] + File: source.rb [bundler-1.0.15 Documentation] @@ -24,7 +24,7 @@
    Last Modified
    -
    Mon Dec 06 17:30:55 -0600 2010
    +
    Tue Jun 14 09:52:48 -0500 2011
    Requires
    @@ -33,6 +33,8 @@
  • uri
    • +
  • rubygems/user_interaction
    • +
  • rubygems/installer
  • rubygems/spec_fetcher
    • diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/spec_set_rb.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/spec_set_rb.html similarity index 89% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/spec_set_rb.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/spec_set_rb.html index 7e9f61a5..9053f7a0 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/spec_set_rb.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/spec_set_rb.html @@ -6,7 +6,7 @@ - File: spec_set.rb [bundler-1.0.7 Documentation] + File: spec_set.rb [bundler-1.0.15 Documentation] @@ -24,7 +24,7 @@
    Last Modified
    -
    Mon Dec 06 17:30:55 -0600 2010
    +
    Tue Jun 14 09:52:48 -0500 2011
    Requires
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/templates/Gemfile.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/templates/Gemfile.html similarity index 88% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/templates/Gemfile.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/templates/Gemfile.html index dc5366c8..c696b482 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/templates/Gemfile.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/templates/Gemfile.html @@ -6,7 +6,7 @@ - File: Gemfile [bundler-1.0.7 Documentation] + File: Gemfile [bundler-1.0.15 Documentation] @@ -41,6 +41,10 @@
  • bundle
    • +
  • bundle-benchmark
    • + +
  • bundle-benchmark.txt
    • +
  • bundle-config
  • bundle-config.txt
    • @@ -150,16 +154,28 @@
  • Bundler::Resolver::SpecGroup
    • +
  • Bundler::RubygemsIntegration
    • + +
  • Bundler::RubygemsIntegration::AlmostModern
    • + +
  • Bundler::RubygemsIntegration::Deprecate
    • + +
  • Bundler::RubygemsIntegration::Gem
    • + +
  • Bundler::RubygemsIntegration::Gem::SourceIndex
    • + +
  • Bundler::RubygemsIntegration::Legacy
    • + +
  • Bundler::RubygemsIntegration::Modern
    • + +
  • Bundler::RubygemsIntegration::Transitional
    • +
  • Bundler::Runtime
  • Bundler::Settings
  • Bundler::SharedHelpers
    • -
  • Bundler::SharedHelpers::Gem
    • - -
  • Bundler::SharedHelpers::Gem::SourceIndex
    • -
  • Bundler::Source
  • Bundler::Source::Git
    • diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/ui_rb.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/ui_rb.html similarity index 86% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/ui_rb.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/ui_rb.html index 19e6d628..4b3a994b 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/ui_rb.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/ui_rb.html @@ -6,7 +6,7 @@ - File: ui.rb [bundler-1.0.7 Documentation] + File: ui.rb [bundler-1.0.15 Documentation] @@ -24,13 +24,15 @@
    Last Modified
    -
    Mon Dec 06 17:30:55 -0600 2010
    +
    Tue Jun 14 09:52:48 -0500 2011
    Requires
      +
    • rubygems/user_interaction
      • +
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/actions/create_file_rb.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/actions/create_file_rb.html similarity index 90% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/actions/create_file_rb.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/actions/create_file_rb.html index e466b090..4c87eaf6 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/actions/create_file_rb.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/actions/create_file_rb.html @@ -6,7 +6,7 @@ - File: create_file.rb [bundler-1.0.7 Documentation] + File: create_file.rb [bundler-1.0.15 Documentation] @@ -24,7 +24,7 @@
    Last Modified
    -
    Mon Dec 06 17:30:55 -0600 2010
    +
    Tue Jun 14 09:52:48 -0500 2011
    Requires
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/actions/directory_rb.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/actions/directory_rb.html similarity index 90% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/actions/directory_rb.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/actions/directory_rb.html index cd3c1b7b..a2812df2 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/actions/directory_rb.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/actions/directory_rb.html @@ -6,7 +6,7 @@ - File: directory.rb [bundler-1.0.7 Documentation] + File: directory.rb [bundler-1.0.15 Documentation] @@ -24,7 +24,7 @@
    Last Modified
    -
    Mon Dec 06 17:30:55 -0600 2010
    +
    Tue Jun 14 09:52:48 -0500 2011
    Requires
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/actions/empty_directory_rb.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/actions/empty_directory_rb.html similarity index 89% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/actions/empty_directory_rb.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/actions/empty_directory_rb.html index f008339a..1b11f197 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/actions/empty_directory_rb.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/actions/empty_directory_rb.html @@ -6,7 +6,7 @@ - File: empty_directory.rb [bundler-1.0.7 Documentation] + File: empty_directory.rb [bundler-1.0.15 Documentation] @@ -24,7 +24,7 @@
    Last Modified
    -
    Mon Dec 06 17:30:55 -0600 2010
    +
    Tue Jun 14 09:52:48 -0500 2011
    Requires
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/actions/file_manipulation_rb.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/actions/file_manipulation_rb.html similarity index 89% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/actions/file_manipulation_rb.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/actions/file_manipulation_rb.html index 7647b424..8ba2a9de 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/actions/file_manipulation_rb.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/actions/file_manipulation_rb.html @@ -6,7 +6,7 @@ - File: file_manipulation.rb [bundler-1.0.7 Documentation] + File: file_manipulation.rb [bundler-1.0.15 Documentation] @@ -24,7 +24,7 @@
    Last Modified
    -
    Mon Dec 06 17:30:55 -0600 2010
    +
    Tue Jun 14 09:52:48 -0500 2011
    Requires
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/actions/inject_into_file_rb.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/actions/inject_into_file_rb.html similarity index 89% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/actions/inject_into_file_rb.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/actions/inject_into_file_rb.html index 82be3a09..a372cdb3 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/actions/inject_into_file_rb.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/actions/inject_into_file_rb.html @@ -6,7 +6,7 @@ - File: inject_into_file.rb [bundler-1.0.7 Documentation] + File: inject_into_file.rb [bundler-1.0.15 Documentation] @@ -24,7 +24,7 @@
    Last Modified
    -
    Mon Dec 06 17:30:55 -0600 2010
    +
    Tue Jun 14 09:52:48 -0500 2011
    Requires
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/actions_rb.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/actions_rb.html similarity index 90% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/actions_rb.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/actions_rb.html index f94d5e74..ee560445 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/actions_rb.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/actions_rb.html @@ -6,7 +6,7 @@ - File: actions.rb [bundler-1.0.7 Documentation] + File: actions.rb [bundler-1.0.15 Documentation] @@ -24,7 +24,7 @@
    Last Modified
    -
    Mon Dec 06 17:30:55 -0600 2010
    +
    Tue Jun 14 09:52:48 -0500 2011
    Requires
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/base_rb.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/base_rb.html similarity index 91% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/base_rb.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/base_rb.html index 5e59c3c5..59dfe089 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/base_rb.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/base_rb.html @@ -6,7 +6,7 @@ - File: base.rb [bundler-1.0.7 Documentation] + File: base.rb [bundler-1.0.15 Documentation] @@ -24,7 +24,7 @@
    Last Modified
    -
    Mon Dec 06 17:30:55 -0600 2010
    +
    Tue Jun 14 09:52:48 -0500 2011
    Requires
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/core_ext/file_binary_read_rb.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/core_ext/file_binary_read_rb.html similarity index 89% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/core_ext/file_binary_read_rb.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/core_ext/file_binary_read_rb.html index aeb2d4bf..54fa26ee 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/core_ext/file_binary_read_rb.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/core_ext/file_binary_read_rb.html @@ -6,7 +6,7 @@ - File: file_binary_read.rb [bundler-1.0.7 Documentation] + File: file_binary_read.rb [bundler-1.0.15 Documentation] @@ -24,7 +24,7 @@
    Last Modified
    -
    Mon Dec 06 17:30:55 -0600 2010
    +
    Tue Jun 14 09:52:48 -0500 2011
    Requires
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/core_ext/hash_with_indifferent_access_rb.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/core_ext/hash_with_indifferent_access_rb.html similarity index 88% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/core_ext/hash_with_indifferent_access_rb.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/core_ext/hash_with_indifferent_access_rb.html index 43985ddb..742a4cd5 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/core_ext/hash_with_indifferent_access_rb.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/core_ext/hash_with_indifferent_access_rb.html @@ -6,7 +6,7 @@ - File: hash_with_indifferent_access.rb [bundler-1.0.7 Documentation] + File: hash_with_indifferent_access.rb [bundler-1.0.15 Documentation] @@ -24,7 +24,7 @@
    Last Modified
    -
    Mon Dec 06 17:30:55 -0600 2010
    +
    Tue Jun 14 09:52:48 -0500 2011
    Requires
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/core_ext/ordered_hash_rb.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/core_ext/ordered_hash_rb.html similarity index 89% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/core_ext/ordered_hash_rb.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/core_ext/ordered_hash_rb.html index 3efa6258..eb046e2e 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/core_ext/ordered_hash_rb.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/core_ext/ordered_hash_rb.html @@ -6,7 +6,7 @@ - File: ordered_hash.rb [bundler-1.0.7 Documentation] + File: ordered_hash.rb [bundler-1.0.15 Documentation] @@ -24,7 +24,7 @@
    Last Modified
    -
    Mon Dec 06 17:30:55 -0600 2010
    +
    Tue Jun 14 09:52:48 -0500 2011
    Requires
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/error_rb.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/error_rb.html similarity index 90% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/error_rb.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/error_rb.html index 3c44032f..d5828195 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/error_rb.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/error_rb.html @@ -6,7 +6,7 @@ - File: error.rb [bundler-1.0.7 Documentation] + File: error.rb [bundler-1.0.15 Documentation] @@ -24,7 +24,7 @@
    Last Modified
    -
    Mon Dec 06 17:30:55 -0600 2010
    +
    Tue Jun 14 09:52:48 -0500 2011
    Requires
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/invocation_rb.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/invocation_rb.html similarity index 89% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/invocation_rb.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/invocation_rb.html index 740f0ec6..30911357 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/invocation_rb.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/invocation_rb.html @@ -6,7 +6,7 @@ - File: invocation.rb [bundler-1.0.7 Documentation] + File: invocation.rb [bundler-1.0.15 Documentation] @@ -24,7 +24,7 @@
    Last Modified
    -
    Mon Dec 06 17:30:55 -0600 2010
    +
    Tue Jun 14 09:52:48 -0500 2011
    Requires
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/parser/argument_rb.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/parser/argument_rb.html similarity index 89% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/parser/argument_rb.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/parser/argument_rb.html index c40afe87..37270b7c 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/parser/argument_rb.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/parser/argument_rb.html @@ -6,7 +6,7 @@ - File: argument.rb [bundler-1.0.7 Documentation] + File: argument.rb [bundler-1.0.15 Documentation] @@ -24,7 +24,7 @@
    Last Modified
    -
    Mon Dec 06 17:30:55 -0600 2010
    +
    Tue Jun 14 09:52:48 -0500 2011
    Requires
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/parser/arguments_rb.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/parser/arguments_rb.html similarity index 89% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/parser/arguments_rb.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/parser/arguments_rb.html index b104ac62..16bab163 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/parser/arguments_rb.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/parser/arguments_rb.html @@ -6,7 +6,7 @@ - File: arguments.rb [bundler-1.0.7 Documentation] + File: arguments.rb [bundler-1.0.15 Documentation] @@ -24,7 +24,7 @@
    Last Modified
    -
    Mon Dec 06 17:30:55 -0600 2010
    +
    Tue Jun 14 09:52:48 -0500 2011
    Requires
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/parser/option_rb.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/parser/option_rb.html similarity index 90% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/parser/option_rb.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/parser/option_rb.html index 23f229f7..168a33ec 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/parser/option_rb.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/parser/option_rb.html @@ -6,7 +6,7 @@ - File: option.rb [bundler-1.0.7 Documentation] + File: option.rb [bundler-1.0.15 Documentation] @@ -24,7 +24,7 @@
    Last Modified
    -
    Mon Dec 06 17:30:55 -0600 2010
    +
    Tue Jun 14 09:52:48 -0500 2011
    Requires
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/parser/options_rb.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/parser/options_rb.html similarity index 89% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/parser/options_rb.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/parser/options_rb.html index a6f9634e..df0a5459 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/parser/options_rb.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/parser/options_rb.html @@ -6,7 +6,7 @@ - File: options.rb [bundler-1.0.7 Documentation] + File: options.rb [bundler-1.0.15 Documentation] @@ -24,7 +24,7 @@
    Last Modified
    -
    Mon Dec 06 17:30:55 -0600 2010
    +
    Tue Jun 14 09:52:48 -0500 2011
    Requires
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/parser_rb.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/parser_rb.html similarity index 91% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/parser_rb.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/parser_rb.html index 8915957c..e21c126a 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/parser_rb.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/parser_rb.html @@ -6,7 +6,7 @@ - File: parser.rb [bundler-1.0.7 Documentation] + File: parser.rb [bundler-1.0.15 Documentation] @@ -24,7 +24,7 @@
    Last Modified
    -
    Mon Dec 06 17:30:55 -0600 2010
    +
    Tue Jun 14 09:52:48 -0500 2011
    Requires
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/shell/basic_rb.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/shell/basic_rb.html similarity index 90% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/shell/basic_rb.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/shell/basic_rb.html index e44c1660..525a510d 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/shell/basic_rb.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/shell/basic_rb.html @@ -6,7 +6,7 @@ - File: basic.rb [bundler-1.0.7 Documentation] + File: basic.rb [bundler-1.0.15 Documentation] @@ -24,7 +24,7 @@
    Last Modified
    -
    Mon Dec 06 17:30:55 -0600 2010
    +
    Tue Jun 14 09:52:48 -0500 2011
    Requires
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/shell/color_rb.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/shell/color_rb.html similarity index 90% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/shell/color_rb.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/shell/color_rb.html index bc28b54d..47da5706 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/shell/color_rb.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/shell/color_rb.html @@ -6,7 +6,7 @@ - File: color.rb [bundler-1.0.7 Documentation] + File: color.rb [bundler-1.0.15 Documentation] @@ -24,7 +24,7 @@
    Last Modified
    -
    Mon Dec 06 17:30:55 -0600 2010
    +
    Tue Jun 14 09:52:48 -0500 2011
    Requires
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/shell/html_rb.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/shell/html_rb.html similarity index 90% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/shell/html_rb.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/shell/html_rb.html index 29655084..36c1d61b 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/shell/html_rb.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/shell/html_rb.html @@ -6,7 +6,7 @@ - File: html.rb [bundler-1.0.7 Documentation] + File: html.rb [bundler-1.0.15 Documentation] @@ -24,7 +24,7 @@
    Last Modified
    -
    Mon Dec 06 17:30:55 -0600 2010
    +
    Tue Jun 14 09:52:48 -0500 2011
    Requires
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/shell_rb.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/shell_rb.html similarity index 90% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/shell_rb.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/shell_rb.html index 9e2d503e..e39eeeb9 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/shell_rb.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/shell_rb.html @@ -6,7 +6,7 @@ - File: shell.rb [bundler-1.0.7 Documentation] + File: shell.rb [bundler-1.0.15 Documentation] @@ -24,7 +24,7 @@
    Last Modified
    -
    Mon Dec 06 17:30:55 -0600 2010
    +
    Tue Jun 14 09:52:48 -0500 2011
    Requires
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/task_rb.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/task_rb.html similarity index 90% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/task_rb.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/task_rb.html index 374de3e4..b9ca9a7c 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/task_rb.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/task_rb.html @@ -6,7 +6,7 @@ - File: task.rb [bundler-1.0.7 Documentation] + File: task.rb [bundler-1.0.15 Documentation] @@ -24,7 +24,7 @@
    Last Modified
    -
    Mon Dec 06 17:30:55 -0600 2010
    +
    Tue Jun 14 09:52:48 -0500 2011
    Requires
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/util_rb.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/util_rb.html similarity index 90% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/util_rb.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/util_rb.html index 225a80e6..1666a6c0 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/util_rb.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/util_rb.html @@ -6,7 +6,7 @@ - File: util.rb [bundler-1.0.7 Documentation] + File: util.rb [bundler-1.0.15 Documentation] @@ -24,7 +24,7 @@
    Last Modified
    -
    Mon Dec 06 17:30:55 -0600 2010
    +
    Tue Jun 14 09:52:48 -0500 2011
    Requires
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/version_rb.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/version_rb.html similarity index 89% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/version_rb.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/version_rb.html index b5e0f0a2..5f478eaf 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor/version_rb.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor/version_rb.html @@ -6,7 +6,7 @@ - File: version.rb [bundler-1.0.7 Documentation] + File: version.rb [bundler-1.0.15 Documentation] @@ -24,7 +24,7 @@
    Last Modified
    -
    Mon Dec 06 17:30:55 -0600 2010
    +
    Tue Jun 14 09:52:48 -0500 2011
    Requires
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor_rb.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor_rb.html similarity index 90% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor_rb.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor_rb.html index fa3f4f91..28b2831a 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vendor/thor_rb.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vendor/thor_rb.html @@ -6,7 +6,7 @@ - File: thor.rb [bundler-1.0.7 Documentation] + File: thor.rb [bundler-1.0.15 Documentation] @@ -24,7 +24,7 @@
    Last Modified
    -
    Mon Dec 06 17:30:55 -0600 2010
    +
    Tue Jun 14 09:52:48 -0500 2011
    Requires
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/version_rb.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/version_rb.html similarity index 89% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/version_rb.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/version_rb.html index a89d2369..f078ab94 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/version_rb.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/version_rb.html @@ -6,7 +6,7 @@ - File: version.rb [bundler-1.0.7 Documentation] + File: version.rb [bundler-1.0.15 Documentation] @@ -24,7 +24,7 @@
    Last Modified
    -
    Mon Dec 06 17:30:55 -0600 2010
    +
    Tue Jun 14 09:52:48 -0500 2011
    Requires
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vlad_rb.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vlad_rb.html similarity index 91% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vlad_rb.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vlad_rb.html index 7eb49a39..664ffe3b 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler/vlad_rb.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler/vlad_rb.html @@ -6,7 +6,7 @@ - File: vlad.rb [bundler-1.0.7 Documentation] + File: vlad.rb [bundler-1.0.15 Documentation] @@ -24,7 +24,7 @@
    Last Modified
    -
    Mon Dec 06 17:30:55 -0600 2010
    +
    Tue Jun 14 09:52:48 -0500 2011
    Requires
    diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler_rb.html b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler_rb.html similarity index 86% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler_rb.html rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler_rb.html index d53cd577..cc18e358 100644 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/lib/bundler_rb.html +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/lib/bundler_rb.html @@ -6,7 +6,7 @@ - File: bundler.rb [bundler-1.0.7 Documentation] + File: bundler.rb [bundler-1.0.15 Documentation] @@ -24,7 +24,7 @@
    Last Modified
    -
    Mon Dec 06 17:30:55 -0600 2010
    +
    Tue Jun 14 09:52:47 -0500 2011
    Requires
    @@ -37,10 +37,14 @@
  • pathname
    • +
  • psych
    • +
  • yaml
  • bundler/rubygems_ext
    • +
  • bundler/rubygems_integration
    • +
  • bundler/version
    • diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/rdoc.css b/vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/rdoc.css similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/rdoc.css rename to vendor/plugins/bundler/doc/bundler-1.0.15/rdoc/rdoc.css diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/BundlerError/cdesc-BundlerError.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/BundlerError/cdesc-BundlerError.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/BundlerError/cdesc-BundlerError.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/BundlerError/cdesc-BundlerError.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/BundlerError/status_code-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/BundlerError/status_code-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/BundlerError/status_code-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/BundlerError/status_code-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/cache-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/cache-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/cache-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/cache-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/cdesc-CLI.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/cdesc-CLI.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/cdesc-CLI.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/cdesc-CLI.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/check-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/check-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/check-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/check-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/config-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/config-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/config-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/config-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/console-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/console-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/console-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/console-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/exec-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/exec-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/exec-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/exec-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/gem-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/gem-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/gem-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/gem-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/have_groff%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/have_groff%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/have_groff%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/have_groff%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/help-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/help-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/help-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/help-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/init-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/init-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/init-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/init-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/install-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/install-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/install-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/install-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/locate_gem-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/locate_gem-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/locate_gem-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/locate_gem-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/lock-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/lock-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/lock-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/lock-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/new-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/new-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/new-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/new-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/open-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/open-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/open-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/open-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/package-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/package-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/package-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/package-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/show-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/show-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/show-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/show-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/source_root-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/source_root-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/source_root-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/source_root-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/unlock-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/unlock-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/unlock-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/unlock-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/update-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/update-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/update-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/update-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/version-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/version-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/version-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/version-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/viz-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/viz-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/CLI/viz-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/CLI/viz-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/build-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/build-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/build-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/build-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/cdesc-Definition.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/cdesc-Definition.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/cdesc-Definition.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/cdesc-Definition.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/converge_dependencies-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/converge_dependencies-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/converge_dependencies-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/converge_dependencies-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/converge_locked_specs-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/converge_locked_specs-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/converge_locked_specs-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/converge_locked_specs-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/converge_sources-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/converge_sources-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/converge_sources-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/converge_sources-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/current_dependencies-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/current_dependencies-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/current_dependencies-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/current_dependencies-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/dependencies-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/dependencies-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/dependencies-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/dependencies-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/ensure_equivalent_gemfile_and_lockfile-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/ensure_equivalent_gemfile_and_lockfile-i.ri similarity index 64% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/ensure_equivalent_gemfile_and_lockfile-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/ensure_equivalent_gemfile_and_lockfile-i.ri index 101c4d90..728f3d83 100644 Binary files a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/ensure_equivalent_gemfile_and_lockfile-i.ri and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/ensure_equivalent_gemfile_and_lockfile-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/expand_dependencies-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/expand_dependencies-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/expand_dependencies-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/expand_dependencies-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/expanded_dependencies-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/expanded_dependencies-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/expanded_dependencies-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/expanded_dependencies-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/groups-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/groups-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/groups-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/groups-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/in_locked_deps%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/in_locked_deps%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/in_locked_deps%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/in_locked_deps%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/index-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/index-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/index-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/index-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/lock-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/lock-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/lock-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/lock-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/missing_specs-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/missing_specs-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/missing_specs-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/missing_specs-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/new-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/new-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/new-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/new-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/new_platform%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/new_platform%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/new_platform%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/new_platform%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/new_specs-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/new_specs-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/new_specs-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/new_specs-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/no_sources%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/no_sources%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/no_sources%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/no_sources%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/platforms-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/platforms-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/platforms-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/platforms-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/pretty_dep-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/pretty_dep-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/pretty_dep-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/pretty_dep-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/removed_specs-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/removed_specs-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/removed_specs-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/removed_specs-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/requested_dependencies-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/requested_dependencies-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/requested_dependencies-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/requested_dependencies-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/requested_specs-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/requested_specs-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/requested_specs-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/requested_specs-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/resolve-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/resolve-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/resolve-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/resolve-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/resolve_remotely%21-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/resolve_remotely%21-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/resolve_remotely%21-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/resolve_remotely%21-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/resolve_with_cache%21-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/resolve_with_cache%21-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/resolve_with_cache%21-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/resolve_with_cache%21-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/rubygems_index-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/rubygems_index-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/rubygems_index-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/rubygems_index-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/satisfies_locked_spec%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/satisfies_locked_spec%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/satisfies_locked_spec%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/satisfies_locked_spec%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/sorted_sources-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/sorted_sources-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/sorted_sources-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/sorted_sources-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/sources-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/sources-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/sources-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/sources-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/specs-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/specs-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/specs-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/specs-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/specs_for-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/specs_for-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/specs_for-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/specs_for-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/to_lock-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/to_lock-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Definition/to_lock-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Definition/to_lock-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/DepProxy/%3d%3d-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/DepProxy/%3d%3d-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/DepProxy/%3d%3d-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/DepProxy/%3d%3d-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/DepProxy/__platform-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/DepProxy/__platform-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/DepProxy/__platform-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/DepProxy/__platform-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/DepProxy/cdesc-DepProxy.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/DepProxy/cdesc-DepProxy.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/DepProxy/cdesc-DepProxy.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/DepProxy/cdesc-DepProxy.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/DepProxy/dep-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/DepProxy/dep-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/DepProxy/dep-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/DepProxy/dep-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/DepProxy/eql%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/DepProxy/eql%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/DepProxy/eql%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/DepProxy/eql%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/DepProxy/hash-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/DepProxy/hash-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/DepProxy/hash-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/DepProxy/hash-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/DepProxy/method_missing-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/DepProxy/method_missing-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/DepProxy/method_missing-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/DepProxy/method_missing-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/DepProxy/new-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/DepProxy/new-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/DepProxy/new-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/DepProxy/new-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/DepProxy/required_by-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/DepProxy/required_by-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/DepProxy/required_by-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/DepProxy/required_by-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/DepProxy/to_s-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/DepProxy/to_s-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/DepProxy/to_s-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/DepProxy/to_s-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/DepProxy/type-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/DepProxy/type-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/DepProxy/type-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/DepProxy/type-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/autorequire-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/autorequire-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/autorequire-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/autorequire-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/cdesc-Dependency.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/cdesc-Dependency.ri similarity index 76% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/cdesc-Dependency.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/cdesc-Dependency.ri index cc1d2b80..55d8b9cc 100644 Binary files a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/cdesc-Dependency.ri and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/cdesc-Dependency.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/current_env%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/current_env%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/current_env%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/current_env%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/current_platform%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/current_platform%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/current_platform%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/current_platform%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/gem_platforms-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/gem_platforms-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/gem_platforms-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/gem_platforms-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/groups-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/groups-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/groups-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/groups-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/jruby%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/jruby%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/jruby%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/jruby%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/mingw%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/mingw%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/mingw%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/mingw%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/mingw_18%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/mingw_18%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/mingw_18%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/mingw_18%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/mingw_19%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/mingw_19%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/mingw_19%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/mingw_19%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/mri%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/mri%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/mri%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/mri%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/mri_18%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/mri_18%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/mri_18%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/mri_18%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/mri_19%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/mri_19%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/mri_19%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/mri_19%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/mswin%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/mswin%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/mswin%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/mswin%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/new-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/new-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/new-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/new-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/platforms-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/platforms-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/platforms-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/platforms-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/rbx%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/rbx%3f-i.ri new file mode 100644 index 00000000..8d599450 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/rbx%3f-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/ruby%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/ruby%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/ruby%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/ruby%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/ruby_18%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/ruby_18%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/ruby_18%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/ruby_18%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/ruby_19%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/ruby_19%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/ruby_19%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/ruby_19%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/should_include%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/should_include%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/should_include%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/should_include%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/to_lock-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/to_lock-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dependency/to_lock-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dependency/to_lock-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Deployment/cdesc-Deployment.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Deployment/cdesc-Deployment.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Deployment/cdesc-Deployment.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Deployment/cdesc-Deployment.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Deployment/define_task-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Deployment/define_task-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Deployment/define_task-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Deployment/define_task-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/DeprecatedError/cdesc-DeprecatedError.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/DeprecatedError/cdesc-DeprecatedError.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/DeprecatedError/cdesc-DeprecatedError.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/DeprecatedError/cdesc-DeprecatedError.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/_deprecated_options-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/_deprecated_options-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/_deprecated_options-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/_deprecated_options-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/_normalize_hash-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/_normalize_hash-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/_normalize_hash-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/_normalize_hash-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/_normalize_options-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/_normalize_options-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/_normalize_options-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/_normalize_options-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/cdesc-Dsl.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/cdesc-Dsl.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/cdesc-Dsl.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/cdesc-Dsl.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/deprecate-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/deprecate-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/deprecate-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/deprecate-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/env-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/env-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/env-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/env-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/evaluate-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/evaluate-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/evaluate-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/evaluate-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/gem-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/gem-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/gem-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/gem-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/gemspec-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/gemspec-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/gemspec-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/gemspec-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/git-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/git-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/git-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/git-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/group-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/group-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/group-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/group-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/new-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/new-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/new-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/new-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/path-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/path-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/path-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/path-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/platform-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/platform-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/platform-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/platform-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/platforms-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/platforms-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/platforms-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/platforms-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/rubygems_source-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/rubygems_source-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/rubygems_source-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/rubygems_source-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/source-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/source-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/source-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/source-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/to_definition-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/to_definition-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Dsl/to_definition-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Dsl/to_definition-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/DslError/cdesc-DslError.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/DslError/cdesc-DslError.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/DslError/cdesc-DslError.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/DslError/cdesc-DslError.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Environment/cdesc-Environment.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Environment/cdesc-Environment.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Environment/cdesc-Environment.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Environment/cdesc-Environment.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Environment/current_dependencies-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Environment/current_dependencies-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Environment/current_dependencies-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Environment/current_dependencies-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Environment/dependencies-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Environment/dependencies-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Environment/dependencies-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Environment/dependencies-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Environment/index-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Environment/index-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Environment/index-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Environment/index-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Environment/inspect-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Environment/inspect-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Environment/inspect-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Environment/inspect-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Environment/lock-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Environment/lock-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Environment/lock-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Environment/lock-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Environment/new-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Environment/new-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Environment/new-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Environment/new-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Environment/requested_specs-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Environment/requested_specs-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Environment/requested_specs-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Environment/requested_specs-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Environment/root-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Environment/root-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Environment/root-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Environment/root-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Environment/specs-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Environment/specs-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Environment/specs-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Environment/specs-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Environment/update-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Environment/update-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Environment/update-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Environment/update-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/base-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/base-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/base-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/base-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/build_gem-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/build_gem-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/build_gem-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/build_gem-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/built_gem_path-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/built_gem_path-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/built_gem_path-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/built_gem_path-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/cdesc-GemHelper.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/cdesc-GemHelper.ri similarity index 90% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/cdesc-GemHelper.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/cdesc-GemHelper.ri index 105cde07..dda75db1 100644 Binary files a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/cdesc-GemHelper.ri and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/cdesc-GemHelper.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/clean%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/clean%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/clean%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/clean%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/gemspec-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/gemspec-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/gemspec-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/gemspec-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/git_push-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/git_push-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/git_push-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/git_push-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/guard_already_tagged-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/guard_already_tagged-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/guard_already_tagged-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/guard_already_tagged-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/guard_clean-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/guard_clean-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/guard_clean-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/guard_clean-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/install-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/install-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/install-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/install-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/install_gem-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/install_gem-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/install_gem-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/install_gem-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/install_tasks-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/install_tasks-c.ri new file mode 100644 index 00000000..cef9fddf Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/install_tasks-c.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/name-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/name-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/name-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/name-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/new-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/new-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/new-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/new-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/perform_git_push-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/perform_git_push-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/perform_git_push-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/perform_git_push-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/release_gem-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/release_gem-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/release_gem-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/release_gem-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/rubygem_push-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/rubygem_push-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/rubygem_push-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/rubygem_push-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/sh-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/sh-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/sh-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/sh-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/sh_with_code-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/sh_with_code-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/sh_with_code-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/sh_with_code-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/spec_path-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/spec_path-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/spec_path-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/spec_path-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/tag_version-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/tag_version-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/tag_version-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/tag_version-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/version-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/version-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/version-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/version-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/version_tag-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/version_tag-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/version_tag-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelper/version_tag-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelpers/cdesc-GemHelpers.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelpers/cdesc-GemHelpers.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelpers/cdesc-GemHelpers.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelpers/cdesc-GemHelpers.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelpers/generic-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelpers/generic-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelpers/generic-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemHelpers/generic-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemNotFound/cdesc-GemNotFound.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemNotFound/cdesc-GemNotFound.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemNotFound/cdesc-GemNotFound.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemNotFound/cdesc-GemNotFound.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemfileError/cdesc-GemfileError.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemfileError/cdesc-GemfileError.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemfileError/cdesc-GemfileError.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemfileError/cdesc-GemfileError.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemfileNotFound/cdesc-GemfileNotFound.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemfileNotFound/cdesc-GemfileNotFound.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemfileNotFound/cdesc-GemfileNotFound.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemfileNotFound/cdesc-GemfileNotFound.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemspecError/cdesc-GemspecError.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemspecError/cdesc-GemspecError.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemspecError/cdesc-GemspecError.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GemspecError/cdesc-GemspecError.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GitError/cdesc-GitError.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GitError/cdesc-GitError.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GitError/cdesc-GitError.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GitError/cdesc-GitError.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Graph/cdesc-Graph.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Graph/cdesc-Graph.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Graph/cdesc-Graph.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Graph/cdesc-Graph.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Graph/groups-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Graph/groups-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Graph/groups-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Graph/groups-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Graph/new-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Graph/new-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Graph/new-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Graph/new-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Graph/nodes-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Graph/nodes-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Graph/nodes-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Graph/nodes-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Graph/populate-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Graph/populate-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Graph/populate-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Graph/populate-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Graph/viz-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Graph/viz-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Graph/viz-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Graph/viz-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GraphNode/cdesc-GraphNode.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GraphNode/cdesc-GraphNode.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GraphNode/cdesc-GraphNode.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GraphNode/cdesc-GraphNode.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GraphNode/dependencies-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GraphNode/dependencies-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GraphNode/dependencies-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GraphNode/dependencies-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GraphNode/is_user-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GraphNode/is_user-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GraphNode/is_user-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GraphNode/is_user-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GraphNode/name-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GraphNode/name-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GraphNode/name-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GraphNode/name-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GraphNode/new-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GraphNode/new-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GraphNode/new-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GraphNode/new-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GraphNode/version-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GraphNode/version-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GraphNode/version-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/GraphNode/version-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/%3c%3c-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/%3c%3c-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/%3c%3c-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/%3c%3c-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/%3d%3d-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/%3d%3d-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/%3d%3d-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/%3d%3d-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/%5b%5d-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/%5b%5d-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/%5b%5d-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/%5b%5d-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/build-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/build-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/build-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/build-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/cdesc-Index.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/cdesc-Index.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/cdesc-Index.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/cdesc-Index.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/each-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/each-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/each-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/each-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/empty%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/empty%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/empty%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/empty%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/initialize_copy-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/initialize_copy-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/initialize_copy-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/initialize_copy-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/new-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/new-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/new-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/new-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/same_version%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/same_version%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/same_version%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/same_version%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/search-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/search-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/search-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/search-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/search_by_dependency-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/search_by_dependency-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/search_by_dependency-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/search_by_dependency-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/search_by_spec-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/search_by_spec-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/search_by_spec-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/search_by_spec-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/search_for_all_platforms-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/search_for_all_platforms-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/search_for_all_platforms-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/search_for_all_platforms-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/sources-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/sources-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/sources-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/sources-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/spec_satisfies_dependency%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/spec_satisfies_dependency%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/spec_satisfies_dependency%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/spec_satisfies_dependency%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/specs-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/specs-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/specs-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/specs-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/use-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/use-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Index/use-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Index/use-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Installer/cdesc-Installer.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Installer/cdesc-Installer.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Installer/cdesc-Installer.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Installer/cdesc-Installer.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Installer/generate_bundler_executable_stubs-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Installer/generate_bundler_executable_stubs-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Installer/generate_bundler_executable_stubs-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Installer/generate_bundler_executable_stubs-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Installer/install-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Installer/install-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Installer/install-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Installer/install-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Installer/run-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Installer/run-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Installer/run-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Installer/run-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/InvalidOption/cdesc-InvalidOption.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/InvalidOption/cdesc-InvalidOption.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/InvalidOption/cdesc-InvalidOption.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/InvalidOption/cdesc-InvalidOption.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/InvalidSpecSet/cdesc-InvalidSpecSet.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/InvalidSpecSet/cdesc-InvalidSpecSet.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/InvalidSpecSet/cdesc-InvalidSpecSet.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/InvalidSpecSet/cdesc-InvalidSpecSet.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LazySpecification/__materialize__-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LazySpecification/__materialize__-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LazySpecification/__materialize__-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LazySpecification/__materialize__-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LazySpecification/cdesc-LazySpecification.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LazySpecification/cdesc-LazySpecification.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LazySpecification/cdesc-LazySpecification.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LazySpecification/cdesc-LazySpecification.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LazySpecification/dependencies-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LazySpecification/dependencies-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LazySpecification/dependencies-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LazySpecification/dependencies-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LazySpecification/full_name-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LazySpecification/full_name-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LazySpecification/full_name-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LazySpecification/full_name-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LazySpecification/method_missing-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LazySpecification/method_missing-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LazySpecification/method_missing-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LazySpecification/method_missing-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LazySpecification/name-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LazySpecification/name-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LazySpecification/name-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LazySpecification/name-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LazySpecification/new-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LazySpecification/new-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LazySpecification/new-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LazySpecification/new-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LazySpecification/platform-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LazySpecification/platform-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LazySpecification/platform-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LazySpecification/platform-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LazySpecification/respond_to%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LazySpecification/respond_to%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LazySpecification/respond_to%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LazySpecification/respond_to%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LazySpecification/satisfies%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LazySpecification/satisfies%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LazySpecification/satisfies%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LazySpecification/satisfies%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LazySpecification/source-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LazySpecification/source-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LazySpecification/source-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LazySpecification/source-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LazySpecification/to_lock-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LazySpecification/to_lock-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LazySpecification/to_lock-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LazySpecification/to_lock-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LazySpecification/to_s-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LazySpecification/to_s-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LazySpecification/to_s-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LazySpecification/to_s-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LazySpecification/version-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LazySpecification/version-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LazySpecification/version-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LazySpecification/version-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LockfileParser/cdesc-LockfileParser.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LockfileParser/cdesc-LockfileParser.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LockfileParser/cdesc-LockfileParser.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LockfileParser/cdesc-LockfileParser.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LockfileParser/dependencies-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LockfileParser/dependencies-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LockfileParser/dependencies-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LockfileParser/dependencies-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LockfileParser/new-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LockfileParser/new-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LockfileParser/new-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LockfileParser/new-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LockfileParser/parse_dependency-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LockfileParser/parse_dependency-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LockfileParser/parse_dependency-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LockfileParser/parse_dependency-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LockfileParser/parse_platform-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LockfileParser/parse_platform-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LockfileParser/parse_platform-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LockfileParser/parse_platform-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LockfileParser/parse_source-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LockfileParser/parse_source-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LockfileParser/parse_source-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LockfileParser/parse_source-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LockfileParser/parse_spec-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LockfileParser/parse_spec-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LockfileParser/parse_spec-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LockfileParser/parse_spec-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LockfileParser/platforms-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LockfileParser/platforms-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LockfileParser/platforms-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LockfileParser/platforms-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LockfileParser/sources-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LockfileParser/sources-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LockfileParser/sources-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LockfileParser/sources-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LockfileParser/specs-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LockfileParser/specs-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/LockfileParser/specs-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/LockfileParser/specs-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/MatchPlatform/cdesc-MatchPlatform.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/MatchPlatform/cdesc-MatchPlatform.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/MatchPlatform/cdesc-MatchPlatform.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/MatchPlatform/cdesc-MatchPlatform.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/MatchPlatform/match_platform-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/MatchPlatform/match_platform-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/MatchPlatform/match_platform-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/MatchPlatform/match_platform-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/PathError/cdesc-PathError.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/PathError/cdesc-PathError.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/PathError/cdesc-PathError.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/PathError/cdesc-PathError.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/ProductionError/cdesc-ProductionError.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/ProductionError/cdesc-ProductionError.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/ProductionError/cdesc-ProductionError.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/ProductionError/cdesc-ProductionError.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/RemoteSpecification/__swap__-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RemoteSpecification/__swap__-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/RemoteSpecification/__swap__-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RemoteSpecification/__swap__-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/RemoteSpecification/_remote_specification-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RemoteSpecification/_remote_specification-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/RemoteSpecification/_remote_specification-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RemoteSpecification/_remote_specification-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/RemoteSpecification/cdesc-RemoteSpecification.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RemoteSpecification/cdesc-RemoteSpecification.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/RemoteSpecification/cdesc-RemoteSpecification.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RemoteSpecification/cdesc-RemoteSpecification.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/RemoteSpecification/fetch_platform-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RemoteSpecification/fetch_platform-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/RemoteSpecification/fetch_platform-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RemoteSpecification/fetch_platform-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/RemoteSpecification/full_name-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RemoteSpecification/full_name-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/RemoteSpecification/full_name-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RemoteSpecification/full_name-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/RemoteSpecification/method_missing-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RemoteSpecification/method_missing-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/RemoteSpecification/method_missing-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RemoteSpecification/method_missing-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/RemoteSpecification/name-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RemoteSpecification/name-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/RemoteSpecification/name-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RemoteSpecification/name-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/RemoteSpecification/new-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RemoteSpecification/new-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/RemoteSpecification/new-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RemoteSpecification/new-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/RemoteSpecification/platform-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RemoteSpecification/platform-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/RemoteSpecification/platform-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RemoteSpecification/platform-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/RemoteSpecification/source-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RemoteSpecification/source-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/RemoteSpecification/source-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RemoteSpecification/source-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/RemoteSpecification/version-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RemoteSpecification/version-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/RemoteSpecification/version-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RemoteSpecification/version-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/SpecGroup/__dependencies-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/SpecGroup/__dependencies-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/SpecGroup/__dependencies-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/SpecGroup/__dependencies-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/SpecGroup/activate_platform-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/SpecGroup/activate_platform-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/SpecGroup/activate_platform-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/SpecGroup/activate_platform-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/SpecGroup/activated-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/SpecGroup/activated-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/SpecGroup/activated-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/SpecGroup/activated-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/SpecGroup/cdesc-SpecGroup.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/SpecGroup/cdesc-SpecGroup.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/SpecGroup/cdesc-SpecGroup.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/SpecGroup/cdesc-SpecGroup.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/SpecGroup/for%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/SpecGroup/for%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/SpecGroup/for%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/SpecGroup/for%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/SpecGroup/initialize_copy-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/SpecGroup/initialize_copy-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/SpecGroup/initialize_copy-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/SpecGroup/initialize_copy-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/SpecGroup/name-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/SpecGroup/name-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/SpecGroup/name-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/SpecGroup/name-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/SpecGroup/new-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/SpecGroup/new-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/SpecGroup/new-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/SpecGroup/new-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/SpecGroup/required_by-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/SpecGroup/required_by-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/SpecGroup/required_by-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/SpecGroup/required_by-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/SpecGroup/source-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/SpecGroup/source-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/SpecGroup/source-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/SpecGroup/source-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/SpecGroup/to_s-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/SpecGroup/to_s-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/SpecGroup/to_s-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/SpecGroup/to_s-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/SpecGroup/to_specs-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/SpecGroup/to_specs-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/SpecGroup/to_specs-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/SpecGroup/to_specs-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/SpecGroup/version-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/SpecGroup/version-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/SpecGroup/version-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/SpecGroup/version-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/cdesc-Resolver.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/cdesc-Resolver.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/cdesc-Resolver.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/cdesc-Resolver.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/clean_req-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/clean_req-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/clean_req-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/clean_req-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/debug-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/debug-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/debug-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/debug-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/error_message-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/error_message-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/error_message-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/error_message-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/errors-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/errors-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/errors-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/errors-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/gem_message-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/gem_message-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/gem_message-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/gem_message-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/gems_size-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/gems_size-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/gems_size-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/gems_size-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/new-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/new-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/new-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/new-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/resolve-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/resolve-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/resolve-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/resolve-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/resolve-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/resolve-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/resolve-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/resolve-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/resolve_requirement-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/resolve_requirement-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/resolve_requirement-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/resolve_requirement-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/search-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/search-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/search-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/search-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/start-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/start-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/start-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/start-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/successify-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/successify-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/successify-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/successify-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/version_conflict-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/version_conflict-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Resolver/version_conflict-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Resolver/version_conflict-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/AlmostModern/cdesc-AlmostModern.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/AlmostModern/cdesc-AlmostModern.ri new file mode 100644 index 00000000..9144fd24 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/AlmostModern/cdesc-AlmostModern.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/AlmostModern/preserve_paths-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/AlmostModern/preserve_paths-i.ri new file mode 100644 index 00000000..4bd4a3bd Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/AlmostModern/preserve_paths-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Deprecate/cdesc-Deprecate.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Deprecate/cdesc-Deprecate.ri new file mode 100644 index 00000000..d22a9b0f Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Deprecate/cdesc-Deprecate.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Deprecate/skip_during-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Deprecate/skip_during-i.ri new file mode 100644 index 00000000..a10178d9 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Deprecate/skip_during-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Gem/SourceIndex/cdesc-SourceIndex.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Gem/SourceIndex/cdesc-SourceIndex.ri new file mode 100644 index 00000000..0570abfb Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Gem/SourceIndex/cdesc-SourceIndex.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Gem/cdesc-Gem.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Gem/cdesc-Gem.ri new file mode 100644 index 00000000..26e62663 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Gem/cdesc-Gem.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Legacy/all_specs-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Legacy/all_specs-i.ri new file mode 100644 index 00000000..02f808aa Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Legacy/all_specs-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Legacy/cdesc-Legacy.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Legacy/cdesc-Legacy.ri new file mode 100644 index 00000000..4cf1f047 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Legacy/cdesc-Legacy.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Legacy/find_name-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Legacy/find_name-i.ri new file mode 100644 index 00000000..455f5025 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Legacy/find_name-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Legacy/stub_rubygems-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Legacy/stub_rubygems-i.ri new file mode 100644 index 00000000..2534d7c4 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Legacy/stub_rubygems-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Modern/all_specs-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Modern/all_specs-i.ri new file mode 100644 index 00000000..240cbc70 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Modern/all_specs-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Modern/cdesc-Modern.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Modern/cdesc-Modern.ri new file mode 100644 index 00000000..cac94577 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Modern/cdesc-Modern.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Modern/find_name-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Modern/find_name-i.ri new file mode 100644 index 00000000..69c076ee Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Modern/find_name-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Modern/stub_rubygems-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Modern/stub_rubygems-i.ri new file mode 100644 index 00000000..83c8f61a Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Modern/stub_rubygems-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Transitional/cdesc-Transitional.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Transitional/cdesc-Transitional.ri new file mode 100644 index 00000000..a9370002 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Transitional/cdesc-Transitional.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Transitional/stub_rubygems-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Transitional/stub_rubygems-i.ri new file mode 100644 index 00000000..a2d397a9 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/Transitional/stub_rubygems-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/bin_path-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/bin_path-i.ri new file mode 100644 index 00000000..03f83942 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/bin_path-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/cdesc-RubygemsIntegration.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/cdesc-RubygemsIntegration.ri new file mode 100644 index 00000000..faf121e2 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/cdesc-RubygemsIntegration.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/clear_paths-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/clear_paths-i.ri new file mode 100644 index 00000000..b6939dd4 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/clear_paths-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/configuration-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/configuration-i.ri new file mode 100644 index 00000000..e8c38157 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/configuration-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/download_gem-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/download_gem-i.ri new file mode 100644 index 00000000..a621077d Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/download_gem-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/fetch_specs-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/fetch_specs-i.ri new file mode 100644 index 00000000..4359cc2d Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/fetch_specs-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/gem_bindir-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/gem_bindir-i.ri new file mode 100644 index 00000000..bbb5de78 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/gem_bindir-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/gem_dir-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/gem_dir-i.ri new file mode 100644 index 00000000..3f0c4b32 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/gem_dir-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/gem_path-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/gem_path-i.ri new file mode 100644 index 00000000..0dcfb952 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/gem_path-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/inflate-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/inflate-i.ri new file mode 100644 index 00000000..d5d2675a Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/inflate-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/loaded_specs-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/loaded_specs-i.ri new file mode 100644 index 00000000..be65330e Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/loaded_specs-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/mark_loaded-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/mark_loaded-i.ri new file mode 100644 index 00000000..d4218e32 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/mark_loaded-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/marshal_spec_dir-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/marshal_spec_dir-i.ri new file mode 100644 index 00000000..0d6eb3de Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/marshal_spec_dir-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/new-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/new-c.ri new file mode 100644 index 00000000..ebe790b2 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/new-c.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/path-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/path-i.ri new file mode 100644 index 00000000..5af559c7 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/path-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/platforms-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/platforms-i.ri new file mode 100644 index 00000000..d835d628 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/platforms-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/preserve_paths-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/preserve_paths-i.ri new file mode 100644 index 00000000..2c8f1f72 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/preserve_paths-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/read_binary-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/read_binary-i.ri new file mode 100644 index 00000000..0ea92843 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/read_binary-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/replace_bin_path-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/replace_bin_path-i.ri new file mode 100644 index 00000000..20c459c5 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/replace_bin_path-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/replace_entrypoints-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/replace_entrypoints-i.ri new file mode 100644 index 00000000..26d7024e Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/replace_entrypoints-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/replace_gem-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/replace_gem-i.ri new file mode 100644 index 00000000..e9a4a2f1 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/replace_gem-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/replace_refresh-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/replace_refresh-i.ri new file mode 100644 index 00000000..46c8d159 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/replace_refresh-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/reverse_rubygems_kernel_mixin-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/reverse_rubygems_kernel_mixin-i.ri new file mode 100644 index 00000000..ed834331 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/reverse_rubygems_kernel_mixin-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/ruby_engine-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/ruby_engine-i.ri new file mode 100644 index 00000000..7ffc8885 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/ruby_engine-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/sources%3d-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/sources%3d-i.ri new file mode 100644 index 00000000..280e9d99 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/sources%3d-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/sources-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/sources-i.ri new file mode 100644 index 00000000..6c67d74d Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/sources-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/spec_from_gem-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/spec_from_gem-i.ri new file mode 100644 index 00000000..b1d384d9 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/spec_from_gem-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/stub_source_index137-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/stub_source_index137-i.ri new file mode 100644 index 00000000..1cb0a265 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/stub_source_index137-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/stub_source_index170-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/stub_source_index170-i.ri new file mode 100644 index 00000000..b416dea4 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/stub_source_index170-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/ui%3d-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/ui%3d-i.ri new file mode 100644 index 00000000..3585c987 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/ui%3d-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/user_home-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/user_home-i.ri new file mode 100644 index 00000000..67ce95e3 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/user_home-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/with_build_args-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/with_build_args-i.ri new file mode 100644 index 00000000..8f10198b Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/RubygemsIntegration/with_build_args-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Runtime/cache-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Runtime/cache-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Runtime/cache-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Runtime/cache-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Runtime/cache_path-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Runtime/cache_path-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Runtime/cache_path-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Runtime/cache_path-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Runtime/cdesc-Runtime.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Runtime/cdesc-Runtime.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Runtime/cdesc-Runtime.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Runtime/cdesc-Runtime.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Runtime/dependencies_for-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Runtime/dependencies_for-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Runtime/dependencies_for-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Runtime/dependencies_for-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Runtime/prune_cache-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Runtime/prune_cache-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Runtime/prune_cache-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Runtime/prune_cache-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Runtime/require-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Runtime/require-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Runtime/require-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Runtime/require-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Runtime/setup-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Runtime/setup-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Runtime/setup-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Runtime/setup-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Runtime/setup_environment-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Runtime/setup_environment-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Runtime/setup_environment-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Runtime/setup_environment-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Settings/%5b%5d%3d-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Settings/%5b%5d%3d-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Settings/%5b%5d%3d-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Settings/%5b%5d%3d-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Settings/%5b%5d-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Settings/%5b%5d-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Settings/%5b%5d-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Settings/%5b%5d-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Settings/all-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Settings/all-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Settings/all-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Settings/all-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Settings/allow_sudo%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Settings/allow_sudo%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Settings/allow_sudo%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Settings/allow_sudo%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Settings/cdesc-Settings.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Settings/cdesc-Settings.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Settings/cdesc-Settings.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Settings/cdesc-Settings.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Settings/delete-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Settings/delete-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Settings/delete-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Settings/delete-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Settings/global_config_file-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Settings/global_config_file-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Settings/global_config_file-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Settings/global_config_file-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Settings/key_for-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Settings/key_for-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Settings/key_for-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Settings/key_for-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Settings/local_config_file-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Settings/local_config_file-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Settings/local_config_file-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Settings/local_config_file-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Settings/locations-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Settings/locations-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Settings/locations-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Settings/locations-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Settings/new-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Settings/new-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Settings/new-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Settings/new-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Settings/path-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Settings/path-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Settings/path-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Settings/path-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Settings/pretty_values_for-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Settings/pretty_values_for-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Settings/pretty_values_for-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Settings/pretty_values_for-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Settings/set_global-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Settings/set_global-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Settings/set_global-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Settings/set_global-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Settings/set_key-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Settings/set_key-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Settings/set_key-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Settings/set_key-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Settings/without%3d-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Settings/without%3d-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Settings/without%3d-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Settings/without%3d-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Settings/without-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Settings/without-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Settings/without-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Settings/without-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SharedHelpers/cdesc-SharedHelpers.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SharedHelpers/cdesc-SharedHelpers.ri similarity index 75% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SharedHelpers/cdesc-SharedHelpers.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SharedHelpers/cdesc-SharedHelpers.ri index 557b0ba3..b5670341 100644 Binary files a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SharedHelpers/cdesc-SharedHelpers.ri and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SharedHelpers/cdesc-SharedHelpers.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SharedHelpers/clean_load_path-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SharedHelpers/clean_load_path-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SharedHelpers/clean_load_path-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SharedHelpers/clean_load_path-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SharedHelpers/default_gemfile-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SharedHelpers/default_gemfile-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SharedHelpers/default_gemfile-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SharedHelpers/default_gemfile-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SharedHelpers/default_lockfile-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SharedHelpers/default_lockfile-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SharedHelpers/default_lockfile-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SharedHelpers/default_lockfile-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SharedHelpers/find_gemfile-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SharedHelpers/find_gemfile-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SharedHelpers/find_gemfile-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SharedHelpers/find_gemfile-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SharedHelpers/gem_loaded-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SharedHelpers/gem_loaded-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SharedHelpers/gem_loaded-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SharedHelpers/gem_loaded-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SharedHelpers/in_bundle%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SharedHelpers/in_bundle%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SharedHelpers/in_bundle%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SharedHelpers/in_bundle%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/%3d%3d-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/%3d%3d-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/%3d%3d-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/%3d%3d-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/allow_git_ops%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/allow_git_ops%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/allow_git_ops%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/allow_git_ops%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/base_name-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/base_name-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/base_name-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/base_name-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/cache-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/cache-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/cache-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/cache-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/cache_path-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/cache_path-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/cache_path-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/cache_path-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/cached%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/cached%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/cached%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/cached%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/cdesc-Git.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/cdesc-Git.ri similarity index 77% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/cdesc-Git.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/cdesc-Git.ri index 507250ca..657fc654 100644 Binary files a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/cdesc-Git.ri and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/cdesc-Git.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/checkout-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/checkout-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/checkout-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/checkout-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/eql%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/eql%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/eql%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/eql%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/from_lock-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/from_lock-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/from_lock-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/from_lock-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/git-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/git-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/git-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/git-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/has_revision_cached%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/has_revision_cached%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/has_revision_cached%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/has_revision_cached%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/in_cache-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/in_cache-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/in_cache-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/in_cache-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/install-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/install-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/install-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/install-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/load_spec_files-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/load_spec_files-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/load_spec_files-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/load_spec_files-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/name-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/name-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/name-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/name-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/new-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/new-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/new-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/new-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/options-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/options-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/options-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/options-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/path-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/path-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/path-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/path-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/ref-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/ref-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/ref-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/ref-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/revision-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/revision-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/revision-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/revision-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/shortref_for_display-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/shortref_for_display-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/shortref_for_display-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/shortref_for_display-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/shortref_for_path-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/shortref_for_path-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/shortref_for_path-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/shortref_for_path-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/specs-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/specs-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/specs-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/specs-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/submodules-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/submodules-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/submodules-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/submodules-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/to_lock-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/to_lock-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/to_lock-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/to_lock-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/to_s-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/to_s-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/to_s-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/to_s-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/unlock%21-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/unlock%21-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/unlock%21-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/unlock%21-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/uri-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/uri-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/uri-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/uri-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/uri_escaped-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/uri_escaped-i.ri new file mode 100644 index 00000000..f789b973 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/uri_escaped-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/uri_hash-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/uri_hash-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Git/uri_hash-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Git/uri_hash-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/%3d%3d-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/%3d%3d-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/%3d%3d-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/%3d%3d-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/Installer/cdesc-Installer.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/Installer/cdesc-Installer.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/Installer/cdesc-Installer.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/Installer/cdesc-Installer.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/Installer/generate_bin-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/Installer/generate_bin-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/Installer/generate_bin-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/Installer/generate_bin-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/Installer/new-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/Installer/new-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/Installer/new-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/Installer/new-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/cache-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/cache-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/cache-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/cache-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/cached%21-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/cached%21-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/cached%21-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/cached%21-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/cdesc-Path.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/cdesc-Path.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/cdesc-Path.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/cdesc-Path.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/eql%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/eql%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/eql%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/eql%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/from_lock-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/from_lock-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/from_lock-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/from_lock-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/generate_bin-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/generate_bin-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/generate_bin-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/generate_bin-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/hash-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/hash-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/hash-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/hash-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/install-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/install-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/install-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/install-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/load_spec_files-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/load_spec_files-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/load_spec_files-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/load_spec_files-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/local_specs-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/local_specs-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/local_specs-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/local_specs-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/name-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/name-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/name-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/name-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/new-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/new-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/new-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/new-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/options-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/options-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/options-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/options-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/path-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/path-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/path-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/path-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/relative_path-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/relative_path-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/relative_path-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/relative_path-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/remote%21-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/remote%21-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/remote%21-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/remote%21-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/specs-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/specs-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/specs-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/specs-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/to_lock-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/to_lock-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/to_lock-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/to_lock-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/to_s-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/to_s-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/to_s-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/to_s-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/version-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/version-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Path/version-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Path/version-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/%3d%3d-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/%3d%3d-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/%3d%3d-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/%3d%3d-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/add_remote-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/add_remote-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/add_remote-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/add_remote-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/cache-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/cache-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/cache-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/cache-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/cached%21-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/cached%21-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/cached%21-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/cached%21-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/cached_gem-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/cached_gem-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/cached_gem-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/cached_gem-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/cached_specs-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/cached_specs-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/cached_specs-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/cached_specs-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/cdesc-Rubygems.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/cdesc-Rubygems.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/cdesc-Rubygems.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/cdesc-Rubygems.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/download_gem_from_uri-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/download_gem_from_uri-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/download_gem_from_uri-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/download_gem_from_uri-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/eql%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/eql%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/eql%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/eql%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/fetch-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/fetch-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/fetch-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/fetch-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/fetch_all_remote_specs-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/fetch_all_remote_specs-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/fetch_all_remote_specs-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/fetch_all_remote_specs-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/fetch_specs-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/fetch_specs-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/fetch_specs-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/fetch_specs-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/from_lock-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/from_lock-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/from_lock-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/from_lock-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/hash-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/hash-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/hash-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/hash-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/install-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/install-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/install-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/install-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/installed_specs-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/installed_specs-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/installed_specs-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/installed_specs-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/merge_remotes-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/merge_remotes-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/merge_remotes-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/merge_remotes-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/name-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/name-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/name-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/name-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/new-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/new-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/new-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/new-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/normalize_uri-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/normalize_uri-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/normalize_uri-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/normalize_uri-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/options-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/options-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/options-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/options-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/remote%21-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/remote%21-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/remote%21-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/remote%21-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/remote_specs-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/remote_specs-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/remote_specs-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/remote_specs-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/remotes-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/remotes-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/remotes-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/remotes-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/specs-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/specs-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/specs-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/specs-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/sudo-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/sudo-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/sudo-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/sudo-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/to_lock-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/to_lock-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/to_lock-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/to_lock-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/to_s-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/to_s-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/Rubygems/to_s-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/Rubygems/to_s-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/cdesc-Source.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/cdesc-Source.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/Source/cdesc-Source.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/Source/cdesc-Source.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SpecSet/%5b%5d%3d-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SpecSet/%5b%5d%3d-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SpecSet/%5b%5d%3d-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SpecSet/%5b%5d%3d-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SpecSet/%5b%5d-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SpecSet/%5b%5d-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SpecSet/%5b%5d-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SpecSet/%5b%5d-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SpecSet/cdesc-SpecSet.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SpecSet/cdesc-SpecSet.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SpecSet/cdesc-SpecSet.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SpecSet/cdesc-SpecSet.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SpecSet/each-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SpecSet/each-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SpecSet/each-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SpecSet/each-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SpecSet/for-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SpecSet/for-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SpecSet/for-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SpecSet/for-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SpecSet/length-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SpecSet/length-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SpecSet/length-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SpecSet/length-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SpecSet/lookup-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SpecSet/lookup-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SpecSet/lookup-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SpecSet/lookup-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SpecSet/materialize-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SpecSet/materialize-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SpecSet/materialize-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SpecSet/materialize-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SpecSet/merge-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SpecSet/merge-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SpecSet/merge-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SpecSet/merge-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SpecSet/new-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SpecSet/new-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SpecSet/new-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SpecSet/new-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SpecSet/sorted-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SpecSet/sorted-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SpecSet/sorted-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SpecSet/sorted-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SpecSet/to_a-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SpecSet/to_a-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SpecSet/to_a-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SpecSet/to_a-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SpecSet/to_hash-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SpecSet/to_hash-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SpecSet/to_hash-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SpecSet/to_hash-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SpecSet/tsort_each_child-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SpecSet/tsort_each_child-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SpecSet/tsort_each_child-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SpecSet/tsort_each_child-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SpecSet/tsort_each_node-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SpecSet/tsort_each_node-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SpecSet/tsort_each_node-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SpecSet/tsort_each_node-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SpecSet/valid_for%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SpecSet/valid_for%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SpecSet/valid_for%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/SpecSet/valid_for%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/RGProxy/cdesc-RGProxy.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/RGProxy/cdesc-RGProxy.ri new file mode 100644 index 00000000..1fd0c588 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/RGProxy/cdesc-RGProxy.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/RGProxy/new-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/RGProxy/new-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/RGProxy/new-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/RGProxy/new-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/RGProxy/say-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/RGProxy/say-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/RGProxy/say-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/RGProxy/say-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/Shell/be_quiet%21-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/Shell/be_quiet%21-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/Shell/be_quiet%21-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/Shell/be_quiet%21-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/Shell/cdesc-Shell.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/Shell/cdesc-Shell.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/Shell/cdesc-Shell.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/Shell/cdesc-Shell.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/Shell/confirm-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/Shell/confirm-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/Shell/confirm-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/Shell/confirm-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/Shell/debug%21-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/Shell/debug%21-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/Shell/debug%21-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/Shell/debug%21-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/Shell/debug-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/Shell/debug-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/Shell/debug-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/Shell/debug-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/Shell/error-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/Shell/error-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/Shell/error-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/Shell/error-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/Shell/info-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/Shell/info-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/Shell/info-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/Shell/info-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/Shell/new-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/Shell/new-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/Shell/new-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/Shell/new-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/Shell/shell-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/Shell/shell-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/Shell/shell-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/Shell/shell-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/Shell/warn-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/Shell/warn-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/Shell/warn-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/Shell/warn-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/cdesc-UI.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/cdesc-UI.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/cdesc-UI.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/cdesc-UI.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/confirm-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/confirm-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/confirm-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/confirm-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/debug-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/debug-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/debug-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/debug-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/error-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/error-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/error-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/error-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/info-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/info-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/info-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/info-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/warn-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/warn-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/warn-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/UI/warn-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/VersionConflict/cdesc-VersionConflict.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/VersionConflict/cdesc-VersionConflict.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/VersionConflict/cdesc-VersionConflict.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/VersionConflict/cdesc-VersionConflict.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/VersionConflict/conflicts-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/VersionConflict/conflicts-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/VersionConflict/conflicts-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/VersionConflict/conflicts-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/VersionConflict/new-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/VersionConflict/new-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/VersionConflict/new-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/VersionConflict/new-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/app_cache-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/app_cache-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/app_cache-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/app_cache-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/app_config_path-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/app_config_path-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/app_config_path-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/app_config_path-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/bin_path-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/bin_path-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/bin_path-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/bin_path-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/bundle_path-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/bundle_path-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/bundle_path-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/bundle_path-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/bundle_path-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/bundle_path-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/bundle_path-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/bundle_path-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/cache-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/cache-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/cache-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/cache-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/cdesc-Bundler.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/cdesc-Bundler.ri similarity index 92% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/cdesc-Bundler.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/cdesc-Bundler.ri index bbb0f8bd..26b698b8 100644 Binary files a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/cdesc-Bundler.ri and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/cdesc-Bundler.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/configure-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/configure-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/configure-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/configure-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/configure_gem_home_and_path-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/configure_gem_home_and_path-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/configure_gem_home_and_path-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/configure_gem_home_and_path-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/default_gemfile-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/default_gemfile-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/default_gemfile-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/default_gemfile-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/default_lockfile-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/default_lockfile-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/default_lockfile-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/default_lockfile-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/definition-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/definition-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/definition-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/definition-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/environment-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/environment-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/environment-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/environment-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/home-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/home-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/home-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/home-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/install_path-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/install_path-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/install_path-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/install_path-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/load-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/load-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/load-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/load-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/load_gemspec-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/load_gemspec-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/load_gemspec-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/load_gemspec-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/mkdir_p-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/mkdir_p-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/mkdir_p-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/mkdir_p-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/read_file-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/read_file-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/read_file-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/read_file-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/require-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/require-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/require-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/require-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/requires_sudo%3f-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/requires_sudo%3f-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/requires_sudo%3f-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/requires_sudo%3f-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/root-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/root-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/root-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/root-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/ruby_scope-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/ruby_scope-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/ruby_scope-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/ruby_scope-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/rubygems-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/rubygems-i.ri new file mode 100644 index 00000000..21e533d6 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/rubygems-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/settings-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/settings-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/settings-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/settings-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/setup-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/setup-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/setup-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/setup-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/specs_path-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/specs_path-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/specs_path-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/specs_path-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/sudo-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/sudo-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/sudo-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/sudo-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/tmp-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/tmp-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/tmp-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/tmp-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/ui-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/ui-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/ui-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/ui-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/ui-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/ui-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/ui-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/ui-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/upgrade_lockfile-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/upgrade_lockfile-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/upgrade_lockfile-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/upgrade_lockfile-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/user_bundle_path-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/user_bundle_path-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/user_bundle_path-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/user_bundle_path-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/with_clean_env-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/with_clean_env-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/with_clean_env-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Bundler/with_clean_env-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/File/cdesc-File.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/File/cdesc-File.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/File/cdesc-File.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/File/cdesc-File.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Dependency/cdesc-Dependency.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Dependency/cdesc-Dependency.ri similarity index 67% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Dependency/cdesc-Dependency.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Dependency/cdesc-Dependency.ri index e3e8efd7..f308b8a1 100644 Binary files a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Dependency/cdesc-Dependency.ri and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Dependency/cdesc-Dependency.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Dependency/encode_with-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Dependency/encode_with-i.ri new file mode 100644 index 00000000..d118b6e3 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Dependency/encode_with-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Dependency/groups-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Dependency/groups-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Dependency/groups-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Dependency/groups-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Dependency/matches_spec%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Dependency/matches_spec%3f-i.ri new file mode 100644 index 00000000..018b19ff Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Dependency/matches_spec%3f-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Dependency/required_by-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Dependency/required_by-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Dependency/required_by-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Dependency/required_by-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Dependency/requirement-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Dependency/requirement-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Dependency/requirement-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Dependency/requirement-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Dependency/source-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Dependency/source-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Dependency/source-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Dependency/source-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Dependency/to_lock-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Dependency/to_lock-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Dependency/to_lock-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Dependency/to_lock-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Dependency/to_yaml_properties-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Dependency/to_yaml_properties-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Dependency/to_yaml_properties-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Dependency/to_yaml_properties-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Platform/cdesc-Platform.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Platform/cdesc-Platform.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Platform/cdesc-Platform.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Platform/cdesc-Platform.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Platform/hash-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Platform/hash-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Platform/hash-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Platform/hash-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Requirement/cdesc-Requirement.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Requirement/cdesc-Requirement.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Requirement/cdesc-Requirement.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Requirement/cdesc-Requirement.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Requirement/none%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Requirement/none%3f-i.ri new file mode 100644 index 00000000..1385cf26 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Requirement/none%3f-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Specification/add_bundler_dependencies-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/add_bundler_dependencies-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Specification/add_bundler_dependencies-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/add_bundler_dependencies-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Specification/cdesc-Specification.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/cdesc-Specification.ri similarity index 54% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Specification/cdesc-Specification.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/cdesc-Specification.ri index 55e3930c..36376036 100644 Binary files a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Specification/cdesc-Specification.ri and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/cdesc-Specification.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Specification/dependencies_to_gemfile-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/dependencies_to_gemfile-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Specification/dependencies_to_gemfile-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/dependencies_to_gemfile-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Specification/full_gem_path-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/full_gem_path-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Specification/full_gem_path-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/full_gem_path-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/gem_dir-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/gem_dir-i.ri new file mode 100644 index 00000000..82f17086 Binary files /dev/null and b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/gem_dir-i.ri differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Specification/git_version-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/git_version-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Specification/git_version-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/git_version-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Specification/groups-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/groups-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Specification/groups-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/groups-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Specification/load_paths-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/load_paths-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Specification/load_paths-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/load_paths-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Specification/loaded_from-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/loaded_from-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Specification/loaded_from-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/loaded_from-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Specification/location-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/location-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Specification/location-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/location-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Specification/nondevelopment_dependencies-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/nondevelopment_dependencies-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Specification/nondevelopment_dependencies-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/nondevelopment_dependencies-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Specification/relative_loaded_from-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/relative_loaded_from-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Specification/relative_loaded_from-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/relative_loaded_from-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Specification/required_by-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/required_by-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Specification/required_by-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/required_by-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Specification/rg_full_gem_path-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/rg_full_gem_path-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Specification/rg_full_gem_path-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/rg_full_gem_path-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Specification/rg_loaded_from-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/rg_loaded_from-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Specification/rg_loaded_from-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/rg_loaded_from-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Specification/source-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/source-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Specification/source-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/source-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Specification/to_gemfile-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/to_gemfile-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Specification/to_gemfile-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/Specification/to_gemfile-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/cdesc-Gem.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/cdesc-Gem.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/cdesc-Gem.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Gem/cdesc-Gem.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/ClassMethods/add_runtime_options%21-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/ClassMethods/add_runtime_options%21-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/ClassMethods/add_runtime_options%21-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/ClassMethods/add_runtime_options%21-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/ClassMethods/cdesc-ClassMethods.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/ClassMethods/cdesc-ClassMethods.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/ClassMethods/cdesc-ClassMethods.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/ClassMethods/cdesc-ClassMethods.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/ClassMethods/source_paths-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/ClassMethods/source_paths-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/ClassMethods/source_paths-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/ClassMethods/source_paths-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/ClassMethods/source_paths_for_search-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/ClassMethods/source_paths_for_search-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/ClassMethods/source_paths_for_search-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/ClassMethods/source_paths_for_search-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/ClassMethods/source_root-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/ClassMethods/source_root-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/ClassMethods/source_root-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/ClassMethods/source_root-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/CreateFile/cdesc-CreateFile.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/CreateFile/cdesc-CreateFile.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/CreateFile/cdesc-CreateFile.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/CreateFile/cdesc-CreateFile.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/Directory/cdesc-Directory.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/Directory/cdesc-Directory.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/Directory/cdesc-Directory.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/Directory/cdesc-Directory.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/EmptyDirectory/cdesc-EmptyDirectory.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/EmptyDirectory/cdesc-EmptyDirectory.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/EmptyDirectory/cdesc-EmptyDirectory.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/EmptyDirectory/cdesc-EmptyDirectory.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/InjectIntoFile/cdesc-InjectIntoFile.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/InjectIntoFile/cdesc-InjectIntoFile.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/InjectIntoFile/cdesc-InjectIntoFile.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/InjectIntoFile/cdesc-InjectIntoFile.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/add_file-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/add_file-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/add_file-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/add_file-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/append_file-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/append_file-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/append_file-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/append_file-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/apply-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/apply-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/apply-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/apply-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/behavior-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/behavior-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/behavior-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/behavior-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/cdesc-Actions.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/cdesc-Actions.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/cdesc-Actions.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/cdesc-Actions.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/chmod-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/chmod-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/chmod-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/chmod-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/copy_file-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/copy_file-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/copy_file-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/copy_file-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/create_file-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/create_file-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/create_file-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/create_file-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/destination_root%3d-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/destination_root%3d-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/destination_root%3d-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/destination_root%3d-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/destination_root-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/destination_root-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/destination_root-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/destination_root-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/directory-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/directory-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/directory-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/directory-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/empty_directory-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/empty_directory-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/empty_directory-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/empty_directory-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/find_in_source_paths-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/find_in_source_paths-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/find_in_source_paths-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/find_in_source_paths-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/get-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/get-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/get-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/get-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/gsub_file-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/gsub_file-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/gsub_file-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/gsub_file-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/in_root-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/in_root-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/in_root-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/in_root-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/inject_into_class-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/inject_into_class-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/inject_into_class-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/inject_into_class-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/inject_into_file-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/inject_into_file-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/inject_into_file-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/inject_into_file-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/inside-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/inside-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/inside-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/inside-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/new-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/new-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/new-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/new-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/prepend_file-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/prepend_file-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/prepend_file-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/prepend_file-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/relative_to_original_destination_root-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/relative_to_original_destination_root-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/relative_to_original_destination_root-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/relative_to_original_destination_root-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/remove_dir-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/remove_dir-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/remove_dir-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/remove_dir-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/remove_file-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/remove_file-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/remove_file-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/remove_file-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/run-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/run-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/run-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/run-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/run_ruby_script-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/run_ruby_script-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/run_ruby_script-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/run_ruby_script-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/source_paths-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/source_paths-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/source_paths-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/source_paths-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/template-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/template-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/template-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/template-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/thor-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/thor-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Actions/thor-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Actions/thor-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Argument/cdesc-Argument.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Argument/cdesc-Argument.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Argument/cdesc-Argument.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Argument/cdesc-Argument.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Arguments/cdesc-Arguments.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Arguments/cdesc-Arguments.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Arguments/cdesc-Arguments.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Arguments/cdesc-Arguments.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/all_tasks-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/all_tasks-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/all_tasks-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/all_tasks-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/argument-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/argument-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/argument-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/argument-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/arguments-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/arguments-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/arguments-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/arguments-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/cdesc-ClassMethods.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/cdesc-ClassMethods.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/cdesc-ClassMethods.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/cdesc-ClassMethods.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/check_unknown_options%21-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/check_unknown_options%21-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/check_unknown_options%21-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/check_unknown_options%21-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/class_option-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/class_option-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/class_option-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/class_option-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/class_options-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/class_options-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/class_options-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/class_options-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/debugging-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/debugging-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/debugging-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/debugging-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/exit_on_failure%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/exit_on_failure%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/exit_on_failure%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/exit_on_failure%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/from_superclass-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/from_superclass-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/from_superclass-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/from_superclass-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/group-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/group-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/group-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/group-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/inherited-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/inherited-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/inherited-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/inherited-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/method_added-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/method_added-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/method_added-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/method_added-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/namespace-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/namespace-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/namespace-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/namespace-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/no_tasks-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/no_tasks-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/no_tasks-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/no_tasks-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/print_options-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/print_options-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/print_options-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/print_options-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/remove_argument-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/remove_argument-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/remove_argument-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/remove_argument-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/remove_class_option-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/remove_class_option-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/remove_class_option-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/remove_class_option-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/remove_task-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/remove_task-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/remove_task-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/remove_task-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/start-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/start-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/start-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/start-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/tasks-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/tasks-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/ClassMethods/tasks-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/ClassMethods/tasks-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/cdesc-Base.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/cdesc-Base.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/cdesc-Base.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/cdesc-Base.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/new-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/new-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/new-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/new-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/options-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/options-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/options-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/options-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/shell%3d-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/shell%3d-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/shell%3d-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/shell%3d-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/shell-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/shell-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/shell-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/shell-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/subclass_files-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/subclass_files-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/subclass_files-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/subclass_files-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/subclasses-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/subclasses-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Base/subclasses-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Base/subclasses-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/CoreExt/HashWithIndifferentAccess/cdesc-HashWithIndifferentAccess.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/CoreExt/HashWithIndifferentAccess/cdesc-HashWithIndifferentAccess.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/CoreExt/HashWithIndifferentAccess/cdesc-HashWithIndifferentAccess.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/CoreExt/HashWithIndifferentAccess/cdesc-HashWithIndifferentAccess.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/CoreExt/OrderedHash/cdesc-OrderedHash.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/CoreExt/OrderedHash/cdesc-OrderedHash.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/CoreExt/OrderedHash/cdesc-OrderedHash.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/CoreExt/OrderedHash/cdesc-OrderedHash.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/CoreExt/cdesc-CoreExt.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/CoreExt/cdesc-CoreExt.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/CoreExt/cdesc-CoreExt.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/CoreExt/cdesc-CoreExt.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/DynamicTask/cdesc-DynamicTask.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/DynamicTask/cdesc-DynamicTask.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/DynamicTask/cdesc-DynamicTask.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/DynamicTask/cdesc-DynamicTask.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/DynamicTask/new-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/DynamicTask/new-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/DynamicTask/new-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/DynamicTask/new-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/DynamicTask/run-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/DynamicTask/run-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/DynamicTask/run-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/DynamicTask/run-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Error/cdesc-Error.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Error/cdesc-Error.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Error/cdesc-Error.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Error/cdesc-Error.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/HiddenTask/cdesc-HiddenTask.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/HiddenTask/cdesc-HiddenTask.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/HiddenTask/cdesc-HiddenTask.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/HiddenTask/cdesc-HiddenTask.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/HiddenTask/hidden%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/HiddenTask/hidden%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/HiddenTask/hidden%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/HiddenTask/hidden%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Invocation/ClassMethods/cdesc-ClassMethods.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Invocation/ClassMethods/cdesc-ClassMethods.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Invocation/ClassMethods/cdesc-ClassMethods.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Invocation/ClassMethods/cdesc-ClassMethods.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Invocation/cdesc-Invocation.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Invocation/cdesc-Invocation.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Invocation/cdesc-Invocation.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Invocation/cdesc-Invocation.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Invocation/invoke-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Invocation/invoke-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Invocation/invoke-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Invocation/invoke-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Invocation/invoke_with_padding-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Invocation/invoke_with_padding-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Invocation/invoke_with_padding-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Invocation/invoke_with_padding-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/InvocationError/cdesc-InvocationError.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/InvocationError/cdesc-InvocationError.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/InvocationError/cdesc-InvocationError.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/InvocationError/cdesc-InvocationError.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/MalformattedArgumentError/cdesc-MalformattedArgumentError.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/MalformattedArgumentError/cdesc-MalformattedArgumentError.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/MalformattedArgumentError/cdesc-MalformattedArgumentError.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/MalformattedArgumentError/cdesc-MalformattedArgumentError.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Option/cdesc-Option.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Option/cdesc-Option.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Option/cdesc-Option.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Option/cdesc-Option.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Options/cdesc-Options.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Options/cdesc-Options.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Options/cdesc-Options.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Options/cdesc-Options.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/RequiredArgumentMissingError/cdesc-RequiredArgumentMissingError.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/RequiredArgumentMissingError/cdesc-RequiredArgumentMissingError.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/RequiredArgumentMissingError/cdesc-RequiredArgumentMissingError.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/RequiredArgumentMissingError/cdesc-RequiredArgumentMissingError.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Sandbox/cdesc-Sandbox.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Sandbox/cdesc-Sandbox.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Sandbox/cdesc-Sandbox.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Sandbox/cdesc-Sandbox.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/ask-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/ask-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/ask-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/ask-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/base-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/base-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/base-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/base-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/cdesc-Basic.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/cdesc-Basic.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/cdesc-Basic.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/cdesc-Basic.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/dynamic_width-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/dynamic_width-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/dynamic_width-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/dynamic_width-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/dynamic_width_stty-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/dynamic_width_stty-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/dynamic_width_stty-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/dynamic_width_stty-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/dynamic_width_tput-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/dynamic_width_tput-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/dynamic_width_tput-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/dynamic_width_tput-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/error-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/error-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/error-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/error-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/file_collision-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/file_collision-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/file_collision-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/file_collision-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/no%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/no%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/no%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/no%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/padding%3d-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/padding%3d-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/padding%3d-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/padding%3d-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/padding-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/padding-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/padding-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/padding-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/print_table-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/print_table-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/print_table-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/print_table-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/print_wrapped-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/print_wrapped-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/print_wrapped-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/print_wrapped-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/say-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/say-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/say-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/say-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/say_status-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/say_status-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/say_status-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/say_status-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/terminal_width-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/terminal_width-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/terminal_width-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/terminal_width-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/truncate-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/truncate-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/truncate-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/truncate-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/unix%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/unix%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/unix%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/unix%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/yes%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/yes%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Basic/yes%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Basic/yes%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Color/cdesc-Color.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Color/cdesc-Color.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Color/cdesc-Color.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Color/cdesc-Color.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Color/set_color-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Color/set_color-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/Color/set_color-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/Color/set_color-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/HTML/ask-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/HTML/ask-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/HTML/ask-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/HTML/ask-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/HTML/cdesc-HTML.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/HTML/cdesc-HTML.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/HTML/cdesc-HTML.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/HTML/cdesc-HTML.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/HTML/set_color-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/HTML/set_color-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/HTML/set_color-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/HTML/set_color-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/cdesc-Shell.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/cdesc-Shell.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/cdesc-Shell.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/cdesc-Shell.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/new-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/new-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/new-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/new-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/shell%3d-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/shell%3d-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/shell%3d-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/shell%3d-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/shell-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/shell-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/shell-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/shell-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/with_padding-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/with_padding-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Shell/with_padding-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Shell/with_padding-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Task/cdesc-Task.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Task/cdesc-Task.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Task/cdesc-Task.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Task/cdesc-Task.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Task/formatted_usage-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Task/formatted_usage-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Task/formatted_usage-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Task/formatted_usage-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Task/handle_argument_error%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Task/handle_argument_error%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Task/handle_argument_error%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Task/handle_argument_error%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Task/handle_no_method_error%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Task/handle_no_method_error%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Task/handle_no_method_error%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Task/handle_no_method_error%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Task/hidden%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Task/hidden%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Task/hidden%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Task/hidden%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Task/new-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Task/new-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Task/new-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Task/new-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Task/not_debugging%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Task/not_debugging%3f-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Task/not_debugging%3f-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Task/not_debugging%3f-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Task/required_options-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Task/required_options-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Task/required_options-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Task/required_options-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Task/run-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Task/run-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Task/run-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Task/run-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/UndefinedTaskError/cdesc-UndefinedTaskError.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/UndefinedTaskError/cdesc-UndefinedTaskError.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/UndefinedTaskError/cdesc-UndefinedTaskError.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/UndefinedTaskError/cdesc-UndefinedTaskError.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/UnknownArgumentError/cdesc-UnknownArgumentError.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/UnknownArgumentError/cdesc-UnknownArgumentError.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/UnknownArgumentError/cdesc-UnknownArgumentError.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/UnknownArgumentError/cdesc-UnknownArgumentError.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Util/camel_case-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Util/camel_case-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Util/camel_case-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Util/camel_case-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Util/cdesc-Util.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Util/cdesc-Util.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Util/cdesc-Util.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Util/cdesc-Util.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Util/find_by_namespace-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Util/find_by_namespace-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Util/find_by_namespace-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Util/find_by_namespace-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Util/find_class_and_task_by_namespace-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Util/find_class_and_task_by_namespace-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Util/find_class_and_task_by_namespace-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Util/find_class_and_task_by_namespace-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Util/globs_for-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Util/globs_for-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Util/globs_for-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Util/globs_for-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Util/load_thorfile-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Util/load_thorfile-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Util/load_thorfile-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Util/load_thorfile-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Util/namespace_from_thor_class-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Util/namespace_from_thor_class-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Util/namespace_from_thor_class-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Util/namespace_from_thor_class-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Util/namespaces_in_content-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Util/namespaces_in_content-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Util/namespaces_in_content-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Util/namespaces_in_content-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Util/ruby_command-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Util/ruby_command-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Util/ruby_command-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Util/ruby_command-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Util/snake_case-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Util/snake_case-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Util/snake_case-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Util/snake_case-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Util/thor_classes_in-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Util/thor_classes_in-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Util/thor_classes_in-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Util/thor_classes_in-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Util/thor_root-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Util/thor_root-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Util/thor_root-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Util/thor_root-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Util/thor_root_glob-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Util/thor_root_glob-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Util/thor_root_glob-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Util/thor_root_glob-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Util/user_home-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Util/user_home-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/Util/user_home-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/Util/user_home-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/banner-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/banner-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/banner-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/banner-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/cdesc-Thor.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/cdesc-Thor.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/cdesc-Thor.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/cdesc-Thor.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/check_unknown_options%21-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/check_unknown_options%21-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/check_unknown_options%21-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/check_unknown_options%21-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/default_task-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/default_task-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/default_task-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/default_task-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/desc-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/desc-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/desc-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/desc-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/help-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/help-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/help-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/help-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/help-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/help-i.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/help-i.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/help-i.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/long_desc-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/long_desc-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/long_desc-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/long_desc-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/map-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/map-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/map-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/map-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/method_option-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/method_option-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/method_option-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/method_option-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/method_options-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/method_options-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/method_options-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/method_options-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/printable_tasks-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/printable_tasks-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/printable_tasks-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/printable_tasks-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/subcommand-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/subcommand-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/subcommand-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/subcommand-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/subcommand_help-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/subcommand_help-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/subcommand_help-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/subcommand_help-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/subcommands-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/subcommands-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/subcommands-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/subcommands-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/task_help-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/task_help-c.ri similarity index 100% rename from vendor/plugins/bundler/doc/bundler-1.0.7/ri/Thor/task_help-c.ri rename to vendor/plugins/bundler/doc/bundler-1.0.15/ri/Thor/task_help-c.ri diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/cache.ri b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/cache.ri new file mode 100644 index 00000000..5390b8af --- /dev/null +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/cache.ri @@ -0,0 +1,49 @@ +{ +:class_methods{)"Bundler::Source::Path["from_lock"new"Bundler::LockfileParser["new"Bundler::Source::Rubygems["from_lock"new"Bundler::Deployment["define_task"Bundler::Resolver["new" resolve"%Bundler::Source::Path::Installer["new"Bundler::Dsl["deprecate" evaluate"new"Thor::Util["camel_case"find_by_namespace"%find_class_and_task_by_namespace"globs_for"load_thorfile"namespace_from_thor_class"namespaces_in_content"ruby_command"snake_case"thor_classes_in"thor_root"thor_root_glob"user_home" Thor[" banner"check_unknown_options!"default_task" desc" help"long_desc"map"method_option"method_options"printable_tasks"subcommand"subcommand_help"subcommands"task_help"Bundler::SpecSet["new"Bundler::GemHelper["install_tasks"new"Thor::DynamicTask["new"Bundler::Installer[" install"!Bundler::RemoteSpecification["new"Bundler::Index[" +build"new"Thor::Shell["new"Bundler::Definition[" +build"new"Bundler::CLI["new"source_root"Bundler::Environment["new"Bundler::UI::Shell["new"Bundler::DepProxy["new"Bundler::GraphNode["new"Bundler::Dependency["new"Bundler::Source::Git["from_lock"new"!Bundler::Resolver::SpecGroup["new"Thor::Actions["new"Bundler::UI::RGProxy["new"!Bundler::RubygemsIntegration["new"Bundler::Settings["new"Bundler::VersionConflict["new" Bundler[#"app_cache"app_config_path" bin_path"bundle_path" +cache"configure" configure_gem_home_and_path"default_gemfile"default_lockfile"definition"environment" home"install_path" load"load_gemspec" mkdir_p"read_file" require"requires_sudo?" root"ruby_scope" settings" +setup"specs_path" sudo"tmp"ui"upgrade_lockfile"user_bundle_path"with_clean_env"Bundler::LazySpecification["new"Thor::Base[ +"new" +shell" shell="subclass_files"subclasses"Bundler::BundlerError["status_code"Thor::Task["new"Bundler::Graph["new:attributes{@[ "attr_accessor version"attr_reader options"attr_reader path"attr_writer name"Gem::Specification["attr_accessor location"'attr_accessor relative_loaded_from"attr_accessor source@ [ "attr_reader dependencies"attr_reader platforms"attr_reader sources"attr_reader specs@["attr_reader remotes"Thor::Shell::Basic["attr_accessor base"attr_accessor padding@["attr_reader errors"Thor::Base::ClassMethods["attr_accessor debugging@C["attr_reader base"attr_reader gemspec"attr_reader spec_path@M[ "attr_accessor source"attr_reader name"attr_reader platform"attr_reader version@P["attr_reader specs@W["attr_reader dependencies"attr_reader platforms"attr_reader sources@_["attr_reader root@b["attr_writer shell@e["attr_reader __platform"attr_reader dep"attr_reader required_by"Gem::Dependency["attr_accessor groups"attr_accessor source@h[ "attr_accessor is_user"attr_reader dependencies"attr_reader name"attr_reader version"Bundler::SharedHelpers["attr_accessor gem_loaded@k["attr_reader autorequire"attr_reader groups"attr_reader platforms@n[ "attr_reader options"attr_reader ref"attr_reader submodules"attr_reader uri@r["attr_reader activated"attr_reader required_by@u["attr_accessor behavior@|["attr_reader conflicts@["attr_reader rubygems"attr_writer bundle_path"attr_writer ui@Ÿ[ +"attr_accessor source"attr_reader dependencies"attr_reader name"attr_reader platform"attr_reader version@¢["attr_accessor options:instance_methods{;" Thor::Actions::ClassMethods[ "add_runtime_options!"source_paths"source_paths_for_search"source_root"Gem::Requirement[" +none?@["==" +cache" cached!" eql?"generate_bin" hash" install"load_spec_files"local_specs" name" options" path"relative_path" remote!" +specs" to_lock" to_s" version@¸["add_bundler_dependencies"dependencies_to_gemfile"full_gem_path" gem_dir"git_version" groups"load_paths"loaded_from" location" nondevelopment_dependencies"relative_loaded_from"required_by"rg_full_gem_path"rg_loaded_from" source"to_gemfile@ [ "dependencies"parse_dependency"parse_platform"parse_source"parse_spec"platforms" sources" +specs@["=="add_remote" +cache" cached!"cached_gem"cached_specs"download_gem_from_uri" eql?" +fetch"fetch_all_remote_specs"fetch_specs" hash" install"installed_specs"merge_remotes" name"normalize_uri" options" remote!"remote_specs" remotes" +specs" sudo" to_lock" to_s"Thor::Shell::Color["set_color@Ä["ask" base"dynamic_width"dynamic_width_stty"dynamic_width_tput" +error"file_collision"no?" padding" padding="print_table"print_wrapped"say"say_status"terminal_width" truncate" +unix?" yes?",Bundler::RubygemsIntegration::Deprecate["skip_during@["clean_req" +debug"error_message" errors"gem_message"gems_size" resolve"resolve_requirement" search" +start"successify"version_conflict@["generate_bin@["_deprecated_options"_normalize_hash"_normalize_options"env"gem" gemspec"git" +group" path" platform"platforms"rubygems_source" source"to_definition@0[" help@@["[]"[]=" each"for" length" lookup"materialize" +merge" sorted" to_a" to_hash"tsort_each_child"tsort_each_node"valid_for?@Ê["all_tasks" argument"arguments"check_unknown_options!"class_option"class_options"debugging"exit_on_failure?"from_superclass" +group"inherited"method_added"namespace" no_tasks"print_options"remove_argument"remove_class_option"remove_task" +start" +tasks@C[" base"build_gem"built_gem_path" clean?" gemspec" git_push"guard_already_tagged"guard_clean" install"install_gem" name"perform_git_push"release_gem"rubygem_push"sh"sh_with_code"spec_path"tag_version" version"version_tag@G["run@J["&generate_bundler_executable_stubs"run")Bundler::RubygemsIntegration::Legacy["all_specs"find_name"stub_rubygems@M[" __swap__"_remote_specification"fetch_platform"full_name"method_missing" name" platform" source" version@P["<<"=="[]" each" empty?"initialize_copy"same_version?" search"search_by_dependency"search_by_spec"search_for_all_platforms" sources"spec_satisfies_dependency?" +specs"use@T[" +shell" shell="with_padding@W[$"converge_dependencies"converge_locked_specs"converge_sources"current_dependencies"dependencies"+ensure_equivalent_gemfile_and_lockfile"expand_dependencies"expanded_dependencies" groups"in_locked_deps?" +index" lock"missing_specs"new_platform?"new_specs"no_sources?"platforms"pretty_dep"removed_specs"requested_dependencies"requested_specs" resolve"resolve_remotely!"resolve_with_cache!"rubygems_index"satisfies_locked_spec?"sorted_sources" sources" +specs"specs_for" to_lock@[[" +cache" +check" config" console" exec"gem"have_groff?" help" init" install"locate_gem" lock" open" package" show" unlock" update" version"viz@_["current_dependencies"dependencies" +index" inspect" lock"requested_specs" root" +specs" update@b[ "be_quiet!" confirm" +debug" debug!" +error" info" +shell" warn"Gem::Platform[" hash"Bundler::Runtime[ " +cache"cache_path"dependencies_for"prune_cache" require" +setup"setup_environment"Thor::Shell::HTML["ask"set_color@e["=="__platform"dep" eql?" hash"method_missing"required_by" to_s" type"/Bundler::RubygemsIntegration::Transitional["stub_rubygems@ä[ "encode_with" groups"matches_spec?"required_by"requirement" source" to_lock"to_yaml_properties@h[ "dependencies" is_user" name" version@í[ "clean_load_path"default_gemfile"default_lockfile"find_gemfile"gem_loaded"in_bundle?"Thor::Invocation[" invoke"invoke_with_padding")Bundler::RubygemsIntegration::Modern["all_specs"find_name"stub_rubygems@k["autorequire"current_env?"current_platform?"gem_platforms" groups" jruby?" mingw?"mingw_18?"mingw_19?" mri?" mri_18?" mri_19?" mswin?"platforms" rbx?" +ruby?" ruby_18?" ruby_19?"should_include?" to_lock@n[!"=="allow_git_ops?"base_name" +cache"cache_path" cached?" checkout" eql?"git"has_revision_cached?" in_cache" install"load_spec_files" name" options" path"ref" revision"shortref_for_display"shortref_for_path" +specs"submodules" to_lock" to_s" unlock!"uri"uri_escaped" uri_hash@r["__dependencies"activate_platform"activated" for?"initialize_copy" name"required_by" source" to_s" to_specs" version@u[ " add_file"append_file" +apply" behavior" +chmod"copy_file"create_file"destination_root"destination_root="directory"empty_directory"find_in_source_paths"get"gsub_file" in_root"inject_into_class"inject_into_file" inside"prepend_file"*relative_to_original_destination_root"remove_dir"remove_file"run"run_ruby_script"source_paths" template" thor@x["say@{[#" bin_path"clear_paths"configuration"download_gem"fetch_specs"gem_bindir" gem_dir" gem_path" inflate"loaded_specs"mark_loaded"marshal_spec_dir" path"platforms"preserve_paths"read_binary"replace_bin_path"replace_entrypoints"replace_gem"replace_refresh""reverse_rubygems_kernel_mixin"ruby_engine" sources" sources="spec_from_gem"stub_source_index137"stub_source_index170"ui="user_home"with_build_args"Thor::HiddenTask[" hidden?@~["[]"[]="all"allow_sudo?" delete"global_config_file" key_for"local_config_file"locations" path"pretty_values_for"set_global" set_key" without" without="Bundler::UI[ +" confirm" +debug" +error" info" warn@|["conflicts@["bundle_path" rubygems"ui@Ÿ["__materialize__"dependencies"full_name"method_missing" name" platform"respond_to?"satisfies?" source" to_lock" to_s" version"Bundler::GemHelpers[" generic"Bundler::MatchPlatform["match_platform@¢[" options"/Bundler::RubygemsIntegration::AlmostModern["preserve_paths@¬[ "formatted_usage"handle_argument_error?"handle_no_method_error?" hidden?"not_debugging?"required_options"run@¯[ " groups" +nodes" populate"viz:ancestors{a" File[" Object@¯[" Object"Thor::InvocationError["Thor::Error@[" Object@¢["Thor::Sandbox["Thor::CoreExt::OrderedHash[" ::Hash""Thor::Actions::EmptyDirectory[" Object"-Thor::CoreExt::HashWithIndifferentAccess[" ::Hash@h[" Object@P["Enumerable" Object@M["MatchPlatform" Object"Thor::UnknownArgumentError[@A@[" Object@$["GemHelpers@p[@Ê["Thor::Actions::CreateFile[""Thor::Actions::EmptyDirectory"Bundler::DslError["Bundler::BundlerError"'Thor::RequiredArgumentMissingError["Thor::InvocationError@|[@e@["Gem::Installer@Ä[" Object""Thor::Actions::InjectIntoFile[@b"Bundler::GitError[@e"Thor::Actions::Directory[@b@[" Object@]["Thor::Shell::Basic"3Bundler::RubygemsIntegration::Gem::SourceIndex[@T[@ ["Bundler::PathError[@e"Bundler::GemspecError[@e@ [" Object"&Bundler::RubygemsIntegration::Gem[@í["Gem["Thor::CoreExt[@¬["IStruct.new(:name, :description, :long_description, :usage, :options)@Ô["!Bundler::RubygemsIntegration"Bundler::GemNotFound[@e@[" Object@[" Object@)[")Bundler::RubygemsIntegration::Modern"Bundler::InvalidOption["Bundler::DslError@~[" Object@r["GemHelpers" +Array@ä[" Object@¸["Bundler::MatchPlatform" Object@["Thor::Error["StandardError@X[")Bundler::RubygemsIntegration::Legacy@b["Bundler::UI@J["Bundler::Environment"#Thor::Invocation::ClassMethods[@Ÿ["MatchPlatform" Object@n["Bundler::Source::Path"$Thor::MalformattedArgumentError[@h@e[" Object@J[@w@u["Bundler::GemfileError[@e@_[" Object@![@ô["Thor::Task@©["StandardError"Bundler::DeprecatedError[@e@[["Thor::Actions" Thor"Bundler::GemfileNotFound[@e@![@{[" Object@x["::Gem::SilentUI@k["Gem::Dependency@A["SharedHelpers@«@G[@¿@@[" +TSort"Enumerable" Object@0["Thor::Base" Object@s[" Object"Thor::Arguments[" Object"Thor::Option["Thor::Argument"Bundler::InvalidSpecSet["StandardError"Bundler::ProductionError[@e@[" Object"Thor::UndefinedTaskError[@A@C["Rake::DSL" Object@W["GemHelpers" Object@[" Object"Thor::Argument[" Object@t[@Œ"Thor::Options["Thor::Arguments"Bundler::Source[@>[" Object: modules[a" File"Bundler::Graph@h"Bundler::Source::Rubygems"Thor::CoreExt::OrderedHash@b"-Thor::CoreExt::HashWithIndifferentAccess"Bundler::GraphNode"Bundler::Index"!Bundler::RemoteSpecification"Thor::UnknownArgumentError"Bundler::Dsl@—"Thor::Actions::CreateFile"Bundler::VersionConflict"'Thor::RequiredArgumentMissingError"%Bundler::Source::Path::Installer@w"Bundler::GitError""Thor::Actions::InjectIntoFile"Thor::Actions::Directory@©"Thor::Shell::Color"Bundler::GemspecError"Bundler::PathError"Bundler::LockfileParser@¿@§"Bundler::GemNotFound"Bundler::Resolver"Bundler::Deployment"Bundler::InvalidOption"/Bundler::RubygemsIntegration::AlmostModern"Bundler::Settings"!Bundler::Resolver::SpecGroup@Ï"Gem::Specification@A"/Bundler::RubygemsIntegration::Transitional"Bundler::UI::Shell"Bundler::Installer"Bundler::LazySpecification"Bundler::Source::Git"$Thor::MalformattedArgumentError"Bundler::DepProxy"Thor::Shell::HTML"Bundler::GemfileError@«"Thor::HiddenTask"Bundler::DeprecatedError@e"Bundler::CLI"Bundler::GemfileNotFound"Bundler::InvalidSpecSet"Bundler::ProductionError@Œ"Bundler::UI::RGProxy"Bundler::Dependency"Bundler::Runtime"Thor::DynamicTask"Bundler::SpecSet@Æ",Bundler::RubygemsIntegration::Deprecate@ù"Thor::Option"Bundler::Definition"Bundler::GemHelper"Thor::UndefinedTaskError@²"Thor::Options@”@á"Gem::Requirement"Gem::Platform"Thor::CoreExt" Thor::Actions::ClassMethods"Bundler::Source"#Thor::Invocation::ClassMethods"Thor::Util"Thor::Base::ClassMethods"Gem"Thor::Sandbox"Thor::Shell"Thor::Invocation"Bundler::SharedHelpers"3Bundler::RubygemsIntegration::Gem::SourceIndex@Å"&Bundler::RubygemsIntegration::Gem" Bundler@Ø@ "Bundler::GemHelpers \ No newline at end of file diff --git a/vendor/plugins/bundler/doc/bundler-1.0.15/ri/created.rid b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/created.rid new file mode 100644 index 00000000..a49b60f2 --- /dev/null +++ b/vendor/plugins/bundler/doc/bundler-1.0.15/ri/created.rid @@ -0,0 +1,71 @@ +Tue, 14 Jun 2011 09:52:49 -0500 +lib/bundler/vendor/thor/actions/create_file.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/gem_helper.rb Tue, 14 Jun 2011 09:52:47 -0500 +lib/bundler/rubygems_ext.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/installer.rb Tue, 14 Jun 2011 09:52:47 -0500 +lib/bundler/man/bundle-benchmark Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/vendor/thor/parser.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/vendor/thor/actions/directory.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/man/bundle-config.txt Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/man/bundle-install.txt Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/templates/Executable Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/vendor/thor/parser/argument.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/vendor/thor/shell/color.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/setup.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/vendor/thor/invocation.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/vendor/thor/shell/html.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/vendor/thor/util.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/remote_specification.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/index.rb Tue, 14 Jun 2011 09:52:47 -0500 +lib/bundler/gem_tasks.rb Tue, 14 Jun 2011 09:52:47 -0500 +lib/bundler/man/bundle-exec Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/vendor/thor/shell.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/man/bundle-benchmark.txt Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/vendor/thor/actions/inject_into_file.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/man/bundle-update Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/vendor/thor/parser/arguments.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/man/bundle-package Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/rubygems_integration.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/man/bundle-config Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/vlad.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/vendor/thor.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/graph.rb Tue, 14 Jun 2011 09:52:47 -0500 +lib/bundler/vendor/thor/parser/options.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/vendor/thor/core_ext/ordered_hash.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/vendor/thor/task.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/dsl.rb Tue, 14 Jun 2011 09:52:47 -0500 +lib/bundler/vendor/thor/core_ext/hash_with_indifferent_access.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/shared_helpers.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/vendor/thor/base.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/definition.rb Tue, 14 Jun 2011 09:52:47 -0500 +lib/bundler/man/bundle-package.txt Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/man/bundle-exec.txt Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/environment.rb Tue, 14 Jun 2011 09:52:47 -0500 +lib/bundler/lockfile_parser.rb Tue, 14 Jun 2011 09:52:47 -0500 +lib/bundler/man/bundle-install Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/vendor/thor/actions/empty_directory.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/spec_set.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/deployment.rb Tue, 14 Jun 2011 09:52:47 -0500 +lib/bundler/man/bundle.txt Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/resolver.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/runtime.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/lazy_specification.rb Tue, 14 Jun 2011 09:52:47 -0500 +lib/bundler/vendor/thor/core_ext/file_binary_read.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/vendor/thor/actions.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/vendor/thor/shell/basic.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/vendor/thor/actions/file_manipulation.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/source.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/dependency.rb Tue, 14 Jun 2011 09:52:47 -0500 +lib/bundler/version.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/cli.rb Tue, 14 Jun 2011 09:52:47 -0500 +lib/bundler/settings.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/capistrano.rb Tue, 14 Jun 2011 09:52:47 -0500 +lib/bundler/templates/Gemfile Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/ui.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/man/bundle Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler.rb Tue, 14 Jun 2011 09:52:47 -0500 +lib/bundler/vendor/thor/parser/option.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/man/bundle-update.txt Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/vendor/thor/error.rb Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/man/gemfile.5.txt Tue, 14 Jun 2011 09:52:48 -0500 +lib/bundler/vendor/thor/version.rb Tue, 14 Jun 2011 09:52:48 -0500 diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/SharedHelpers.html b/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/SharedHelpers.html deleted file mode 100644 index a539107f..00000000 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/Bundler/SharedHelpers.html +++ /dev/null @@ -1,718 +0,0 @@ - - - - - - - Module: Bundler::SharedHelpers - - - - - - - - - - - -
    -
    -
    -

    - Home - Classes - Methods -

    -
    -
    - -
    -
    -

    In Files

    -
    - -
    -
    - - -
    - -
    - - - - - - -
    -

    Namespace

    - -
    - - - - - - - - - -
    - -
    - - - - - -
    -

    Class Index - [+]

    -
    -
    - Quicksearch - -
    -
    - - - -
    - - -
    -
    - -
    -

    Bundler::SharedHelpers

    - -
    - -
    - - - - - - -
    -

    Attributes

    - - -
    - - - - -
    - gem_loaded[RW] -
    - -
    - - - -
    -
    - -
    - - - - -
    -

    Public Instance Methods

    - - -
    - - -
    - - default_gemfile() - click to toggle source - -
    - -
    - - - - - -
    -
    -    # File lib/bundler/shared_helpers.rb, line 19
-19:     def default_gemfile
-20:       gemfile = find_gemfile
-21:       raise GemfileNotFound, "Could not locate Gemfile" unless gemfile
-22:       Pathname.new(gemfile)
-23:     end
    -
    - -
    - - - - -
    - - -
    - - -
    - - default_lockfile() - click to toggle source - -
    - -
    - - - - - -
    -
    -    # File lib/bundler/shared_helpers.rb, line 25
-25:     def default_lockfile
-26:       Pathname.new("#{default_gemfile}.lock")
-27:     end
    -
    - -
    - - - - -
    - - -
    - - -
    - - in_bundle?() - click to toggle source - -
    - -
    - - - - - -
    -
    -    # File lib/bundler/shared_helpers.rb, line 29
-29:     def in_bundle?
-30:       find_gemfile
-31:     end
    -
    - -
    - - - - -
    - - -
    - -
    -

    Private Instance Methods

    - - -
    - - -
    - - clean_load_path() - click to toggle source - -
    - -
    - - - - - -
    -
    -    # File lib/bundler/shared_helpers.rb, line 55
-55:     def clean_load_path
-56:       # handle 1.9 where system gems are always on the load path
-57:       if defined?(::Gem)
-58:         me = File.expand_path("../../", __FILE__)
-59:         $LOAD_PATH.reject! do |p|
-60:           next if File.expand_path(p) =~ /^#{me}/
-61:           p != File.dirname(__FILE__) &&
-62:             Gem.path.any?{|gp| p =~ /^#{gp}/ }
-63:         end
-64:         $LOAD_PATH.uniq!
-65:       end
-66:     end
    -
    - -
    - - - - -
    - - -
    - - -
    - - cripple_rubygems(specs) - click to toggle source - -
    - -
    - - - - - -
    -
    -     # File lib/bundler/shared_helpers.rb, line 80
- 80:     def cripple_rubygems(specs)
- 81:       reverse_rubygems_kernel_mixin
- 82: 
- 83:       executables = specs.map { |s| s.executables }.flatten
- 84:       Gem.source_index # ensure RubyGems is fully loaded
- 85: 
- 86:       ::Kernel.send(:define_method, :gem) do |dep, *reqs|
- 87:         if executables.include? File.basename(caller.first.split(':').first)
- 88:           return
- 89:         end
- 90:         opts = reqs.last.is_a?(Hash) ? reqs.pop : {}
- 91: 
- 92:         unless dep.respond_to?(:name) && dep.respond_to?(:requirement)
- 93:           dep = Gem::Dependency.new(dep, reqs)
- 94:         end
- 95: 
- 96:         spec = specs.find  { |s| s.name == dep.name }
- 97: 
- 98:         if spec.nil?
- 99:           e = Gem::LoadError.new "#{dep.name} is not part of the bundle. Add it to Gemfile."
-100:           e.name = dep.name
-101:           e.version_requirement = dep.requirement
-102:           raise e
-103:         elsif dep !~ spec
-104:           e = Gem::LoadError.new "can't activate #{dep}, already activated #{spec.full_name}. "                                   "Make sure all dependencies are added to Gemfile."
-105:           e.name = dep.name
-106:           e.version_requirement = dep.requirement
-107:           raise e
-108:         end
-109: 
-110:         true
-111:       end
-112: 
-113:       # === Following hacks are to improve on the generated bin wrappers ===
-114: 
-115:       # Yeah, talk about a hack
-116:       source_index_class = (class << Gem::SourceIndex ; self ; end)
-117:       source_index_class.send(:remove_method, :from_gems_in)
-118:       source_index_class.send(:define_method, :from_gems_in) do |*args|
-119:         source_index = Gem::SourceIndex.new
-120:         source_index.spec_dirs = *args
-121:         source_index.add_specs(*specs)
-122:         source_index
-123:       end
-124: 
-125:       # OMG more hacks
-126:       gem_class = (class << Gem ; self ; end)
-127:       gem_class.send(:remove_method, :refresh)
-128:       gem_class.send(:define_method, :refresh) { }
-129:       gem_class.send(:remove_method, :bin_path)
-130:       gem_class.send(:define_method, :bin_path) do |name, *args|
-131:         exec_name, *reqs = args
-132: 
-133:         if exec_name == 'bundle'
-134:           return ENV['BUNDLE_BIN_PATH']
-135:         end
-136: 
-137:         spec = nil
-138: 
-139:         if exec_name
-140:           spec = specs.find { |s| s.executables.include?(exec_name) }
-141:           spec or raise Gem::Exception, "can't find executable #{exec_name}"
-142:         else
-143:           spec = specs.find  { |s| s.name == name }
-144:           exec_name = spec.default_executable or raise Gem::Exception, "no default executable for #{spec.full_name}"
-145:         end
-146: 
-147:         gem_bin = File.join(spec.full_gem_path, spec.bindir, exec_name)
-148:         gem_from_path_bin = File.join(File.dirname(spec.loaded_from), spec.bindir, exec_name)
-149:         File.exist?(gem_bin) ? gem_bin : gem_from_path_bin
-150:       end
-151: 
-152:       Gem.clear_paths
-153:     end
    -
    - -
    - - - - -
    - - -
    - - -
    - - find_gemfile() - click to toggle source - -
    - -
    - - - - - -
    -
    -    # File lib/bundler/shared_helpers.rb, line 35
-35:     def find_gemfile
-36:       given = ENV['BUNDLE_GEMFILE']
-37:       return given if given && !given.empty?
-38: 
-39:       previous = nil
-40:       current  = File.expand_path(Dir.pwd)
-41: 
-42:       until !File.directory?(current) || current == previous
-43:         if ENV['BUNDLE_SPEC_RUN']
-44:           # avoid stepping above the tmp directory when testing
-45:           return nil if File.file?(File.join(current, 'bundler.gemspec'))
-46:         end
-47: 
-48:         # otherwise return the Gemfile if it's there
-49:         filename = File.join(current, 'Gemfile')
-50:         return filename if File.file?(filename)
-51:         current, previous = File.expand_path("..", current), current
-52:       end
-53:     end
    -
    - -
    - - - - -
    - - -
    - - -
    - - reverse_rubygems_kernel_mixin() - click to toggle source - -
    - -
    - - - - - -
    -
    -    # File lib/bundler/shared_helpers.rb, line 68
-68:     def reverse_rubygems_kernel_mixin
-69:       # Disable rubygems' gem activation system
-70:       ::Kernel.class_eval do
-71:         if private_method_defined?(:gem_original_require)
-72:           alias rubygems_require require
-73:           alias require gem_original_require
-74:         end
-75: 
-76:         undef gem
-77:       end
-78:     end
    -
    - -
    - - - - -
    - - -
    - - -
    - - -
    - -

    Disabled; run with --debug to generate this.

    - -
    - -
    -

    [Validate]

    -

    Generated with the Darkfish - Rdoc Generator 1.1.6.

    -
    - - - - diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/created.rid b/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/created.rid deleted file mode 100644 index 3e67715d..00000000 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/rdoc/created.rid +++ /dev/null @@ -1,67 +0,0 @@ -Mon, 06 Dec 2010 17:31:08 -0600 -lib/bundler/vendor/thor.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/task.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/parser/options.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/man/bundle-update Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/man/bundle Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/environment.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/core_ext/ordered_hash.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/ui.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/shared_helpers.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/setup.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/rubygems_ext.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/index.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/dependency.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/version.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/shell/color.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/shell/basic.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/parser/argument.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/templates/Executable Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/remote_specification.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/man/gemfile.5.txt Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/actions.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/templates/Gemfile Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/spec_set.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/graph.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/gem_helper.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/version.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/util.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/actions/empty_directory.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/actions/create_file.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/source.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/man/bundle-update.txt Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/man/bundle-exec.txt Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/man/bundle-config Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/capistrano.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/man/bundle-package.txt Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/man/bundle-package Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/man/bundle-install Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/shell/html.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/runtime.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/resolver.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/man/bundle.txt Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/definition.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/parser.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/core_ext/file_binary_read.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/actions/inject_into_file.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/settings.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/man/bundle-install.txt Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/lockfile_parser.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/lazy_specification.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/deployment.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vlad.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/parser/option.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/man/bundle-config.txt Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/invocation.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/error.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/actions/directory.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/installer.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/cli.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/shell.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/parser/arguments.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/core_ext/hash_with_indifferent_access.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/base.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/actions/file_manipulation.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/man/bundle-exec Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/dsl.rb Mon, 06 Dec 2010 17:30:55 -0600 diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/install_tasks-c.ri b/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/install_tasks-c.ri deleted file mode 100644 index e9b4101c..00000000 Binary files a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/GemHelper/install_tasks-c.ri and /dev/null differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SharedHelpers/Gem/SourceIndex/cdesc-SourceIndex.ri b/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SharedHelpers/Gem/SourceIndex/cdesc-SourceIndex.ri deleted file mode 100644 index 2c5bc8a8..00000000 Binary files a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SharedHelpers/Gem/SourceIndex/cdesc-SourceIndex.ri and /dev/null differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SharedHelpers/Gem/cdesc-Gem.ri b/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SharedHelpers/Gem/cdesc-Gem.ri deleted file mode 100644 index 0bad12cb..00000000 Binary files a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SharedHelpers/Gem/cdesc-Gem.ri and /dev/null differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SharedHelpers/cripple_rubygems-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SharedHelpers/cripple_rubygems-i.ri deleted file mode 100644 index 73891550..00000000 Binary files a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SharedHelpers/cripple_rubygems-i.ri and /dev/null differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SharedHelpers/reverse_rubygems_kernel_mixin-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SharedHelpers/reverse_rubygems_kernel_mixin-i.ri deleted file mode 100644 index 87f5bde6..00000000 Binary files a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/SharedHelpers/reverse_rubygems_kernel_mixin-i.ri and /dev/null differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/RGProxy/cdesc-RGProxy.ri b/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/RGProxy/cdesc-RGProxy.ri deleted file mode 100644 index 9cc16fb7..00000000 Binary files a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Bundler/UI/RGProxy/cdesc-RGProxy.ri and /dev/null differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Dependency/matches_spec%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Dependency/matches_spec%3f-i.ri deleted file mode 100644 index 28f08b88..00000000 Binary files a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Dependency/matches_spec%3f-i.ri and /dev/null differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Requirement/none%3f-i.ri b/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Requirement/none%3f-i.ri deleted file mode 100644 index f0c6fc81..00000000 Binary files a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/Gem/Requirement/none%3f-i.ri and /dev/null differ diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/cache.ri b/vendor/plugins/bundler/doc/bundler-1.0.7/ri/cache.ri deleted file mode 100644 index d0134d69..00000000 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/cache.ri +++ /dev/null @@ -1,52 +0,0 @@ -{ -:class_methods{("Bundler::Source::Path["from_lock"new"Bundler::LockfileParser["new"Bundler::Source::Rubygems["from_lock"new"Bundler::Deployment["define_task"Bundler::Resolver["new" resolve"%Bundler::Source::Path::Installer["new"Bundler::Dsl["deprecate" evaluate"new"Thor::Util["camel_case"find_by_namespace"%find_class_and_task_by_namespace"globs_for"load_thorfile"namespace_from_thor_class"namespaces_in_content"ruby_command"snake_case"thor_classes_in"thor_root"thor_root_glob"user_home" Thor[" banner"check_unknown_options!"default_task" desc" help"long_desc"map"method_option"method_options"printable_tasks"subcommand"subcommand_help"subcommands"task_help"Bundler::SpecSet["new"Bundler::GemHelper["install_tasks"new"Thor::DynamicTask["new"Bundler::Installer[" install"!Bundler::RemoteSpecification["new"Bundler::Index[" -build"new"Thor::Shell["new"Bundler::Definition[" -build"new"Bundler::CLI["new"source_root"Bundler::Environment["new"Bundler::UI::Shell["new"Bundler::DepProxy["new"Bundler::GraphNode["new"Bundler::Dependency["new"Bundler::Source::Git["from_lock"new"!Bundler::Resolver::SpecGroup["new"Thor::Actions["new"Bundler::UI::RGProxy["new"Bundler::Settings["new"Bundler::VersionConflict["new" Bundler[#"app_cache"app_config_path" bin_path"bundle_path" -cache"configure" configure_gem_home_and_path"default_gemfile"default_lockfile"definition"environment" home"install_path" load"load_gemspec" mkdir_p"read_file" require"requires_sudo?" root"ruby_scope" settings" -setup"specs_path" sudo"tmp"ui"upgrade_lockfile"user_bundle_path"with_clean_env"Bundler::LazySpecification["new"Thor::Base[ -"new" -shell" shell="subclass_files"subclasses"Bundler::BundlerError["status_code"Thor::Task["new"Bundler::Graph["new:attributes{@[ "attr_accessor version"attr_reader options"attr_reader path"attr_writer name"Gem::Specification["attr_accessor location"'attr_accessor relative_loaded_from"attr_accessor source@ [ "attr_reader dependencies"attr_reader platforms"attr_reader sources"attr_reader specs@["attr_reader remotes"Thor::Shell::Basic["attr_accessor base"attr_accessor padding@["attr_reader errors"Thor::Base::ClassMethods["attr_accessor debugging@C["attr_reader base"attr_reader gemspec"attr_reader spec_path@M[ "attr_accessor source"attr_reader name"attr_reader platform"attr_reader version@P["attr_reader specs@W["attr_reader dependencies"attr_reader platforms"attr_reader sources@_["attr_reader root@b["attr_writer shell@e["attr_reader __platform"attr_reader dep"attr_reader required_by"Gem::Dependency["attr_accessor groups"attr_accessor source@h[ "attr_accessor is_user"attr_reader dependencies"attr_reader name"attr_reader version"Bundler::SharedHelpers["attr_accessor gem_loaded@k["attr_reader autorequire"attr_reader groups"attr_reader platforms@n[ "attr_reader options"attr_reader ref"attr_reader submodules"attr_reader uri@r["attr_reader activated"attr_reader required_by@u["attr_accessor behavior@~["attr_reader conflicts@|["attr_writer bundle_path"attr_writer ui@œ[ -"attr_accessor source"attr_reader dependencies"attr_reader name"attr_reader platform"attr_reader version@Ÿ["attr_accessor options:instance_methods{5" Thor::Actions::ClassMethods[ "add_runtime_options!"source_paths"source_paths_for_search"source_root"Gem::Requirement[" -none?@["==" -cache" cached!" eql?"generate_bin" hash" install"load_spec_files"local_specs" name" options" path"relative_path" remote!" -specs" to_lock" to_s" version@µ["add_bundler_dependencies"dependencies_to_gemfile"full_gem_path"git_version" groups"load_paths"loaded_from" location" nondevelopment_dependencies"relative_loaded_from"required_by"rg_full_gem_path"rg_loaded_from" source"to_gemfile@ [ "dependencies"parse_dependency"parse_platform"parse_source"parse_spec"platforms" sources" -specs@["=="add_remote" -cache" cached!"cached_gem"cached_specs"download_gem_from_uri" eql?" -fetch"fetch_all_remote_specs"fetch_specs" hash" install"installed_specs"merge_remotes" name"normalize_uri" options" remote!"remote_specs" remotes" -specs" sudo" to_lock" to_s"Thor::Shell::Color["set_color@Á["ask" base"dynamic_width"dynamic_width_stty"dynamic_width_tput" -error"file_collision"no?" padding" padding="print_table"print_wrapped"say"say_status"terminal_width" truncate" -unix?" yes?@["clean_req" -debug"error_message" errors"gem_message"gems_size" resolve"resolve_requirement" search" -start"successify"version_conflict@["generate_bin@["_deprecated_options"_normalize_hash"_normalize_options"env"gem" gemspec"git" -group" path" platform"platforms"rubygems_source" source"to_definition@0[" help@@["[]"[]=" each"for" length" lookup"materialize" -merge" sorted" to_a" to_hash"tsort_each_child"tsort_each_node"valid_for?@Ç["all_tasks" argument"arguments"check_unknown_options!"class_option"class_options"debugging"exit_on_failure?"from_superclass" -group"inherited"method_added"namespace" no_tasks"print_options"remove_argument"remove_class_option"remove_task" -start" -tasks@C[" base"build_gem"built_gem_path" clean?" gemspec" git_push"guard_already_tagged"guard_clean" install"install_gem" name"perform_git_push"release_gem"rubygem_push"sh"sh_with_code"spec_path"tag_version" version"version_tag@G["run@J["&generate_bundler_executable_stubs"run@M[" __swap__"_remote_specification"fetch_platform"full_name"method_missing" name" platform" source" version@P["<<"=="[]" each" empty?"initialize_copy"same_version?" search"search_by_dependency"search_by_spec"search_for_all_platforms" sources"spec_satisfies_dependency?" -specs"use@T[" -shell" shell="with_padding@W[$"converge_dependencies"converge_locked_specs"converge_sources"current_dependencies"dependencies"+ensure_equivalent_gemfile_and_lockfile"expand_dependencies"expanded_dependencies" groups"in_locked_deps?" -index" lock"missing_specs"new_platform?"new_specs"no_sources?"platforms"pretty_dep"removed_specs"requested_dependencies"requested_specs" resolve"resolve_remotely!"resolve_with_cache!"rubygems_index"satisfies_locked_spec?"sorted_sources" sources" -specs"specs_for" to_lock@[[" -cache" -check" config" console" exec"gem"have_groff?" help" init" install"locate_gem" lock" open" package" show" unlock" update" version"viz@_["current_dependencies"dependencies" -index" inspect" lock"requested_specs" root" -specs" update@b[ "be_quiet!" confirm" -debug" debug!" -error" info" -shell" warn"Gem::Platform[" hash"Bundler::Runtime[ " -cache"cache_path"dependencies_for"prune_cache" require" -setup"setup_environment"Thor::Shell::HTML["ask"set_color@e["=="__platform"dep" eql?" hash"method_missing"required_by" to_s" type@á[ " groups"matches_spec?"required_by"requirement" source" to_lock"to_yaml_properties@h[ "dependencies" is_user" name" version@ê[ "clean_load_path"cripple_rubygems"default_gemfile"default_lockfile"find_gemfile"gem_loaded"in_bundle?""reverse_rubygems_kernel_mixin"Thor::Invocation[" invoke"invoke_with_padding@k["autorequire"current_env?"current_platform?"gem_platforms" groups" jruby?" mingw?"mingw_18?"mingw_19?" mri?" mri_18?" mri_19?" mswin?"platforms" -ruby?" ruby_18?" ruby_19?"should_include?" to_lock@n[ "=="allow_git_ops?"base_name" -cache"cache_path" cached?" checkout" eql?"git"has_revision_cached?" in_cache" install"load_spec_files" name" options" path"ref" revision"shortref_for_display"shortref_for_path" -specs"submodules" to_lock" to_s" unlock!"uri" uri_hash@r["__dependencies"activate_platform"activated" for?"initialize_copy" name"required_by" source" to_s" to_specs" version@u[ " add_file"append_file" -apply" behavior" -chmod"copy_file"create_file"destination_root"destination_root="directory"empty_directory"find_in_source_paths"get"gsub_file" in_root"inject_into_class"inject_into_file" inside"prepend_file"*relative_to_original_destination_root"remove_dir"remove_file"run"run_ruby_script"source_paths" template" thor@x["say"Thor::HiddenTask[" hidden?@{["[]"[]="all"allow_sudo?" delete"global_config_file" key_for"local_config_file"locations" path"pretty_values_for"set_global" set_key" without" without="Bundler::UI[ -" confirm" -debug" -error" info" warn@~["conflicts@|["bundle_path"ui@œ["__materialize__"dependencies"full_name"method_missing" name" platform"respond_to?"satisfies?" source" to_lock" to_s" version"Bundler::GemHelpers[" generic"Bundler::MatchPlatform["match_platform@Ÿ[" options@©[ "formatted_usage"handle_argument_error?"handle_no_method_error?" hidden?"not_debugging?"required_options"run@¬[ " groups" -nodes" populate"viz:ancestors{[" File[" Object"-Bundler::SharedHelpers::Gem::SourceIndex[@¬[" Object"Thor::InvocationError["Thor::Error@[" Object@Ÿ["Thor::Sandbox["Thor::CoreExt::OrderedHash[" ::Hash""Thor::Actions::EmptyDirectory[" Object"-Thor::CoreExt::HashWithIndifferentAccess[" ::Hash@h[" Object@P["Enumerable" Object@M["MatchPlatform" Object"Thor::UnknownArgumentError[@ -@[" Object@î["GemHelpers@a[@Ç[" Bundler::SharedHelpers::Gem["Thor::Actions::CreateFile[""Thor::Actions::EmptyDirectory"Bundler::DslError["Bundler::BundlerError"'Thor::RequiredArgumentMissingError["Thor::InvocationError@~[@0@["Gem::Installer@Á[" Object""Thor::Actions::InjectIntoFile[@-"Bundler::GitError[@0"Thor::Actions::Directory[@-@Ò[" Object@X["Thor::Shell::Basic@T[@ ["Bundler::PathError[@0"Bundler::GemspecError[@0@ [" Object@ê["Gem["Thor::CoreExt[@©["IStruct.new(:name, :description, :long_description, :usage, :options)"Bundler::GemNotFound[@0@[" Object@[" Object@{[" Object"Bundler::InvalidOption["Bundler::DslError@r["GemHelpers" -Array@á[" Object@µ["Bundler::MatchPlatform" Object@|["Thor::Error["StandardError@b["Bundler::UI@J["Bundler::Environment"#Thor::Invocation::ClassMethods[@œ["MatchPlatform" Object@n["Bundler::Source::Path"$Thor::MalformattedArgumentError[@3@e[" Object@=[@B@u["Bundler::GemfileError[@0@_[" Object@ë[@¿["Thor::Task@¦["StandardError"Bundler::DeprecatedError[@0@[["Thor::Actions" Thor"Bundler::GemfileNotFound[@0@![@x["Gem::SilentUI@k["Gem::Dependency@4["SharedHelpers@l@G[@€@@[" -TSort"Enumerable" Object@0["Thor::Base" Object"Thor::Arguments[" Object"Thor::Option["Thor::Argument"Bundler::InvalidSpecSet["StandardError"Bundler::ProductionError[@0@W["GemHelpers" Object@C[" Object"Thor::UndefinedTaskError[@ -@[" Object@[" Object"Thor::Options["Thor::Arguments"Thor::Argument[" Object"Bundler::Source[@1[" Object: modules[[" File"Bundler::Graph@3"Bundler::Source::Rubygems"Thor::CoreExt::OrderedHash@-"-Thor::CoreExt::HashWithIndifferentAccess"Bundler::GraphNode"Bundler::Index"!Bundler::RemoteSpecification"Thor::UnknownArgumentError"Bundler::Dsl"Thor::Actions::CreateFile@\"Bundler::VersionConflict"'Thor::RequiredArgumentMissingError"%Bundler::Source::Path::Installer@B""Thor::Actions::InjectIntoFile"Bundler::GitError"Thor::Actions::Directory@j"Thor::Shell::Color"Bundler::PathError"Bundler::GemspecError"Bundler::LockfileParser@€"Bundler::GemNotFound"Bundler::Resolver"Bundler::Deployment"Bundler::Settings"Bundler::InvalidOption"!Bundler::Resolver::SpecGroup@Ž"Gem::Specification@ -"Bundler::UI::Shell"Bundler::Installer"Bundler::LazySpecification"Bundler::Source::Git"$Thor::MalformattedArgumentError"Bundler::DepProxy"Thor::Shell::HTML"Bundler::GemfileError@l"Thor::HiddenTask@0"Bundler::DeprecatedError"Bundler::CLI"Bundler::GemfileNotFound"Bundler::InvalidSpecSet"Bundler::UI::RGProxy"Bundler::Dependency"Bundler::Runtime"Thor::DynamicTask"Bundler::SpecSet@‡@±"Thor::Option"Bundler::ProductionError"Bundler::Definition"Bundler::GemHelper"Thor::UndefinedTaskError@s"Thor::Options@ž"Gem::Requirement"Gem::Platform"Thor::CoreExt" Thor::Actions::ClassMethods"Bundler::Source" Bundler::SharedHelpers::Gem"#Thor::Invocation::ClassMethods"-Bundler::SharedHelpers::Gem::SourceIndex"Thor::Util"Thor::Base::ClassMethods"Gem"Thor::Sandbox"Thor::Shell"Thor::Invocation"Bundler::SharedHelpers@†" Bundler@—@c"Bundler::GemHelpers \ No newline at end of file diff --git a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/created.rid b/vendor/plugins/bundler/doc/bundler-1.0.7/ri/created.rid deleted file mode 100644 index a84897c0..00000000 --- a/vendor/plugins/bundler/doc/bundler-1.0.7/ri/created.rid +++ /dev/null @@ -1,67 +0,0 @@ -Mon, 06 Dec 2010 17:30:56 -0600 -lib/bundler/vendor/thor.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/task.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/parser/options.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/man/bundle-update Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/man/bundle Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/environment.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/core_ext/ordered_hash.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/ui.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/shared_helpers.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/setup.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/rubygems_ext.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/index.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/dependency.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/version.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/shell/color.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/shell/basic.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/parser/argument.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/templates/Executable Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/remote_specification.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/man/gemfile.5.txt Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/actions.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/templates/Gemfile Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/spec_set.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/graph.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/gem_helper.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/version.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/util.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/actions/empty_directory.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/actions/create_file.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/source.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/man/bundle-update.txt Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/man/bundle-exec.txt Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/man/bundle-config Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/capistrano.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/man/bundle-package.txt Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/man/bundle-package Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/man/bundle-install Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/shell/html.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/runtime.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/resolver.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/man/bundle.txt Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/definition.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/parser.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/core_ext/file_binary_read.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/actions/inject_into_file.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/settings.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/man/bundle-install.txt Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/lockfile_parser.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/lazy_specification.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/deployment.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vlad.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/parser/option.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/man/bundle-config.txt Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/invocation.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/error.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/actions/directory.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/installer.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/cli.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/shell.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/parser/arguments.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/core_ext/hash_with_indifferent_access.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/base.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/vendor/thor/actions/file_manipulation.rb Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/man/bundle-exec Mon, 06 Dec 2010 17:30:55 -0600 -lib/bundler/dsl.rb Mon, 06 Dec 2010 17:30:55 -0600 diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/.gitignore b/vendor/plugins/bundler/gems/bundler-1.0.15/.gitignore similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/.gitignore rename to vendor/plugins/bundler/gems/bundler-1.0.15/.gitignore diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/CHANGELOG.md b/vendor/plugins/bundler/gems/bundler-1.0.15/CHANGELOG.md similarity index 85% rename from vendor/plugins/bundler/gems/bundler-1.0.7/CHANGELOG.md rename to vendor/plugins/bundler/gems/bundler-1.0.15/CHANGELOG.md index 19ea421e..e9176ca1 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/CHANGELOG.md +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/CHANGELOG.md @@ -1,3 +1,117 @@ +## 1.0.15 (June 9, 2011) + +Features: + + - Improved Rubygems integration, removed many deprecation notices + +Bugfixes: + + - Escape URL arguments to git correctly on Windows (1.0.14 regression) + +## 1.0.14 (May 27, 2011) + +Features: + + - Rubinius platform :rbx (@rkbodenner) + - Include gem rake tasks with "require 'bundler/gem_tasks" (@indirect) + - Include user name and email from git config in new gemspec (@ognevsky) + +Bugfixes: + + - Set file permissions after checking out git repos (@tissak) + - Remove deprecated call to Gem::SourceIndex#all_gems (@mpj) + - Require the version file in new gemspecs (@rubiii) + - Allow relative paths from the Gemfile in gems with no gemspec (@mbirk) + - Install gems that contain 'bundler', e.g. guard-bundler (@hone) + - Display installed path correctly on Windows (@tadman) + - Escape quotes in git URIs (@mheffner) + - Improve Rake 0.9 support (@quix) + - Handle certain directories already existing (@raggi) + - Escape filenames containing regex characters (@indirect) + +## 1.0.13 (May 4, 2011) + +Features: + + - Compatibility with Rubygems master (soon to be v1.8) (@evanphx) + - Informative error when --path points to a broken symlink + - Support Rake 0.9 and greater (@e2) + - Output full errors for non-TTYs e.g. pow (@josh) + +Bugfixes: + + - Allow spaces in gem path names for gem tasks (@rslifka) + - Have cap run bundle install from release_path (@martinjagusch) + - Quote git refspec so zsh doesn't expand it (@goneflyin) + +## 1.0.12 (April 8, 2011) + +Features: + + - Add --no-deployment option to `install` for disabling it on dev machines + - Better error message when git fails and cache is present (@parndt) + - Honor :bundle_cmd in cap `rake` command (@voidlock, @cgriego) + +Bugfixes: + + - Compatibility with Rubygems 1.7 and Rails 2.3 and vendored gems (@evanphx) + - Fix changing gem order in lock (@gucki) + - Remove color escape sequences when displaying man pages (@bgreenlee) + - Fix creating GEM_HOME on both JRuby 1.5 and 1.6 (@nickseiger) + - Fix gems without a gemspec and directories in bin/ (@epall) + - Fix --no-prune option for `bundle install` (@cmeiklejohn) + +## 1.0.11 (April 1, 2011) + +Features: + + - Compatibility with Rubygems 1.6 and 1.7 + - Better error messages when a git command fails + +Bugfixes: + + - Don't always update gemspec gems (@carllerche) + - Remove ivar warnings (@jackdempsey) + - Fix occasional git failures in zsh (@jonah-carbonfive) + - Consistent lock for gems with double deps like Cap (@akahn) + +## 1.0.10 (February 1, 2011) + +Bugfixes: + + - Fix a regression loading YAML gemspecs from :git and :path gems + - Requires, namespaces, etc. to work with changes in Rubygems 1.5 + +## 1.0.9 (January 19, 2011) + +Bugfixes: + + - Fix a bug where Bundler.require could remove gems from the load + path. In Rails apps with a default application.rb, this removed + all gems in groups other than :default and Rails.env. + +## 1.0.8 (January 18, 2011) + +Features: + + - Allow overriding gemspec() deps with :git deps + - Add --local option to `bundle update` + - Ignore Gemfile.lock in newly generated gems + - Use `less` as help pager instead of `more` + - Run `bundle exec rake` instead of `rake` in Capistrano tasks + +Bugfixes: + + - Fix --no-cache option for `bundle install` + - Allow Vlad deploys to work without Capistrano gem installed + - Fix group arguments to `bundle console` + - Allow groups to be loaded even if other groups were loaded + - Evaluate gemspec() gemspecs in their directory not the cwd + - Count on Rake to chdir to the right place in GemHelper + - Change Pathnames to Strings for MacRuby + - Check git process exit status correctly + - Fix some warnings in 1.9.3-trunk (thanks tenderlove) + ## 1.0.7 (November 17, 2010) Bugfixes: @@ -290,8 +404,6 @@ isolation. - Fix cases where the same dependency appeared several times in the Gemfile.lock - Fix a bug where require errors were being swallowed during Bundler.require -## BACKFILL COMING - ## 1.0.0.beta.1 - No `bundle lock` command. Locking happens automatically on install or update diff --git a/vendor/plugins/bundler/gems/bundler-1.0.15/ISSUES.md b/vendor/plugins/bundler/gems/bundler-1.0.15/ISSUES.md new file mode 100644 index 00000000..b1220dad --- /dev/null +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/ISSUES.md @@ -0,0 +1,61 @@ +# Bundler Issues + +## Frequently encountered issues + +### REE and Zlib::GzipFile::Error + +Ruby Enterprise Edition users may see a `Zlib::GzipFile::Error` while installing gems. It is due to [a bug in REE](http://code.google.com/p/rubyenterpriseedition/issues/detail?id=45). You may be able to resolve the issue by upgrading REE, or changing to a different interpreter. + +### Rake activation error + +Anyone who has installed the Spork gem may see activation errors while running `rake` directly. This is because old versions of Spork would [install the newest rake using a mkmf file](https://github.com/timcharper/spork/issues/119). To resolve the issue, update the Spork version requirement in your Gemfile to at least `"~>0.8.5"` or `"~>0.9.0.rc8"`. + +## Troubleshooting + +Instructions for common Bundler use-cases can be found on the [Bundler documentation site](http://gembundler.com/v1.0/). + +Detailed information about each Bundler command, including help with common problems, can be found in the [Bundler man pages](http://gembundler.com/man/bundle.1.html). + +After reading the documentation, try these troubleshooting steps: + + # remove user-specific gems and git repos + rm -rf ~/.bundle/ ~/.gem/ + + # remove system-wide git repos and git checkouts + rm -rf $GEM_HOME/bundler/ $GEM_HOME/cache/bundler/ + + # remove project-specific settings and git repos + rm -rf .bundle/ + + # remove project-specific cached .gem files + rm -rf vendor/cache/ + + # remove the saved resolve of the Gemfile + rm -rf Gemfile.lock + + # try to install one more time + bundle install + +## Reporting unresolved problems + +Instructions that allow the Bundler team to reproduce your issue are vitally important. When you report a bug, please include the following information: + + - The command you ran + - Exception backtrace(s), if any + - Your Gemfile + - Your Gemfile.lock + - Your Bundler configuration settings (run `bundle config`) + - What version of bundler you are using (run `bundle -v`) + - What version of Ruby you are using (run `ruby -v`) + - What version of Rubygems you are using (run `gem -v`) + - Whether you are using RVM, and if so what version (run `rvm -v`) + - Whether you have the `rubygems-bundler` gem, which can break gem binares + + +If you are using Rails 2.3, please also include: + + - Your boot.rb file + - Your preinitializer.rb file + - Your environment.rb file + +[Create a gist](https://gist.github.com) containing all of that information, then visit the [Bundler issue tracker](https://github.com/carlhuda/bundler) and create a new ticket describing your problem and linking to your gist. diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/LICENSE b/vendor/plugins/bundler/gems/bundler-1.0.15/LICENSE similarity index 93% rename from vendor/plugins/bundler/gems/bundler-1.0.7/LICENSE rename to vendor/plugins/bundler/gems/bundler-1.0.15/LICENSE index 66f44e97..4d62f8af 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/LICENSE +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/LICENSE @@ -1,6 +1,8 @@ Portions copyright (c) 2010 Andre Arko Portions copyright (c) 2009 Engine Yard +MIT License + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/README.md b/vendor/plugins/bundler/gems/bundler-1.0.15/README.md similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/README.md rename to vendor/plugins/bundler/gems/bundler-1.0.15/README.md diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/Rakefile b/vendor/plugins/bundler/gems/bundler-1.0.15/Rakefile similarity index 53% rename from vendor/plugins/bundler/gems/bundler-1.0.7/Rakefile rename to vendor/plugins/bundler/gems/bundler-1.0.15/Rakefile index 34a0b30d..b07d399e 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/Rakefile +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/Rakefile @@ -1,13 +1,17 @@ # -*- encoding: utf-8 -*- $:.unshift File.expand_path("../lib", __FILE__) -require 'bundler/gem_helper' -Bundler::GemHelper.install_tasks +require 'bundler/gem_tasks' -def sudo? - ENV['BUNDLER_SUDO_TESTS'] +namespace :spec do + desc "Ensure spec dependencies are installed" + task :deps do + sh "gem list ronn | (grep 'ronn' 1> /dev/null) || gem install ronn --no-ri --no-rdoc" + sh "gem list rspec | (grep 'rspec (2.' 1> /dev/null) || gem install rspec --no-ri --no-rdoc" + end end begin + # running the specs needs both rspec and ronn require 'rspec/core/rake_task' require 'ronn' @@ -18,65 +22,71 @@ begin end task :spec => "man:build" - begin - require 'ci/reporter/rake/rspec' - - namespace :ci do - desc "Run specs with Hudson output" - RSpec::Core::RakeTask.new(:spec) - task :spec => ["ci:setup:rspec", "man:build", "spec:set_sudo"] - end - - rescue LoadError - namespace :ci do - task :spec do - abort "Run `rake ci:deps` to be able to run the CI specs" - end - - desc "Install CI dependencies" - task :deps do - sh "gem list ci_reporter | (grep 'ci_reporter' 1> /dev/null) || gem install ci_reporter --no-ri --no-rdoc" - end - task :deps => "spec:deps" - end - end - namespace :spec do + task :clean do + rm_rf 'tmp' + end + desc "Run the spec suite with the sudo tests" - task :sudo => ["set_sudo", "clean", "spec"] + task :sudo => ["set_sudo", "spec", "clean_sudo"] task :set_sudo do ENV['BUNDLER_SUDO_TESTS'] = '1' end - task :clean do - if sudo? - system "sudo rm -rf #{File.expand_path('../tmp', __FILE__)}" - else - rm_rf 'tmp' - end + task :clean_sudo do + puts "Cleaning up sudo test files..." + system "sudo rm -rf #{File.expand_path('../tmp/sudo_gem_home', __FILE__)}" end namespace :rubygems do # Rubygems 1.3.5, 1.3.6, and HEAD specs rubyopt = ENV["RUBYOPT"] - %w(master REL_1_3_5 REL_1_3_6).each do |rg| + %w(master v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.3).each do |rg| desc "Run specs with Rubygems #{rg}" RSpec::Core::RakeTask.new(rg) do |t| t.rspec_opts = %w(-fs --color) t.ruby_opts = %w(-w) end + # Create tasks like spec:rubygems:v1.8.3:sudo to run the sudo specs + namespace rg do + task :sudo => ["set_sudo", rg, "clean_sudo"] + end + task "clone_rubygems_#{rg}" do - unless File.directory?("tmp/rubygems_#{rg}") - system("git clone git://github.com/jbarnette/rubygems.git tmp/rubygems_#{rg} && cd tmp/rubygems_#{rg} && git reset --hard #{rg}") + unless File.directory?("tmp/rubygems") + system("git clone git://github.com/rubygems/rubygems.git tmp/rubygems") end - ENV["RUBYOPT"] = "-I#{File.expand_path("tmp/rubygems_#{rg}/lib")} #{rubyopt}" + hash = nil + + Dir.chdir("tmp/rubygems") do + system("git remote update") + system("git checkout #{rg}") + system("git pull origin master") if rg == "master" + hash = `git rev-parse HEAD`.strip + end + + puts "Running bundler specs against rubygems '#{rg}' at #{hash}" + ENV["RUBYOPT"] = "-I#{File.expand_path("tmp/rubygems/lib")} #{rubyopt}" end task rg => "clone_rubygems_#{rg}" task "rubygems:all" => rg end + + desc "Run specs under a Rubygems checkout (set RG=path)" + RSpec::Core::RakeTask.new("co") do |t| + t.rspec_opts = %w(-fs --color) + t.ruby_opts = %w(-w) + end + + task "setup_co" do + ENV["RUBYOPT"] = "-I#{File.expand_path ENV['RG']} #{rubyopt}" + end + + task "co" => "setup_co" + task "rubygems:all" => "co" end namespace :ruby do @@ -106,46 +116,60 @@ begin end + namespace :man do + directory "lib/bundler/man" + + Dir["man/*.ronn"].each do |ronn| + basename = File.basename(ronn, ".ronn") + roff = "lib/bundler/man/#{basename}" + + file roff => ["lib/bundler/man", ronn] do + sh "ronn --roff --pipe #{ronn} > #{roff}" + end + + file "#{roff}.txt" => roff do + sh "groff -Wall -mtty-char -mandoc -Tascii #{roff} | col -b > #{roff}.txt" + end + + task :build_all_pages => "#{roff}.txt" + end + + desc "Build the man pages" + task :build => "man:build_all_pages" + + desc "Clean up from the built man pages" + task :clean do + rm_rf "lib/bundler/man" + end + end + + begin + require 'ci/reporter/rake/rspec' + + namespace :ci do + desc "Run specs with Hudson output" + RSpec::Core::RakeTask.new(:spec) + task :spec => ["ci:setup:rspec", "man:build"] + end + + rescue LoadError + namespace :ci do + task :spec do + abort "Run `rake ci:deps` to be able to run the CI specs" + end + + desc "Install CI dependencies" + task :deps do + sh "gem list ci_reporter | (grep 'ci_reporter' 1> /dev/null) || gem install ci_reporter --no-ri --no-rdoc" + end + task :deps => "spec:deps" + end + end + rescue LoadError task :spec do abort "Run `rake spec:deps` to be able to run the specs" end - - namespace :spec do - desc "Ensure spec dependencies are installed" - task :deps do - sh "gem list ronn | (grep 'ronn' 1> /dev/null) || gem install ronn --no-ri --no-rdoc" - sh "gem list rspec | (grep 'rspec (2.0' 1> /dev/null) || gem install rspec --no-ri --no-rdoc" - end - end - -end - -namespace :man do - directory "lib/bundler/man" - - Dir["man/*.ronn"].each do |ronn| - basename = File.basename(ronn, ".ronn") - roff = "lib/bundler/man/#{basename}" - - file roff => ["lib/bundler/man", ronn] do - sh "ronn --roff --pipe #{ronn} > #{roff}" - end - - file "#{roff}.txt" => roff do - sh "groff -Wall -mtty-char -mandoc -Tascii #{roff} | col -b > #{roff}.txt" - end - - task :build_all_pages => "#{roff}.txt" - end - - desc "Build the man pages" - task :build => "man:build_all_pages" - - desc "Clean up from the built man pages" - task :clean do - rm_rf "lib/bundler/man" - end end namespace :vendor do diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/UPGRADING.md b/vendor/plugins/bundler/gems/bundler-1.0.15/UPGRADING.md similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/UPGRADING.md rename to vendor/plugins/bundler/gems/bundler-1.0.15/UPGRADING.md diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/bin/bundle b/vendor/plugins/bundler/gems/bundler-1.0.15/bin/bundle similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/bin/bundle rename to vendor/plugins/bundler/gems/bundler-1.0.15/bin/bundle diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/bundler.gemspec b/vendor/plugins/bundler/gems/bundler-1.0.15/bundler.gemspec similarity index 87% rename from vendor/plugins/bundler/gems/bundler-1.0.7/bundler.gemspec rename to vendor/plugins/bundler/gems/bundler-1.0.15/bundler.gemspec index abd4ae56..cb7f795c 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/bundler.gemspec +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/bundler.gemspec @@ -8,8 +8,8 @@ Gem::Specification.new do |s| s.name = "bundler" s.version = Bundler::VERSION s.platform = Gem::Platform::RUBY - s.authors = ["Carl Lerche", "Yehuda Katz", "André Arko"] - s.email = ["carlhuda@engineyard.com"] + s.authors = ["André Arko", "Terence Lee", "Carl Lerche", "Yehuda Katz"] + s.email = ["andre@arko.net"] s.homepage = "http://gembundler.com" s.summary = %q{The best way to manage your application's dependencies} s.description = %q{Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably} @@ -25,6 +25,5 @@ Gem::Specification.new do |s| s.files = `git ls-files`.split("\n") + man_files s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n") s.executables = %w(bundle) - s.default_executable = "bundle" s.require_paths = ["lib"] end diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler.rb similarity index 86% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler.rb index b821df42..b70f718a 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler.rb @@ -1,8 +1,15 @@ require 'rbconfig' require 'fileutils' require 'pathname' + +begin + require 'psych' +rescue LoadError +end + require 'yaml' require 'bundler/rubygems_ext' +require 'bundler/rubygems_integration' require 'bundler/version' module Bundler @@ -79,7 +86,6 @@ module Bundler end def bundle_path - # STDERR.puts settings.path @bundle_path ||= Pathname.new(settings.path).expand_path(root) end @@ -93,16 +99,18 @@ module Bundler end def setup(*groups) - return @setup if defined?(@setup) && @setup + # Just return if all groups are already loaded + return @setup if defined?(@setup) if groups.empty? # Load all groups, but only once @setup = load.setup else + @completed_groups ||= [] # Figure out which groups haven't been loaded yet - unloaded = groups - (@completed_groups || []) + unloaded = groups - @completed_groups # Record groups that are now loaded - @completed_groups = groups | (@completed_groups || []) + @completed_groups = groups # Load any groups that are not yet loaded unloaded.any? ? load.setup(*unloaded) : load end @@ -130,11 +138,11 @@ module Bundler end def ruby_scope - "#{Gem.ruby_engine}/#{Gem::ConfigMap[:ruby_version]}" + "#{Bundler.rubygems.ruby_engine}/#{Gem::ConfigMap[:ruby_version]}" end def user_bundle_path - Pathname.new(Gem.user_home).join(".bundler") + Pathname.new(Bundler.rubygems.user_home).join(".bundler") end def home @@ -192,7 +200,7 @@ module Bundler end def requires_sudo? - return @requires_sudo if @checked_for_sudo + return @requires_sudo if defined?(@checked_for_sudo) && @checked_for_sudo path = bundle_path path = path.parent until path.exist? @@ -221,13 +229,14 @@ module Bundler def load_gemspec(file) path = Pathname.new(file) # Eval the gemspec from its parent directory - Dir.chdir(path.dirname) do + Dir.chdir(path.dirname.to_s) do + contents = File.read(path.basename.to_s) begin - Gem::Specification.from_yaml(path.basename) + Gem::Specification.from_yaml(contents) # Raises ArgumentError if the file is not valid YAML rescue ArgumentError, SyntaxError, Gem::EndOfYAMLException, Gem::Exception begin - eval(File.read(path.basename), TOPLEVEL_BINDING, path.expand_path.to_s) + eval(contents, TOPLEVEL_BINDING, path.expand_path.to_s) rescue LoadError => e original_line = e.backtrace.find { |line| line.include?(path.to_s) } msg = "There was a LoadError while evaluating #{path.basename}:\n #{e.message}" @@ -250,14 +259,17 @@ module Bundler if settings[:disable_shared_gems] ENV['GEM_PATH'] = '' ENV['GEM_HOME'] = File.expand_path(bundle_path, root) - elsif Gem.dir != bundle_path.to_s - paths = [Gem.dir, Gem.path].flatten.compact.uniq.reject{|p| p.empty? } + elsif Bundler.rubygems.gem_dir != bundle_path.to_s + possibles = [Bundler.rubygems.gem_dir, Bundler.rubygems.gem_path] + paths = possibles.flatten.compact.uniq.reject { |p| p.empty? } ENV["GEM_PATH"] = paths.join(File::PATH_SEPARATOR) ENV["GEM_HOME"] = bundle_path.to_s end - FileUtils.mkdir_p bundle_path.to_s - Gem.clear_paths + # TODO: This mkdir_p is only needed for JRuby <= 1.5 and should go away (GH #602) + FileUtils.mkdir_p bundle_path.to_s rescue nil + + Bundler.rubygems.clear_paths end def upgrade_lockfile diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/capistrano.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/capistrano.rb similarity index 84% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/capistrano.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/capistrano.rb index a304b09f..0a14c6d8 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/capistrano.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/capistrano.rb @@ -7,4 +7,5 @@ require 'bundler/deployment' Capistrano::Configuration.instance(:must_exist).load do after "deploy:update_code", "bundle:install" Bundler::Deployment.define_task(self, :task, :except => { :no_release => true }) + set :rake, lambda { "#{fetch(:bundle_cmd, "bundle")} exec rake" } end diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/cli.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/cli.rb similarity index 93% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/cli.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/cli.rb index 8e562c71..5df8af8d 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/cli.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/cli.rb @@ -1,11 +1,9 @@ $:.unshift File.expand_path('../vendor', __FILE__) require 'thor' require 'thor/actions' +require 'rubygems/user_interaction' require 'rubygems/config_file' -# Work around a RubyGems bug -Gem.configuration - module Bundler class CLI < Thor include Thor::Actions @@ -15,7 +13,7 @@ module Bundler the_shell = (options["no-color"] ? Thor::Shell::Basic.new : shell) Bundler.ui = UI::Shell.new(the_shell) Bundler.ui.debug! if options["verbose"] - Gem::DefaultUserInteraction.ui = UI::RGProxy.new(Bundler.ui) + Bundler.rubygems.ui = UI::RGProxy.new(Bundler.ui) end check_unknown_options! unless ARGV.include?("exec") || ARGV.include?("config") @@ -45,7 +43,7 @@ module Bundler if have_groff? && root !~ %r{^file:/.+!/META-INF/jruby.home/.+} groff = "groff -Wall -mtty-char -mandoc -Tascii" - pager = ENV['MANPAGER'] || ENV['PAGER'] || 'more' + pager = ENV['MANPAGER'] || ENV['PAGER'] || 'less -R' Kernel.exec "#{groff} #{root}/#{command} | #{pager}" else @@ -152,8 +150,6 @@ module Bundler "Do not allow the Gemfile.lock to be updated after this install" method_option "deployment", :type => :boolean, :banner => "Install using defaults tuned for deployment environments" - method_option "production", :type => :boolean, :banner => - "Deprecated, please use --deployment instead" def install(path = nil) opts = options.dup opts[:without] ||= [] @@ -163,18 +159,13 @@ module Bundler end opts[:without].map!{|g| g.to_sym } + # Can't use Bundler.settings for this because settings needs gemfile.dirname ENV['BUNDLE_GEMFILE'] = File.expand_path(opts[:gemfile]) if opts[:gemfile] ENV['RB_USER_INSTALL'] = '1' if Bundler::FREEBSD # Just disable color in deployment mode Bundler.ui.shell = Thor::Shell::Basic.new if opts[:deployment] - if opts[:production] - opts[:deployment] = true - Bundler.ui.warn "The --production option is deprecated, and will be removed in " \ - "the final release of Bundler 1.0. Please use --deployment instead." - end - if (path || opts[:path] || opts[:deployment]) && opts[:system] Bundler.ui.error "You have specified both a path to install your gems to, \n" \ "as well as --system. Please choose." @@ -212,22 +203,27 @@ module Bundler Bundler.settings[:frozen] = '1' end - # Can't use Bundler.settings for this because settings needs gemfile.dirname + # When install is called with --no-deployment, disable deployment mode + if opts[:deployment] == false + Bundler.settings.delete(:frozen) + opts[:system] = true + end + Bundler.settings[:path] = nil if opts[:system] Bundler.settings[:path] = "vendor/bundle" if opts[:deployment] Bundler.settings[:path] = path if path Bundler.settings[:path] = opts[:path] if opts[:path] Bundler.settings[:bin] = opts["binstubs"] if opts[:binstubs] - Bundler.settings[:disable_shared_gems] = '1' if Bundler.settings[:path] + Bundler.settings[:no_prune] = true if opts["no-prune"] + Bundler.settings[:disable_shared_gems] = Bundler.settings[:path] ? '1' : nil Bundler.settings.without = opts[:without] unless opts[:without].empty? Bundler.ui.be_quiet! if opts[:quiet] Installer.install(Bundler.root, Bundler.definition, opts) - Bundler.load.cache if Bundler.root.join("vendor/cache").exist? + Bundler.load.cache if Bundler.root.join("vendor/cache").exist? && !options["no-cache"] if Bundler.settings[:path] - relative_path = Bundler.settings[:path] - relative_path = "./" + relative_path unless relative_path[0] == ?/ + relative_path = File.expand_path(Bundler.settings[:path]).sub(/^#{File.expand_path('.')}/, '.') Bundler.ui.confirm "Your bundle is complete! " + "It was installed into #{relative_path}" else @@ -241,7 +237,7 @@ module Bundler "Please use `bundle install --path #{path}` instead." end rescue GemNotFound => e - if opts[:local] + if opts[:local] && Bundler.app_cache.exist? Bundler.ui.warn "Some gems seem to be missing from your vendor/cache directory." end @@ -258,6 +254,8 @@ module Bundler possible versions of the gems in the bundle. D method_option "source", :type => :array, :banner => "Update a specific source (and all gems associated with it)" + method_option "local", :type => :boolean, :banner => + "Do not attempt to fetch gems remotely and use the gem cache instead" def update(*gems) sources = Array(options[:source]) @@ -268,7 +266,8 @@ module Bundler Bundler.definition(:gems => gems, :sources => sources) end - Installer.install Bundler.root, Bundler.definition, "update" => true + opts = {"update" => true, "local" => options[:local]} + Installer.install Bundler.root, Bundler.definition, opts Bundler.load.cache if Bundler.root.join("vendor/cache").exist? Bundler.ui.confirm "Your bundle is updated! " + "Use `bundle show [gemname]` to see where a bundled gem is installed." @@ -308,7 +307,7 @@ module Bundler def cache Bundler.definition.resolve_with_cache! Bundler.load.cache - Bundler.settings[:no_prune] = true if options[:no_prune] + Bundler.settings[:no_prune] = true if options["no-prune"] Bundler.load.lock rescue GemNotFound => e Bundler.ui.error(e.message) @@ -430,8 +429,7 @@ module Bundler desc "console [GROUP]", "Opens an IRB session with the bundle pre-loaded" def console(group = nil) - require 'bundler/setup' - group ? Bundler.require(:default, group) : Bundler.require + group ? Bundler.require(:default, *(group.split.map! {|g| g.to_sym })) : Bundler.require ARGV.clear require 'irb' @@ -481,8 +479,12 @@ module Bundler constant_name = name.split('_').map{|p| p.capitalize}.join constant_name = constant_name.split('-').map{|q| q.capitalize}.join('::') if constant_name =~ /-/ constant_array = constant_name.split('::') + git_author_name = `git config user.name`.chomp + git_author_email = `git config user.email`.chomp + author_name = git_author_name.empty? ? "TODO: Write your name" : git_author_name + author_email = git_author_email.empty? ? "TODO: Write your email address" : git_author_email FileUtils.mkdir_p(File.join(target, 'lib', name)) - opts = {:name => name, :constant_name => constant_name, :constant_array => constant_array} + opts = {:name => name, :constant_name => constant_name, :constant_array => constant_array, :author_name => author_name, :author_email => author_email} template(File.join("newgem/Gemfile.tt"), File.join(target, "Gemfile"), opts) template(File.join("newgem/Rakefile.tt"), File.join(target, "Rakefile"), opts) template(File.join("newgem/gitignore.tt"), File.join(target, ".gitignore"), opts) diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/definition.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/definition.rb similarity index 94% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/definition.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/definition.rb index 475a40c5..962838aa 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/definition.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/definition.rb @@ -61,7 +61,7 @@ module Bundler @unlock[:gems] ||= [] @unlock[:sources] ||= [] - current_platform = Gem.platforms.map { |p| generic(p) }.compact.last + current_platform = Bundler.rubygems.platforms.map { |p| generic(p) }.compact.last @new_platform = !@platforms.include?(current_platform) @platforms |= [current_platform] @@ -225,7 +225,7 @@ module Bundler handled = [] dependencies. - sort_by { |d| d.name }. + sort_by { |d| d.to_s }. each do |dep| next if handled.include?(dep.name) out << dep.to_lock @@ -235,11 +235,17 @@ module Bundler out end - def ensure_equivalent_gemfile_and_lockfile + def ensure_equivalent_gemfile_and_lockfile(explicit_flag = false) changes = false - msg = "You have modified your Gemfile in development but did not check\n" \ - "the resulting snapshot (Gemfile.lock) into version control" + msg = "You are trying to install in deployment mode after changing\n" \ + "your Gemfile. Run `bundle install` elsewhere and add the\n" \ + "updated Gemfile.lock to version control." + + unless explicit_flag + msg += "\n\nIf this is a development machine, remove the Gemfile " \ + "freeze \nby running `bundle install --no-deployment`." + end added = [] deleted = [] @@ -287,6 +293,7 @@ module Bundler msg << "\n\nYou have added to the Gemfile:\n" << added.join("\n") if added.any? msg << "\n\nYou have deleted from the Gemfile:\n" << deleted.join("\n") if deleted.any? msg << "\n\nYou have changed in the Gemfile:\n" << changed.join("\n") if changed.any? + msg << "\n" raise ProductionError, msg if added.any? || deleted.any? || changed.any? end @@ -367,8 +374,10 @@ module Bundler # If the spec is no longer in the path source, unlock it. This # commonly happens if the version changed in the gemspec next unless other + + deps2 = other.dependencies.select { |d| d.type != :development } # If the dependencies of the path source have changed, unlock it - next unless s.dependencies.sort == other.dependencies.sort + next unless s.dependencies.sort == deps2.sort end converged << s diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/dependency.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/dependency.rb similarity index 92% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/dependency.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/dependency.rb index 06cb78c7..e05b85a8 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/dependency.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/dependency.rb @@ -15,6 +15,7 @@ module Bundler :mri => Gem::Platform::RUBY, :mri_18 => Gem::Platform::RUBY, :mri_19 => Gem::Platform::RUBY, + :rbx => Gem::Platform::RUBY, :jruby => Gem::Platform::JAVA, :mswin => Gem::Platform::MSWIN, :mingw => Gem::Platform::MINGW, @@ -72,7 +73,8 @@ module Bundler out = " #{name}" unless requirement == Gem::Requirement.default - out << " (#{requirement.to_s})" + reqs = requirement.requirements.map{|o,v| "#{o} #{v}" } + out << " (#{reqs.join(', ')})" end out << '!' if source @@ -106,6 +108,10 @@ module Bundler mri? && RUBY_VERSION >= "1.9" end + def rbx? + ruby? && defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx" + end + def jruby? defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby" end diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/deployment.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/deployment.rb similarity index 90% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/deployment.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/deployment.rb index 73ee604d..727f357e 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/deployment.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/deployment.rb @@ -1,7 +1,7 @@ module Bundler class Deployment def self.define_task(context, task_method = :task, opts = {}) - if context.is_a?(Capistrano::Configuration) + if defined?(Capistrano) && context.is_a?(Capistrano::Configuration) context_name = "capistrano" role_default = "{:except => {:no_release => true}}" else @@ -9,7 +9,7 @@ module Bundler role_default = "[:app]" end - roles = context.fetch(:bundle_roles, nil) + roles = context.fetch(:bundle_roles, false) opts[:roles] = roles if roles context.send :namespace, :bundle do @@ -45,7 +45,7 @@ module Bundler args << bundle_flags.to_s args << "--without #{bundle_without.join(" ")}" unless bundle_without.empty? - run "#{bundle_cmd} install #{args.join(' ')}" + run "cd #{context.fetch(:current_release)} && #{bundle_cmd} install #{args.join(' ')}" end end end diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/dsl.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/dsl.rb similarity index 97% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/dsl.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/dsl.rb index 9abafe71..fa80a76d 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/dsl.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/dsl.rb @@ -29,12 +29,9 @@ module Bundler case gemspecs.size when 1 - spec = Gem::Specification.load(gemspecs.first) + spec = Bundler.load_gemspec(gemspecs.first) raise InvalidOption, "There was an error loading the gemspec at #{gemspecs.first}." unless spec gem spec.name, :path => path - spec.runtime_dependencies.each do |dep| - gem dep.name, *dep.requirement.as_list - end group(development_group) do spec.development_dependencies.each do |dep| gem dep.name, *dep.requirement.as_list diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/environment.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/environment.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/environment.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/environment.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/gem_helper.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/gem_helper.rb similarity index 90% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/gem_helper.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/gem_helper.rb index ff5d5421..474e8454 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/gem_helper.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/gem_helper.rb @@ -4,9 +4,11 @@ require 'bundler' module Bundler class GemHelper - def self.install_tasks(opts = nil) - dir = File.dirname(Rake.application.rakefile_location) - self.new(dir, opts && opts[:name]).install + include Rake::DSL if defined? Rake::DSL + + def self.install_tasks(opts = {}) + dir = opts[:dir] || Dir.pwd + self.new(dir, opts[:name]).install end attr_reader :spec_path, :base, :gemspec @@ -39,7 +41,7 @@ module Bundler def build_gem file_name = nil - sh("gem build #{spec_path}") { |out, code| + sh("gem build '#{spec_path}'") { |out, code| raise out unless out[/Successfully/] file_name = File.basename(built_gem_path) FileUtils.mkdir_p(File.join(base, 'pkg')) @@ -51,7 +53,7 @@ module Bundler def install_gem built_gem_path = build_gem - out, code = sh_with_code("gem install #{built_gem_path}") + out, _ = sh_with_code("gem install '#{built_gem_path}'") raise "Couldn't install gem, run `gem install #{built_gem_path}' for more detailed output" unless out[/Successfully installed/] Bundler.ui.confirm "#{name} (#{version}) installed" end @@ -68,7 +70,7 @@ module Bundler protected def rubygem_push(path) - out, status = sh("gem push #{path}") + out, _ = sh("gem push '#{path}'") raise "Gem push failed due to lack of RubyGems.org credentials." if out[/Enter your RubyGems.org credentials/] Bundler.ui.confirm "Pushed #{name} #{version} to rubygems.org" end @@ -100,8 +102,7 @@ module Bundler end def clean? - out, code = sh_with_code("git diff --exit-code") - code == 0 + sh_with_code("git diff --exit-code")[1] == 0 end def tag_version diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/templates/newgem/Rakefile.tt b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/gem_tasks.rb similarity index 53% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/templates/newgem/Rakefile.tt rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/gem_tasks.rb index 14cfe0b5..bc759088 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/templates/newgem/Rakefile.tt +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/gem_tasks.rb @@ -1,2 +1,2 @@ -require 'bundler' +require 'bundler/gem_helper' Bundler::GemHelper.install_tasks diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/graph.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/graph.rb similarity index 98% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/graph.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/graph.rb index 27f2c461..3cea736a 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/graph.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/graph.rb @@ -83,7 +83,7 @@ module Bundler # For gems in Gemfile, add details @env.current_dependencies.each do |dependency| - node = @nodes[dependency.name] + next unless node = @nodes[dependency.name] node.is_user = true dependency.groups.each do |group| diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/index.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/index.rb similarity index 98% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/index.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/index.rb index 1ca9af19..4d7f7725 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/index.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/index.rb @@ -104,7 +104,7 @@ module Bundler def same_version?(a, b) regex = /^(.*?)(?:\.0)*$/ - ret = a.to_s[regex, 1] == b.to_s[regex, 1] + a.to_s[regex, 1] == b.to_s[regex, 1] end def spec_satisfies_dependency?(spec, dep) @@ -115,11 +115,10 @@ module Bundler def search_by_dependency(dependency) @cache[dependency.hash] ||= begin specs = @specs[dependency.name] + found = specs.select { |spec| dependency.matches_spec?(spec) && Gem::Platform.match(spec.platform) } wants_prerelease = dependency.requirement.prerelease? only_prerelease = specs.all? {|spec| spec.version.prerelease? } - found = specs.select { |spec| dependency.matches_spec?(spec) && Gem::Platform.match(spec.platform) } - unless wants_prerelease || only_prerelease found.reject! { |spec| spec.version.prerelease? } end diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/installer.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/installer.rb similarity index 81% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/installer.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/installer.rb index c1fbada8..e0728a25 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/installer.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/installer.rb @@ -10,8 +10,16 @@ module Bundler end def run(options) + # Create the BUNDLE_PATH directory + begin + Bundler.bundle_path.mkpath unless Bundler.bundle_path.exist? + rescue Errno::EEXIST + raise PathError, "Could not install to path `#{Bundler.settings[:path]}` " + + "because of an invalid symlink. Remove the symlink so the directory can be created." + end + if Bundler.settings[:frozen] - @definition.ensure_equivalent_gemfile_and_lockfile + @definition.ensure_equivalent_gemfile_and_lockfile(options[:deployment]) end if dependencies.empty? @@ -35,9 +43,6 @@ module Bundler @definition.resolve_remotely! end - # Ensure that BUNDLE_PATH exists - Bundler.mkdir_p(Bundler.bundle_path) unless File.exist?(Bundler.bundle_path) - # Must install gems in the order that the resolver provides # as dependencies might actually affect the installation of # the gem. @@ -49,13 +54,9 @@ module Bundler # next # end - begin - old_args = Gem::Command.build_args - Gem::Command.build_args = [Bundler.settings["build.#{spec.name}"]] + Bundler.rubygems.with_build_args [Bundler.settings["build.#{spec.name}"]] do spec.source.install(spec) Bundler.ui.debug "from #{spec.loaded_from} " - ensure - Gem::Command.build_args = old_args end Bundler.ui.info "" diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/lazy_specification.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/lazy_specification.rb similarity index 96% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/lazy_specification.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/lazy_specification.rb index 9db9b0ed..5924ec60 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/lazy_specification.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/lazy_specification.rb @@ -36,7 +36,7 @@ module Bundler out = " #{name} (#{version}-#{platform})\n" end - dependencies.sort_by {|d| d.name }.each do |dep| + dependencies.sort_by {|d| d.to_s }.each do |dep| next if dep.type == :development out << " #{dep.to_lock}\n" end diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/lockfile_parser.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/lockfile_parser.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/lockfile_parser.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/lockfile_parser.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/bundle b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle similarity index 98% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/bundle rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle index 014145cd..1b2b35d9 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/bundle +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE" "1" "November 2010" "" "" +.TH "BUNDLE" "1" "May 2011" "" "" . .SH "NAME" \fBbundle\fR \- Ruby Dependency Management diff --git a/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle-benchmark b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle-benchmark new file mode 100644 index 00000000..6673a878 --- /dev/null +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle-benchmark @@ -0,0 +1,19 @@ +.\" generated with Ronn/v0.7.3 +.\" http://github.com/rtomayko/ronn/tree/0.7.3 +. +.TH "BUNDLE\-BENCHMARK" "1" "May 2011" "" "" +. +.SH "NAME" +\fBbundle\-benchmark\fR \- Display the time taken for each gem to be loaded +. +.SH "SYNOPSIS" +\fBbundle benchmark\fR [group] +. +.SH "DESCRIPTION" +This command loads all your required dependencies as per Bundler\.setup, and displays the total time spent in requiring each gem and its dependencies\. +. +.P +Use this command to track down problems with excessive boot time in your application, or to optimize specific groups in your Gemfile for fast setup\. +. +.SH "GROUP OPTION" +To test the load times for gems in a specific group, pass the group as an argument to \fBbundle benchmark\fR\. Omitting this option loads all dependencies in your Gemfile\. diff --git a/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle-benchmark.txt b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle-benchmark.txt new file mode 100644 index 00000000..52b2a36c --- /dev/null +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle-benchmark.txt @@ -0,0 +1,27 @@ +BUNDLE-BENCHMARK(1) BUNDLE-BENCHMARK(1) + + + +NAME + bundle-benchmark - Display the time taken for each gem to be loaded + +SYNOPSIS + bundle benchmark [group] + +DESCRIPTION + This command loads all your required dependencies as per Bundler.setup, + and displays the total time spent in requiring each gem and its depen- + dencies. + + Use this command to track down problems with excessive boot time in + your application, or to optimize specific groups in your Gemfile for + fast setup. + +GROUP OPTION + To test the load times for gems in a specific group, pass the group as + an argument to bundle benchmark. Omitting this option loads all depen- + dencies in your Gemfile. + + + + May 2011 BUNDLE-BENCHMARK(1) diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/bundle-config b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle-config similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/bundle-config rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle-config diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/bundle-config.txt b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle-config.txt similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/bundle-config.txt rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle-config.txt diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/bundle-exec b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle-exec similarity index 99% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/bundle-exec rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle-exec index ce9ce7da..855f0a79 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/bundle-exec +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle-exec @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-EXEC" "1" "November 2010" "" "" +.TH "BUNDLE\-EXEC" "1" "January 2011" "" "" . .SH "NAME" \fBbundle\-exec\fR \- Execute a command in the context of the bundle diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/bundle-exec.txt b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle-exec.txt similarity index 99% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/bundle-exec.txt rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle-exec.txt index e589958a..04a774a1 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/bundle-exec.txt +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle-exec.txt @@ -128,4 +128,4 @@ RUBYGEMS PLUGINS - November 2010 BUNDLE-EXEC(1) + January 2011 BUNDLE-EXEC(1) diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/bundle-install b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle-install similarity index 94% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/bundle-install rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle-install index a847047a..50dea0ef 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/bundle-install +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle-install @@ -1,20 +1,23 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-INSTALL" "1" "October 2010" "" "" +.TH "BUNDLE\-INSTALL" "1" "May 2011" "" "" . .SH "NAME" \fBbundle\-install\fR \- Install the dependencies specified in your Gemfile . .SH "SYNOPSIS" -\fBbundle install\fR [\-\-local] [\-\-quiet] [\-\-gemfile=GEMFILE] [\-\-system] +\fBbundle install\fR [\-\-gemfile=GEMFILE] . .IP "" 4 . .nf - [\-\-deployment] [\-\-frozen] [\-\-path] - [\-\-binstubs[=DIRECTORY]] [\-\-without=GROUP1[ GROUP2\.\.\.]] + [\-\-path PATH] [\-\-system] + [\-\-without=GROUP1[ GROUP2\.\.\.]] + [\-\-local] [\-\-deployment] + [\-\-binstubs[=DIRECTORY]] + [\-\-quiet] . .fi . @@ -53,14 +56,14 @@ Do not attempt to connect to \fBrubygems\.org\fR, instead using just the gems lo . .TP \fB\-\-deployment\fR -Switches bundler\'s defaults into \fIdeployment mode\fR\. +Switches bundler\'s defaults into \fIdeployment mode\fR\. Do not use this flag on development machines\. . .TP \fB\-\-binstubs[=]\fR Create a directory (defaults to \fBbin\fR) containing an executable that runs in the context of the bundle\. For instance, if the \fBrails\fR gem comes with a \fBrails\fR executable, this flag will create a \fBbin/rails\fR executable that ensures that all dependencies used come from the bundled gems\. . .SH "DEPLOYMENT MODE" -Bundler\'s defaults are optimized for development\. To switch to defaults optimized for deployment, use the \fB\-\-deployment\fR flag\. +Bundler\'s defaults are optimized for development\. To switch to defaults optimized for deployment, use the \fB\-\-deployment\fR flag\. Do not activate deployment mode on development machines, as it will cause in an error when the Gemfile is modified\. . .IP "1." 4 A \fBGemfile\.lock\fR is required\. @@ -118,10 +121,10 @@ Checking out private git repositories using your user\'s SSH keys .IP "" 0 . .P -Of these three, the first two could theoretically be performed by \fBchown\fRing the resulting files to \fB$SUDO_USER\fR\. The third, however, can only be performed by actually invoking the \fBgit\fR command as the current user\. +Of these three, the first two could theoretically be performed by \fBchown\fRing the resulting files to \fB$SUDO_USER\fR\. The third, however, can only be performed by actually invoking the \fBgit\fR command as the current user\. Therefore, git gems are downloaded and installed into \fB~/\.bundle\fR rather than $GEM_HOME or $BUNDLE_PATH\. . .P -As a result, you should run \fBbundle install\fR as the current user, and bundler will ask for your password if it is needed to perform the final step\. +As a result, you should run \fBbundle install\fR as the current user, and bundler will ask for your password if it is needed to put the gems into their final location\. . .SH "INSTALLING GROUPS" By default, \fBbundle install\fR will install all gems in all groups in your Gemfile(5), except those declared for a different platform\. diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/bundle-install.txt b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle-install.txt similarity index 82% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/bundle-install.txt rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle-install.txt index 6501bae0..276af004 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/bundle-install.txt +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle-install.txt @@ -6,12 +6,15 @@ NAME bundle-install - Install the dependencies specified in your Gemfile SYNOPSIS - bundle install [--local] [--quiet] [--gemfile=GEMFILE] [--system] + bundle install [--gemfile=GEMFILE] - [--deployment] [--frozen] [--path] - [--binstubs[=DIRECTORY]] [--without=GROUP1[ GROUP2...]] + [--path PATH] [--system] + [--without=GROUP1[ GROUP2...]] + [--local] [--deployment] + [--binstubs[=DIRECTORY]] + [--quiet] @@ -61,63 +64,66 @@ OPTIONS bypass the normal lookup. --deployment - Switches bundler's defaults into deployment mode. + Switches bundler's defaults into deployment mode. Do not use + this flag on development machines. --binstubs[=] - Create a directory (defaults to bin) containing an executable - that runs in the context of the bundle. For instance, if the + Create a directory (defaults to bin) containing an executable + that runs in the context of the bundle. For instance, if the rails gem comes with a rails executable, this flag will create a - bin/rails executable that ensures that all dependencies used + bin/rails executable that ensures that all dependencies used come from the bundled gems. DEPLOYMENT MODE Bundler's defaults are optimized for development. To switch to defaults - optimized for deployment, use the --deployment flag. + optimized for deployment, use the --deployment flag. Do not activate + deployment mode on development machines, as it will cause in an error + when the Gemfile is modified. 1. A Gemfile.lock is required. To ensure that the same versions of the gems you developed with and - tested with are also used in deployments, a Gemfile.lock is + tested with are also used in deployments, a Gemfile.lock is required. - This is mainly to ensure that you remember to check your Gem- + This is mainly to ensure that you remember to check your Gem- file.lock into version control. 2. The Gemfile.lock must be up to date - In development, you can modify your Gemfile(5) and re-run bundle + In development, you can modify your Gemfile(5) and re-run bundle install to conservatively update your Gemfile.lock snapshot. - In deployment, your Gemfile.lock should be up-to-date with changes + In deployment, your Gemfile.lock should be up-to-date with changes made in your Gemfile(5). - 3. Gems are installed to vendor/bundle not your default system loca- + 3. Gems are installed to vendor/bundle not your default system loca- tion - In development, it's convenient to share the gems used in your - application with other applications and other scripts run on the + In development, it's convenient to share the gems used in your + application with other applications and other scripts run on the system. - In deployment, isolation is a more important default. In addition, - the user deploying the application may not have permission to - install gems to the system, or the web server may not have permis- + In deployment, isolation is a more important default. In addition, + the user deploying the application may not have permission to + install gems to the system, or the web server may not have permis- sion to read them. - As a result, bundle install --deployment installs gems to the ven- - dor/bundle directory in the application. This may be overridden + As a result, bundle install --deployment installs gems to the ven- + dor/bundle directory in the application. This may be overridden using the --path option. SUDO USAGE - By default, bundler installs gems to the same location as gem install. + By default, bundler installs gems to the same location as gem install. - In some cases, that location may not be writable by your Unix user. In + In some cases, that location may not be writable by your Unix user. In that case, bundler will stage everything in a temporary directory, then - ask you for your sudo password in order to copy the gems into their + ask you for your sudo password in order to copy the gems into their system location. - From your perspective, this is identical to installing them gems + From your perspective, this is identical to installing them gems directly into the system. You should never use sudo bundle install. This is because several other @@ -131,14 +137,15 @@ SUDO USAGE - Of these three, the first two could theoretically be performed by - chowning the resulting files to $SUDO_USER. The third, however, can - only be performed by actually invoking the git command as the current - user. + Of these three, the first two could theoretically be performed by + chowning the resulting files to $SUDO_USER. The third, however, can + only be performed by actually invoking the git command as the current + user. Therefore, git gems are downloaded and installed into ~/.bundle + rather than $GEM_HOME or $BUNDLE_PATH. As a result, you should run bundle install as the current user, and - bundler will ask for your password if it is needed to perform the final - step. + bundler will ask for your password if it is needed to put the gems into + their final location. INSTALLING GROUPS By default, bundle install will install all gems in all groups in your @@ -328,4 +335,4 @@ CONSERVATIVE UPDATING - October 2010 BUNDLE-INSTALL(1) + May 2011 BUNDLE-INSTALL(1) diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/bundle-package b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle-package similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/bundle-package rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle-package diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/bundle-package.txt b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle-package.txt similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/bundle-package.txt rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle-package.txt diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/bundle-update b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle-update similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/bundle-update rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle-update diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/bundle-update.txt b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle-update.txt similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/bundle-update.txt rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle-update.txt diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/bundle.txt b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle.txt similarity index 98% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/bundle.txt rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle.txt index 6c8a6862..35d7d08c 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/bundle.txt +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/bundle.txt @@ -83,4 +83,4 @@ OBSOLETE - November 2010 BUNDLE(1) + May 2011 BUNDLE(1) diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/gemfile.5 b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/gemfile.5 similarity index 97% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/gemfile.5 rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/gemfile.5 index f486b0a3..db3c5871 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/gemfile.5 +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/gemfile.5 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "GEMFILE" "5" "October 2010" "" "" +.TH "GEMFILE" "5" "May 2011" "" "" . .SH "NAME" \fBGemfile\fR \- A format for describing gem dependencies for Ruby programs @@ -181,6 +181,10 @@ Same as \fIruby\fR, but not Rubinius \fImri\fR \fBAND\fR version 1\.9 . .TP +\fBrbx\fR +Same as \fIruby\fR, but only Rubinius (not MRI) +. +.TP \fBjruby\fR JRuby . @@ -188,6 +192,18 @@ JRuby \fBmswin\fR Windows . +.TP +\fBmingw\fR +Windows \'mingw32\' platform (aka RubyInstaller) +. +.TP +\fBmingw_18\fR +\fImingw\fR \fBAND\fR version 1\.8 +. +.TP +\fBmingw_19\fR +\fImingw\fR \fBAND\fR version 1\.9 +. .P As with groups, you can specify one or more platforms: . diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/gemfile.5.txt b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/gemfile.5.txt similarity index 97% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/gemfile.5.txt rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/gemfile.5.txt index 3b2a3a6a..1745de6a 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/man/gemfile.5.txt +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/man/gemfile.5.txt @@ -154,10 +154,20 @@ GEMS (#gem) mri_19 mri AND version 1.9 + rbx Same as ruby, but only Rubinius (not MRI) + jruby JRuby mswin Windows + mingw Windows 'mingw32' platform (aka RubyInstaller) + + mingw_18 + mingw AND version 1.8 + + mingw_19 + mingw AND version 1.9 + As with groups, you can specify one or more platforms: @@ -332,4 +342,4 @@ SOURCE PRIORITY - October 2010 GEMFILE(5) + May 2011 GEMFILE(5) diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/remote_specification.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/remote_specification.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/remote_specification.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/remote_specification.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/resolver.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/resolver.rb similarity index 99% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/resolver.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/resolver.rb index 0a27c092..4948357c 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/resolver.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/resolver.rb @@ -407,7 +407,7 @@ module Bundler end def error_message - output = errors.inject("") do |o, (conflict, (origin, requirement))| + errors.inject("") do |o, (conflict, (origin, requirement))| # origin is the SpecSet of specs from the Gemfile that is conflicted with if origin @@ -422,7 +422,7 @@ module Bundler o << " Current Bundler version:\n" newer_bundler_required = requirement.requirement > Gem::Requirement.new(origin.version) # If the origin is a LockfileParser, it does not respond_to :required_by - elsif !origin.respond_to?(:required_by) || !(required_by = origin.required_by.first) + elsif !origin.respond_to?(:required_by) || !(origin.required_by.first) o << " In snapshot (Gemfile.lock):\n" end diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/rubygems_ext.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/rubygems_ext.rb similarity index 90% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/rubygems_ext.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/rubygems_ext.rb index 29b12d79..95a382f0 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/rubygems_ext.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/rubygems_ext.rb @@ -19,7 +19,7 @@ module Gem def full_gem_path source.respond_to?(:path) ? - Pathname.new(loaded_from).dirname.expand_path.to_s : + Pathname.new(loaded_from).dirname.expand_path(Bundler.root).to_s : rg_full_gem_path end @@ -39,6 +39,11 @@ module Gem end end + # RubyGems 1.8+ used only. + def gem_dir + full_gem_path + end + def groups @groups ||= [] end @@ -105,6 +110,12 @@ module Gem alias eql? == + def encode_with(coder) + to_yaml_properties.each do |ivar| + coder[ivar.to_s.sub(/^@/, '')] = instance_variable_get(ivar) + end + end + def to_yaml_properties instance_variables.reject { |p| ["@source", "@groups"].include?(p.to_s) } end @@ -112,11 +123,13 @@ module Gem def to_lock out = " #{name}" unless requirement == Gem::Requirement.default - out << " (#{requirement.to_s})" + reqs = requirement.requirements.map{|o,v| "#{o} #{v}" } + out << " (#{reqs.join(', ')})" end out end + # Backport of performance enhancement added to Rubygems 1.4 def matches_spec?(spec) # name can be a Regexp, so use === return false unless name === spec.name @@ -127,6 +140,7 @@ module Gem end class Requirement + # Backport of performance enhancement added to Rubygems 1.4 def none? @none ||= (to_s == ">= 0") end unless allocate.respond_to?(:none?) diff --git a/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/rubygems_integration.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/rubygems_integration.rb new file mode 100644 index 00000000..f2d2f5e2 --- /dev/null +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/rubygems_integration.rb @@ -0,0 +1,323 @@ +module Bundler + class RubygemsIntegration + def initialize + # Work around a RubyGems bug + configuration + end + + def loaded_specs(name) + Gem.loaded_specs[name] + end + + def mark_loaded(spec) + Gem.loaded_specs[spec.name] = spec + end + + def path(obj) + obj.to_s + end + + def platforms + Gem.platforms + end + + def configuration + Gem.configuration + end + + def ruby_engine + Gem.ruby_engine + end + + def read_binary(path) + Gem.read_binary(path) + end + + def inflate(obj) + Gem.inflate(obj) + end + + def sources=(val) + Gem.sources = val + end + + def sources + Gem.sources + end + + def gem_dir + Gem.dir + end + + def gem_bindir + Gem.bindir + end + + def user_home + Gem.user_home + end + + def gem_path + Gem.path + end + + def marshal_spec_dir + Gem::MARSHAL_SPEC_DIR + end + + def clear_paths + Gem.clear_paths + end + + def bin_path(gem, bin, ver) + Gem.bin_path(gem, bin, ver) + end + + def preserve_paths + # this is a no-op outside of Rubygems 1.8 + yield + end + + def ui=(obj) + Gem::DefaultUserInteraction.ui = obj + end + + def fetch_specs(all, pre, &blk) + Gem::SpecFetcher.new.list(all, pre).each(&blk) + end + + def with_build_args(args) + old_args = Gem::Command.build_args + begin + Gem::Command.build_args = args + yield + ensure + Gem::Command.build_args = old_args + end + end + + def spec_from_gem(path) + Gem::Format.from_file_by_path(path).spec + end + + def download_gem(spec, uri, path) + Gem::RemoteFetcher.fetcher.download(spec, uri, path) + end + + def reverse_rubygems_kernel_mixin + # Disable rubygems' gem activation system + ::Kernel.class_eval do + if private_method_defined?(:gem_original_require) + alias rubygems_require require + alias require gem_original_require + end + + undef gem + end + end + + def replace_gem(specs) + executables = specs.map { |s| s.executables }.flatten + + ::Kernel.send(:define_method, :gem) do |dep, *reqs| + if executables.include? File.basename(caller.first.split(':').first) + return + end + opts = reqs.last.is_a?(Hash) ? reqs.pop : {} + + unless dep.respond_to?(:name) && dep.respond_to?(:requirement) + dep = Gem::Dependency.new(dep, reqs) + end + + spec = specs.find { |s| s.name == dep.name } + + if spec.nil? + + e = Gem::LoadError.new "#{dep.name} is not part of the bundle. Add it to Gemfile." + e.name = dep.name + if e.respond_to?(:requirement=) + e.requirement = dep.requirement + else + e.version_requirement = dep.requirement + end + raise e + elsif dep !~ spec + e = Gem::LoadError.new "can't activate #{dep}, already activated #{spec.full_name}. " \ + "Make sure all dependencies are added to Gemfile." + e.name = dep.name + if e.respond_to?(:requirement=) + e.requirement = dep.requirement + else + e.version_requirement = dep.requirement + end + raise e + end + + true + end + end + + if defined? ::Deprecate + Deprecate = ::Deprecate + elsif defined? Gem::Deprecate + Deprecate = Gem::Deprecate + else + class Deprecate + def skip_during; yield; end + end + end + + def stub_source_index137(specs) + # Rubygems versions lower than 1.7 use SourceIndex#from_gems_in + source_index_class = (class << Gem::SourceIndex ; self ; end) + source_index_class.send(:remove_method, :from_gems_in) + source_index_class.send(:define_method, :from_gems_in) do |*args| + source_index = Gem::SourceIndex.new + source_index.spec_dirs = *args + source_index.add_specs(*specs) + source_index + end + end + + def stub_source_index170(specs) + Gem::SourceIndex.send(:define_method, :initialize) do |*args| + @gems = {} + # You're looking at this thinking: Oh! This is how I make those + # rubygems deprecations go away! + # + # You'd be correct BUT using of this method in production code + # must be approved by the rubygems team itself! + # + # This is your warning. If you use this and don't have approval + # we can't protect you. + # + Deprecate.skip_during do + self.spec_dirs = *args + add_specs(*specs) + end + end + end + + # Used to make bin stubs that are not created by bundler work + # under bundler. The new Gem.bin_path only considers gems in + # +specs+ + def replace_bin_path(specs) + gem_class = (class << Gem ; self ; end) + gem_class.send(:remove_method, :bin_path) + gem_class.send(:define_method, :bin_path) do |name, *args| + exec_name, *reqs = args + + if exec_name == 'bundle' + return ENV['BUNDLE_BIN_PATH'] + end + + spec = nil + + if exec_name + spec = specs.find { |s| s.executables.include?(exec_name) } + spec or raise Gem::Exception, "can't find executable #{exec_name}" + else + spec = specs.find { |s| s.name == name } + exec_name = spec.default_executable or raise Gem::Exception, "no default executable for #{spec.full_name}" + end + + gem_bin = File.join(spec.full_gem_path, spec.bindir, exec_name) + gem_from_path_bin = File.join(File.dirname(spec.loaded_from), spec.bindir, exec_name) + File.exist?(gem_bin) ? gem_bin : gem_from_path_bin + end + end + + # Because Bundler has a static view of what specs are available, + # we don't #reflesh, so stub it out. + def replace_refresh + gem_class = (class << Gem ; self ; end) + gem_class.send(:remove_method, :refresh) + gem_class.send(:define_method, :refresh) { } + end + + # Replace or hook into Rubygems to provide a bundlerized view + # of the world. + def replace_entrypoints(specs) + reverse_rubygems_kernel_mixin + + replace_gem(specs) + + stub_rubygems(specs) + + replace_bin_path(specs) + replace_refresh + + Gem.clear_paths + end + + # Rubygems versions 1.3.6 through 1.6.2 + class Legacy < RubygemsIntegration + def stub_rubygems(specs) + stub_source_index137(specs) + end + + def all_specs + Gem.source_index.gems.values + end + + def find_name(name) + Gem.source_index.find_name(name) + end + end + + # Rubygems 1.7 + class Transitional < Legacy + def stub_rubygems(specs) + stub_source_index170(specs) + end + end + + # Rubygems 1.8.5 + class Modern < RubygemsIntegration + def stub_rubygems(specs) + Gem::Specification.all = specs + + Gem.post_reset { + Gem::Specification.all = specs + } + + stub_source_index170(specs) + end + + def all_specs + Gem::Specification.to_a + end + + def find_name(name) + Gem::Specification.find_all_by_name name + end + end + + # Rubygems 1.8.0 to 1.8.4 + class AlmostModern < Modern + # Rubygems [>= 1.8.0, < 1.8.5] has a bug that changes Gem.dir whenever + # you call Gem::Installer#install with an :install_dir set. We have to + # change it back for our sudo mode to work. + def preserve_paths + old_dir, old_path = gem_dir, gem_path + yield + Gem.use_paths(old_dir, old_path) + end + end + + end + + if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.8.5') + @rubygems = RubygemsIntegration::Modern.new + elsif Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.8.0') + @rubygems = RubygemsIntegration::AlmostModern.new + elsif Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.7.0') + @rubygems = RubygemsIntegration::Transitional.new + else # Rubygems 1.3.6 through 1.6.2 + @rubygems = RubygemsIntegration::Legacy.new + end + + class << self + attr_reader :rubygems + end +end diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/runtime.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/runtime.rb similarity index 84% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/runtime.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/runtime.rb index b4ea8d1a..70c9b0ff 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/runtime.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/runtime.rb @@ -11,7 +11,7 @@ module Bundler specs = groups.any? ? @definition.specs_for(groups) : requested_specs setup_environment - cripple_rubygems(specs) + Bundler.rubygems.replace_entrypoints(specs) # Activate the specs specs.each do |spec| @@ -19,15 +19,19 @@ module Bundler raise GemNotFound, "#{spec.full_name} is missing. Run `bundle` to get it." end - if activated_spec = Gem.loaded_specs[spec.name] and activated_spec.version != spec.version + if activated_spec = Bundler.rubygems.loaded_specs(spec.name) and activated_spec.version != spec.version e = Gem::LoadError.new "You have already activated #{activated_spec.name} #{activated_spec.version}, " \ "but your Gemfile requires #{spec.name} #{spec.version}. Consider using bundle exec." e.name = spec.name - e.version_requirement = Gem::Requirement.new(spec.version.to_s) + if e.respond_to?(:requirement=) + e.requirement = Gem::Requirement.new(spec.version.to_s) + else + e.version_requirement = Gem::Requirement.new(spec.version.to_s) + end raise e end - Gem.loaded_specs[spec.name] = spec + Bundler.rubygems.mark_loaded(spec) load_paths = spec.load_paths.reject {|path| $LOAD_PATH.include?(path)} $LOAD_PATH.unshift(*load_paths) end @@ -81,7 +85,7 @@ module Bundler alias gems specs def cache - FileUtils.mkdir_p(cache_path) + FileUtils.mkdir_p(cache_path) unless File.exists?(cache_path) Bundler.ui.info "Updating .gem files in vendor/cache" specs.each do |spec| @@ -92,13 +96,13 @@ module Bundler end def prune_cache - FileUtils.mkdir_p(cache_path) + FileUtils.mkdir_p(cache_path) unless File.exists?(cache_path) resolve = @definition.resolve cached = Dir["#{cache_path}/*.gem"] cached = cached.delete_if do |path| - spec = Gem::Format.from_file_by_path(path).spec + spec = Bundler.rubygems.spec_from_gem path resolve.any? do |s| s.name == spec.name && s.version == spec.version && !s.source.is_a?(Bundler::Source::Git) @@ -123,7 +127,7 @@ module Bundler def setup_environment begin - ENV["BUNDLE_BIN_PATH"] = Gem.bin_path("bundler", "bundle", VERSION) + ENV["BUNDLE_BIN_PATH"] = Bundler.rubygems.bin_path("bundler", "bundle", VERSION) rescue Gem::GemNotFoundException ENV["BUNDLE_BIN_PATH"] = File.expand_path("../../../bin/bundle", __FILE__) end diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/settings.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/settings.rb similarity index 94% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/settings.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/settings.rb index e103957a..c3209c3a 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/settings.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/settings.rb @@ -16,7 +16,7 @@ module Bundler end def delete(key) - @local_config + @local_config.delete(key_for(key)) end def set_global(key, value) @@ -79,7 +79,7 @@ module Bundler if path = self[:path] "#{path}/#{Bundler.ruby_scope}" else - Gem.dir + Bundler.rubygems.gem_dir end end @@ -106,7 +106,7 @@ module Bundler end def global_config_file - file = ENV["BUNDLE_CONFIG"] || File.join(Gem.user_home, ".bundle/config") + file = ENV["BUNDLE_CONFIG"] || File.join(Bundler.rubygems.user_home, ".bundle/config") Pathname.new(file) end diff --git a/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/setup.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/setup.rb new file mode 100644 index 00000000..d5770977 --- /dev/null +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/setup.rb @@ -0,0 +1,23 @@ +require 'bundler/shared_helpers' + +if Bundler::SharedHelpers.in_bundle? + require 'bundler' + if STDOUT.tty? + begin + Bundler.setup + rescue Bundler::BundlerError => e + puts "\e[31m#{e.message}\e[0m" + puts e.backtrace.join("\n") if ENV["DEBUG"] + if Bundler::GemNotFound === e + puts "\e[33mRun `bundle install` to install missing gems.\e[0m" + end + exit e.status_code + end + else + Bundler.setup + end + + # Add bundler to the load path after disabling system gems + bundler_lib = File.expand_path("../..", __FILE__) + $LOAD_PATH.unshift(bundler_lib) unless $LOAD_PATH.include?(bundler_lib) +end diff --git a/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/shared_helpers.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/shared_helpers.rb new file mode 100644 index 00000000..e6f4899f --- /dev/null +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/shared_helpers.rb @@ -0,0 +1,71 @@ +require 'pathname' +require 'rubygems' + +require 'bundler/rubygems_integration' + +module Gem + class Dependency + if !instance_methods.map { |m| m.to_s }.include?("requirement") + def requirement + version_requirements + end + end + end +end + +module Bundler + module SharedHelpers + attr_accessor :gem_loaded + + def default_gemfile + gemfile = find_gemfile + raise GemfileNotFound, "Could not locate Gemfile" unless gemfile + Pathname.new(gemfile) + end + + def default_lockfile + Pathname.new("#{default_gemfile}.lock") + end + + def in_bundle? + find_gemfile + end + + private + + def find_gemfile + given = ENV['BUNDLE_GEMFILE'] + return given if given && !given.empty? + + previous = nil + current = File.expand_path(Dir.pwd) + + until !File.directory?(current) || current == previous + if ENV['BUNDLE_SPEC_RUN'] + # avoid stepping above the tmp directory when testing + return nil if File.file?(File.join(current, 'bundler.gemspec')) + end + + # otherwise return the Gemfile if it's there + filename = File.join(current, 'Gemfile') + return filename if File.file?(filename) + current, previous = File.expand_path("..", current), current + end + end + + def clean_load_path + # handle 1.9 where system gems are always on the load path + if defined?(::Gem) + me = File.expand_path("../../", __FILE__) + $LOAD_PATH.reject! do |p| + next if File.expand_path(p) =~ /^#{Regexp.escape(me)}/ + p != File.dirname(__FILE__) && + Bundler.rubygems.gem_path.any?{|gp| p =~ /^#{Regexp.escape(gp)}/ } + end + $LOAD_PATH.uniq! + end + end + + extend self + end +end diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/source.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/source.rb similarity index 82% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/source.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/source.rb index 5fef845b..f18ace20 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/source.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/source.rb @@ -1,4 +1,5 @@ require "uri" +require 'rubygems/user_interaction' require "rubygems/installer" require "rubygems/spec_fetcher" require "rubygems/format" @@ -16,8 +17,12 @@ module Bundler @remotes = (options["remotes"] || []).map { |r| normalize_uri(r) } @allow_remote = false @allow_cached = false + # Hardcode the paths for now - @caches = [ Bundler.app_cache ] + Gem.path.map { |p| File.expand_path("#{p}/cache") } + @caches = [ Bundler.app_cache ] + Bundler.rubygems.gem_path.map do |x| + File.expand_path("#{x}/cache") + end + @spec_fetch_map = {} end @@ -69,43 +74,45 @@ module Bundler spec, uri = @spec_fetch_map[spec.full_name] if spec path = download_gem_from_uri(spec, uri) - s = Gem::Format.from_file_by_path(path).spec + s = Bundler.rubygems.spec_from_gem(path) spec.__swap__(s) end end def install(spec) - path = cached_gem(spec) - if installed_specs[spec].any? Bundler.ui.info "Using #{spec.name} (#{spec.version}) " return end Bundler.ui.info "Installing #{spec.name} (#{spec.version}) " + path = cached_gem(spec) - install_path = Bundler.requires_sudo? ? Bundler.tmp : Gem.dir - options = { :install_dir => install_path, - :ignore_dependencies => true, - :wrappers => true, - :env_shebang => true } - options.merge!(:bin_dir => "#{install_path}/bin") unless spec.executables.nil? || spec.executables.empty? + Bundler.rubygems.preserve_paths do - installer = Gem::Installer.new path, options - installer.install + install_path = Bundler.requires_sudo? ? Bundler.tmp : Bundler.rubygems.gem_dir + options = { :install_dir => install_path, + :ignore_dependencies => true, + :wrappers => true, + :env_shebang => true } + options.merge!(:bin_dir => "#{install_path}/bin") unless spec.executables.nil? || spec.executables.empty? + + installer = Gem::Installer.new path, options + installer.install + end # SUDO HAX if Bundler.requires_sudo? - sudo "mkdir -p #{Gem.dir}/gems #{Gem.dir}/specifications" - sudo "cp -R #{Bundler.tmp}/gems/#{spec.full_name} #{Gem.dir}/gems/" - sudo "cp -R #{Bundler.tmp}/specifications/#{spec.full_name}.gemspec #{Gem.dir}/specifications/" + sudo "mkdir -p #{Bundler.rubygems.gem_dir}/gems #{Bundler.rubygems.gem_dir}/specifications" + sudo "cp -R #{Bundler.tmp}/gems/#{spec.full_name} #{Bundler.rubygems.gem_dir}/gems/" + sudo "cp -R #{Bundler.tmp}/specifications/#{spec.full_name}.gemspec #{Bundler.rubygems.gem_dir}/specifications/" spec.executables.each do |exe| - sudo "mkdir -p #{Gem.bindir}" - sudo "cp -R #{Bundler.tmp}/bin/#{exe} #{Gem.bindir}" + sudo "mkdir -p #{Bundler.rubygems.gem_bindir}" + sudo "cp -R #{Bundler.tmp}/bin/#{exe} #{Bundler.rubygems.gem_bindir}" end end - spec.loaded_from = "#{Gem.dir}/specifications/#{spec.full_name}.gemspec" + spec.loaded_from = "#{Bundler.rubygems.gem_dir}/specifications/#{spec.full_name}.gemspec" end def sudo(str) @@ -134,8 +141,12 @@ module Bundler private def cached_gem(spec) - possibilities = @caches.map { |p| "#{p}/#{spec.full_name}.gem" } - possibilities.find { |p| File.exist?(p) } + possibilities = @caches.map { |p| "#{p}/#{spec.file_name}" } + cached_gem = possibilities.find { |p| File.exist?(p) } + unless cached_gem + raise Bundler::GemNotFound, "Could not find #{spec.file_name} for installation" + end + cached_gem end def normalize_uri(uri) @@ -158,7 +169,7 @@ module Bundler @installed_specs ||= begin idx = Index.new have_bundler = false - Gem.source_index.to_a.reverse.each do |dont_use_this_var, spec| + Bundler.rubygems.all_specs.reverse.each do |spec| next if spec.name == 'bundler' && spec.version.to_s != VERSION have_bundler = true if spec.name == 'bundler' spec.source = self @@ -175,6 +186,7 @@ module Bundler s.version = VERSION s.platform = Gem::Platform::RUBY s.source = self + s.authors = ["bundler team"] s.loaded_from = File.expand_path("..", __FILE__) end idx << bundler @@ -189,10 +201,10 @@ module Bundler path = Bundler.app_cache Dir["#{path}/*.gem"].each do |gemfile| - next if gemfile =~ /bundler\-[\d\.]+?\.gem/ + next if gemfile =~ /^bundler\-[\d\.]+?\.gem/ begin - s ||= Gem::Format.from_file_by_path(gemfile).spec + s ||= Bundler.rubygems.spec_from_gem(gemfile) rescue Gem::Package::FormatError raise GemspecError, "Could not read gem at #{gemfile}. It may be corrupted." end @@ -208,7 +220,7 @@ module Bundler def remote_specs @remote_specs ||= begin idx = Index.new - old = Gem.sources + old = Bundler.rubygems.sources remotes.each do |uri| Bundler.ui.info "Fetching source index for #{uri}" @@ -225,7 +237,7 @@ module Bundler end idx ensure - Gem.sources = old + Bundler.rubygems.sources = old end end @@ -247,14 +259,14 @@ module Bundler def download_gem_from_uri(spec, uri) spec.fetch_platform - download_path = Bundler.requires_sudo? ? Bundler.tmp : Gem.dir - gem_path = "#{Gem.dir}/cache/#{spec.full_name}.gem" + download_path = Bundler.requires_sudo? ? Bundler.tmp : Bundler.rubygems.gem_dir + gem_path = "#{Bundler.rubygems.gem_dir}/cache/#{spec.full_name}.gem" FileUtils.mkdir_p("#{download_path}/cache") - Gem::RemoteFetcher.fetcher.download(spec, uri, download_path) + Bundler.rubygems.download_gem(spec, uri, download_path) if Bundler.requires_sudo? - sudo "mkdir -p #{Gem.dir}/cache" + sudo "mkdir -p #{Bundler.rubygems.gem_dir}/cache" sudo "mv #{Bundler.tmp}/cache/#{spec.full_name}.gem #{gem_path}" end @@ -316,14 +328,13 @@ module Bundler def eql?(o) o.instance_of?(Path) && path.expand_path(Bundler.root) == o.path.expand_path(Bundler.root) && - name == o.name && version == o.version end alias == eql? def name - File.basename(@path.to_s) + File.basename(path.expand_path(Bundler.root).to_s) end def load_spec_files @@ -349,9 +360,11 @@ module Bundler s.platform = Gem::Platform::RUBY s.summary = "Fake gemspec for #{@name}" s.relative_loaded_from = "#{@name}.gemspec" + s.authors = ["no one"] if expanded_path.join("bin").exist? - binaries = expanded_path.join("bin").children.map{|c| c.basename.to_s } - s.executables = binaries + binaries = expanded_path.join("bin").children + binaries.reject!{|p| File.directory?(p) } + s.executables = binaries.map{|c| c.basename.to_s } end end end @@ -369,8 +382,8 @@ module Bundler class Installer < Gem::Installer def initialize(spec, options = {}) @spec = spec - @bin_dir = Bundler.requires_sudo? ? "#{Bundler.tmp}/bin" : "#{Gem.dir}/bin" - @gem_dir = spec.full_gem_path + @bin_dir = Bundler.requires_sudo? ? "#{Bundler.tmp}/bin" : "#{Bundler.rubygems.gem_dir}/bin" + @gem_dir = Bundler.rubygems.path(spec.full_gem_path) @wrappers = options[:wrappers] || true @env_shebang = options[:env_shebang] || true @format_executable = options[:format_executable] || false @@ -384,9 +397,9 @@ module Bundler end super if Bundler.requires_sudo? - Bundler.mkdir_p "#{Gem.dir}/bin" + Bundler.mkdir_p "#{Bundler.rubygems.gem_dir}/bin" spec.executables.each do |exe| - Bundler.sudo "cp -R #{Bundler.tmp}/bin/#{exe} #{Gem.dir}/bin/" + Bundler.sudo "cp -R #{Bundler.tmp}/bin/#{exe} #{Bundler.rubygems.gem_dir}/bin/" end end end @@ -558,8 +571,10 @@ module Bundler if allow_git_ops? out = %x{git #{command}} - if $? != 0 - raise GitError, "An error has occurred in git when running `git #{command}`. Cannot complete bundling." + if $?.exitstatus != 0 + msg = "Git error: command `git #{command}` in directory #{Dir.pwd} has failed." + msg << "\nIf this error persists you could try removing the cache directory '#{cache_path}'" if cached? + raise GitError, msg end out else @@ -593,6 +608,19 @@ module Bundler Digest::SHA1.hexdigest(input) end + # Escape the URI for git commands + def uri_escaped + if Bundler::WINDOWS + # Windows quoting requires double quotes only, with double quotes + # inside the string escaped by being doubled. + '"' + uri.gsub('"') {|s| '""'} + '"' + else + # Bash requires single quoted strings, with the single quotes escaped + # by ending the string, escaping the quote, and restarting the string. + "'" + uri.gsub("'") {|s| "'\\''"} + "'" + end + end + def cache_path @cache_path ||= begin git_scope = "#{base_name}-#{uri_hash}" @@ -610,12 +638,12 @@ module Bundler return if has_revision_cached? Bundler.ui.info "Updating #{uri}" in_cache do - git %|fetch --force --quiet --tags "#{uri}" refs/heads/*:refs/heads/*| + git %|fetch --force --quiet --tags #{uri_escaped} "refs/heads/*:refs/heads/*"| end else Bundler.ui.info "Fetching #{uri}" FileUtils.mkdir_p(cache_path.dirname) - git %|clone "#{uri}" "#{cache_path}" --bare --no-hardlinks| + git %|clone #{uri_escaped} "#{cache_path}" --bare --no-hardlinks| end end @@ -624,6 +652,7 @@ module Bundler FileUtils.mkdir_p(path.dirname) FileUtils.rm_rf(path) git %|clone --no-checkout "#{cache_path}" "#{path}"| + File.chmod((0777 & ~File.umask), path) end Dir.chdir(path) do git %|fetch --force --quiet --tags "#{cache_path}"| diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/spec_set.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/spec_set.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/spec_set.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/spec_set.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/templates/Executable b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/templates/Executable similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/templates/Executable rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/templates/Executable diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/templates/Gemfile b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/templates/Gemfile similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/templates/Gemfile rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/templates/Gemfile diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/templates/newgem/Gemfile.tt b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/templates/newgem/Gemfile.tt similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/templates/newgem/Gemfile.tt rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/templates/newgem/Gemfile.tt diff --git a/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/templates/newgem/Rakefile.tt b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/templates/newgem/Rakefile.tt new file mode 100644 index 00000000..c702cfcc --- /dev/null +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/templates/newgem/Rakefile.tt @@ -0,0 +1 @@ +require 'bundler/gem_tasks' diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/templates/newgem/bin/newgem.tt b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/templates/newgem/bin/newgem.tt similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/templates/newgem/bin/newgem.tt rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/templates/newgem/bin/newgem.tt diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/templates/newgem/gitignore.tt b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/templates/newgem/gitignore.tt similarity index 60% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/templates/newgem/gitignore.tt rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/templates/newgem/gitignore.tt index 9f30a350..4040c6c1 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/templates/newgem/gitignore.tt +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/templates/newgem/gitignore.tt @@ -1,3 +1,4 @@ -pkg/* *.gem .bundle +Gemfile.lock +pkg/* diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/templates/newgem/lib/newgem.rb.tt b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/templates/newgem/lib/newgem.rb.tt similarity index 86% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/templates/newgem/lib/newgem.rb.tt rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/templates/newgem/lib/newgem.rb.tt index d54b2367..db76ef60 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/templates/newgem/lib/newgem.rb.tt +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/templates/newgem/lib/newgem.rb.tt @@ -1,3 +1,5 @@ +require "<%=config[:name]%>/version" + <%- config[:constant_array].each_with_index do |c,i| -%> <%= ' '*i %>module <%= c %> <%- end -%> diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/templates/newgem/lib/newgem/version.rb.tt b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/templates/newgem/lib/newgem/version.rb.tt similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/templates/newgem/lib/newgem/version.rb.tt rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/templates/newgem/lib/newgem/version.rb.tt diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/templates/newgem/newgem.gemspec.tt b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/templates/newgem/newgem.gemspec.tt similarity index 82% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/templates/newgem/newgem.gemspec.tt rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/templates/newgem/newgem.gemspec.tt index 4bf214a2..3b7ace15 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/templates/newgem/newgem.gemspec.tt +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/templates/newgem/newgem.gemspec.tt @@ -5,9 +5,8 @@ require "<%=config[:name]%>/version" Gem::Specification.new do |s| s.name = <%=config[:name].inspect%> s.version = <%=config[:constant_name]%>::VERSION - s.platform = Gem::Platform::RUBY - s.authors = ["TODO: Write your name"] - s.email = ["TODO: Write your email address"] + s.authors = ["<%= config[:author_name] %>"] + s.email = ["<%= config[:author_email] %>"] s.homepage = "" s.summary = %q{TODO: Write a gem summary} s.description = %q{TODO: Write a gem description} diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/ui.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/ui.rb similarity index 92% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/ui.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/ui.rb index e6331921..c483216a 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/ui.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/ui.rb @@ -1,3 +1,5 @@ +require 'rubygems/user_interaction' + module Bundler class UI def warn(message) @@ -53,9 +55,10 @@ module Bundler end end - class RGProxy < Gem::SilentUI + class RGProxy < ::Gem::SilentUI def initialize(ui) @ui = ui + super() end def say(message) diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/actions.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/actions.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/actions.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/actions.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/actions/create_file.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/actions/create_file.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/actions/create_file.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/actions/create_file.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/actions/directory.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/actions/directory.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/actions/directory.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/actions/directory.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/actions/empty_directory.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/actions/empty_directory.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/actions/empty_directory.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/actions/empty_directory.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/actions/file_manipulation.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/actions/file_manipulation.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/actions/file_manipulation.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/actions/file_manipulation.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/actions/inject_into_file.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/actions/inject_into_file.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/actions/inject_into_file.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/actions/inject_into_file.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/base.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/base.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/base.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/base.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/core_ext/file_binary_read.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/core_ext/file_binary_read.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/core_ext/file_binary_read.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/core_ext/file_binary_read.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/core_ext/hash_with_indifferent_access.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/core_ext/hash_with_indifferent_access.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/core_ext/hash_with_indifferent_access.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/core_ext/hash_with_indifferent_access.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/core_ext/ordered_hash.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/core_ext/ordered_hash.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/core_ext/ordered_hash.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/core_ext/ordered_hash.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/error.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/error.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/error.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/error.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/invocation.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/invocation.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/invocation.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/invocation.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/parser.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/parser.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/parser.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/parser.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/parser/argument.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/parser/argument.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/parser/argument.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/parser/argument.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/parser/arguments.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/parser/arguments.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/parser/arguments.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/parser/arguments.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/parser/option.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/parser/option.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/parser/option.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/parser/option.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/parser/options.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/parser/options.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/parser/options.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/parser/options.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/shell.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/shell.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/shell.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/shell.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/shell/basic.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/shell/basic.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/shell/basic.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/shell/basic.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/shell/color.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/shell/color.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/shell/color.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/shell/color.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/shell/html.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/shell/html.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/shell/html.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/shell/html.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/task.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/task.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/task.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/task.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/util.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/util.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/util.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/util.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/version.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/version.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vendor/thor/version.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vendor/thor/version.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/version.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/version.rb similarity index 74% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/version.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/version.rb index 069ac689..9f8590d5 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/version.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/version.rb @@ -2,5 +2,5 @@ module Bundler # We're doing this because we might write tests that deal # with other versions of bundler and we are unsure how to # handle this better. - VERSION = "1.0.7" unless defined?(::Bundler::VERSION) + VERSION = "1.0.15" unless defined?(::Bundler::VERSION) end diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vlad.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vlad.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/vlad.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/lib/bundler/vlad.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/man/bundle-config.ronn b/vendor/plugins/bundler/gems/bundler-1.0.15/man/bundle-config.ronn similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/man/bundle-config.ronn rename to vendor/plugins/bundler/gems/bundler-1.0.15/man/bundle-config.ronn diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/man/bundle-exec.ronn b/vendor/plugins/bundler/gems/bundler-1.0.15/man/bundle-exec.ronn similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/man/bundle-exec.ronn rename to vendor/plugins/bundler/gems/bundler-1.0.15/man/bundle-exec.ronn diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/man/bundle-install.ronn b/vendor/plugins/bundler/gems/bundler-1.0.15/man/bundle-install.ronn similarity index 96% rename from vendor/plugins/bundler/gems/bundler-1.0.7/man/bundle-install.ronn rename to vendor/plugins/bundler/gems/bundler-1.0.15/man/bundle-install.ronn index 12cc64e7..3b2d5231 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/man/bundle-install.ronn +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/man/bundle-install.ronn @@ -60,6 +60,7 @@ update process below under [CONSERVATIVE UPDATING][]. * `--deployment`: Switches bundler's defaults into [deployment mode][DEPLOYMENT MODE]. + Do not use this flag on development machines. * `--binstubs[=]`: Create a directory (defaults to `bin`) containing an executable @@ -72,6 +73,8 @@ update process below under [CONSERVATIVE UPDATING][]. Bundler's defaults are optimized for development. To switch to defaults optimized for deployment, use the `--deployment` flag. +Do not activate deployment mode on development machines, as it +will cause in an error when the Gemfile is modified. 1. A `Gemfile.lock` is required. @@ -128,11 +131,12 @@ other steps in `bundle install` must be performed as the current user: Of these three, the first two could theoretically be performed by `chown`ing the resulting files to `$SUDO_USER`. The third, however, can only be performed by actually invoking the `git` command as -the current user. +the current user. Therefore, git gems are downloaded and installed +into `~/.bundle` rather than $GEM_HOME or $BUNDLE_PATH. As a result, you should run `bundle install` as the current user, -and bundler will ask for your password if it is needed to perform -the final step. +and bundler will ask for your password if it is needed to put the +gems into their final location. ## INSTALLING GROUPS diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/man/bundle-package.ronn b/vendor/plugins/bundler/gems/bundler-1.0.15/man/bundle-package.ronn similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/man/bundle-package.ronn rename to vendor/plugins/bundler/gems/bundler-1.0.15/man/bundle-package.ronn diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/man/bundle-update.ronn b/vendor/plugins/bundler/gems/bundler-1.0.15/man/bundle-update.ronn similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/man/bundle-update.ronn rename to vendor/plugins/bundler/gems/bundler-1.0.15/man/bundle-update.ronn diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/man/bundle.ronn b/vendor/plugins/bundler/gems/bundler-1.0.15/man/bundle.ronn similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/man/bundle.ronn rename to vendor/plugins/bundler/gems/bundler-1.0.15/man/bundle.ronn diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/man/gemfile.5.ronn b/vendor/plugins/bundler/gems/bundler-1.0.15/man/gemfile.5.ronn similarity index 99% rename from vendor/plugins/bundler/gems/bundler-1.0.7/man/gemfile.5.ronn rename to vendor/plugins/bundler/gems/bundler-1.0.15/man/gemfile.5.ronn index b0d69153..a8809b7a 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/man/gemfile.5.ronn +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/man/gemfile.5.ronn @@ -120,6 +120,8 @@ There are a number of `Gemfile` platforms: _mri_ `AND` version 1.8 * `mri_19`: _mri_ `AND` version 1.9 + * `rbx`: + Same as _ruby_, but only Rubinius (not MRI) * `jruby`: JRuby * `mswin`: diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/man/index.txt b/vendor/plugins/bundler/gems/bundler-1.0.15/man/index.txt similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/man/index.txt rename to vendor/plugins/bundler/gems/bundler-1.0.15/man/index.txt diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/cache/gems_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/cache/gems_spec.rb similarity index 95% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/cache/gems_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/cache/gems_spec.rb index f80595ce..aef513b5 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/cache/gems_spec.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/cache/gems_spec.rb @@ -214,6 +214,17 @@ describe "bundle cache" do bundle "install" out.should_not =~ /removing/i end + + it "should install gems with the name bundler in them (that aren't bundler)" do + build_gem "foo-bundler", "1.0", + :path => bundled_app('vendor/cache') + + install_gemfile <<-G + gem "foo-bundler" + G + + should_be_installed "foo-bundler 1.0" + end end end diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/cache/git_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/cache/git_spec.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/cache/git_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/cache/git_spec.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/cache/path_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/cache/path_spec.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/cache/path_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/cache/path_spec.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/cache/platform_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/cache/platform_spec.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/cache/platform_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/cache/platform_spec.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/deploy_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/deploy_spec.rb similarity index 92% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/deploy_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/deploy_spec.rb index 8c810a19..5678e4cc 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/deploy_spec.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/deploy_spec.rb @@ -21,7 +21,7 @@ describe "install with --deployment or --frozen" do it "works after you try to deploy without a lock" do bundle "install --deployment" bundle :install, :exitstatus => true - check exitstatus.should == 0 + exitstatus.should eq(0) should_be_installed "rack 1.0" end @@ -76,7 +76,7 @@ describe "install with --deployment or --frozen" do G bundle "install --deployment" - out.should include("You have modified your Gemfile") + out.should include("deployment mode") out.should include("You have added to the Gemfile") out.should include("* rack-obama") out.should_not include("You have deleted from the Gemfile") @@ -92,7 +92,7 @@ describe "install with --deployment or --frozen" do ENV['BUNDLE_FROZEN'] = '1' bundle "install" - out.should include("You have modified your Gemfile") + out.should include("deployment mode") out.should include("You have added to the Gemfile") out.should include("* rack-obama") out.should_not include("You have deleted from the Gemfile") @@ -107,7 +107,7 @@ describe "install with --deployment or --frozen" do G bundle "install --frozen" - out.should include("You have modified your Gemfile") + out.should include("deployment mode") out.should include("You have added to the Gemfile") out.should include("* rack-obama") out.should_not include("You have deleted from the Gemfile") @@ -121,7 +121,7 @@ describe "install with --deployment or --frozen" do G bundle "install --deployment" - out.should include("You have modified your Gemfile") + out.should include("deployment mode") out.should include("You have added to the Gemfile:\n* activesupport\n\n") out.should include("You have deleted from the Gemfile:\n* rack") out.should_not include("You have changed in the Gemfile") @@ -134,7 +134,7 @@ describe "install with --deployment or --frozen" do G bundle "install --deployment" - out.should include("You have modified your Gemfile") + out.should include("deployment mode") out.should include("You have added to the Gemfile:\n* source: git://hubz.com (at master)") out.should_not include("You have changed in the Gemfile") end @@ -153,7 +153,7 @@ describe "install with --deployment or --frozen" do G bundle "install --deployment" - out.should include("You have modified your Gemfile") + out.should include("deployment mode") out.should include("You have deleted from the Gemfile:\n* source: #{lib_path("rack-1.0")} (at master)") out.should_not include("You have added to the Gemfile") out.should_not include("You have changed in the Gemfile") @@ -176,7 +176,7 @@ describe "install with --deployment or --frozen" do G bundle "install --deployment" - out.should include("You have modified your Gemfile") + out.should include("deployment mode") out.should include("You have changed in the Gemfile:\n* rack from `no specified source` to `#{lib_path("rack")} (at master)`") out.should_not include("You have added to the Gemfile") out.should_not include("You have deleted from the Gemfile") diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/deprecated_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/deprecated_spec.rb similarity index 82% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/deprecated_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/deprecated_spec.rb index 76b2853a..d1656cde 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/deprecated_spec.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/deprecated_spec.rb @@ -34,10 +34,4 @@ describe "bundle install with deprecated features" do end - it "reports that --production is deprecated" do - gemfile %{gem "rack"} - bundle "install --production" - out.should =~ /--production option is deprecated/ - end - end diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/gems/c_ext_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/gems/c_ext_spec.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/gems/c_ext_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/gems/c_ext_spec.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/gems/env_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/gems/env_spec.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/gems/env_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/gems/env_spec.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/gems/flex_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/gems/flex_spec.rb similarity index 98% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/gems/flex_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/gems/flex_spec.rb index baafe1ae..c48b7b63 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/gems/flex_spec.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/gems/flex_spec.rb @@ -185,10 +185,10 @@ describe "bundle flex_install" do it "does not install gems whose dependencies are not met" do bundle :install - ruby <<-RUBY + ruby <<-RUBY, :expect_err => true require 'bundler/setup' RUBY - out.should =~ /could not find gem 'rack-obama/i + err.should =~ /could not find gem 'rack-obama/i end it "suggests bundle update when the Gemfile requires different versions than the lock" do diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/gems/groups_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/gems/groups_spec.rb similarity index 92% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/gems/groups_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/gems/groups_spec.rb index e54cbd72..51865ab6 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/gems/groups_spec.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/gems/groups_spec.rb @@ -35,12 +35,29 @@ describe "bundle install with gem sources" do it "sets up everything if Bundler.setup is used with no groups" do out = run("require 'rack'; puts RACK") - check out.should == '1.0.0' + out.should eq('1.0.0') out = run("require 'activesupport'; puts ACTIVESUPPORT") - check out.should == '2.3.5' + out.should eq('2.3.5') out = run("require 'thin'; puts THIN") + out.should eq('1.0') + end + + it "removes old groups when new groups are set up" do + run <<-RUBY, :emo, :expect_err => true + Bundler.setup(:default) + require 'thin'; puts THIN + RUBY + @err.should =~ /no such file to load -- thin/i + end + + it "sets up old groups when they have previously been removed" do + out = run <<-RUBY, :emo + Bundler.setup(:default) + Bundler.setup(:default, :emo) + require 'thin'; puts THIN + RUBY out.should == '1.0' end end diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/gems/packed_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/gems/packed_spec.rb similarity index 82% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/gems/packed_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/gems/packed_spec.rb index a89a4eee..59222122 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/gems/packed_spec.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/gems/packed_spec.rb @@ -68,5 +68,17 @@ describe "bundle install with gem sources" do out.should == "1.0.0 RUBY" end end + + it "does not update the cache if --no-cache is passed" do + gemfile <<-G + source "file://#{gem_repo1}" + gem "rack" + G + bundled_app("vendor/cache").mkpath + bundled_app("vendor/cache").children.should be_empty + + bundle "install --no-cache" + bundled_app("vendor/cache").children.should be_empty + end end end diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/gems/platform_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/gems/platform_spec.rb similarity index 99% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/gems/platform_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/gems/platform_spec.rb index f4017dc3..d5207420 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/gems/platform_spec.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/gems/platform_spec.rb @@ -177,7 +177,7 @@ describe "bundle install with platform conditionals" do end it "does not blow up on sources with all platform-excluded specs" do - git = build_git "foo" + build_git "foo" install_gemfile <<-G platform :#{not_local_tag} do diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/gems/resolving_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/gems/resolving_spec.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/gems/resolving_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/gems/resolving_spec.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/gems/simple_case_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/gems/simple_case_spec.rb similarity index 98% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/gems/simple_case_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/gems/simple_case_spec.rb index c27642ac..a427367b 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/gems/simple_case_spec.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/gems/simple_case_spec.rb @@ -545,6 +545,15 @@ describe "bundle install with gem sources" do bundle :install err.should be_empty end + + it "still installs correctly when using path" do + build_lib 'yaml_spec', :gemspec => :yaml + + install_gemfile <<-G + gem 'yaml_spec', :path => "#{lib_path('yaml_spec-1.0')}" + G + err.should == "" + end end describe "when the gem has an architecture in its platform" do diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/gems/sudo_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/gems/sudo_spec.rb similarity index 92% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/gems/sudo_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/gems/sudo_spec.rb index 44b0ba25..3894f768 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/gems/sudo_spec.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/gems/sudo_spec.rb @@ -10,10 +10,11 @@ describe "when using sudo", :sudo => true do install_gemfile <<-G source "file://#{gem_repo1}" gem "rack", '1.0' + gem "thin" G system_gem_path("gems/rack-1.0.0").should exist - check system_gem_path("gems/rack-1.0.0").stat.uid.should == 0 + system_gem_path("gems/rack-1.0.0").stat.uid.should eq(0) should_be_installed "rack 1.0" end @@ -29,7 +30,7 @@ describe "when using sudo", :sudo => true do G bundle_path.join("gems/rack-1.0.0").should exist - check bundle_path.join("gems/rack-1.0.0").stat.uid.should == 0 + bundle_path.join("gems/rack-1.0.0").stat.uid.should eq(0) should_be_installed "rack 1.0" end diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/gems/win32_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/gems/win32_spec.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/gems/win32_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/gems/win32_spec.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/gemspec_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/gemspec_spec.rb similarity index 88% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/gemspec_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/gemspec_spec.rb index e7992c11..90e9a2fe 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/gemspec_spec.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/gemspec_spec.rb @@ -93,4 +93,16 @@ describe "bundle install from an existing gemspec" do should_be_installed "bar-dev 1.0.0", :groups => :dev end + it "should evaluate the gemspec in its directory" do + build_lib("foo", :path => tmp.join("foo")) + File.open(tmp.join("foo/foo.gemspec"), "w") do |s| + s.write "raise 'ahh' unless Dir.pwd == '#{tmp.join("foo")}'" + end + + install_gemfile <<-G, :expect_err => true + gemspec :path => '#{tmp.join("foo")}' + G + @err.should_not match(/ahh/) + end + end diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/git_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/git_spec.rb similarity index 98% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/git_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/git_spec.rb index f2803ab6..62cb887d 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/git_spec.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/git_spec.rb @@ -145,7 +145,7 @@ describe "bundle install with git sources" do gem "foo" end G - check err.should == "" + err.should eq("") run <<-RUBY require 'foo' @@ -348,10 +348,9 @@ describe "bundle install with git sources" do bundle :install, :expect_err => true - out.should include("An error has occurred in git") + out.should include("Git error:") err.should include("fatal") err.should include("omgomg") - err.should include("fatal: The remote end hung up unexpectedly") end it "works when the gem path has spaces in it" do diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/invalid_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/invalid_spec.rb similarity index 50% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/invalid_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/invalid_spec.rb index ebcae181..67b6d31a 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/invalid_spec.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/invalid_spec.rb @@ -15,3 +15,21 @@ describe "bundle install with deprecated features" do end end + +describe "bundle install to a dead symlink" do + before do + in_app_root do + `ln -s /tmp/idontexist bundle` + end + end + + it "reports the symlink is dead" do + gemfile <<-G + source "file://#{gem_repo1}" + gem "rack" + G + + bundle "install --path bundle" + out.should =~ /invalid symlink/ + end +end \ No newline at end of file diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/path_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/path_spec.rb similarity index 85% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/path_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/path_spec.rb index 3f2bde8e..8b778d4e 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/path_spec.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/path_spec.rb @@ -141,6 +141,47 @@ describe "bundle install with explicit source paths" do should_be_installed "rack 1.0" end + it "doesn't automatically unlock dependencies when using the gemspec syntax" do + build_lib "foo", "1.0", :path => lib_path("foo") do |s| + s.add_dependency "rack", ">= 1.0" + end + + Dir.chdir lib_path("foo") + + install_gemfile lib_path("foo/Gemfile"), <<-G + source "file://#{gem_repo1}" + gemspec + G + + build_gem "rack", "1.0.1", :to_system => true + + bundle "install" + + should_be_installed "foo 1.0" + should_be_installed "rack 1.0" + end + + it "doesn't automatically unlock dependencies when using the gemspec syntax and the gem has development dependencies" do + build_lib "foo", "1.0", :path => lib_path("foo") do |s| + s.add_dependency "rack", ">= 1.0" + s.add_development_dependency "activesupport" + end + + Dir.chdir lib_path("foo") + + install_gemfile lib_path("foo/Gemfile"), <<-G + source "file://#{gem_repo1}" + gemspec + G + + build_gem "rack", "1.0.1", :to_system => true + + bundle "install" + + should_be_installed "foo 1.0" + should_be_installed "rack 1.0" + end + it "raises if there are multiple gemspecs" do build_lib "foo", "1.0", :path => lib_path("foo") do |s| s.write "bar.gemspec" @@ -150,7 +191,7 @@ describe "bundle install with explicit source paths" do gemspec :path => "#{lib_path("foo")}" G - check exitstatus.should == 15 + exitstatus.should eq(15) out.should =~ /There are multiple gemspecs/ end @@ -182,6 +223,17 @@ describe "bundle install with explicit source paths" do out.should == "1.0" end + it "handles directories in bin/" do + build_lib "foo" + lib_path("foo-1.0").join("foo.gemspec").rmtree + lib_path("foo-1.0").join("bin/performance").mkpath + + install_gemfile <<-G + gem 'foo', '1.0', :path => "#{lib_path('foo-1.0')}" + G + err.should == "" + end + it "removes the .gem file after installing" do build_lib "foo" diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/upgrade_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/upgrade_spec.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/install/upgrade_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/install/upgrade_spec.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/lock/git_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/lock/git_spec.rb similarity index 90% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/lock/git_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/lock/git_spec.rb index da392115..7d023b83 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/lock/git_spec.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/lock/git_spec.rb @@ -27,7 +27,7 @@ describe "bundle lock with git gems" do it "provides correct #full_gem_path" do run <<-RUBY - puts Gem.source_index.find_name('foo').first.full_gem_path + puts Bundler.rubygems.find_name('foo').first.full_gem_path RUBY out.should == bundle("show foo") end diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/lock/lockfile_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/lock/lockfile_spec.rb similarity index 96% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/lock/lockfile_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/lock/lockfile_spec.rb index d49ede5c..86663f23 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/lock/lockfile_spec.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/lock/lockfile_spec.rb @@ -318,7 +318,7 @@ describe "the lockfile format" do actionpack (= 2.3.2) activerecord (= 2.3.2) activeresource (= 2.3.2) - rake + rake (= 0.8.7) rake (0.8.7) PLATFORMS @@ -329,6 +329,29 @@ describe "the lockfile format" do G end + it "orders dependencies according to version" do + install_gemfile <<-G + source "file://#{gem_repo1}" + gem 'double_deps' + G + + lockfile_should_be <<-G + GEM + remote: file:#{gem_repo1}/ + specs: + double_deps (1.0) + net-ssh + net-ssh (>= 1.0.0) + net-ssh (1.0) + + PLATFORMS + #{generic(Gem::Platform.local)} + + DEPENDENCIES + double_deps + G + end + it "does not add the :require option to the lockfile" do install_gemfile <<-G source "file://#{gem_repo1}" diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/other/check_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/other/check_spec.rb similarity index 95% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/other/check_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/other/check_spec.rb index 519ecc15..7cb7eb6a 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/other/check_spec.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/other/check_spec.rb @@ -8,7 +8,7 @@ describe "bundle check" do G bundle :check, :exitstatus => true - check @exitstatus.should == 0 + @exitstatus.should eq(0) out.should == "The Gemfile's dependencies are satisfied" end @@ -55,7 +55,7 @@ describe "bundle check" do G bundle :check, :exitstatus => true - check @exitstatus.should > 0 + @exitstatus.should be > 0 out.should include("could not be satisfied") end @@ -89,7 +89,7 @@ describe "bundle check" do bundle "install --without foo" bundle "check", :exitstatus => true - check @exitstatus.should == 0 + @exitstatus.should eq(0) out.should include("The Gemfile's dependencies are satisfied") end @@ -175,7 +175,7 @@ describe "bundle check" do it "outputs an error when the default Gemfile is not found" do bundle :check, :exitstatus => true - check @exitstatus.should == 10 + @exitstatus.should eq(10) out.should include("Could not locate Gemfile") end @@ -190,7 +190,7 @@ describe "bundle check" do last_out = out 3.times do |i| bundle :check - check out.should == last_out + out.should eq(last_out) err.should be_empty end end @@ -207,7 +207,7 @@ describe "bundle check" do it "returns success when the Gemfile is satisfied" do bundle :install bundle :check, :exitstatus => true - check @exitstatus.should == 0 + @exitstatus.should eq(0) out.should == "The Gemfile's dependencies are satisfied" end diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/other/config_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/other/config_spec.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/other/config_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/other/config_spec.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/other/console_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/other/console_spec.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/other/console_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/other/console_spec.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/other/exec_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/other/exec_spec.rb similarity index 96% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/other/exec_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/other/exec_spec.rb index 9cb70464..8f38824b 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/other/exec_spec.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/other/exec_spec.rb @@ -54,7 +54,7 @@ describe "bundle exec" do bundle "exec rackup" - check out.should == "0.9.1" + out.should eq("0.9.1") Dir.chdir bundled_app2 do bundle "exec rackup" @@ -74,7 +74,7 @@ describe "bundle exec" do bundle "exec rackup" - check out.should == "0.9.1" + out.should eq("0.9.1") should_not_be_installed "rack_middleware 1.0" end @@ -83,7 +83,8 @@ describe "bundle exec" do gem "rack" G - rubyopt = "-I#{bundler_path} -rbundler/setup" + rubyopt = ENV['RUBYOPT'] + rubyopt = "-I#{bundler_path} -rbundler/setup #{rubyopt}" bundle "exec 'echo $RUBYOPT'" out.should have_rubyopts(rubyopt) @@ -98,7 +99,7 @@ describe "bundle exec" do G bundle "exec foobarbaz", :exitstatus => true - check exitstatus.should == 127 + exitstatus.should eq(127) out.should include("bundler: command not found: foobarbaz") out.should include("Install missing gem binaries with `bundle install`") end @@ -110,7 +111,7 @@ describe "bundle exec" do bundle "exec touch foo" bundle "exec ./foo", :exitstatus => true - check exitstatus.should == 126 + exitstatus.should eq(126) out.should include("bundler: not executable: ./foo") end diff --git a/vendor/plugins/bundler/gems/bundler-1.0.15/spec/other/ext_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/other/ext_spec.rb new file mode 100644 index 00000000..ff6864ef --- /dev/null +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/other/ext_spec.rb @@ -0,0 +1,37 @@ +require 'spec_helper' + +describe "Gem::Specification#match_platform" do + it "does not match platforms other than the gem platform" do + darwin = gem "lol", "1.0", "platform_specific-1.0-x86-darwin-10" + darwin.match_platform(pl('java')).should be_false + end +end + +describe "Bundler::GemHelpers#generic" do + include Bundler::GemHelpers + + it "converts non-windows platforms into ruby" do + generic(pl('x86-darwin-10')).should == pl('ruby') + end +end + +describe "Gem::SourceIndex#refresh!" do + rubygems_1_7 = Gem::Version.new(Gem::VERSION) >= Gem::Version.new("1.7.0") + + before do + install_gemfile <<-G + source "file://#{gem_repo1}" + gem "rack" + G + end + + it "does not explode when called", :if => rubygems_1_7 do + run "Gem.source_index.refresh!" + run "Gem::SourceIndex.new([]).refresh!" + end + + it "does not explode when called", :unless => rubygems_1_7 do + run "Gem.source_index.refresh!" + run "Gem::SourceIndex.from_gems_in([]).refresh!" + end +end \ No newline at end of file diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/other/gem_helper_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/other/gem_helper_spec.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/other/gem_helper_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/other/gem_helper_spec.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/other/help_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/other/help_spec.rb similarity index 79% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/other/help_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/other/help_spec.rb index 06bc9490..c443fa5c 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/other/help_spec.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/other/help_spec.rb @@ -1,7 +1,9 @@ require "spec_helper" describe "bundle help" do - it "complains if older versions of bundler are installed" do + # Rubygems 1.4+ no longer load gem plugins so this test is no longer needed + rubygems_under_14 = Gem::Requirement.new("< 1.4").satisfied_by?(Gem::Version.new(Gem::VERSION)) + it "complains if older versions of bundler are installed", :if => rubygems_under_14 do system_gems "bundler-0.8.1" bundle "help", :expect_err => true diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/other/init_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/other/init_spec.rb similarity index 80% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/other/init_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/other/init_spec.rb index 6b380e15..0b9f4470 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/other/init_spec.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/other/init_spec.rb @@ -32,9 +32,9 @@ describe "bundle init" do gemfile = bundled_app("Gemfile").read gemfile.should =~ /source :gemcutter/ - check gemfile.scan(/gem "rack", "= 1.0.1"/).size.should == 1 - check gemfile.scan(/gem "rspec", "= 1.2"/).size.should == 1 - check gemfile.scan(/group :development/).size.should == 1 + gemfile.scan(/gem "rack", "= 1.0.1"/).size.should eq(1) + gemfile.scan(/gem "rspec", "= 1.2"/).size.should eq(1) + gemfile.scan(/group :development/).size.should eq(1) end end \ No newline at end of file diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/other/newgem_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/other/newgem_spec.rb similarity index 85% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/other/newgem_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/other/newgem_spec.rb index 4650c9e7..039b245f 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/other/newgem_spec.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/other/newgem_spec.rb @@ -21,4 +21,8 @@ describe "bundle gem" do bundled_app("test-gem/lib/test-gem/version.rb").read.should =~ /module Test\n module Gem/ bundled_app("test-gem/lib/test-gem.rb").read.should =~ /module Test\n module Gem/ end -end \ No newline at end of file + + it "requires the version file" do + bundled_app("test-gem/lib/test-gem.rb").read.should =~ /require "test-gem\/version"/ + end +end diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/other/open_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/other/open_spec.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/other/open_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/other/open_spec.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/other/show_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/other/show_spec.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/other/show_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/other/show_spec.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/pack/gems_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/pack/gems_spec.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/pack/gems_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/pack/gems_spec.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/quality_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/quality_spec.rb similarity index 98% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/quality_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/quality_spec.rb index df430d5c..9b84be4b 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/quality_spec.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/quality_spec.rb @@ -49,7 +49,7 @@ describe "The library itself" do it "can still be built" do Dir.chdir(root) do `gem build bundler.gemspec` - $?.should == 0 + $?.should eq(0) # clean up the .gem generated system("rm bundler-#{Bundler::VERSION}.gem") diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/resolver/basic_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/resolver/basic_spec.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/resolver/basic_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/resolver/basic_spec.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/resolver/platform_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/resolver/platform_spec.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/resolver/platform_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/resolver/platform_spec.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/runtime/executable_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/runtime/executable_spec.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/runtime/executable_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/runtime/executable_spec.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/runtime/load_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/runtime/load_spec.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/runtime/load_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/runtime/load_spec.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/runtime/platform_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/runtime/platform_spec.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/runtime/platform_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/runtime/platform_spec.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/runtime/require_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/runtime/require_spec.rb similarity index 93% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/runtime/require_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/runtime/require_spec.rb index bb366175..2f3a515d 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/runtime/require_spec.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/runtime/require_spec.rb @@ -48,23 +48,23 @@ describe "Bundler.require" do it "requires the gems" do # default group run "Bundler.require" - check out.should == "two" + out.should eq("two") # specific group run "Bundler.require(:bar)" - check out.should == "baz\nqux" + out.should eq("baz\nqux") # default and specific group run "Bundler.require(:default, :bar)" - check out.should == "baz\nqux\ntwo" + out.should eq("baz\nqux\ntwo") # specific group given as a string run "Bundler.require('bar')" - check out.should == "baz\nqux" + out.should eq("baz\nqux") # specific group declared as a string run "Bundler.require(:string)" - check out.should == "six" + out.should eq("six") # required in resolver order instead of gemfile order run("Bundler.require(:not)") @@ -95,10 +95,10 @@ describe "Bundler.require" do describe "using bundle exec" do it "requires the locked gems" do bundle "exec ruby -e 'Bundler.require'" - check out.should == "two" + out.should eq("two") bundle "exec ruby -e 'Bundler.require(:bar)'" - check out.should == "baz\nqux" + out.should eq("baz\nqux") bundle "exec ruby -e 'Bundler.require(:default, :bar)'" out.should == "baz\nqux\ntwo" @@ -138,7 +138,7 @@ describe "Bundler.require" do G run "Bundler.require" - check out.should == "two\nmodule_two\none" + out.should eq("two\nmodule_two\none") end describe "a gem with different requires for different envs" do @@ -178,7 +178,7 @@ describe "Bundler.require" do G run "Bundler.require" - check out.should == "two_not_loaded\none\ntwo" + out.should eq("two_not_loaded\none\ntwo") end describe "with busted gems" do @@ -225,7 +225,7 @@ describe "Bundler.require with platform specific dependencies" do run "Bundler.require; puts RACK", :expect_err => true - check out.should == "1.0.0" + out.should eq("1.0.0") err.should be_empty end end diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/runtime/setup_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/runtime/setup_spec.rb similarity index 80% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/runtime/setup_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/runtime/setup_spec.rb index 1bfa4ca7..e2d94e23 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/runtime/setup_spec.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/runtime/setup_spec.rb @@ -1,6 +1,65 @@ require "spec_helper" describe "Bundler.setup" do + describe "with no arguments" do + it "makes all groups available" do + install_gemfile <<-G + source "file://#{gem_repo1}" + gem "rack", :group => :test + G + + ruby <<-RUBY + require 'rubygems' + require 'bundler' + Bundler.setup + + require 'rack' + puts RACK + RUBY + err.should eq("") + out.should eq("1.0.0") + end + end + + describe "when called with groups" do + before(:each) do + install_gemfile <<-G + source "file://#{gem_repo1}" + gem "rack", :group => :test + G + end + + it "doesn't make all groups available" do + ruby <<-RUBY + require 'rubygems' + require 'bundler' + Bundler.setup(:default) + + begin + require 'rack' + rescue LoadError + puts "WIN" + end + RUBY + err.should eq("") + out.should eq("WIN") + end + + it "leaves all groups available if they were already" do + ruby <<-RUBY + require 'rubygems' + require 'bundler' + Bundler.setup + Bundler.setup(:default) + + require 'rack' + puts RACK + RUBY + err.should eq("") + out.should eq("1.0.0") + end + end + it "raises if the Gemfile was not yet installed" do gemfile <<-G source "file://#{gem_repo1}" @@ -68,7 +127,7 @@ describe "Bundler.setup" do gem "rack" G - lockfile = File.read(bundled_app("Gemfile.lock")) + File.read(bundled_app("Gemfile.lock")) FileUtils.rm(bundled_app("Gemfile.lock")) @@ -107,7 +166,7 @@ describe "Bundler.setup" do should_be_installed "rack 1.0.0" end - describe "cripping rubygems" do + describe "integrate with rubygems" do describe "by replacing #gem" do before :each do install_gemfile <<-G @@ -129,6 +188,19 @@ describe "Bundler.setup" do out.should == "WIN" end + it "version_requirement is now deprecated in rubygems 1.4.0+ when gem is missing" do + run <<-R, :expect_err => true + begin + gem "activesupport" + puts "FAIL" + rescue LoadError + puts "WIN" + end + R + + err.should be_empty + end + it "replaces #gem but raises when the version is wrong" do run <<-R begin @@ -141,6 +213,19 @@ describe "Bundler.setup" do out.should == "WIN" end + + it "version_requirement is now deprecated in rubygesm 1.4.0+ when the version is wrong" do + run <<-R, :expect_err => true + begin + gem "rack", "1.0.0" + puts "FAIL" + rescue LoadError + puts "WIN" + end + R + + err.should be_empty + end end describe "by hiding system gems" do @@ -348,6 +433,31 @@ describe "Bundler.setup" do out.should == "You have already activated thin 1.1, but your Gemfile requires thin 1.0. Consider using bundle exec." end + + it "version_requirement is now deprecated in rubygems 1.4.0+" do + system_gems "thin-1.0", "rack-1.0.0" + build_gem "thin", "1.1", :to_system => true do |s| + s.add_dependency "rack" + end + + gemfile <<-G + gem "thin", "1.0" + G + + ruby <<-R, :expect_err => true + require 'rubygems' + gem "thin" + require 'bundler' + begin + Bundler.setup + puts "FAIL" + rescue Gem::LoadError => e + puts e.message + end + R + + err.should be_empty + end end end @@ -412,12 +522,34 @@ describe "Bundler.setup" do run <<-R Gem.refresh - puts Gem.source_index.find_name("rack").inspect + puts Bundler.rubygems.find_name("rack").inspect R out.should == "[]" end + describe "when a vendored gem specification uses the :path option" do + it "should resolve paths relative to the Gemfile" do + path = bundled_app(File.join('vendor', 'foo')) + build_lib "foo", :path => path + + # If the .gemspec exists, then Bundler handles the path differently. + # See Source::Path.load_spec_files for details. + FileUtils.rm(File.join(path, 'foo.gemspec')) + + install_gemfile <<-G + gem 'foo', '1.2.3', :path => 'vendor/foo' + G + + Dir.chdir(bundled_app.parent) do + run <<-R, :env => {"BUNDLE_GEMFILE" => bundled_app('Gemfile')} + require 'foo' + R + end + err.should == "" + end + end + describe "with git gems that don't have gemspecs" do before :each do build_git "no-gemspec", :gemspec => false @@ -560,8 +692,8 @@ describe "Bundler.setup" do Bundler.load RUBY - err.should be_empty - out.should be_empty + err.should eq("") + out.should eq("") end end @@ -575,4 +707,5 @@ describe "Bundler.setup" do err.should be_empty end end + end diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/runtime/with_clean_env_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/runtime/with_clean_env_spec.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/runtime/with_clean_env_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/runtime/with_clean_env_spec.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/spec_helper.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/spec_helper.rb similarity index 87% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/spec_helper.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/spec_helper.rb index a5f17dba..fc7ccebf 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/spec_helper.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/spec_helper.rb @@ -26,7 +26,7 @@ $show_err = true Spec::Rubygems.setup FileUtils.rm_rf(Spec::Path.gem_repo1) -ENV['RUBYOPT'] = "-I#{Spec::Path.root}/spec/support/rubygems_hax" +ENV['RUBYOPT'] = "#{ENV['RUBYOPT']} -r#{Spec::Path.root}/spec/support/rubygems_hax/platform.rb" ENV['BUNDLE_SPEC_RUN'] = "true" RSpec.configure do |config| @@ -39,8 +39,13 @@ RSpec.configure do |config| config.include Spec::Platforms config.include Spec::Sudo + if Spec::Sudo.test_sudo? + config.filter_run :sudo => true + else + config.filter_run_excluding :sudo => true + end + config.filter_run :focused => true unless ENV['CI'] - config.filter_run_excluding :sudo => true unless Spec::Sudo.test_sudo? config.run_all_when_everything_filtered = true config.alias_example_to :fit, :focused => true @@ -52,11 +57,6 @@ RSpec.configure do |config| pending "JRuby executables do not have a proper shebang" if RUBY_PLATFORM == "java" end - def check(*args) - # suppresses ruby warnings about "useless use of == in void context" - # e.g. check foo.should == bar - end - config.before :all do build_repo1 end diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/support/builders.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/support/builders.rb similarity index 95% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/support/builders.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/support/builders.rb index 66542855..936e1a4a 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/support/builders.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/support/builders.rb @@ -32,7 +32,7 @@ module Spec build_gem "rails", "2.3.2" do |s| s.executables = "rails" - s.add_dependency "rake" + s.add_dependency "rake", "0.8.7" s.add_dependency "actionpack", "2.3.2" s.add_dependency "activerecord", "2.3.2" s.add_dependency "actionmailer", "2.3.2" @@ -217,6 +217,12 @@ module Spec s.add_dependency "net_d" end + # Capistrano did this (at least until version 2.5.10) + build_gem "double_deps" do |s| + s.add_dependency "net-ssh", ">= 1.0.0" + s.add_dependency "net-ssh" + end + build_gem "foo" end end @@ -316,6 +322,9 @@ module Spec Array(versions).each do |version| spec = builder.new(self, name, version) + if !spec.authors or spec.authors.empty? + spec.authors = ["no one"] + end yield spec if block_given? spec._build(options) end @@ -448,6 +457,8 @@ module Spec @files = _default_files.merge(@files) end + @spec.authors = ["no one"] + @files.each do |file, source| file = Pathname.new(path).join(file) FileUtils.mkdir_p(file.dirname) @@ -473,6 +484,8 @@ module Spec Dir.chdir(path) do `git init` `git add *` + `git config user.email "lol@wut.com"` + `git config user.name "lolwut"` `git commit -m 'OMG INITIAL COMMIT'` end end @@ -489,7 +502,7 @@ module Spec end class GitUpdater < LibBuilder - WINDOWS = Config::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw)! + WINDOWS = RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw)! NULL = WINDOWS ? "NUL" : "/dev/null" def silently(str) @@ -557,6 +570,11 @@ module Spec Dir.chdir(lib_path) do destination = opts[:path] || _default_path FileUtils.mkdir_p(destination) + + if !@spec.authors or @spec.authors.empty? + @spec.authors = ["that guy"] + end + Gem::Builder.new(@spec).build if opts[:to_system] `gem install --ignore-dependencies #{@spec.full_name}.gem` diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/support/helpers.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/support/helpers.rb similarity index 98% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/support/helpers.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/support/helpers.rb index cdfb8b95..90a82c99 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/support/helpers.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/support/helpers.rb @@ -3,7 +3,7 @@ module Spec def reset! @in_p, @out_p, @err_p = nil, nil, nil Dir["#{tmp}/{gems/*,*}"].each do |dir| - next if %(base remote1 gems rubygems_1_3_5 rubygems_1_3_6 rubygems_master).include?(File.basename(dir)) + next if %(base remote1 gems rubygems).include?(File.basename(dir)) unless ENV['BUNDLER_SUDO_TESTS'] FileUtils.rm_rf(dir) else diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/support/indexes.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/support/indexes.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/support/indexes.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/support/indexes.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/support/matchers.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/support/matchers.rb similarity index 82% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/support/matchers.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/support/matchers.rb index 429faa07..361a0330 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/support/matchers.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/support/matchers.rb @@ -35,7 +35,7 @@ module Spec version_const = name == 'bundler' ? 'Bundler::VERSION' : Spec::Builders.constantize(name) run "require '#{name}.rb'; puts #{version_const}", *groups actual_version, actual_platform = out.split(/\s+/) - check Gem::Version.new(actual_version).should == Gem::Version.new(version) + Gem::Version.new(actual_version).should eq(Gem::Version.new(version)) actual_platform.should == platform end end @@ -67,23 +67,11 @@ module Spec bundled_app("Gemfile.lock").should exist end - RSpec::Matchers.define :be_with_diff do |expected| + def lockfile_should_be(expected) + should_be_locked spaces = expected[/\A\s+/, 0] || "" expected.gsub!(/^#{spaces}/, '') - - failure_message_for_should do |actual| - "The lockfile did not match.\n=== Expected:\n" << - expected << "\n=== Got:\n" << actual << "\n===========\n" - end - - match do |actual| - expected == actual - end - end - - def lockfile_should_be(expected) - lock = File.read(bundled_app("Gemfile.lock")) - lock.should be_with_diff(expected) + bundled_app("Gemfile.lock").read.should == expected end end end diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/support/path.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/support/path.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/support/path.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/support/path.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/support/platforms.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/support/platforms.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/support/platforms.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/support/platforms.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/support/ruby_ext.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/support/ruby_ext.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/support/ruby_ext.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/support/ruby_ext.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/support/rubygems_ext.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/support/rubygems_ext.rb similarity index 84% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/support/rubygems_ext.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/support/rubygems_ext.rb index 9e1aa7fa..6991f5ec 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/support/rubygems_ext.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/support/rubygems_ext.rb @@ -1,3 +1,5 @@ +require 'rubygems/user_interaction' + module Spec module Rubygems def self.setup @@ -10,7 +12,9 @@ module Spec unless File.exist?("#{Path.base_system_gems}") FileUtils.mkdir_p(Path.base_system_gems) puts "running `gem install rake fakeweb --no-rdoc --no-ri`" - `gem install rake fakeweb --no-rdoc --no-ri` + `gem install fakeweb --no-rdoc --no-ri` + # Rake version has to be consistent for tests to pass + `gem install rake --version 0.8.7 --no-rdoc --no-ri` # 3.0.0 breaks 1.9.2 specs puts "running `gem install builder --version 2.1.2 --no-rdoc --no-ri`" `gem install builder --version 2.1.2 --no-rdoc --no-ri` diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/support/rubygems_hax/rubygems_plugin.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/support/rubygems_hax/platform.rb similarity index 89% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/support/rubygems_hax/rubygems_plugin.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/support/rubygems_hax/platform.rb index 35a375a5..183d0801 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/support/rubygems_hax/rubygems_plugin.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/support/rubygems_hax/platform.rb @@ -1,3 +1,5 @@ +require 'rubygems' + class Gem::Platform @local = new(ENV['BUNDLER_SPEC_PLATFORM']) if ENV['BUNDLER_SPEC_PLATFORM'] end diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/support/sudo.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/support/sudo.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/support/sudo.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/support/sudo.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/update/gems_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/update/gems_spec.rb similarity index 92% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/update/gems_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/update/gems_spec.rb index b4d59c98..dcc69602 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/update/gems_spec.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/update/gems_spec.rb @@ -43,6 +43,15 @@ describe "bundle update" do should_be_installed "rack 1.2", "rack-obama 1.0", "activesupport 2.3.5" end end + + describe "with --local option" do + it "doesn't hit repo2" do + FileUtils.rm_rf(gem_repo2) + + bundle "update --local" + out.should_not match(/Fetching source index/) + end + end end describe "bundle update in more complicated situations" do diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/update/git_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/update/git_spec.rb similarity index 98% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/update/git_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/update/git_spec.rb index 674fa79b..cd15b5c5 100644 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/update/git_spec.rb +++ b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/update/git_spec.rb @@ -145,7 +145,7 @@ describe "bundle update" do G run "require 'submodule'" - check out.should == 'GEM' + out.should eq('GEM') install_gemfile <<-G git "#{lib_path('has_submodule-1.0')}", :submodules => true do @@ -166,7 +166,7 @@ describe "bundle update" do G run "require 'submodule'" - check out.should == 'GIT' + out.should eq('GIT') install_gemfile <<-G git "#{lib_path('has_submodule-1.0')}" do diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/update/source_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.15/spec/update/source_spec.rb similarity index 100% rename from vendor/plugins/bundler/gems/bundler-1.0.7/spec/update/source_spec.rb rename to vendor/plugins/bundler/gems/bundler-1.0.15/spec/update/source_spec.rb diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/ISSUES.md b/vendor/plugins/bundler/gems/bundler-1.0.7/ISSUES.md deleted file mode 100644 index 3863dcfc..00000000 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/ISSUES.md +++ /dev/null @@ -1,47 +0,0 @@ -# Bundler Issues - -## Troubleshooting - -Instructions for common Bundler use-cases can be found on the [Bundler documentation site](http://gembundler.com/v1.0/). Detailed information about each Bundler command, including help with common problems, can be found in the [Bundler man pages](http://gembundler.com/man/bundle.1.html). - -After reading the documentation, try these troubleshooting steps: - - # remove user-specific gems and git repos - rm -rf ~/.bundle/ ~/.gem/ - - # remove system-wide git repos and git checkouts - rm -rf $GEM_HOME/bundler/ $GEM_HOME/cache/bundler/ - - # remove project-specific settings and git repos - rm -rf .bundle/ - - # remove project-specific cached .gem files - rm -rf vendor/cache/ - - # remove the saved resolve of the Gemfile - rm -rf Gemfile.lock - - # try to install one more time - bundle install - -## Reporting unresolved problems - -If you are still having problems, please report issues to the [Bundler issue tracker](http://github.com/carlhuda/bundler/issues/). - -Instructions that allow the Bundler team to reproduce your issue are vitally important. When you report a bug, please create a gist of the following information and include a link in your ticket: - - - What version of bundler you are using - - What version of Ruby you are using - - Whether you are using RVM, and if so what version - - Your Gemfile - - Your Gemfile.lock - - If you are on 0.9, whether you have locked or not - - If you are on 1.0, the result of `bundle config` - - The command you ran to generate exception(s) - - The exception backtrace(s) - -If you are using Rails 2.3, please also include: - - - Your boot.rb file - - Your preinitializer.rb file - - Your environment.rb file diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/setup.rb b/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/setup.rb deleted file mode 100644 index 3930d160..00000000 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/setup.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'bundler/shared_helpers' - -if Bundler::SharedHelpers.in_bundle? - require 'bundler' - begin - Bundler.setup - rescue Bundler::BundlerError => e - puts "\e[31m#{e.message}\e[0m" - puts e.backtrace.join("\n") if ENV["DEBUG"] - exit e.status_code - end - - # Add bundler to the load path after disabling system gems - bundler_lib = File.expand_path("../..", __FILE__) - $LOAD_PATH.unshift(bundler_lib) unless $LOAD_PATH.include?(bundler_lib) -end diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/shared_helpers.rb b/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/shared_helpers.rb deleted file mode 100644 index 23e3d01c..00000000 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/lib/bundler/shared_helpers.rb +++ /dev/null @@ -1,158 +0,0 @@ -require 'pathname' -require 'rubygems' -Gem.source_index # ensure Rubygems is fully loaded in Ruby 1.9 - -module Gem - class Dependency - if !instance_methods.map { |m| m.to_s }.include?("requirement") - def requirement - version_requirements - end - end - end -end - -module Bundler - module SharedHelpers - attr_accessor :gem_loaded - - def default_gemfile - gemfile = find_gemfile - raise GemfileNotFound, "Could not locate Gemfile" unless gemfile - Pathname.new(gemfile) - end - - def default_lockfile - Pathname.new("#{default_gemfile}.lock") - end - - def in_bundle? - find_gemfile - end - - private - - def find_gemfile - given = ENV['BUNDLE_GEMFILE'] - return given if given && !given.empty? - - previous = nil - current = File.expand_path(Dir.pwd) - - until !File.directory?(current) || current == previous - if ENV['BUNDLE_SPEC_RUN'] - # avoid stepping above the tmp directory when testing - return nil if File.file?(File.join(current, 'bundler.gemspec')) - end - - # otherwise return the Gemfile if it's there - filename = File.join(current, 'Gemfile') - return filename if File.file?(filename) - current, previous = File.expand_path("..", current), current - end - end - - def clean_load_path - # handle 1.9 where system gems are always on the load path - if defined?(::Gem) - me = File.expand_path("../../", __FILE__) - $LOAD_PATH.reject! do |p| - next if File.expand_path(p) =~ /^#{me}/ - p != File.dirname(__FILE__) && - Gem.path.any?{|gp| p =~ /^#{gp}/ } - end - $LOAD_PATH.uniq! - end - end - - def reverse_rubygems_kernel_mixin - # Disable rubygems' gem activation system - ::Kernel.class_eval do - if private_method_defined?(:gem_original_require) - alias rubygems_require require - alias require gem_original_require - end - - undef gem - end - end - - def cripple_rubygems(specs) - reverse_rubygems_kernel_mixin - - executables = specs.map { |s| s.executables }.flatten - Gem.source_index # ensure RubyGems is fully loaded - - ::Kernel.send(:define_method, :gem) do |dep, *reqs| - if executables.include? File.basename(caller.first.split(':').first) - return - end - opts = reqs.last.is_a?(Hash) ? reqs.pop : {} - - unless dep.respond_to?(:name) && dep.respond_to?(:requirement) - dep = Gem::Dependency.new(dep, reqs) - end - - spec = specs.find { |s| s.name == dep.name } - - if spec.nil? - e = Gem::LoadError.new "#{dep.name} is not part of the bundle. Add it to Gemfile." - e.name = dep.name - e.version_requirement = dep.requirement - raise e - elsif dep !~ spec - e = Gem::LoadError.new "can't activate #{dep}, already activated #{spec.full_name}. " \ - "Make sure all dependencies are added to Gemfile." - e.name = dep.name - e.version_requirement = dep.requirement - raise e - end - - true - end - - # === Following hacks are to improve on the generated bin wrappers === - - # Yeah, talk about a hack - source_index_class = (class << Gem::SourceIndex ; self ; end) - source_index_class.send(:remove_method, :from_gems_in) - source_index_class.send(:define_method, :from_gems_in) do |*args| - source_index = Gem::SourceIndex.new - source_index.spec_dirs = *args - source_index.add_specs(*specs) - source_index - end - - # OMG more hacks - gem_class = (class << Gem ; self ; end) - gem_class.send(:remove_method, :refresh) - gem_class.send(:define_method, :refresh) { } - gem_class.send(:remove_method, :bin_path) - gem_class.send(:define_method, :bin_path) do |name, *args| - exec_name, *reqs = args - - if exec_name == 'bundle' - return ENV['BUNDLE_BIN_PATH'] - end - - spec = nil - - if exec_name - spec = specs.find { |s| s.executables.include?(exec_name) } - spec or raise Gem::Exception, "can't find executable #{exec_name}" - else - spec = specs.find { |s| s.name == name } - exec_name = spec.default_executable or raise Gem::Exception, "no default executable for #{spec.full_name}" - end - - gem_bin = File.join(spec.full_gem_path, spec.bindir, exec_name) - gem_from_path_bin = File.join(File.dirname(spec.loaded_from), spec.bindir, exec_name) - File.exist?(gem_bin) ? gem_bin : gem_from_path_bin - end - - Gem.clear_paths - end - - extend self - end -end diff --git a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/other/ext_spec.rb b/vendor/plugins/bundler/gems/bundler-1.0.7/spec/other/ext_spec.rb deleted file mode 100644 index 2dd6afc9..00000000 --- a/vendor/plugins/bundler/gems/bundler-1.0.7/spec/other/ext_spec.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'spec_helper' - -describe "Gem::Specification#match_platform" do - it "does not match platforms other than the gem platform" do - darwin = gem "lol", "1.0", "platform_specific-1.0-x86-darwin-10" - darwin.match_platform(pl('java')).should be_false - end -end - -describe "Bundler::GemHelpers#generic" do - include Bundler::GemHelpers - - it "converts non-windows platforms into ruby" do - generic(pl('x86-darwin-10')).should == pl('ruby') - end -end diff --git a/vendor/plugins/bundler/specifications/bundler-1.0.15.gemspec b/vendor/plugins/bundler/specifications/bundler-1.0.15.gemspec new file mode 100644 index 00000000..6ac92e6f --- /dev/null +++ b/vendor/plugins/bundler/specifications/bundler-1.0.15.gemspec @@ -0,0 +1,37 @@ +# -*- encoding: utf-8 -*- + +Gem::Specification.new do |s| + s.name = %q{bundler} + s.version = "1.0.15" + + s.required_rubygems_version = Gem::Requirement.new(">= 1.3.6") if s.respond_to? :required_rubygems_version= + s.authors = ["Andr\303\251 Arko", "Terence Lee", "Carl Lerche", "Yehuda Katz"] + s.date = %q{2011-06-09} + s.default_executable = %q{bundle} + s.description = %q{Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably} + s.email = ["andre@arko.net"] + s.executables = ["bundle"] + s.files = [".gitignore", "CHANGELOG.md", "ISSUES.md", "LICENSE", "README.md", "Rakefile", "UPGRADING.md", "bin/bundle", "bundler.gemspec", "lib/bundler.rb", "lib/bundler/capistrano.rb", "lib/bundler/cli.rb", "lib/bundler/definition.rb", "lib/bundler/dependency.rb", "lib/bundler/deployment.rb", "lib/bundler/dsl.rb", "lib/bundler/environment.rb", "lib/bundler/gem_helper.rb", "lib/bundler/gem_tasks.rb", "lib/bundler/graph.rb", "lib/bundler/index.rb", "lib/bundler/installer.rb", "lib/bundler/lazy_specification.rb", "lib/bundler/lockfile_parser.rb", "lib/bundler/remote_specification.rb", "lib/bundler/resolver.rb", "lib/bundler/rubygems_ext.rb", "lib/bundler/rubygems_integration.rb", "lib/bundler/runtime.rb", "lib/bundler/settings.rb", "lib/bundler/setup.rb", "lib/bundler/shared_helpers.rb", "lib/bundler/source.rb", "lib/bundler/spec_set.rb", "lib/bundler/templates/Executable", "lib/bundler/templates/Gemfile", "lib/bundler/templates/newgem/Gemfile.tt", "lib/bundler/templates/newgem/Rakefile.tt", "lib/bundler/templates/newgem/bin/newgem.tt", "lib/bundler/templates/newgem/gitignore.tt", "lib/bundler/templates/newgem/lib/newgem.rb.tt", "lib/bundler/templates/newgem/lib/newgem/version.rb.tt", "lib/bundler/templates/newgem/newgem.gemspec.tt", "lib/bundler/ui.rb", "lib/bundler/vendor/thor.rb", "lib/bundler/vendor/thor/actions.rb", "lib/bundler/vendor/thor/actions/create_file.rb", "lib/bundler/vendor/thor/actions/directory.rb", "lib/bundler/vendor/thor/actions/empty_directory.rb", "lib/bundler/vendor/thor/actions/file_manipulation.rb", "lib/bundler/vendor/thor/actions/inject_into_file.rb", "lib/bundler/vendor/thor/base.rb", "lib/bundler/vendor/thor/core_ext/file_binary_read.rb", "lib/bundler/vendor/thor/core_ext/hash_with_indifferent_access.rb", "lib/bundler/vendor/thor/core_ext/ordered_hash.rb", "lib/bundler/vendor/thor/error.rb", "lib/bundler/vendor/thor/invocation.rb", "lib/bundler/vendor/thor/parser.rb", "lib/bundler/vendor/thor/parser/argument.rb", "lib/bundler/vendor/thor/parser/arguments.rb", "lib/bundler/vendor/thor/parser/option.rb", "lib/bundler/vendor/thor/parser/options.rb", "lib/bundler/vendor/thor/shell.rb", "lib/bundler/vendor/thor/shell/basic.rb", "lib/bundler/vendor/thor/shell/color.rb", "lib/bundler/vendor/thor/shell/html.rb", "lib/bundler/vendor/thor/task.rb", "lib/bundler/vendor/thor/util.rb", "lib/bundler/vendor/thor/version.rb", "lib/bundler/version.rb", "lib/bundler/vlad.rb", "man/bundle-config.ronn", "man/bundle-exec.ronn", "man/bundle-install.ronn", "man/bundle-package.ronn", "man/bundle-update.ronn", "man/bundle.ronn", "man/gemfile.5.ronn", "man/index.txt", "spec/cache/gems_spec.rb", "spec/cache/git_spec.rb", "spec/cache/path_spec.rb", "spec/cache/platform_spec.rb", "spec/install/deploy_spec.rb", "spec/install/deprecated_spec.rb", "spec/install/gems/c_ext_spec.rb", "spec/install/gems/env_spec.rb", "spec/install/gems/flex_spec.rb", "spec/install/gems/groups_spec.rb", "spec/install/gems/packed_spec.rb", "spec/install/gems/platform_spec.rb", "spec/install/gems/resolving_spec.rb", "spec/install/gems/simple_case_spec.rb", "spec/install/gems/sudo_spec.rb", "spec/install/gems/win32_spec.rb", "spec/install/gemspec_spec.rb", "spec/install/git_spec.rb", "spec/install/invalid_spec.rb", "spec/install/path_spec.rb", "spec/install/upgrade_spec.rb", "spec/lock/git_spec.rb", "spec/lock/lockfile_spec.rb", "spec/other/check_spec.rb", "spec/other/config_spec.rb", "spec/other/console_spec.rb", "spec/other/exec_spec.rb", "spec/other/ext_spec.rb", "spec/other/gem_helper_spec.rb", "spec/other/help_spec.rb", "spec/other/init_spec.rb", "spec/other/newgem_spec.rb", "spec/other/open_spec.rb", "spec/other/show_spec.rb", "spec/pack/gems_spec.rb", "spec/quality_spec.rb", "spec/resolver/basic_spec.rb", "spec/resolver/platform_spec.rb", "spec/runtime/executable_spec.rb", "spec/runtime/load_spec.rb", "spec/runtime/platform_spec.rb", "spec/runtime/require_spec.rb", "spec/runtime/setup_spec.rb", "spec/runtime/with_clean_env_spec.rb", "spec/spec_helper.rb", "spec/support/builders.rb", "spec/support/helpers.rb", "spec/support/indexes.rb", "spec/support/matchers.rb", "spec/support/path.rb", "spec/support/platforms.rb", "spec/support/ruby_ext.rb", "spec/support/rubygems_ext.rb", "spec/support/rubygems_hax/platform.rb", "spec/support/sudo.rb", "spec/update/gems_spec.rb", "spec/update/git_spec.rb", "spec/update/source_spec.rb", "lib/bundler/man/bundle", "lib/bundler/man/bundle-benchmark", "lib/bundler/man/bundle-benchmark.txt", "lib/bundler/man/bundle-config", "lib/bundler/man/bundle-config.txt", "lib/bundler/man/bundle-exec", "lib/bundler/man/bundle-exec.txt", "lib/bundler/man/bundle-install", "lib/bundler/man/bundle-install.txt", "lib/bundler/man/bundle-package", "lib/bundler/man/bundle-package.txt", "lib/bundler/man/bundle-update", "lib/bundler/man/bundle-update.txt", "lib/bundler/man/bundle.txt", "lib/bundler/man/gemfile.5", "lib/bundler/man/gemfile.5.txt"] + s.homepage = %q{http://gembundler.com} + s.require_paths = ["lib"] + s.rubyforge_project = %q{bundler} + s.rubygems_version = %q{1.3.7} + s.summary = %q{The best way to manage your application's dependencies} + s.test_files = ["spec/cache/gems_spec.rb", "spec/cache/git_spec.rb", "spec/cache/path_spec.rb", "spec/cache/platform_spec.rb", "spec/install/deploy_spec.rb", "spec/install/deprecated_spec.rb", "spec/install/gems/c_ext_spec.rb", "spec/install/gems/env_spec.rb", "spec/install/gems/flex_spec.rb", "spec/install/gems/groups_spec.rb", "spec/install/gems/packed_spec.rb", "spec/install/gems/platform_spec.rb", "spec/install/gems/resolving_spec.rb", "spec/install/gems/simple_case_spec.rb", "spec/install/gems/sudo_spec.rb", "spec/install/gems/win32_spec.rb", "spec/install/gemspec_spec.rb", "spec/install/git_spec.rb", "spec/install/invalid_spec.rb", "spec/install/path_spec.rb", "spec/install/upgrade_spec.rb", "spec/lock/git_spec.rb", "spec/lock/lockfile_spec.rb", "spec/other/check_spec.rb", "spec/other/config_spec.rb", "spec/other/console_spec.rb", "spec/other/exec_spec.rb", "spec/other/ext_spec.rb", "spec/other/gem_helper_spec.rb", "spec/other/help_spec.rb", "spec/other/init_spec.rb", "spec/other/newgem_spec.rb", "spec/other/open_spec.rb", "spec/other/show_spec.rb", "spec/pack/gems_spec.rb", "spec/quality_spec.rb", "spec/resolver/basic_spec.rb", "spec/resolver/platform_spec.rb", "spec/runtime/executable_spec.rb", "spec/runtime/load_spec.rb", "spec/runtime/platform_spec.rb", "spec/runtime/require_spec.rb", "spec/runtime/setup_spec.rb", "spec/runtime/with_clean_env_spec.rb", "spec/spec_helper.rb", "spec/support/builders.rb", "spec/support/helpers.rb", "spec/support/indexes.rb", "spec/support/matchers.rb", "spec/support/path.rb", "spec/support/platforms.rb", "spec/support/ruby_ext.rb", "spec/support/rubygems_ext.rb", "spec/support/rubygems_hax/platform.rb", "spec/support/sudo.rb", "spec/update/gems_spec.rb", "spec/update/git_spec.rb", "spec/update/source_spec.rb"] + + if s.respond_to? :specification_version then + current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION + s.specification_version = 3 + + if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then + s.add_development_dependency(%q, [">= 0"]) + s.add_development_dependency(%q, [">= 0"]) + else + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + end + else + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + end +end diff --git a/vendor/plugins/bundler/specifications/bundler-1.0.7.gemspec b/vendor/plugins/bundler/specifications/bundler-1.0.7.gemspec deleted file mode 100644 index 38828d11..00000000 --- a/vendor/plugins/bundler/specifications/bundler-1.0.7.gemspec +++ /dev/null @@ -1,37 +0,0 @@ -# -*- encoding: utf-8 -*- - -Gem::Specification.new do |s| - s.name = %q{bundler} - s.version = "1.0.7" - - s.required_rubygems_version = Gem::Requirement.new(">= 1.3.6") if s.respond_to? :required_rubygems_version= - s.authors = ["Carl Lerche", "Yehuda Katz", "Andr\303\251 Arko"] - s.date = %q{2010-11-17} - s.default_executable = %q{bundle} - s.description = %q{Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably} - s.email = ["carlhuda@engineyard.com"] - s.executables = ["bundle"] - s.files = [".gitignore", "CHANGELOG.md", "ISSUES.md", "LICENSE", "README.md", "Rakefile", "UPGRADING.md", "bin/bundle", "bundler.gemspec", "lib/bundler.rb", "lib/bundler/capistrano.rb", "lib/bundler/cli.rb", "lib/bundler/definition.rb", "lib/bundler/dependency.rb", "lib/bundler/deployment.rb", "lib/bundler/dsl.rb", "lib/bundler/environment.rb", "lib/bundler/gem_helper.rb", "lib/bundler/graph.rb", "lib/bundler/index.rb", "lib/bundler/installer.rb", "lib/bundler/lazy_specification.rb", "lib/bundler/lockfile_parser.rb", "lib/bundler/remote_specification.rb", "lib/bundler/resolver.rb", "lib/bundler/rubygems_ext.rb", "lib/bundler/runtime.rb", "lib/bundler/settings.rb", "lib/bundler/setup.rb", "lib/bundler/shared_helpers.rb", "lib/bundler/source.rb", "lib/bundler/spec_set.rb", "lib/bundler/templates/Executable", "lib/bundler/templates/Gemfile", "lib/bundler/templates/newgem/Gemfile.tt", "lib/bundler/templates/newgem/Rakefile.tt", "lib/bundler/templates/newgem/bin/newgem.tt", "lib/bundler/templates/newgem/gitignore.tt", "lib/bundler/templates/newgem/lib/newgem.rb.tt", "lib/bundler/templates/newgem/lib/newgem/version.rb.tt", "lib/bundler/templates/newgem/newgem.gemspec.tt", "lib/bundler/ui.rb", "lib/bundler/vendor/thor.rb", "lib/bundler/vendor/thor/actions.rb", "lib/bundler/vendor/thor/actions/create_file.rb", "lib/bundler/vendor/thor/actions/directory.rb", "lib/bundler/vendor/thor/actions/empty_directory.rb", "lib/bundler/vendor/thor/actions/file_manipulation.rb", "lib/bundler/vendor/thor/actions/inject_into_file.rb", "lib/bundler/vendor/thor/base.rb", "lib/bundler/vendor/thor/core_ext/file_binary_read.rb", "lib/bundler/vendor/thor/core_ext/hash_with_indifferent_access.rb", "lib/bundler/vendor/thor/core_ext/ordered_hash.rb", "lib/bundler/vendor/thor/error.rb", "lib/bundler/vendor/thor/invocation.rb", "lib/bundler/vendor/thor/parser.rb", "lib/bundler/vendor/thor/parser/argument.rb", "lib/bundler/vendor/thor/parser/arguments.rb", "lib/bundler/vendor/thor/parser/option.rb", "lib/bundler/vendor/thor/parser/options.rb", "lib/bundler/vendor/thor/shell.rb", "lib/bundler/vendor/thor/shell/basic.rb", "lib/bundler/vendor/thor/shell/color.rb", "lib/bundler/vendor/thor/shell/html.rb", "lib/bundler/vendor/thor/task.rb", "lib/bundler/vendor/thor/util.rb", "lib/bundler/vendor/thor/version.rb", "lib/bundler/version.rb", "lib/bundler/vlad.rb", "man/bundle-config.ronn", "man/bundle-exec.ronn", "man/bundle-install.ronn", "man/bundle-package.ronn", "man/bundle-update.ronn", "man/bundle.ronn", "man/gemfile.5.ronn", "man/index.txt", "spec/cache/gems_spec.rb", "spec/cache/git_spec.rb", "spec/cache/path_spec.rb", "spec/cache/platform_spec.rb", "spec/install/deploy_spec.rb", "spec/install/deprecated_spec.rb", "spec/install/gems/c_ext_spec.rb", "spec/install/gems/env_spec.rb", "spec/install/gems/flex_spec.rb", "spec/install/gems/groups_spec.rb", "spec/install/gems/packed_spec.rb", "spec/install/gems/platform_spec.rb", "spec/install/gems/resolving_spec.rb", "spec/install/gems/simple_case_spec.rb", "spec/install/gems/sudo_spec.rb", "spec/install/gems/win32_spec.rb", "spec/install/gemspec_spec.rb", "spec/install/git_spec.rb", "spec/install/invalid_spec.rb", "spec/install/path_spec.rb", "spec/install/upgrade_spec.rb", "spec/lock/git_spec.rb", "spec/lock/lockfile_spec.rb", "spec/other/check_spec.rb", "spec/other/config_spec.rb", "spec/other/console_spec.rb", "spec/other/exec_spec.rb", "spec/other/ext_spec.rb", "spec/other/gem_helper_spec.rb", "spec/other/help_spec.rb", "spec/other/init_spec.rb", "spec/other/newgem_spec.rb", "spec/other/open_spec.rb", "spec/other/show_spec.rb", "spec/pack/gems_spec.rb", "spec/quality_spec.rb", "spec/resolver/basic_spec.rb", "spec/resolver/platform_spec.rb", "spec/runtime/executable_spec.rb", "spec/runtime/load_spec.rb", "spec/runtime/platform_spec.rb", "spec/runtime/require_spec.rb", "spec/runtime/setup_spec.rb", "spec/runtime/with_clean_env_spec.rb", "spec/spec_helper.rb", "spec/support/builders.rb", "spec/support/helpers.rb", "spec/support/indexes.rb", "spec/support/matchers.rb", "spec/support/path.rb", "spec/support/platforms.rb", "spec/support/ruby_ext.rb", "spec/support/rubygems_ext.rb", "spec/support/rubygems_hax/rubygems_plugin.rb", "spec/support/sudo.rb", "spec/update/gems_spec.rb", "spec/update/git_spec.rb", "spec/update/source_spec.rb", "lib/bundler/man/bundle", "lib/bundler/man/bundle-config", "lib/bundler/man/bundle-config.txt", "lib/bundler/man/bundle-exec", "lib/bundler/man/bundle-exec.txt", "lib/bundler/man/bundle-install", "lib/bundler/man/bundle-install.txt", "lib/bundler/man/bundle-package", "lib/bundler/man/bundle-package.txt", "lib/bundler/man/bundle-update", "lib/bundler/man/bundle-update.txt", "lib/bundler/man/bundle.txt", "lib/bundler/man/gemfile.5", "lib/bundler/man/gemfile.5.txt"] - s.homepage = %q{http://gembundler.com} - s.require_paths = ["lib"] - s.rubyforge_project = %q{bundler} - s.rubygems_version = %q{1.3.7} - s.summary = %q{The best way to manage your application's dependencies} - s.test_files = ["spec/cache/gems_spec.rb", "spec/cache/git_spec.rb", "spec/cache/path_spec.rb", "spec/cache/platform_spec.rb", "spec/install/deploy_spec.rb", "spec/install/deprecated_spec.rb", "spec/install/gems/c_ext_spec.rb", "spec/install/gems/env_spec.rb", "spec/install/gems/flex_spec.rb", "spec/install/gems/groups_spec.rb", "spec/install/gems/packed_spec.rb", "spec/install/gems/platform_spec.rb", "spec/install/gems/resolving_spec.rb", "spec/install/gems/simple_case_spec.rb", "spec/install/gems/sudo_spec.rb", "spec/install/gems/win32_spec.rb", "spec/install/gemspec_spec.rb", "spec/install/git_spec.rb", "spec/install/invalid_spec.rb", "spec/install/path_spec.rb", "spec/install/upgrade_spec.rb", "spec/lock/git_spec.rb", "spec/lock/lockfile_spec.rb", "spec/other/check_spec.rb", "spec/other/config_spec.rb", "spec/other/console_spec.rb", "spec/other/exec_spec.rb", "spec/other/ext_spec.rb", "spec/other/gem_helper_spec.rb", "spec/other/help_spec.rb", "spec/other/init_spec.rb", "spec/other/newgem_spec.rb", "spec/other/open_spec.rb", "spec/other/show_spec.rb", "spec/pack/gems_spec.rb", "spec/quality_spec.rb", "spec/resolver/basic_spec.rb", "spec/resolver/platform_spec.rb", "spec/runtime/executable_spec.rb", "spec/runtime/load_spec.rb", "spec/runtime/platform_spec.rb", "spec/runtime/require_spec.rb", "spec/runtime/setup_spec.rb", "spec/runtime/with_clean_env_spec.rb", "spec/spec_helper.rb", "spec/support/builders.rb", "spec/support/helpers.rb", "spec/support/indexes.rb", "spec/support/matchers.rb", "spec/support/path.rb", "spec/support/platforms.rb", "spec/support/ruby_ext.rb", "spec/support/rubygems_ext.rb", "spec/support/rubygems_hax/rubygems_plugin.rb", "spec/support/sudo.rb", "spec/update/gems_spec.rb", "spec/update/git_spec.rb", "spec/update/source_spec.rb"] - - if s.respond_to? :specification_version then - current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION - s.specification_version = 3 - - if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - else - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - end - else - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - end -end diff --git a/vendor/plugins/rails_xss/init.rb b/vendor/plugins/rails_xss/init.rb index 06eb5454..533eb1f3 100644 --- a/vendor/plugins/rails_xss/init.rb +++ b/vendor/plugins/rails_xss/init.rb @@ -1,5 +1,7 @@ unless $gems_rake_task - if !(Rails::VERSION::MAJOR.to_i >= 2 && Rails::VERSION::MINOR.to_i >=3 && Rails::VERSION::TINY.to_i >=8) + if Rails::VERSION::MAJOR >= 3 + $stderr.puts "You don't need to install rails_xss as a plugin for Rails 3 and after." + elsif Rails::VERSION::MAJOR <= 2 && Rails::VERSION::MINOR <= 3 && Rails::VERSION::TINY <= 7 $stderr.puts "rails_xss requires Rails 2.3.8 or later. Please upgrade to enable automatic HTML safety." else require 'rails_xss' diff --git a/vendor/plugins/rails_xss/lib/rails_xss/action_view.rb b/vendor/plugins/rails_xss/lib/rails_xss/action_view.rb index ad2fc87b..95cb0d4b 100644 --- a/vendor/plugins/rails_xss/lib/rails_xss/action_view.rb +++ b/vendor/plugins/rails_xss/lib/rails_xss/action_view.rb @@ -15,6 +15,15 @@ module ActionView end module Helpers + module CaptureHelper + def content_for(name, content = nil, &block) + ivar = "@content_for_#{name}" + content = capture(&block) if block_given? + instance_variable_set(ivar, "#{instance_variable_get(ivar)}#{ERB::Util.h(content)}".html_safe) + nil + end + end + module TextHelper def concat(string, unused_binding = nil) if unused_binding @@ -23,15 +32,53 @@ module ActionView output_buffer.concat(string) end + + def simple_format(text, html_options={}) + start_tag = tag('p', html_options, true) + text = ERB::Util.h(text).to_str.dup + text.gsub!(/\r\n?/, "\n") # \r\n and \r -> \n + text.gsub!(/\n\n+/, "

    \n\n#{start_tag}") # 2+ newline -> paragraph + text.gsub!(/([^\n]\n)(?=[^\n])/, '\1
    ') # 1 newline -> br + text.insert 0, start_tag + text.html_safe.safe_concat("

    ") + end end module TagHelper private def content_tag_string_with_escaping(name, content, options, escape = true) - content_tag_string_without_escaping(name, ERB::Util.h(content), options, escape) + content_tag_string_without_escaping(name, escape ? ERB::Util.h(content) : content, options, escape) end alias_method_chain :content_tag_string, :escaping end + + module UrlHelper + def link_to(*args, &block) + if block_given? + options = args.first || {} + html_options = args.second + concat(link_to(capture(&block), options, html_options)) + else + name = args.first + options = args.second || {} + html_options = args.third + + url = url_for(options) + + if html_options + html_options = html_options.stringify_keys + href = html_options['href'] + convert_options_to_javascript!(html_options, url) + tag_options = tag_options(html_options) + else + tag_options = nil + end + + href_attr = "href=\"#{url}\"" unless href + "#{ERB::Util.h(name || url)}".html_safe + end + end + end end end @@ -49,35 +96,6 @@ module RailsXss end end end - - module HelperOverrides - def link_to(*args, &block) - if block_given? - options = args.first || {} - html_options = args.second - concat(link_to(capture(&block), options, html_options)) - else - name = args.first - options = args.second || {} - html_options = args.third - - url = url_for(options) - - if html_options - html_options = html_options.stringify_keys - href = html_options['href'] - convert_options_to_javascript!(html_options, url) - tag_options = tag_options(html_options) - else - tag_options = nil - end - - href_attr = "href=\"#{url}\"" unless href - "#{ERB::Util.h(name || url)}".html_safe - end - end - end end Module.class_eval { include RailsXss::SafeHelpers } -ActionController::Base.helper(RailsXss::HelperOverrides) diff --git a/vendor/plugins/rails_xss/lib/rails_xss/erubis.rb b/vendor/plugins/rails_xss/lib/rails_xss/erubis.rb index b58e24d5..c8171c66 100644 --- a/vendor/plugins/rails_xss/lib/rails_xss/erubis.rb +++ b/vendor/plugins/rails_xss/lib/rails_xss/erubis.rb @@ -11,8 +11,10 @@ module RailsXss src << "@output_buffer.safe_concat('" << escape_text(text) << "');" end + BLOCK_EXPR = /\s+(do|\{)(\s*\|[^|]*\|)?\s*\Z/ + def add_expr_literal(src, code) - if code =~ /\s*raw\s+(.*)/ + if code =~ BLOCK_EXPR src << "@output_buffer.safe_concat((" << $1 << ").to_s);" else src << '@output_buffer << ((' << code << ').to_s);' diff --git a/vendor/plugins/rails_xss/lib/rails_xss/string_ext.rb b/vendor/plugins/rails_xss/lib/rails_xss/string_ext.rb index ae21705d..ed1aaa24 100644 --- a/vendor/plugins/rails_xss/lib/rails_xss/string_ext.rb +++ b/vendor/plugins/rails_xss/lib/rails_xss/string_ext.rb @@ -9,6 +9,19 @@ ActiveSupport::SafeBuffer.class_eval do end end alias << concat + UNSAFE_STRING_METHODS = ["capitalize", "chomp", "chop", "delete", "downcase", "gsub", "lstrip", "next", "reverse", "rstrip", "slice", "squeeze", "strip", "sub", "succ", "swapcase", "tr", "tr_s", "upcase"].freeze + + for unsafe_method in UNSAFE_STRING_METHODS + class_eval <<-EOT, __FILE__, __LINE__ + def #{unsafe_method}(*args) + super.to_str + end + + def #{unsafe_method}!(*args) + raise TypeError, "Cannot modify SafeBuffer in place" + end + EOT + end end class String diff --git a/vendor/plugins/rails_xss/test/active_record_helper_test.rb b/vendor/plugins/rails_xss/test/active_record_helper_test.rb new file mode 100644 index 00000000..728ec0ac --- /dev/null +++ b/vendor/plugins/rails_xss/test/active_record_helper_test.rb @@ -0,0 +1,74 @@ +require 'test_helper' + +class ActiveRecordHelperTest < ActionView::TestCase + silence_warnings do + Post = Struct.new("Post", :title, :author_name, :body, :secret, :written_on) + Post.class_eval do + alias_method :title_before_type_cast, :title unless respond_to?(:title_before_type_cast) + alias_method :body_before_type_cast, :body unless respond_to?(:body_before_type_cast) + alias_method :author_name_before_type_cast, :author_name unless respond_to?(:author_name_before_type_cast) + end + end + + def setup_post + @post = Post.new + def @post.errors + Class.new { + def on(field) + case field.to_s + when "author_name" + "can't be empty" + when "body" + true + else + false + end + end + def empty?() false end + def count() 1 end + def full_messages() [ "Author name can't be empty" ] end + }.new + end + + def @post.new_record?() true end + def @post.to_param() nil end + + def @post.column_for_attribute(attr_name) + Post.content_columns.select { |column| column.name == attr_name }.first + end + + silence_warnings do + def Post.content_columns() [ Column.new(:string, "title", "Title"), Column.new(:text, "body", "Body") ] end + end + + @post.title = "Hello World" + @post.author_name = "" + @post.body = "Back to the hill and over it again!" + @post.secret = 1 + @post.written_on = Date.new(2004, 6, 15) + end + + def setup + setup_post + + @response = ActionController::TestResponse.new + + @controller = Object.new + def @controller.url_for(options) + options = options.symbolize_keys + + [options[:action], options[:id].to_param].compact.join('/') + end + end + + def test_text_field_with_errors_is_safe + assert text_field("post", "author_name").html_safe? + end + + def test_text_field_with_errors + assert_dom_equal( + %(
    ), + text_field("post", "author_name") + ) + end +end diff --git a/vendor/plugins/rails_xss/test/asset_tag_helper_test.rb b/vendor/plugins/rails_xss/test/asset_tag_helper_test.rb new file mode 100644 index 00000000..f58feda3 --- /dev/null +++ b/vendor/plugins/rails_xss/test/asset_tag_helper_test.rb @@ -0,0 +1,49 @@ +require 'test_helper' + +class AssetTagHelperTest < ActionView::TestCase + def setup + @controller = Class.new do + attr_accessor :request + def url_for(*args) "http://www.example.com" end + end.new + end + + def test_auto_discovery_link_tag + assert_dom_equal(%(), + auto_discovery_link_tag(:atom, {}, {:rel => "Not so alternate"})) + end + + def test_javascript_include_tag_with_blank_asset_id + ENV["RAILS_ASSET_ID"] = "" + assert_dom_equal(%(\n\n\n\n\n), + javascript_include_tag("test", :defaults)) + end + + def test_javascript_include_tag_with_given_asset_id + ENV["RAILS_ASSET_ID"] = "1" + assert_dom_equal(%(\n\n\n\n), + javascript_include_tag(:defaults)) + ENV["RAILS_ASSET_ID"] = "" + end + + def test_javascript_include_tag_is_html_safe + assert javascript_include_tag(:defaults).html_safe? + assert javascript_include_tag("prototype").html_safe? + end + + def test_stylesheet_link_tag + assert_dom_equal(%(), + stylesheet_link_tag("http://www.example.com/styles/style")) + end + + def test_stylesheet_link_tag_is_html_safe + assert stylesheet_link_tag('dir/file').html_safe? + assert stylesheet_link_tag('dir/other/file', 'dir/file2').html_safe? + assert stylesheet_tag('dir/file', {}).html_safe? + end + + def test_image_tag + assert_dom_equal(%(Mouse), + image_tag("mouse.png", :mouseover => image_path("mouse_over.png"))) + end +end diff --git a/vendor/plugins/rails_xss/test/caching_test.rb b/vendor/plugins/rails_xss/test/caching_test.rb new file mode 100644 index 00000000..3ea41e8b --- /dev/null +++ b/vendor/plugins/rails_xss/test/caching_test.rb @@ -0,0 +1,54 @@ +require 'test_helper' + +CACHE_DIR = 'test_cache' +# Don't change '/../temp/' cavalierly or you might hose something you don't want hosed +FILE_STORE_PATH = File.join(File.dirname(__FILE__), '/../temp/', CACHE_DIR) +ActionController::Base.page_cache_directory = FILE_STORE_PATH +ActionController::Base.cache_store = :file_store, FILE_STORE_PATH + +class FragmentCachingTestController < ActionController::Base + def some_action; end; +end + +class FragmentCachingTest < ActionController::TestCase + def setup + ActionController::Base.perform_caching = true + @store = ActiveSupport::Cache::MemoryStore.new + ActionController::Base.cache_store = @store + @controller = FragmentCachingTestController.new + @params = {:controller => 'posts', :action => 'index'} + @request = ActionController::TestRequest.new + @response = ActionController::TestResponse.new + @controller.params = @params + @controller.request = @request + @controller.response = @response + @controller.send(:initialize_current_url) + @controller.send(:initialize_template_class, @response) + @controller.send(:assign_shortcuts, @request, @response) + end + + def test_fragment_for + @store.write('views/expensive', 'fragment content') + fragment_computed = false + + buffer = 'generated till now -> '.html_safe + @controller.fragment_for(buffer, 'expensive') { fragment_computed = true } + + assert !fragment_computed + assert_equal 'generated till now -> fragment content', buffer + end + + def test_html_safety + assert_nil @store.read('views/name') + content = 'value'.html_safe + assert_equal content, @controller.write_fragment('name', content) + + cached = @store.read('views/name') + assert_equal content, cached + assert_equal String, cached.class + + html_safe = @controller.read_fragment('name') + assert_equal content, html_safe + assert html_safe.html_safe? + end +end diff --git a/vendor/plugins/rails_xss/test/content_for_test.rb b/vendor/plugins/rails_xss/test/content_for_test.rb new file mode 100644 index 00000000..45ba6762 --- /dev/null +++ b/vendor/plugins/rails_xss/test/content_for_test.rb @@ -0,0 +1,39 @@ +require 'test_helper' + +class ContentForTest < ActionView::TestCase + + def test_content_for_should_yield_html_safe_string + content_for(:testing, "Some

    html

    ") + content = instance_variable_get(:"@content_for_testing") + assert content.html_safe? + end + + def test_content_for_should_escape_content + content_for(:testing, "Some

    html

    ") + content = instance_variable_get(:"@content_for_testing") + expected = %{Some <p>html</p>} + assert_dom_equal expected, content + end + + def test_content_for_should_not_escape_html_safe_content + content_for(:testing, "Some

    html

    ".html_safe) + content = instance_variable_get(:"@content_for_testing") + expected = %{Some

    html

    } + assert_dom_equal expected, content + end + + def test_content_for_should_escape_content_from_block + content_for(:testing){ "Some

    html

    " } + content = instance_variable_get(:"@content_for_testing") + expected = %{Some <p>html</p>} + assert_dom_equal expected, content + end + + def test_content_for_should_not_escape_html_safe_content_from_block + content_for(:testing){ "Some

    html

    ".html_safe } + content = instance_variable_get(:"@content_for_testing") + expected = %{Some

    html

    } + assert_dom_equal expected, content + end + +end diff --git a/vendor/plugins/rails_xss/test/date_helper_test.rb b/vendor/plugins/rails_xss/test/date_helper_test.rb new file mode 100644 index 00000000..daf01027 --- /dev/null +++ b/vendor/plugins/rails_xss/test/date_helper_test.rb @@ -0,0 +1,29 @@ +require 'test_helper' + +class DateHelperTest < ActionView::TestCase + silence_warnings do + Post = Struct.new("Post", :id, :written_on, :updated_at) + end + + def test_select_html_safety + assert select_day(16).html_safe? + assert select_month(8).html_safe? + assert select_year(Time.mktime(2003, 8, 16, 8, 4, 18)).html_safe? + assert select_minute(Time.mktime(2003, 8, 16, 8, 4, 18)).html_safe? + assert select_second(Time.mktime(2003, 8, 16, 8, 4, 18)).html_safe? + + assert select_minute(8, :use_hidden => true).html_safe? + assert select_month(8, :prompt => 'Choose month').html_safe? + + assert select_time(Time.mktime(2003, 8, 16, 8, 4, 18), {}, :class => 'selector').html_safe? + assert select_date(Time.mktime(2003, 8, 16), :date_separator => " / ", :start_year => 2003, :end_year => 2005, :prefix => "date[first]").html_safe? + end + + def test_object_select_html_safety + @post = Post.new + @post.written_on = Date.new(2004, 6, 15) + + assert date_select("post", "written_on", :default => Time.local(2006, 9, 19, 15, 16, 35), :include_blank => true).html_safe? + assert time_select("post", "written_on", :ignore_date => true).html_safe? + end +end diff --git a/vendor/plugins/rails_xss/test/deprecated_output_safety_test.rb b/vendor/plugins/rails_xss/test/deprecated_output_safety_test.rb new file mode 100644 index 00000000..e16f7ce0 --- /dev/null +++ b/vendor/plugins/rails_xss/test/deprecated_output_safety_test.rb @@ -0,0 +1,112 @@ +require 'test_helper' + +class DeprecatedOutputSafetyTest < ActiveSupport::TestCase + def setup + @string = "hello" + end + + test "A string can be marked safe using html_safe!" do + assert_deprecated do + @string.html_safe! + assert @string.html_safe? + end + end + + test "Marking a string safe returns the string using html_safe!" do + assert_deprecated do + assert_equal @string, @string.html_safe! + end + end + + test "Adding a safe string to another safe string returns a safe string using html_safe!" do + assert_deprecated do + @other_string = "other".html_safe! + @string.html_safe! + @combination = @other_string + @string + + assert_equal "otherhello", @combination + assert @combination.html_safe? + end + end + + test "Adding an unsafe string to a safe string returns an unsafe string using html_safe!" do + assert_deprecated do + @other_string = "other".html_safe! + @combination = @other_string + "" + @other_combination = @string + "" + + assert_equal "other", @combination + assert_equal "hello", @other_combination + + assert !@combination.html_safe? + assert !@other_combination.html_safe? + end + end + + test "Concatting safe onto unsafe yields unsafe using html_safe!" do + assert_deprecated do + @other_string = "other" + @string.html_safe! + + @other_string.concat(@string) + assert !@other_string.html_safe? + end + end + + test "Concatting unsafe onto safe yields unsafe using html_safe!" do + assert_deprecated do + @other_string = "other".html_safe! + string = @other_string.concat("") + assert_equal "other", string + assert !string.html_safe? + end + end + + test "Concatting safe onto safe yields safe using html_safe!" do + assert_deprecated do + @other_string = "other".html_safe! + @string.html_safe! + + @other_string.concat(@string) + assert @other_string.html_safe? + end + end + + test "Concatting safe onto unsafe with << yields unsafe using html_safe!" do + assert_deprecated do + @other_string = "other" + @string.html_safe! + + @other_string << @string + assert !@other_string.html_safe? + end + end + + test "Concatting unsafe onto safe with << yields unsafe using html_safe!" do + assert_deprecated do + @other_string = "other".html_safe! + string = @other_string << "" + assert_equal "other", string + assert !string.html_safe? + end + end + + test "Concatting safe onto safe with << yields safe using html_safe!" do + assert_deprecated do + @other_string = "other".html_safe! + @string.html_safe! + + @other_string << @string + assert @other_string.html_safe? + end + end + + test "Concatting a fixnum to safe always yields safe using html_safe!" do + assert_deprecated do + @string.html_safe! + @string.concat(13) + assert_equal "hello".concat(13), @string + assert @string.html_safe? + end + end +end diff --git a/vendor/plugins/rails_xss/test/erb_util_test.rb b/vendor/plugins/rails_xss/test/erb_util_test.rb new file mode 100644 index 00000000..9a04d38e --- /dev/null +++ b/vendor/plugins/rails_xss/test/erb_util_test.rb @@ -0,0 +1,36 @@ +require 'test_helper' + +class ErbUtilTest < Test::Unit::TestCase + include ERB::Util + + ERB::Util::HTML_ESCAPE.each do |given, expected| + define_method "test_html_escape_#{expected.gsub(/\W/, '')}" do + assert_equal expected, html_escape(given) + end + + unless given == '"' + define_method "test_json_escape_#{expected.gsub(/\W/, '')}" do + assert_equal ERB::Util::JSON_ESCAPE[given], json_escape(given) + end + end + end + + def test_html_escape_is_html_safe + escaped = h("

    ") + assert_equal "<p>", escaped + assert escaped.html_safe? + end + + def test_html_escape_passes_html_escpe_unmodified + escaped = h("

    ".html_safe) + assert_equal "

    ", escaped + assert escaped.html_safe? + end + + def test_rest_in_ascii + (0..127).to_a.map {|int| int.chr }.each do |chr| + next if %w(& " < >).include?(chr) + assert_equal chr, html_escape(chr) + end + end +end diff --git a/vendor/plugins/rails_xss/test/form_helper_test.rb b/vendor/plugins/rails_xss/test/form_helper_test.rb new file mode 100644 index 00000000..e5580d26 --- /dev/null +++ b/vendor/plugins/rails_xss/test/form_helper_test.rb @@ -0,0 +1,1447 @@ +require 'test_helper' + +silence_warnings do + Post = Struct.new(:title, :author_name, :body, :secret, :written_on, :cost) + Post.class_eval do + alias_method :title_before_type_cast, :title unless respond_to?(:title_before_type_cast) + alias_method :body_before_type_cast, :body unless respond_to?(:body_before_type_cast) + alias_method :author_name_before_type_cast, :author_name unless respond_to?(:author_name_before_type_cast) + alias_method :secret?, :secret + + def new_record=(boolean) + @new_record = boolean + end + + def new_record? + @new_record + end + + attr_accessor :author + def author_attributes=(attributes); end + + attr_accessor :comments + def comments_attributes=(attributes); end + + attr_accessor :tags + def tags_attributes=(attributes); end + end + + class Comment + attr_reader :id + attr_reader :post_id + def initialize(id = nil, post_id = nil); @id, @post_id = id, post_id end + def save; @id = 1; @post_id = 1 end + def new_record?; @id.nil? end + def to_param; @id; end + def name + @id.nil? ? "new #{self.class.name.downcase}" : "#{self.class.name.downcase} ##{@id}" + end + + attr_accessor :relevances + def relevances_attributes=(attributes); end + + end + + class Tag + attr_reader :id + attr_reader :post_id + def initialize(id = nil, post_id = nil); @id, @post_id = id, post_id end + def save; @id = 1; @post_id = 1 end + def new_record?; @id.nil? end + def to_param; @id; end + def value + @id.nil? ? "new #{self.class.name.downcase}" : "#{self.class.name.downcase} ##{@id}" + end + + attr_accessor :relevances + def relevances_attributes=(attributes); end + + end + + class CommentRelevance + attr_reader :id + attr_reader :comment_id + def initialize(id = nil, comment_id = nil); @id, @comment_id = id, comment_id end + def save; @id = 1; @comment_id = 1 end + def new_record?; @id.nil? end + def to_param; @id; end + def value + @id.nil? ? "new #{self.class.name.downcase}" : "#{self.class.name.downcase} ##{@id}" + end + end + + class TagRelevance + attr_reader :id + attr_reader :tag_id + def initialize(id = nil, tag_id = nil); @id, @tag_id = id, tag_id end + def save; @id = 1; @tag_id = 1 end + def new_record?; @id.nil? end + def to_param; @id; end + def value + @id.nil? ? "new #{self.class.name.downcase}" : "#{self.class.name.downcase} ##{@id}" + end + end + + class Author < Comment + attr_accessor :post + def post_attributes=(attributes); end + end +end + +class FormHelperTest < ActionView::TestCase + tests ActionView::Helpers::FormHelper + + def setup + super + + # Create "label" locale for testing I18n label helpers + I18n.backend.store_translations 'label', { + :helpers => { + :label => { + :post => { + :body => "Write entire text here" + } + } + } + } + + @post = Post.new + @comment = Comment.new + def @post.errors() + Class.new{ + def on(field); "can't be empty" if field == "author_name"; end + def empty?() false end + def count() 1 end + def full_messages() [ "Author name can't be empty" ] end + }.new + end + def @post.id; 123; end + def @post.id_before_type_cast; 123; end + def @post.to_param; '123'; end + + @post.title = "Hello World" + @post.author_name = "" + @post.body = "Back to the hill and over it again!" + @post.secret = 1 + @post.written_on = Date.new(2004, 6, 15) + + def Post.human_attribute_name(attribute) + attribute.to_s == "cost" ? "Total cost" : attribute.to_s.humanize + end + + @controller = Class.new do + attr_reader :url_for_options + def url_for(options) + @url_for_options = options + "http://www.example.com" + end + end + @controller = @controller.new + end + + def test_label + assert_dom_equal('', label("post", "title")) + assert_dom_equal('', label("post", "title", "The title goes here")) + assert_dom_equal( + '', + label("post", "title", nil, :class => 'title_label') + ) + assert_dom_equal('', label("post", "secret?")) + end + + def test_label_with_symbols + assert_dom_equal('', label(:post, :title)) + assert_dom_equal('', label(:post, :secret?)) + end + + def test_label_with_locales_strings + old_locale, I18n.locale = I18n.locale, :label + assert_dom_equal('', label("post", "body")) + ensure + I18n.locale = old_locale + end + + def test_label_with_human_attribute_name + old_locale, I18n.locale = I18n.locale, :label + assert_dom_equal('', label(:post, :cost)) + ensure + I18n.locale = old_locale + end + + def test_label_with_locales_symbols + old_locale, I18n.locale = I18n.locale, :label + assert_dom_equal('', label(:post, :body)) + ensure + I18n.locale = old_locale + end + + def test_label_with_for_attribute_as_symbol + assert_dom_equal('', label(:post, :title, nil, :for => "my_for")) + end + + def test_label_with_for_attribute_as_string + assert_dom_equal('', label(:post, :title, nil, "for" => "my_for")) + end + + def test_label_with_id_attribute_as_symbol + assert_dom_equal('', label(:post, :title, nil, :id => "my_id")) + end + + def test_label_with_id_attribute_as_string + assert_dom_equal('', label(:post, :title, nil, "id" => "my_id")) + end + + def test_label_with_for_and_id_attributes_as_symbol + assert_dom_equal('', label(:post, :title, nil, :for => "my_for", :id => "my_id")) + end + + def test_label_with_for_and_id_attributes_as_string + assert_dom_equal('', label(:post, :title, nil, "for" => "my_for", "id" => "my_id")) + end + + def test_label_for_radio_buttons_with_value + assert_dom_equal('', label("post", "title", "The title goes here", :value => "great_title")) + assert_dom_equal('', label("post", "title", "The title goes here", :value => "great title")) + end + + def test_text_field + assert_dom_equal( + '', text_field("post", "title") + ) + assert_dom_equal( + '', password_field("post", "title") + ) + assert_dom_equal( + '', password_field("person", "name") + ) + end + + def test_text_field_with_escapes + @post.title = "Hello World" + assert_dom_equal( + '', text_field("post", "title") + ) + end + + def test_text_field_with_html_entities + @post.title = "The HTML Entity for & is &" + assert_dom_equal( + '', + text_field("post", "title") + ) + end + + def test_text_field_with_options + expected = '' + assert_dom_equal expected, text_field("post", "title", "size" => 35) + assert_dom_equal expected, text_field("post", "title", :size => 35) + end + + def test_text_field_assuming_size + expected = '' + assert_dom_equal expected, text_field("post", "title", "maxlength" => 35) + assert_dom_equal expected, text_field("post", "title", :maxlength => 35) + end + + def test_text_field_removing_size + expected = '' + assert_dom_equal expected, text_field("post", "title", "maxlength" => 35, "size" => nil) + assert_dom_equal expected, text_field("post", "title", :maxlength => 35, :size => nil) + end + + def test_text_field_doesnt_change_param_values + object_name = 'post[]' + expected = '' + assert_equal expected, text_field(object_name, "title") + assert_equal object_name, "post[]" + end + + def test_hidden_field + assert_dom_equal '', + hidden_field("post", "title") + assert_dom_equal '', + hidden_field("post", "secret?") + end + + def test_hidden_field_with_escapes + @post.title = "Hello World" + assert_dom_equal '', + hidden_field("post", "title") + end + + def test_hidden_field_with_options + assert_dom_equal '', + hidden_field("post", "title", :value => "Something Else") + end + + def test_check_box + assert_dom_equal( + '', + check_box("post", "secret") + ) + @post.secret = 0 + assert_dom_equal( + '', + check_box("post", "secret") + ) + assert_dom_equal( + '', + check_box("post", "secret" ,{"checked"=>"checked"}) + ) + @post.secret = true + assert_dom_equal( + '', + check_box("post", "secret") + ) + assert_dom_equal( + '', + check_box("post", "secret?") + ) + + @post.secret = ['0'] + assert_dom_equal( + '', + check_box("post", "secret") + ) + @post.secret = ['1'] + assert_dom_equal( + '', + check_box("post", "secret") + ) + end + + def test_check_box_with_explicit_checked_and_unchecked_values + @post.secret = "on" + assert_dom_equal( + '', + check_box("post", "secret", {}, "on", "off") + ) + end + + def test_checkbox_disabled_still_submits_checked_value + assert_dom_equal( + '', + check_box("post", "secret", { :disabled => :true }) + ) + end + + def test_radio_button + assert_dom_equal('', + radio_button("post", "title", "Hello World") + ) + assert_dom_equal('', + radio_button("post", "title", "Goodbye World") + ) + assert_dom_equal('', + radio_button("item[subobject]", "title", "inside world") + ) + end + + def test_radio_button_is_checked_with_integers + assert_dom_equal('', + radio_button("post", "secret", "1") + ) + end + + def test_radio_button_respects_passed_in_id + assert_dom_equal('', + radio_button("post", "secret", "1", :id=>"foo") + ) + end + + def test_radio_button_with_booleans + assert_dom_equal('', + radio_button("post", "secret", true) + ) + + assert_dom_equal('', + radio_button("post", "secret", false) + ) + end + + def test_text_area + assert_dom_equal( + '', + text_area("post", "body") + ) + end + + def test_text_area_with_escapes + @post.body = "Back to the hill and over it again!" + assert_dom_equal( + '', + text_area("post", "body") + ) + end + + def test_text_area_with_alternate_value + assert_dom_equal( + '', + text_area("post", "body", :value => 'Testing alternate values.') + ) + end + + def test_text_area_with_html_entities + @post.body = "The HTML Entity for & is &" + assert_dom_equal( + '', + text_area("post", "body") + ) + end + + def test_text_area_with_size_option + assert_dom_equal( + '', + text_area("post", "body", :size => "183x820") + ) + end + + def test_explicit_name + assert_dom_equal( + '', text_field("post", "title", "name" => "dont guess") + ) + assert_dom_equal( + '', + text_area("post", "body", "name" => "really!") + ) + assert_dom_equal( + '', + check_box("post", "secret", "name" => "i mean it") + ) + assert_dom_equal text_field("post", "title", "name" => "dont guess"), + text_field("post", "title", :name => "dont guess") + assert_dom_equal text_area("post", "body", "name" => "really!"), + text_area("post", "body", :name => "really!") + assert_dom_equal check_box("post", "secret", "name" => "i mean it"), + check_box("post", "secret", :name => "i mean it") + end + + def test_explicit_id + assert_dom_equal( + '', text_field("post", "title", "id" => "dont guess") + ) + assert_dom_equal( + '', + text_area("post", "body", "id" => "really!") + ) + assert_dom_equal( + '', + check_box("post", "secret", "id" => "i mean it") + ) + assert_dom_equal text_field("post", "title", "id" => "dont guess"), + text_field("post", "title", :id => "dont guess") + assert_dom_equal text_area("post", "body", "id" => "really!"), + text_area("post", "body", :id => "really!") + assert_dom_equal check_box("post", "secret", "id" => "i mean it"), + check_box("post", "secret", :id => "i mean it") + end + + def test_auto_index + pid = @post.id + assert_dom_equal( + "", + label("post[]", "title") + ) + assert_dom_equal( + "", text_field("post[]","title") + ) + assert_dom_equal( + "", + text_area("post[]", "body") + ) + assert_dom_equal( + "", + check_box("post[]", "secret") + ) + assert_dom_equal( +"", + radio_button("post[]", "title", "Hello World") + ) + assert_dom_equal("", + radio_button("post[]", "title", "Goodbye World") + ) + end + + def test_form_for + form_for(:post, @post, :html => { :id => 'create-post' }) do |f| + concat f.label(:title) + concat f.text_field(:title) + concat f.text_area(:body) + concat f.check_box(:secret) + concat f.submit('Create post') + end + + expected = + "

    " + + "" + + "" + + "" + + "" + + "" + + "" + + "
    " + + assert_dom_equal expected, output_buffer + end + + def test_form_for_with_method + form_for(:post, @post, :html => { :id => 'create-post', :method => :put }) do |f| + concat f.text_field(:title) + concat f.text_area(:body) + concat f.check_box(:secret) + end + + expected = + "
    " + + "
    " + + "" + + "" + + "" + + "" + + "
    " + + assert_dom_equal expected, output_buffer + end + + def test_form_for_without_object + form_for(:post, :html => { :id => 'create-post' }) do |f| + concat f.text_field(:title) + concat f.text_area(:body) + concat f.check_box(:secret) + end + + expected = + "
    " + + "" + + "" + + "" + + "" + + "
    " + + assert_dom_equal expected, output_buffer + end + + def test_form_for_with_index + form_for("post[]", @post) do |f| + concat f.label(:title) + concat f.text_field(:title) + concat f.text_area(:body) + concat f.check_box(:secret) + end + + expected = + "
    " + + "" + + "" + + "" + + "" + + "" + + "
    " + + assert_dom_equal expected, output_buffer + end + + def test_form_for_with_nil_index_option_override + form_for("post[]", @post, :index => nil) do |f| + concat f.text_field(:title) + concat f.text_area(:body) + concat f.check_box(:secret) + end + + expected = + "
    " + + "" + + "" + + "" + + "" + + "
    " + + assert_dom_equal expected, output_buffer + end + + def test_nested_fields_for + form_for(:post, @post) do |f| + f.fields_for(:comment, @post) do |c| + concat c.text_field(:title) + end + end + + expected = "
    " + + "" + + "
    " + + assert_dom_equal expected, output_buffer + end + + def test_nested_fields_for_with_nested_collections + form_for('post[]', @post) do |f| + concat f.text_field(:title) + f.fields_for('comment[]', @comment) do |c| + concat c.text_field(:name) + end + end + + expected = "
    " + + "" + + "" + + "
    " + + assert_dom_equal expected, output_buffer + end + + def test_nested_fields_for_with_index_and_parent_fields + form_for('post', @post, :index => 1) do |c| + concat c.text_field(:title) + c.fields_for('comment', @comment, :index => 1) do |r| + concat r.text_field(:name) + end + end + + expected = "
    " + + "" + + "" + + "
    " + + assert_dom_equal expected, output_buffer + end + + def test_form_for_with_index_and_nested_fields_for + form_for(:post, @post, :index => 1) do |f| + f.fields_for(:comment, @post) do |c| + concat c.text_field(:title) + end + end + + expected = "
    " + + "" + + "
    " + + assert_dom_equal expected, output_buffer + end + + def test_nested_fields_for_with_index_on_both + form_for(:post, @post, :index => 1) do |f| + f.fields_for(:comment, @post, :index => 5) do |c| + concat c.text_field(:title) + end + end + + expected = "
    " + + "" + + "
    " + + assert_dom_equal expected, output_buffer + end + + def test_nested_fields_for_with_auto_index + form_for("post[]", @post) do |f| + f.fields_for(:comment, @post) do |c| + concat c.text_field(:title) + end + end + + expected = "
    " + + "" + + "
    " + + assert_dom_equal expected, output_buffer + end + + def test_nested_fields_for_with_index_radio_button + form_for(:post, @post) do |f| + f.fields_for(:comment, @post, :index => 5) do |c| + concat c.radio_button(:title, "hello") + end + end + + expected = "
    " + + "" + + "
    " + + assert_dom_equal expected, output_buffer + end + + def test_nested_fields_for_with_auto_index_on_both + form_for("post[]", @post) do |f| + f.fields_for("comment[]", @post) do |c| + concat c.text_field(:title) + end + end + + expected = "
    " + + "" + + "
    " + + assert_dom_equal expected, output_buffer + end + + def test_nested_fields_for_with_index_and_auto_index + form_for("post[]", @post) do |f| + f.fields_for(:comment, @post, :index => 5) do |c| + concat c.text_field(:title) + end + end + + form_for(:post, @post, :index => 1) do |f| + f.fields_for("comment[]", @post) do |c| + concat c.text_field(:title) + end + end + + expected = "
    " + + "" + + "
    " + + "
    " + + "" + + "
    " + + assert_dom_equal expected, output_buffer + end + + def test_nested_fields_for_with_a_new_record_on_a_nested_attributes_one_to_one_association + @post.author = Author.new + + form_for(:post, @post) do |f| + concat f.text_field(:title) + f.fields_for(:author) do |af| + concat af.text_field(:name) + end + end + + expected = '
    ' + + '' + + '' + + '
    ' + + assert_dom_equal expected, output_buffer + end + + def test_nested_fields_for_with_explicitly_passed_object_on_a_nested_attributes_one_to_one_association + form_for(:post, @post) do |f| + f.fields_for(:author, Author.new(123)) do |af| + assert_not_nil af.object + assert_equal 123, af.object.id + end + end + end + + def test_nested_fields_for_with_an_existing_record_on_a_nested_attributes_one_to_one_association + @post.author = Author.new(321) + + form_for(:post, @post) do |f| + concat f.text_field(:title) + f.fields_for(:author) do |af| + concat af.text_field(:name) + end + end + + expected = '
    ' + + '' + + '' + + '' + + '
    ' + + assert_dom_equal expected, output_buffer + end + + def test_nested_fields_for_with_existing_records_on_a_nested_attributes_one_to_one_association_with_explicit_hidden_field_placement + @post.author = Author.new(321) + + form_for(:post, @post) do |f| + concat f.text_field(:title) + f.fields_for(:author) do |af| + concat af.hidden_field(:id) + concat af.text_field(:name) + end + end + + expected = '
    ' + + '' + + '' + + '' + + '
    ' + + assert_dom_equal expected, output_buffer + end + + def test_nested_fields_for_with_existing_records_on_a_nested_attributes_collection_association + @post.comments = Array.new(2) { |id| Comment.new(id + 1) } + + form_for(:post, @post) do |f| + concat f.text_field(:title) + @post.comments.each do |comment| + f.fields_for(:comments, comment) do |cf| + concat cf.text_field(:name) + end + end + end + + expected = '
    ' + + '' + + '' + + '' + + '' + + '' + + '
    ' + + assert_dom_equal expected, output_buffer + end + + def test_nested_fields_for_with_existing_records_on_a_nested_attributes_collection_association_with_explicit_hidden_field_placement + @post.comments = Array.new(2) { |id| Comment.new(id + 1) } + + form_for(:post, @post) do |f| + concat f.text_field(:title) + @post.comments.each do |comment| + f.fields_for(:comments, comment) do |cf| + concat cf.hidden_field(:id) + concat cf.text_field(:name) + end + end + end + + expected = '
    ' + + '' + + '' + + '' + + '' + + '' + + '
    ' + + assert_dom_equal expected, output_buffer + end + + def test_nested_fields_for_with_new_records_on_a_nested_attributes_collection_association + @post.comments = [Comment.new, Comment.new] + + form_for(:post, @post) do |f| + concat f.text_field(:title) + @post.comments.each do |comment| + f.fields_for(:comments, comment) do |cf| + concat cf.text_field(:name) + end + end + end + + expected = '
    ' + + '' + + '' + + '' + + '
    ' + + assert_dom_equal expected, output_buffer + end + + def test_nested_fields_for_with_existing_and_new_records_on_a_nested_attributes_collection_association + @post.comments = [Comment.new(321), Comment.new] + + form_for(:post, @post) do |f| + concat f.text_field(:title) + @post.comments.each do |comment| + f.fields_for(:comments, comment) do |cf| + concat cf.text_field(:name) + end + end + end + + expected = '
    ' + + '' + + '' + + '' + + '' + + '
    ' + + assert_dom_equal expected, output_buffer + end + + def test_nested_fields_for_with_an_empty_supplied_attributes_collection + form_for(:post, @post) do |f| + concat f.text_field(:title) + f.fields_for(:comments, []) do |cf| + concat cf.text_field(:name) + end + end + + expected = '
    ' + + '' + + '
    ' + + assert_dom_equal expected, output_buffer + end + + def test_nested_fields_for_with_existing_records_on_a_supplied_nested_attributes_collection + @post.comments = Array.new(2) { |id| Comment.new(id + 1) } + + form_for(:post, @post) do |f| + concat f.text_field(:title) + f.fields_for(:comments, @post.comments) do |cf| + concat cf.text_field(:name) + end + end + + expected = '
    ' + + '' + + '' + + '' + + '' + + '' + + '
    ' + + assert_dom_equal expected, output_buffer + end + + def test_nested_fields_for_on_a_nested_attributes_collection_association_yields_only_builder + @post.comments = [Comment.new(321), Comment.new] + yielded_comments = [] + + form_for(:post, @post) do |f| + concat f.text_field(:title) + f.fields_for(:comments) do |cf| + concat cf.text_field(:name) + yielded_comments << cf.object + end + end + + expected = '
    ' + + '' + + '' + + '' + + '' + + '
    ' + + assert_dom_equal expected, output_buffer + assert_equal yielded_comments, @post.comments + end + + def test_nested_fields_for_with_child_index_option_override_on_a_nested_attributes_collection_association + @post.comments = [] + + form_for(:post, @post) do |f| + f.fields_for(:comments, Comment.new(321), :child_index => 'abc') do |cf| + concat cf.text_field(:name) + end + end + + expected = '
    ' + + '' + + '' + + '
    ' + + assert_dom_equal expected, output_buffer + end + + def test_nested_fields_uses_unique_indices_for_different_collection_associations + @post.comments = [Comment.new(321)] + @post.tags = [Tag.new(123), Tag.new(456)] + @post.comments[0].relevances = [] + @post.tags[0].relevances = [] + @post.tags[1].relevances = [] + form_for(:post, @post) do |f| + f.fields_for(:comments, @post.comments[0]) do |cf| + concat cf.text_field(:name) + cf.fields_for(:relevances, CommentRelevance.new(314)) do |crf| + concat crf.text_field(:value) + end + end + f.fields_for(:tags, @post.tags[0]) do |tf| + concat tf.text_field(:value) + tf.fields_for(:relevances, TagRelevance.new(3141)) do |trf| + concat trf.text_field(:value) + end + end + f.fields_for('tags', @post.tags[1]) do |tf| + concat tf.text_field(:value) + tf.fields_for(:relevances, TagRelevance.new(31415)) do |trf| + concat trf.text_field(:value) + end + end + end + + expected = '
    ' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '
    ' + + assert_dom_equal expected, output_buffer + end + + def test_fields_for + fields_for(:post, @post) do |f| + concat f.text_field(:title) + concat f.text_area(:body) + concat f.check_box(:secret) + end + + expected = + "" + + "" + + "" + + "" + + assert_dom_equal expected, output_buffer + end + + def test_fields_for_with_index + fields_for("post[]", @post) do |f| + concat f.text_field(:title) + concat f.text_area(:body) + concat f.check_box(:secret) + end + + expected = + "" + + "" + + "" + + "" + + assert_dom_equal expected, output_buffer + end + + def test_fields_for_with_nil_index_option_override + fields_for("post[]", @post, :index => nil) do |f| + concat f.text_field(:title) + concat f.text_area(:body) + concat f.check_box(:secret) + end + + expected = + "" + + "" + + "" + + "" + + assert_dom_equal expected, output_buffer + end + + def test_fields_for_with_index_option_override + fields_for("post[]", @post, :index => "abc") do |f| + concat f.text_field(:title) + concat f.text_area(:body) + concat f.check_box(:secret) + end + + expected = + "" + + "" + + "" + + "" + + assert_dom_equal expected, output_buffer + end + + def test_fields_for_without_object + fields_for(:post) do |f| + concat f.text_field(:title) + concat f.text_area(:body) + concat f.check_box(:secret) + end + + expected = + "" + + "" + + "" + + "" + + assert_dom_equal expected, output_buffer + end + + def test_fields_for_with_only_object + fields_for(@post) do |f| + concat f.text_field(:title) + concat f.text_area(:body) + concat f.check_box(:secret) + end + + expected = + "" + + "" + + "" + + "" + + assert_dom_equal expected, output_buffer + end + + def test_fields_for_object_with_bracketed_name + fields_for("author[post]", @post) do |f| + concat f.label(:title) + concat f.text_field(:title) + end + + assert_dom_equal "" + + "", + output_buffer + end + + def test_fields_for_object_with_bracketed_name_and_index + fields_for("author[post]", @post, :index => 1) do |f| + concat f.label(:title) + concat f.text_field(:title) + end + + assert_dom_equal "" + + "", + output_buffer + end + + def test_form_builder_does_not_have_form_for_method + assert ! ActionView::Helpers::FormBuilder.instance_methods.include?('form_for') + end + + def test_form_for_and_fields_for + form_for(:post, @post, :html => { :id => 'create-post' }) do |post_form| + concat post_form.text_field(:title) + concat post_form.text_area(:body) + + fields_for(:parent_post, @post) do |parent_fields| + concat parent_fields.check_box(:secret) + end + end + + expected = + "
    " + + "" + + "" + + "" + + "" + + "
    " + + assert_dom_equal expected, output_buffer + end + + def test_form_for_and_fields_for_with_object + form_for(:post, @post, :html => { :id => 'create-post' }) do |post_form| + concat post_form.text_field(:title) + concat post_form.text_area(:body) + + post_form.fields_for(@comment) do |comment_fields| + concat comment_fields.text_field(:name) + end + end + + expected = + "
    " + + "" + + "" + + "" + + "
    " + + assert_dom_equal expected, output_buffer + end + + class LabelledFormBuilder < ActionView::Helpers::FormBuilder + (field_helpers - %w(hidden_field)).each do |selector| + src, line = <<-END_SRC, __LINE__ + 1 + def #{selector}(field, *args, &proc) + (" " + super + "
    ").html_safe + end + END_SRC + class_eval src, __FILE__, line + end + end + + def test_form_for_with_labelled_builder + form_for(:post, @post, :builder => LabelledFormBuilder) do |f| + concat f.text_field(:title) + concat f.text_area(:body) + concat f.check_box(:secret) + end + + expected = + "
    " + + "
    " + + "
    " + + "
    " + + "
    " + + assert_dom_equal expected, output_buffer + end + + def test_default_form_builder + old_default_form_builder, ActionView::Base.default_form_builder = + ActionView::Base.default_form_builder, LabelledFormBuilder + + form_for(:post, @post) do |f| + concat f.text_field(:title) + concat f.text_area(:body) + concat f.check_box(:secret) + end + + expected = + "
    " + + "
    " + + "
    " + + "
    " + + "
    " + + assert_dom_equal expected, output_buffer + ensure + ActionView::Base.default_form_builder = old_default_form_builder + end + + def test_default_form_builder_with_active_record_helpers + form_for(:post, @post) do |f| + concat f.error_message_on('author_name') + concat f.error_messages + end + + expected = %(
    ) + + %(
    can't be empty
    ) + + %(

    1 error prohibited this post from being saved

    There were problems with the following fields:

    • Author name can't be empty
    ) + + %(
    ) + + assert_dom_equal expected, output_buffer + + end + + def test_default_form_builder_no_instance_variable + post = @post + @post = nil + + form_for(:post, post) do |f| + concat f.error_message_on('author_name') + concat f.error_messages + end + + expected = %(
    ) + + %(
    can't be empty
    ) + + %(

    1 error prohibited this post from being saved

    There were problems with the following fields:

    • Author name can't be empty
    ) + + %(
    ) + + assert_dom_equal expected, output_buffer + + end + + def test_default_form_builder_without_object + + form_for(:post) do |f| + concat f.error_message_on('author_name') + concat f.error_messages + end + + expected = %(
    ) + + %(
    can't be empty
    ) + + %(

    1 error prohibited this post from being saved

    There were problems with the following fields:

    • Author name can't be empty
    ) + + %(
    ) + + assert_dom_equal expected, output_buffer + + end + + # Perhaps this test should be moved to prototype helper tests. + def test_remote_form_for_with_labelled_builder + self.extend ActionView::Helpers::PrototypeHelper + + remote_form_for(:post, @post, :builder => LabelledFormBuilder) do |f| + concat f.text_field(:title) + concat f.text_area(:body) + concat f.check_box(:secret) + end + + expected = + %(
    ) + + "
    " + + "
    " + + "
    " + + "
    " + + assert_dom_equal expected, output_buffer + end + + def test_fields_for_with_labelled_builder + fields_for(:post, @post, :builder => LabelledFormBuilder) do |f| + concat f.text_field(:title) + concat f.text_area(:body) + concat f.check_box(:secret) + end + + expected = + "
    " + + "
    " + + "
    " + + assert_dom_equal expected, output_buffer + end + + def test_form_for_with_labelled_builder_with_nested_fields_for_without_options_hash + klass = nil + + form_for(:post, @post, :builder => LabelledFormBuilder) do |f| + f.fields_for(:comments, Comment.new) do |nested_fields| + klass = nested_fields.class + '' + end + end + + assert_equal LabelledFormBuilder, klass + end + + def test_form_for_with_labelled_builder_with_nested_fields_for_with_options_hash + klass = nil + + form_for(:post, @post, :builder => LabelledFormBuilder) do |f| + f.fields_for(:comments, Comment.new, :index => 'foo') do |nested_fields| + klass = nested_fields.class + '' + end + end + + assert_equal LabelledFormBuilder, klass + end + + class LabelledFormBuilderSubclass < LabelledFormBuilder; end + + def test_form_for_with_labelled_builder_with_nested_fields_for_with_custom_builder + klass = nil + + form_for(:post, @post, :builder => LabelledFormBuilder) do |f| + f.fields_for(:comments, Comment.new, :builder => LabelledFormBuilderSubclass) do |nested_fields| + klass = nested_fields.class + '' + end + end + + assert_equal LabelledFormBuilderSubclass, klass + end + + def test_form_for_with_html_options_adds_options_to_form_tag + form_for(:post, @post, :html => {:id => 'some_form', :class => 'some_class'}) do |f| end + expected = "
    " + + assert_dom_equal expected, output_buffer + end + + def test_form_for_with_string_url_option + form_for(:post, @post, :url => 'http://www.otherdomain.com') do |f| end + + assert_equal '
    ', output_buffer + end + + def test_form_for_with_hash_url_option + form_for(:post, @post, :url => {:controller => 'controller', :action => 'action'}) do |f| end + + assert_equal 'controller', @controller.url_for_options[:controller] + assert_equal 'action', @controller.url_for_options[:action] + end + + def test_form_for_with_record_url_option + form_for(:post, @post, :url => @post) do |f| end + + expected = "
    " + assert_equal expected, output_buffer + end + + def test_form_for_with_existing_object + form_for(@post) do |f| end + + expected = "
    " + assert_equal expected, output_buffer + end + + def test_form_for_with_new_object + post = Post.new + post.new_record = true + def post.id() nil end + + form_for(post) do |f| end + + expected = "
    " + assert_equal expected, output_buffer + end + + def test_form_for_with_existing_object_in_list + @post.new_record = false + @comment.save + + form_for([@post, @comment]) {} + + expected = %(
    ) + assert_dom_equal expected, output_buffer + end + + def test_form_for_with_new_object_in_list + @post.new_record = false + + form_for([@post, @comment]) {} + + expected = %(
    ) + assert_dom_equal expected, output_buffer + end + + def test_form_for_with_existing_object_and_namespace_in_list + @post.new_record = false + @comment.save + + form_for([:admin, @post, @comment]) {} + + expected = %(
    ) + assert_dom_equal expected, output_buffer + end + + def test_form_for_with_new_object_and_namespace_in_list + @post.new_record = false + + form_for([:admin, @post, @comment]) {} + + expected = %(
    ) + assert_dom_equal expected, output_buffer + end + + def test_form_for_with_existing_object_and_custom_url + form_for(@post, :url => "/super_posts") do |f| end + + expected = "
    " + assert_equal expected, output_buffer + end + + def test_remote_form_for_with_html_options_adds_options_to_form_tag + self.extend ActionView::Helpers::PrototypeHelper + + remote_form_for(:post, @post, :html => {:id => 'some_form', :class => 'some_class'}) do |f| end + expected = "
    " + + assert_dom_equal expected, output_buffer + end + + protected + def comments_path(post) + "/posts/#{post.id}/comments" + end + alias_method :post_comments_path, :comments_path + + def comment_path(post, comment) + "/posts/#{post.id}/comments/#{comment.id}" + end + alias_method :post_comment_path, :comment_path + + def admin_comments_path(post) + "/admin/posts/#{post.id}/comments" + end + alias_method :admin_post_comments_path, :admin_comments_path + + def admin_comment_path(post, comment) + "/admin/posts/#{post.id}/comments/#{comment.id}" + end + alias_method :admin_post_comment_path, :admin_comment_path + + def posts_path + "/posts" + end + + def post_path(post) + "/posts/#{post.id}" + end + + def protect_against_forgery? + false + end +end diff --git a/vendor/plugins/rails_xss/test/form_tag_helper_test.rb b/vendor/plugins/rails_xss/test/form_tag_helper_test.rb new file mode 100644 index 00000000..41eeceeb --- /dev/null +++ b/vendor/plugins/rails_xss/test/form_tag_helper_test.rb @@ -0,0 +1,354 @@ +require 'test_helper' + +class FormTagHelperTest < ActionView::TestCase + def setup + @controller = Class.new do + def url_for(options) + "http://www.example.com" + end + end + @controller = @controller.new + end + + VALID_HTML_ID = /^[A-Za-z][-_:.A-Za-z0-9]*$/ # see http://www.w3.org/TR/html4/types.html#type-name + + def test_check_box_tag + actual = check_box_tag "admin" + expected = %() + assert_dom_equal expected, actual + end + + def test_check_box_tag_id_sanitized + label_elem = root_elem(check_box_tag("project[2][admin]")) + assert_match VALID_HTML_ID, label_elem['id'] + end + + def test_form_tag + actual = form_tag + expected = %(
    ) + assert_dom_equal expected, actual + end + + def test_form_tag_multipart + actual = form_tag({}, { 'multipart' => true }) + expected = %() + assert_dom_equal expected, actual + end + + def test_form_tag_with_method_put + actual = form_tag({}, { :method => :put }) + expected = %(
    ) + assert_dom_equal expected, actual + end + + def test_form_tag_with_method_delete + actual = form_tag({}, { :method => :delete }) + expected = %(
    ) + assert_dom_equal expected, actual + end + + def test_form_tag_with_block_in_erb + __in_erb_template = '' + form_tag("http://example.com") { concat "Hello world!" } + + expected = %(Hello world!
    ) + assert_dom_equal expected, output_buffer + end + + def test_form_tag_with_block_and_method_in_erb + __in_erb_template = '' + form_tag("http://example.com", :method => :put) { concat "Hello world!" } + + expected = %(
    Hello world!
    ) + assert_dom_equal expected, output_buffer + end + + def test_hidden_field_tag + actual = hidden_field_tag "id", 3 + expected = %() + assert_dom_equal expected, actual + end + + def test_hidden_field_tag_id_sanitized + input_elem = root_elem(hidden_field_tag("item[][title]")) + assert_match VALID_HTML_ID, input_elem['id'] + end + + def test_file_field_tag + assert_dom_equal "", file_field_tag("picsplz") + end + + def test_file_field_tag_with_options + assert_dom_equal "", file_field_tag("picsplz", :class => "pix") + end + + def test_password_field_tag + actual = password_field_tag + expected = %() + assert_dom_equal expected, actual + end + + def test_radio_button_tag + actual = radio_button_tag "people", "david" + expected = %() + assert_dom_equal expected, actual + + actual = radio_button_tag("num_people", 5) + expected = %() + assert_dom_equal expected, actual + + actual = radio_button_tag("gender", "m") + radio_button_tag("gender", "f") + expected = %() + assert_dom_equal expected, actual + + actual = radio_button_tag("opinion", "-1") + radio_button_tag("opinion", "1") + expected = %() + assert_dom_equal expected, actual + + actual = radio_button_tag("person[gender]", "m") + expected = %() + assert_dom_equal expected, actual + end + + def test_select_tag + actual = select_tag "people", "".html_safe + expected = %() + assert_dom_equal expected, actual + end + + def test_select_tag_with_multiple + actual = select_tag "colors", "".html_safe, :multiple => :true + expected = %() + assert_dom_equal expected, actual + end + + def test_select_tag_disabled + actual = select_tag "places", "".html_safe, :disabled => :true + expected = %() + assert_dom_equal expected, actual + end + + def test_select_tag_id_sanitized + input_elem = root_elem(select_tag("project[1]people", "")) + assert_match VALID_HTML_ID, input_elem['id'] + end + + def test_select_tag_with_array_options + assert_deprecated /array/ do + select_tag "people", [""] + end + end + + def test_text_area_tag_size_string + actual = text_area_tag "body", "hello world", "size" => "20x40" + expected = %() + assert_dom_equal expected, actual + end + + def test_text_area_tag_size_symbol + actual = text_area_tag "body", "hello world", :size => "20x40" + expected = %() + assert_dom_equal expected, actual + end + + def test_text_area_tag_should_disregard_size_if_its_given_as_an_integer + actual = text_area_tag "body", "hello world", :size => 20 + expected = %() + assert_dom_equal expected, actual + end + + def test_text_area_tag_id_sanitized + input_elem = root_elem(text_area_tag("item[][description]")) + assert_match VALID_HTML_ID, input_elem['id'] + end + + def test_text_area_tag_escape_content + actual = text_area_tag "body", "hello world", :size => "20x40" + expected = %() + assert_dom_equal expected, actual + end + + def test_text_area_tag_unescaped_content + actual = text_area_tag "body", "hello world", :size => "20x40", :escape => false + expected = %() + assert_dom_equal expected, actual + end + + def test_text_area_tag_unescaped_nil_content + actual = text_area_tag "body", nil, :escape => false + expected = %() + assert_dom_equal expected, actual + end + + def test_text_field_tag + actual = text_field_tag "title", "Hello!" + expected = %() + assert_dom_equal expected, actual + end + + def test_text_field_tag_class_string + actual = text_field_tag "title", "Hello!", "class" => "admin" + expected = %() + assert_dom_equal expected, actual + end + + def test_text_field_tag_size_symbol + actual = text_field_tag "title", "Hello!", :size => 75 + expected = %() + assert_dom_equal expected, actual + end + + def test_text_field_tag_size_string + actual = text_field_tag "title", "Hello!", "size" => "75" + expected = %() + assert_dom_equal expected, actual + end + + def test_text_field_tag_maxlength_symbol + actual = text_field_tag "title", "Hello!", :maxlength => 75 + expected = %() + assert_dom_equal expected, actual + end + + def test_text_field_tag_maxlength_string + actual = text_field_tag "title", "Hello!", "maxlength" => "75" + expected = %() + assert_dom_equal expected, actual + end + + def test_text_field_disabled + actual = text_field_tag "title", "Hello!", :disabled => :true + expected = %() + assert_dom_equal expected, actual + end + + def test_text_field_tag_with_multiple_options + actual = text_field_tag "title", "Hello!", :size => 70, :maxlength => 80 + expected = %() + assert_dom_equal expected, actual + end + + def test_text_field_tag_id_sanitized + input_elem = root_elem(text_field_tag("item[][title]")) + assert_match VALID_HTML_ID, input_elem['id'] + end + + def test_label_tag_without_text + actual = label_tag "title" + expected = %() + assert_dom_equal expected, actual + end + + def test_label_tag_with_symbol + actual = label_tag :title + expected = %() + assert_dom_equal expected, actual + end + + def test_label_tag_with_text + actual = label_tag "title", "My Title" + expected = %() + assert_dom_equal expected, actual + end + + def test_label_tag_class_string + actual = label_tag "title", "My Title", "class" => "small_label" + expected = %() + assert_dom_equal expected, actual + end + + def test_label_tag_id_sanitized + label_elem = root_elem(label_tag("item[title]")) + assert_match VALID_HTML_ID, label_elem['for'] + end + + def test_boolean_options + assert_dom_equal %(), check_box_tag("admin", 1, true, 'disabled' => true, :readonly => "yes") + assert_dom_equal %(), check_box_tag("admin", 1, true, :disabled => false, :readonly => nil) + assert_dom_equal %(), tag(:input, :type => "checkbox", :checked => false) + assert_dom_equal %(), select_tag("people", "".html_safe, :multiple => true) + assert_dom_equal %(), select_tag("people[]", "".html_safe, :multiple => true) + assert_dom_equal %(), select_tag("people", "".html_safe, :multiple => nil) + end + + def test_stringify_symbol_keys + actual = text_field_tag "title", "Hello!", :id => "admin" + expected = %() + assert_dom_equal expected, actual + end + + def test_submit_tag + assert_dom_equal( + %(), + submit_tag("Save", :disable_with => "Saving...", :onclick => "alert('hello!')") + ) + end + + def test_submit_tag_with_no_onclick_options + assert_dom_equal( + %(), + submit_tag("Save", :disable_with => "Saving...") + ) + end + + def test_submit_tag_with_confirmation + assert_dom_equal( + %(), + submit_tag("Save", :confirm => "Are you sure?") + ) + end + + def test_submit_tag_with_confirmation_and_with_disable_with + assert_dom_equal( + %(), + submit_tag("Save", :disable_with => "Saving...", :confirm => "Are you sure?") + ) + end + + def test_image_submit_tag_with_confirmation + assert_dom_equal( + %(), + image_submit_tag("save.gif", :confirm => "Are you sure?") + ) + end + + def test_pass + assert_equal 1, 1 + end + + def test_field_set_tag_in_erb + __in_erb_template = '' + field_set_tag("Your details") { concat "Hello world!" } + + expected = %(
    Your detailsHello world!
    ) + assert_dom_equal expected, output_buffer + + self.output_buffer = ''.html_safe + field_set_tag { concat "Hello world!" } + + expected = %(
    Hello world!
    ) + assert_dom_equal expected, output_buffer + + self.output_buffer = ''.html_safe + field_set_tag('') { concat "Hello world!" } + + expected = %(
    Hello world!
    ) + assert_dom_equal expected, output_buffer + + self.output_buffer = ''.html_safe + field_set_tag('', :class => 'format') { concat "Hello world!" } + + expected = %(
    Hello world!
    ) + assert_dom_equal expected, output_buffer + end + + def protect_against_forgery? + false + end + + private + + def root_elem(rendered_content) + HTML::Document.new(rendered_content).root.children[0] + end +end diff --git a/vendor/plugins/rails_xss/test/output_escaping_test.rb b/vendor/plugins/rails_xss/test/output_escaping_test.rb new file mode 100644 index 00000000..8b6f8b83 --- /dev/null +++ b/vendor/plugins/rails_xss/test/output_escaping_test.rb @@ -0,0 +1,19 @@ +require 'test_helper' + +class OutputEscapingTest < ActiveSupport::TestCase + + test "escape_html shouldn't die when passed nil" do + assert ERB::Util.h(nil).blank? + end + + test "escapeHTML should escape strings" do + assert_equal "<>"", ERB::Util.h("<>\"") + end + + test "escapeHTML shouldn't touch explicitly safe strings" do + # TODO this seems easier to compose and reason about, but + # this should be verified + assert_equal "<", ERB::Util.h("<".html_safe) + end + +end diff --git a/vendor/plugins/rails_xss/test/output_safety_test.rb b/vendor/plugins/rails_xss/test/output_safety_test.rb new file mode 100644 index 00000000..2e376477 --- /dev/null +++ b/vendor/plugins/rails_xss/test/output_safety_test.rb @@ -0,0 +1,115 @@ +require 'test_helper' + +class OutputSafetyTest < ActiveSupport::TestCase + def setup + @string = "hello" + @object = Class.new(Object) do + def to_s + "other" + end + end.new + end + + test "A string is unsafe by default" do + assert !@string.html_safe? + end + + test "A string can be marked safe" do + string = @string.html_safe + assert string.html_safe? + end + + test "Marking a string safe returns the string" do + assert_equal @string, @string.html_safe + end + + test "A fixnum is safe by default" do + assert 5.html_safe? + end + + test "An object is unsafe by default" do + assert !@object.html_safe? + end + + test "Adding an object to a safe string returns a safe string" do + string = @string.html_safe + string << @object + + assert_equal "helloother", string + assert string.html_safe? + end + + test "Adding a safe string to another safe string returns a safe string" do + @other_string = "other".html_safe + string = @string.html_safe + @combination = @other_string + string + + assert_equal "otherhello", @combination + assert @combination.html_safe? + end + + test "Adding an unsafe string to a safe string escapes it and returns a safe string" do + @other_string = "other".html_safe + @combination = @other_string + "" + @other_combination = @string + "" + + assert_equal "other<foo>", @combination + assert_equal "hello", @other_combination + + assert @combination.html_safe? + assert !@other_combination.html_safe? + end + + test "Concatting safe onto unsafe yields unsafe" do + @other_string = "other" + + string = @string.html_safe + @other_string.concat(string) + assert !@other_string.html_safe? + end + + test "Concatting unsafe onto safe yields escaped safe" do + @other_string = "other".html_safe + string = @other_string.concat("") + assert_equal "other<foo>", string + assert string.html_safe? + end + + test "Concatting safe onto safe yields safe" do + @other_string = "other".html_safe + string = @string.html_safe + + @other_string.concat(string) + assert @other_string.html_safe? + end + + test "Concatting safe onto unsafe with << yields unsafe" do + @other_string = "other" + string = @string.html_safe + + @other_string << string + assert !@other_string.html_safe? + end + + test "Concatting unsafe onto safe with << yields escaped safe" do + @other_string = "other".html_safe + string = @other_string << "" + assert_equal "other<foo>", string + assert string.html_safe? + end + + test "Concatting safe onto safe with << yields safe" do + @other_string = "other".html_safe + string = @string.html_safe + + @other_string << string + assert @other_string.html_safe? + end + + test "Concatting a fixnum to safe always yields safe" do + string = @string.html_safe + string = string.concat(13) + assert_equal "hello".concat(13), string + assert string.html_safe? + end +end diff --git a/vendor/plugins/rails_xss/test/rails_xss_test.rb b/vendor/plugins/rails_xss/test/rails_xss_test.rb index 91f477ed..b6268baf 100644 --- a/vendor/plugins/rails_xss/test/rails_xss_test.rb +++ b/vendor/plugins/rails_xss/test/rails_xss_test.rb @@ -21,114 +21,3 @@ class RailsXssTest < ActiveSupport::TestCase end end end - -class DeprecatedOutputSafetyTest < ActiveSupport::TestCase - def setup - @string = "hello" - end - - test "A string can be marked safe using html_safe!" do - assert_deprecated do - @string.html_safe! - assert @string.html_safe? - end - end - - test "Marking a string safe returns the string using html_safe!" do - assert_deprecated do - assert_equal @string, @string.html_safe! - end - end - - test "Adding a safe string to another safe string returns a safe string using html_safe!" do - assert_deprecated do - @other_string = "other".html_safe! - @string.html_safe! - @combination = @other_string + @string - - assert_equal "otherhello", @combination - assert @combination.html_safe? - end - end - - test "Adding an unsafe string to a safe string returns an unsafe string using html_safe!" do - assert_deprecated do - @other_string = "other".html_safe! - @combination = @other_string + "" - @other_combination = @string + "" - - assert_equal "other", @combination - assert_equal "hello", @other_combination - - assert !@combination.html_safe? - assert !@other_combination.html_safe? - end - end - - test "Concatting safe onto unsafe yields unsafe using html_safe!" do - assert_deprecated do - @other_string = "other" - @string.html_safe! - - @other_string.concat(@string) - assert !@other_string.html_safe? - end - end - - test "Concatting unsafe onto safe yields unsafe using html_safe!" do - assert_deprecated do - @other_string = "other".html_safe! - string = @other_string.concat("") - assert_equal "other", string - assert !string.html_safe? - end - end - - test "Concatting safe onto safe yields safe using html_safe!" do - assert_deprecated do - @other_string = "other".html_safe! - @string.html_safe! - - @other_string.concat(@string) - assert @other_string.html_safe? - end - end - - test "Concatting safe onto unsafe with << yields unsafe using html_safe!" do - assert_deprecated do - @other_string = "other" - @string.html_safe! - - @other_string << @string - assert !@other_string.html_safe? - end - end - - test "Concatting unsafe onto safe with << yields unsafe using html_safe!" do - assert_deprecated do - @other_string = "other".html_safe! - string = @other_string << "" - assert_equal "other", string - assert !string.html_safe? - end - end - - test "Concatting safe onto safe with << yields safe using html_safe!" do - assert_deprecated do - @other_string = "other".html_safe! - @string.html_safe! - - @other_string << @string - assert @other_string.html_safe? - end - end - - test "Concatting a fixnum to safe always yields safe using html_safe!" do - assert_deprecated do - @string.html_safe! - @string.concat(13) - assert_equal "hello".concat(13), @string - assert @string.html_safe? - end - end -end diff --git a/vendor/plugins/rails_xss/test/raw_output_helper_test.rb b/vendor/plugins/rails_xss/test/raw_output_helper_test.rb new file mode 100644 index 00000000..2a67f976 --- /dev/null +++ b/vendor/plugins/rails_xss/test/raw_output_helper_test.rb @@ -0,0 +1,18 @@ +require 'test_helper' + +class RawOutputHelperTest < ActionView::TestCase + + def setup + @string = "hello" + end + + test "raw returns the safe string" do + result = raw(@string) + assert_equal @string, result + assert result.html_safe? + end + + test "raw handles nil values correctly" do + assert_equal "", raw(nil) + end +end diff --git a/vendor/plugins/rails_xss/test/safe_buffer_test.rb b/vendor/plugins/rails_xss/test/safe_buffer_test.rb new file mode 100644 index 00000000..a0a2ecce --- /dev/null +++ b/vendor/plugins/rails_xss/test/safe_buffer_test.rb @@ -0,0 +1,51 @@ +require 'test_helper' + +class SafeBufferTest < ActiveSupport::TestCase + def setup + @buffer = ActiveSupport::SafeBuffer.new + end + + test "Should look like a string" do + assert @buffer.is_a?(String) + assert_equal "", @buffer + end + + test "Should escape a raw string which is passed to them" do + @buffer << "') + assert_equal "

    ", + content_tag(:p, '', nil, false) + end + + def test_tag_honors_html_safe_for_param_values + ['1&2', '1 < 2', '“test“'].each do |escaped| + assert_equal %(), tag('a', :href => escaped.html_safe) + end + end +end diff --git a/vendor/plugins/rails_xss/test/test_helper.rb b/vendor/plugins/rails_xss/test/test_helper.rb index caecd7fd..d9594e44 100644 --- a/vendor/plugins/rails_xss/test/test_helper.rb +++ b/vendor/plugins/rails_xss/test/test_helper.rb @@ -2,4 +2,5 @@ abort 'RAILS_ROOT=/path/to/rails/2.3/app rake test' unless ENV['RAILS_ROOT'] require File.expand_path('config/environment', ENV['RAILS_ROOT']) require File.expand_path('../../init', __FILE__) require 'active_support/test_case' +require 'action_view/test_case' require 'test/unit' diff --git a/vendor/plugins/rails_xss/test/text_helper_test.rb b/vendor/plugins/rails_xss/test/text_helper_test.rb new file mode 100644 index 00000000..b74ae547 --- /dev/null +++ b/vendor/plugins/rails_xss/test/text_helper_test.rb @@ -0,0 +1,30 @@ +require 'test_helper' + +class TextHelperTest < ActionView::TestCase + + def setup + @controller = Class.new do + attr_accessor :request + def url_for(*args) "http://www.example.com" end + end.new + end + + def test_simple_format_with_escaping_html_options + assert_dom_equal(%(

    It's nice to have options.

    ), + simple_format("It's nice to have options.", :class=>"intro")) + end + + def test_simple_format_should_not_escape_safe_content + assert_dom_equal(%(

    This is .

    ), + simple_format('This is .'.html_safe)) + end + + def test_simple_format_escapes_unsafe_content + assert_dom_equal(%(

    This is <script>evil_js</script>.

    ), + simple_format('This is .')) + end + + def test_truncate_should_not_be_html_safe + assert !truncate("Hello World!", :length => 12).html_safe? + end +end diff --git a/vendor/plugins/rails_xss/test/url_for_test.rb b/vendor/plugins/rails_xss/test/url_for_test.rb new file mode 100644 index 00000000..b13451bf --- /dev/null +++ b/vendor/plugins/rails_xss/test/url_for_test.rb @@ -0,0 +1,39 @@ +require 'test_helper' + +class UrlHelperTest < ActionView::TestCase + + def abcd(hash = {}) + hash_for(:a => :b, :c => :d).merge(hash) + end + + def hash_for(opts = {}) + {:controller => "foo", :action => "bar"}.merge(opts) + end + + def test_url_for_does_not_escape_urls_if_explicitly_stated + assert_equal "/foo/bar?a=b&c=d", url_for(abcd(:escape => false)) + end + + def test_link_tag_with_img + link = link_to("".html_safe, "/") + expected = %{    } + assert_dom_equal expected, link + end + + def test_link_to_should_not_escape_content_for_html_safe + link = link_to("Some

    html

    ".html_safe, "/") + expected = %{Some

    html

    } + assert_dom_equal link, expected + end + + def test_link_to_escapes_content_for_non_safe + link = link_to("Some

    html

    ", "/") + expected = %{Some <p>html</p>} + assert_dom_equal link, expected + end + + def test_url_for_escaping_is_safety_aware + assert url_for(abcd(:escape => true)).html_safe?, "escaped urls should be html_safe?" + assert !url_for(abcd(:escape => false)).html_safe?, "non-escaped urls should not be html_safe?" + end +end diff --git a/vendor/rails/actionmailer/Rakefile b/vendor/rails/actionmailer/Rakefile index e7ef2b23..ba85056e 100644 --- a/vendor/rails/actionmailer/Rakefile +++ b/vendor/rails/actionmailer/Rakefile @@ -1,9 +1,9 @@ require 'rubygems' require 'rake' require 'rake/testtask' -require 'rake/rdoctask' +require 'rdoc/task' require 'rake/packagetask' -require 'rake/gempackagetask' +require 'rubygems/package_task' require File.join(File.dirname(__FILE__), 'lib', 'action_mailer', 'version') PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' @@ -29,7 +29,7 @@ Rake::TestTask.new { |t| # Generate the RDoc documentation -Rake::RDocTask.new { |rdoc| +RDoc::Task.new { |rdoc| rdoc.rdoc_dir = 'doc' rdoc.title = "Action Mailer -- Easy email delivery and testing" rdoc.options << '--line-numbers' << '--inline-source' << '-A cattr_accessor=object' @@ -54,19 +54,17 @@ spec = Gem::Specification.new do |s| s.rubyforge_project = "actionmailer" s.homepage = "http://www.rubyonrails.org" - s.add_dependency('actionpack', '= 2.3.11' + PKG_BUILD) + s.add_dependency('actionpack', '= 2.3.12' + PKG_BUILD) - s.has_rdoc = true s.requirements << 'none' s.require_path = 'lib' - s.autorequire = 'action_mailer' s.files = [ "Rakefile", "install.rb", "README", "CHANGELOG", "MIT-LICENSE" ] s.files = s.files + Dir.glob( "lib/**/*" ).delete_if { |item| item.include?( "\.svn" ) } s.files = s.files + Dir.glob( "test/**/*" ).delete_if { |item| item.include?( "\.svn" ) } end -Rake::GemPackageTask.new(spec) do |p| +Gem::PackageTask.new(spec) do |p| p.gem_spec = spec p.need_tar = true p.need_zip = true diff --git a/vendor/rails/actionmailer/lib/action_mailer/version.rb b/vendor/rails/actionmailer/lib/action_mailer/version.rb index da9b986a..ce0b782e 100644 --- a/vendor/rails/actionmailer/lib/action_mailer/version.rb +++ b/vendor/rails/actionmailer/lib/action_mailer/version.rb @@ -2,7 +2,7 @@ module ActionMailer module VERSION #:nodoc: MAJOR = 2 MINOR = 3 - TINY = 11 + TINY = 12 STRING = [MAJOR, MINOR, TINY].join('.') end diff --git a/vendor/rails/actionpack/Rakefile b/vendor/rails/actionpack/Rakefile index 4c7c4b7b..004ed541 100644 --- a/vendor/rails/actionpack/Rakefile +++ b/vendor/rails/actionpack/Rakefile @@ -1,9 +1,9 @@ require 'rubygems' require 'rake' require 'rake/testtask' -require 'rake/rdoctask' +require 'rdoc/task' require 'rake/packagetask' -require 'rake/gempackagetask' +require 'rubygems/package_task' require File.join(File.dirname(__FILE__), 'lib', 'action_pack', 'version') PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' @@ -45,7 +45,7 @@ end # Genereate the RDoc documentation -Rake::RDocTask.new { |rdoc| +RDoc::Task.new { |rdoc| rdoc.rdoc_dir = 'doc' rdoc.title = "Action Pack -- On rails from request to response" rdoc.options << '--line-numbers' << '--inline-source' @@ -76,14 +76,12 @@ spec = Gem::Specification.new do |s| s.rubyforge_project = "actionpack" s.homepage = "http://www.rubyonrails.org" - s.has_rdoc = true s.requirements << 'none' - s.add_dependency('activesupport', '= 2.3.11' + PKG_BUILD) + s.add_dependency('activesupport', '= 2.3.12' + PKG_BUILD) s.add_dependency('rack', '~> 1.1.0') s.require_path = 'lib' - s.autorequire = 'action_controller' s.files = [ "Rakefile", "install.rb", "README", "RUNNING_UNIT_TESTS", "CHANGELOG", "MIT-LICENSE" ] dist_dirs.each do |dir| @@ -91,7 +89,7 @@ spec = Gem::Specification.new do |s| end end -Rake::GemPackageTask.new(spec) do |p| +Gem::PackageTask.new(spec) do |p| p.gem_spec = spec p.need_tar = true p.need_zip = true diff --git a/vendor/rails/actionpack/lib/action_controller/request.rb b/vendor/rails/actionpack/lib/action_controller/request.rb index 98c5e8ce..dc462530 100755 --- a/vendor/rails/actionpack/lib/action_controller/request.rb +++ b/vendor/rails/actionpack/lib/action_controller/request.rb @@ -446,7 +446,9 @@ EOM end def reset_session - session.destroy if session + # session may be a hash, if so, we do not want to call destroy + # fixes issue 6440 + session.destroy if session and session.respond_to?(:destroy) self.session = {} end diff --git a/vendor/rails/actionpack/lib/action_controller/session/abstract_store.rb b/vendor/rails/actionpack/lib/action_controller/session/abstract_store.rb index de0163d2..1d2ee87f 100644 --- a/vendor/rails/actionpack/lib/action_controller/session/abstract_store.rb +++ b/vendor/rails/actionpack/lib/action_controller/session/abstract_store.rb @@ -196,6 +196,7 @@ module ActionController if (request_cookies.nil? || request_cookies[@key] != sid) || options[:expire_after] cookie = {:value => sid} + cookie[:expires] = Time.now + options[:expire_after] if options[:expire_after] Rack::Utils.set_cookie_header!(response[1], @key, cookie.merge(options)) end end diff --git a/vendor/rails/actionpack/lib/action_pack/version.rb b/vendor/rails/actionpack/lib/action_pack/version.rb index 227ef601..010bfcb0 100644 --- a/vendor/rails/actionpack/lib/action_pack/version.rb +++ b/vendor/rails/actionpack/lib/action_pack/version.rb @@ -2,7 +2,7 @@ module ActionPack #:nodoc: module VERSION #:nodoc: MAJOR = 2 MINOR = 3 - TINY = 11 + TINY = 12 STRING = [MAJOR, MINOR, TINY].join('.') end diff --git a/vendor/rails/actionpack/lib/action_view/template_handlers/erb.rb b/vendor/rails/actionpack/lib/action_view/template_handlers/erb.rb index a0131e13..41c88f59 100644 --- a/vendor/rails/actionpack/lib/action_view/template_handlers/erb.rb +++ b/vendor/rails/actionpack/lib/action_view/template_handlers/erb.rb @@ -15,6 +15,7 @@ module ActionView erb = "#{magic}<% __in_erb_template=true %>#{template.source}" if erb.respond_to?(:force_encoding) + erb.force_encoding(template.source.encoding) # erb.force_encoding(template.source.encoding) erb.force_encoding('UTF-8') end diff --git a/vendor/rails/actionpack/test/controller/session/abstract_store_test.rb b/vendor/rails/actionpack/test/controller/session/abstract_store_test.rb new file mode 100644 index 00000000..2df66a2e --- /dev/null +++ b/vendor/rails/actionpack/test/controller/session/abstract_store_test.rb @@ -0,0 +1,64 @@ +require 'abstract_unit' + +# You need to start a memcached server inorder to run these tests +class AbstractStoreTest < ActionController::IntegrationTest + SessionKey = '_myapp_session' + DispatcherApp = ActionController::Dispatcher.new + + class TestController < ActionController::Base + def get_session + session[:test] = 'test' + head :ok + end + end + + def test_expiry_after + with_test_route_set(:expire_after => 5 * 60) do + get 'get_session' + assert_response :success + assert_match /expires=\S+/, headers['Set-Cookie'] + end + end + +protected + + def with_test_route_set(options = {}) + with_routing do |set| + set.draw do |map| + map.with_options :controller => "abstract_store_test/test" do |c| + c.connect "/:action" + end + end + + options = { :key => SessionKey, :secret => 'SessionSecret' }.merge!(options) + @integration_session = open_session(TestStore.new(DispatcherApp, options)) + + yield + end + end + + class TestStore < ActionController::Session::AbstractStore + def initialize(app, options = {}) + super + @_store = Hash.new({}) + end + + private + + def get_session(env, sid) + sid ||= generate_sid + session = @_store[sid] + [sid, session] + end + + def set_session(env, sid, session_data) + @_store[sid] = session_data + end + + def destroy(env) + @_store.delete(sid) + end + end + +end + diff --git a/vendor/rails/actionpack/test/controller/session/cookie_store_test.rb b/vendor/rails/actionpack/test/controller/session/cookie_store_test.rb index b7b922c3..8d02fffa 100644 --- a/vendor/rails/actionpack/test/controller/session/cookie_store_test.rb +++ b/vendor/rails/actionpack/test/controller/session/cookie_store_test.rb @@ -42,6 +42,12 @@ class CookieStoreTest < ActionController::IntegrationTest head :ok end + def call_reset_session_twice + reset_session + reset_session + head :ok + end + def call_reset_session reset_session head :ok @@ -190,6 +196,44 @@ class CookieStoreTest < ActionController::IntegrationTest end end + def test_calling_session_reset_twice + with_test_route_set do + get '/set_session_value' + assert_response :success + session_payload = response.body + assert_equal "_myapp_session=#{response.body}; path=/; HttpOnly", + headers['Set-Cookie'] + + get '/call_reset_session_twice' + assert_response :success + assert_not_equal "", headers['Set-Cookie'] + assert_not_equal session_payload, cookies[SessionKey] + + get '/get_session_value' + assert_response :success + assert_equal 'foo: nil', response.body + end + end + + def test_setting_session_value_after_session_reset + with_test_route_set do + get '/set_session_value' + assert_response :success + session_payload = response.body + assert_equal "_myapp_session=#{response.body}; path=/; HttpOnly", + headers['Set-Cookie'] + + get '/call_reset_session' + assert_response :success + assert_not_equal "", headers['Set-Cookie'] + assert_not_equal session_payload, cookies[SessionKey] + + get '/get_session_value' + assert_response :success + assert_equal 'foo: nil', response.body + end + end + def test_setting_session_value_after_session_reset with_test_route_set do get '/set_session_value' diff --git a/vendor/rails/activemodel/Rakefile b/vendor/rails/activemodel/Rakefile index 4b60f8d6..6e7df2e7 100755 --- a/vendor/rails/activemodel/Rakefile +++ b/vendor/rails/activemodel/Rakefile @@ -1,7 +1,7 @@ #!/usr/bin/env ruby require 'rake' require 'rake/testtask' -require 'rake/rdoctask' +require 'rdoc/task' task :default => :test @@ -13,7 +13,7 @@ Rake::TestTask.new do |t| end # Generate the RDoc documentation -Rake::RDocTask.new do |rdoc| +RDoc::Task.new do |rdoc| rdoc.rdoc_dir = 'doc' rdoc.title = "Active Model" rdoc.options << '--line-numbers' << '--inline-source' << '-A cattr_accessor=object' diff --git a/vendor/rails/activerecord/Rakefile b/vendor/rails/activerecord/Rakefile index 613bda69..dcdff6ba 100644 --- a/vendor/rails/activerecord/Rakefile +++ b/vendor/rails/activerecord/Rakefile @@ -1,9 +1,9 @@ require 'rubygems' require 'rake' require 'rake/testtask' -require 'rake/rdoctask' +require 'rdoc/task' require 'rake/packagetask' -require 'rake/gempackagetask' +require 'rubygems/package_task' require File.join(File.dirname(__FILE__), 'lib', 'active_record', 'version') require File.expand_path(File.dirname(__FILE__)) + "/test/config" @@ -157,7 +157,7 @@ task :rebuild_frontbase_databases => 'frontbase:rebuild_databases' # Generate the RDoc documentation -Rake::RDocTask.new { |rdoc| +RDoc::Task.new { |rdoc| rdoc.rdoc_dir = 'doc' rdoc.title = "Active Record -- Object-relation mapping put on rails" rdoc.options << '--line-numbers' << '--inline-source' << '-A cattr_accessor=object' @@ -192,16 +192,14 @@ spec = Gem::Specification.new do |s| s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "\.svn" ) } end - s.add_dependency('activesupport', '= 2.3.11' + PKG_BUILD) + s.add_dependency('activesupport', '= 2.3.12' + PKG_BUILD) s.files.delete FIXTURES_ROOT + "/fixture_database.sqlite" s.files.delete FIXTURES_ROOT + "/fixture_database_2.sqlite" s.files.delete FIXTURES_ROOT + "/fixture_database.sqlite3" s.files.delete FIXTURES_ROOT + "/fixture_database_2.sqlite3" s.require_path = 'lib' - s.autorequire = 'active_record' - s.has_rdoc = true s.extra_rdoc_files = %w( README ) s.rdoc_options.concat ['--main', 'README'] @@ -211,7 +209,7 @@ spec = Gem::Specification.new do |s| s.rubyforge_project = "activerecord" end -Rake::GemPackageTask.new(spec) do |p| +Gem::PackageTask.new(spec) do |p| p.gem_spec = spec p.need_tar = true p.need_zip = true diff --git a/vendor/rails/activerecord/lib/active_record/associations/association_collection.rb b/vendor/rails/activerecord/lib/active_record/associations/association_collection.rb index 3a602e49..c04110a9 100644 --- a/vendor/rails/activerecord/lib/active_record/associations/association_collection.rb +++ b/vendor/rails/activerecord/lib/active_record/associations/association_collection.rb @@ -381,7 +381,7 @@ module ActiveRecord when /^find_or_create_by_(.*)$/ rest = $1 find_args = pull_finder_args_from(DynamicFinderMatch.match(method).attribute_names, *args) - return send("find_by_#{rest}", find_args) || + return send("find_by_#{rest}", *find_args) || method_missing("create_by_#{rest}", *args, &block) when /^create_by_(.*)$/ return create($1.split('_and_').zip(args).inject({}) { |h,kv| k,v=kv ; h[k] = v ; h }, &block) diff --git a/vendor/rails/activerecord/lib/active_record/base.rb b/vendor/rails/activerecord/lib/active_record/base.rb index ac82cc1b..461007fd 100755 --- a/vendor/rails/activerecord/lib/active_record/base.rb +++ b/vendor/rails/activerecord/lib/active_record/base.rb @@ -1286,7 +1286,7 @@ module ActiveRecord #:nodoc: # Turns the +table_name+ back into a class name following the reverse rules of +table_name+. def class_name(table_name = table_name) # :nodoc: - ActiveSupport::Deprecation.warn("ActiveRecord::Base#class_name is deprecated and will be removed in Rails 2.3.9.", caller) + ActiveSupport::Deprecation.warn("ActiveRecord::Base#class_name is deprecated and will be removed in Rails 3.", caller) # remove any prefix and/or suffix from the table name class_name = table_name[table_name_prefix.length..-(table_name_suffix.length + 1)].camelize diff --git a/vendor/rails/activerecord/lib/active_record/version.rb b/vendor/rails/activerecord/lib/active_record/version.rb index f106e409..db0e08ef 100644 --- a/vendor/rails/activerecord/lib/active_record/version.rb +++ b/vendor/rails/activerecord/lib/active_record/version.rb @@ -2,7 +2,7 @@ module ActiveRecord module VERSION #:nodoc: MAJOR = 2 MINOR = 3 - TINY = 11 + TINY = 12 STRING = [MAJOR, MINOR, TINY].join('.') end diff --git a/vendor/rails/activerecord/test/cases/associations/has_many_associations_test.rb b/vendor/rails/activerecord/test/cases/associations/has_many_associations_test.rb index 3996b847..2f715a46 100644 --- a/vendor/rails/activerecord/test/cases/associations/has_many_associations_test.rb +++ b/vendor/rails/activerecord/test/cases/associations/has_many_associations_test.rb @@ -82,6 +82,15 @@ class HasManyAssociationsTest < ActiveRecord::TestCase assert_equal 4, post.comments.length end + def test_find_or_create_by_with_same_parameters_creates_a_single_record + author = Author.first + assert_difference "Post.count", +1 do + 2.times do + author.posts.find_or_create_by_body_and_title('one', 'two') + end + end + end + def test_find_or_create_by_with_block post = Post.create! :title => 'test_find_or_create_by_with_additional_parameters', :body => 'this is the body' comment = post.comments.find_or_create_by_body('other test comment body') { |comment| comment.type = 'test' } diff --git a/vendor/rails/activesupport/Rakefile b/vendor/rails/activesupport/Rakefile index d5ece391..f874efea 100644 --- a/vendor/rails/activesupport/Rakefile +++ b/vendor/rails/activesupport/Rakefile @@ -1,6 +1,6 @@ require 'rake/testtask' -require 'rake/rdoctask' -require 'rake/gempackagetask' +require 'rdoc/task' +require 'rubygems/package_task' require File.join(File.dirname(__FILE__), 'lib', 'active_support', 'version') @@ -27,7 +27,7 @@ dist_dirs = [ "lib", "test"] # Genereate the RDoc documentation -Rake::RDocTask.new { |rdoc| +RDoc::Task.new { |rdoc| rdoc.rdoc_dir = 'doc' rdoc.title = "Active Support -- Utility classes and standard library extensions from Rails" rdoc.options << '--line-numbers' << '--inline-source' @@ -48,7 +48,6 @@ spec = Gem::Specification.new do |s| s.files = [ "CHANGELOG", "README" ] + Dir.glob( "lib/**/*" ).delete_if { |item| item.include?( "\.svn" ) } s.require_path = 'lib' - s.has_rdoc = true s.author = "David Heinemeier Hansson" s.email = "david@loudthinking.com" @@ -56,7 +55,7 @@ spec = Gem::Specification.new do |s| s.rubyforge_project = "activesupport" end -Rake::GemPackageTask.new(spec) do |p| +Gem::PackageTask.new(spec) do |p| p.gem_spec = spec p.need_tar = true p.need_zip = true diff --git a/vendor/rails/activesupport/lib/active_support/version.rb b/vendor/rails/activesupport/lib/active_support/version.rb index 922d12ff..eee0a635 100644 --- a/vendor/rails/activesupport/lib/active_support/version.rb +++ b/vendor/rails/activesupport/lib/active_support/version.rb @@ -2,7 +2,7 @@ module ActiveSupport module VERSION #:nodoc: MAJOR = 2 MINOR = 3 - TINY = 11 + TINY = 12 STRING = [MAJOR, MINOR, TINY].join('.') end diff --git a/vendor/rails/railties/Rakefile b/vendor/rails/railties/Rakefile index ebf7c68e..01ac7019 100644 --- a/vendor/rails/railties/Rakefile +++ b/vendor/rails/railties/Rakefile @@ -1,7 +1,7 @@ require 'rake' require 'rake/testtask' -require 'rake/rdoctask' -require 'rake/gempackagetask' +require 'rdoc/task' +require 'rubygems/package_task' require 'date' require 'rbconfig' @@ -267,7 +267,7 @@ task :generate_app_doc do system %{cd #{PKG_DESTINATION}; rake doc:app} end -Rake::RDocTask.new { |rdoc| +RDoc::Task.new { |rdoc| rdoc.rdoc_dir = 'doc' rdoc.title = "Railties -- Gluing the Engine to the Rails" rdoc.options << '--line-numbers' << '--inline-source' << '--accessor' << 'cattr_accessor=object' @@ -313,20 +313,18 @@ spec = Gem::Specification.new do |s| EOF s.add_dependency('rake', '>= 0.8.3') - s.add_dependency('activesupport', '= 2.3.11' + PKG_BUILD) - s.add_dependency('activerecord', '= 2.3.11' + PKG_BUILD) - s.add_dependency('actionpack', '= 2.3.11' + PKG_BUILD) - s.add_dependency('actionmailer', '= 2.3.11' + PKG_BUILD) - s.add_dependency('activeresource', '= 2.3.11' + PKG_BUILD) + s.add_dependency('activesupport', '= 2.3.12' + PKG_BUILD) + s.add_dependency('activerecord', '= 2.3.12' + PKG_BUILD) + s.add_dependency('actionpack', '= 2.3.12' + PKG_BUILD) + s.add_dependency('actionmailer', '= 2.3.12' + PKG_BUILD) + s.add_dependency('activeresource', '= 2.3.12' + PKG_BUILD) s.rdoc_options << '--exclude' << '.' - s.has_rdoc = false s.files = PKG_FILES s.require_path = 'lib' s.bindir = "bin" # Use these for applications. s.executables = ["rails"] - s.default_executable = "rails" s.author = "David Heinemeier Hansson" s.email = "david@loudthinking.com" @@ -334,7 +332,7 @@ spec = Gem::Specification.new do |s| s.rubyforge_project = "rails" end -Rake::GemPackageTask.new(spec) do |pkg| +Gem::PackageTask.new(spec) do |pkg| pkg.gem_spec = spec end diff --git a/vendor/rails/railties/lib/rails/gem_dependency.rb b/vendor/rails/railties/lib/rails/gem_dependency.rb index 4a2418c1..1ff608a8 100644 --- a/vendor/rails/railties/lib/rails/gem_dependency.rb +++ b/vendor/rails/railties/lib/rails/gem_dependency.rb @@ -38,7 +38,7 @@ module Rails result = self.new(name, :version => version) spec_filename = File.join(directory_name, '.specification') if load_spec - raise "Missing specification file in #{File.dirname(spec_filename)}. Perhaps you need to do a 'rake gems:refresh_specs'?" unless File.exists?(spec_filename) + raise "Missing specification file in #{File.dirname(spec_filename)}. Perhaps you need to do a 'rake gems:refresh_specs'\?" unless File.exists?(spec_filename) spec = YAML::load_file(spec_filename) result.specification = spec end @@ -72,7 +72,15 @@ module Rails @load_paths_added = @loaded = @frozen = true return end - gem self + + begin + dep = Gem::Dependency.new(name, requirement) + spec = Gem.source_index.find { |_,s| s.satisfies_requirement?(dep) }.last + spec.activate # a way that exists + rescue + gem self.name, self.requirement # < 1.8 unhappy way + end + @spec = Gem.loaded_specs[name] @frozen = @spec.loaded_from.include?(self.class.unpacked_path) if @spec @load_paths_added = true @@ -117,18 +125,6 @@ module Rails @spec = s end - if method_defined?(:requirement) - def requirement - req = super - req unless req == Gem::Requirement.default - end - else - def requirement - req = version_requirements - req unless req == Gem::Requirement.default - end - end - def built? return false unless frozen? @@ -274,9 +270,10 @@ module Rails end def ==(other) - self.name == other.name && self.requirement == other.requirement + Gem::Dependency === other.class && + self.name == other.name && self.requirement == other.requirement end - alias_method :"eql?", :"==" + alias_method :eql?, :"==" private diff --git a/vendor/rails/railties/lib/rails/vendor_gem_source_index.rb b/vendor/rails/railties/lib/rails/vendor_gem_source_index.rb index ea5147a8..9324de98 100644 --- a/vendor/rails/railties/lib/rails/vendor_gem_source_index.rb +++ b/vendor/rails/railties/lib/rails/vendor_gem_source_index.rb @@ -31,7 +31,7 @@ module Rails def refresh! # reload the installed gems - @installed_source_index.refresh! + # HACK: I don't think this is needed: @installed_source_index.refresh! vendor_gems = {} # handle vendor Rails gems - they are identified by having loaded_from set to "" diff --git a/vendor/rails/railties/lib/rails/version.rb b/vendor/rails/railties/lib/rails/version.rb index 2f557201..94df7c10 100644 --- a/vendor/rails/railties/lib/rails/version.rb +++ b/vendor/rails/railties/lib/rails/version.rb @@ -2,7 +2,7 @@ module Rails module VERSION #:nodoc: MAJOR = 2 MINOR = 3 - TINY = 11 + TINY = 12 STRING = [MAJOR, MINOR, TINY].join('.') end diff --git a/vendor/rails/railties/lib/rails_generator/generators/components/plugin/templates/Rakefile b/vendor/rails/railties/lib/rails_generator/generators/components/plugin/templates/Rakefile index 85e8ff18..c56ce947 100644 --- a/vendor/rails/railties/lib/rails_generator/generators/components/plugin/templates/Rakefile +++ b/vendor/rails/railties/lib/rails_generator/generators/components/plugin/templates/Rakefile @@ -1,6 +1,6 @@ require 'rake' require 'rake/testtask' -require 'rake/rdoctask' +require 'rdoc/task' desc 'Default: run unit tests.' task :default => :test @@ -14,7 +14,7 @@ Rake::TestTask.new(:test) do |t| end desc 'Generate documentation for the <%= file_name %> plugin.' -Rake::RDocTask.new(:rdoc) do |rdoc| +RDoc::Task.new(:rdoc) do |rdoc| rdoc.rdoc_dir = 'rdoc' rdoc.title = '<%= class_name %>' rdoc.options << '--line-numbers' << '--inline-source' diff --git a/vendor/rails/railties/lib/tasks/documentation.rake b/vendor/rails/railties/lib/tasks/documentation.rake index 8b41478a..bc7887b7 100644 --- a/vendor/rails/railties/lib/tasks/documentation.rake +++ b/vendor/rails/railties/lib/tasks/documentation.rake @@ -1,6 +1,6 @@ namespace :doc do desc "Generate documentation for the application. Set custom template with TEMPLATE=/path/to/rdoc/template.rb or title with TITLE=\"Custom Title\"" - Rake::RDocTask.new("app") { |rdoc| + RDoc::Task.new("app") { |rdoc| rdoc.rdoc_dir = 'doc/app' rdoc.template = ENV['template'] if ENV['template'] rdoc.title = ENV['title'] || "Rails Application Documentation" @@ -12,7 +12,7 @@ namespace :doc do } desc "Generate documentation for the Rails framework" - Rake::RDocTask.new("rails") { |rdoc| + RDoc::Task.new("rails") { |rdoc| rdoc.rdoc_dir = 'doc/api' rdoc.template = "#{ENV['template']}.rb" if ENV['template'] rdoc.title = "Rails Framework Documentation" diff --git a/vendor/rails/railties/lib/tasks/framework.rake b/vendor/rails/railties/lib/tasks/framework.rake index 5dcdacef..76ee9aff 100644 --- a/vendor/rails/railties/lib/tasks/framework.rake +++ b/vendor/rails/railties/lib/tasks/framework.rake @@ -24,7 +24,7 @@ namespace :rails do begin chdir("vendor/rails") do rails.dependencies.select { |g| deps.include? g.name }.each do |g| - Gem::GemRunner.new.run(["unpack", g.name, "--version", g.version_requirements.to_s]) + Gem::GemRunner.new.run(["unpack", g.name, "--version", g.respond_to?(:requirement) ? g.requirement.to_s : g.version_requirements.to_s]) mv(Dir.glob("#{g.name}*").first, g.name) end