bundler 1.0.0.beta.2 → 1.0.0.beta.3

data/lib/bundler/cli.rb

@@ -9,13 +9,16 @@ module Bundler
   class CLI < Thor
     def initialize(*)
       super
-      Bundler.ui = UI::Shell.new(shell)
+      use_shell = options["no-color"] ? Thor::Shell::Basic.new : shell
+
+      Bundler.ui = UI::Shell.new(use_shell)
       Gem::DefaultUserInteraction.ui = UI::RGProxy.new(Bundler.ui)
     end
 
     check_unknown_options! unless ARGV.include?("exec")
 
     default_task :install
+    class_option "no-color", :type => :boolean, :banner => "Disable colorization in output"
 
     desc "init", "Generates a Gemfile into the current working directory"
     long_desc <<-D
@@ -93,6 +96,8 @@ module Bundler
       "Only output warnings and errors."
     method_option "local", :type => :boolean, :banner =>
       "Do not attempt to fetch gems remotely and use the gem cache instead"
+    method_option "binstubs", :type => :boolean, :banner =>
+      "Generate bin stubs for bundled gems to ./bin"
     def install(path = nil)
       opts = options.dup
       opts[:without] ||= []
@@ -101,6 +106,7 @@ module Bundler
       # Can't use Bundler.settings for this because settings needs gemfile.dirname
       ENV['BUNDLE_GEMFILE'] = opts[:gemfile] if opts[:gemfile]
       Bundler.settings[:path] = path if path
+      Bundler.settings[:bin] = 'bin' if opts[:binstubs]
       Bundler.settings[:disable_shared_gems] = '1' if options["disable-shared-gems"] || path
       Bundler.settings.without = opts[:without]
       Bundler.ui.be_quiet! if opts[:quiet]
@@ -128,7 +134,7 @@ module Bundler
 
       if gems.empty? && sources.empty?
         # We're doing a full update
-        FileUtils.rm Bundler.root.join("Gemfile.lock")
+        FileUtils.rm_f Bundler.root.join("Gemfile.lock")
       else
         Bundler.definition(:gems => gems, :sources => sources)
       end
@@ -230,13 +236,13 @@ module Bundler
 
     desc "open GEM", "Opens the source directory of the given bundled gem"
     def open(name)
-      editor = [ENV['VISUAL'], ENV['EDITOR']].find{|e| !e.nil? && !e.empty? }
+      editor = [ENV['BUNDLER_EDITOR'], ENV['VISUAL'], ENV['EDITOR']].find{|e| !e.nil? && !e.empty? }
       if editor
         command = "#{editor} #{locate_gem(name)}"
         success = system(command)
         Bundler.ui.info "Could not run '#{command}'" unless success
       else
-        Bundler.ui.info("To open a bundled gem, set $EDITOR")
+        Bundler.ui.info("To open a bundled gem, set $EDITOR or $BUNDLER_EDITOR")
       end
     end
 

data/lib/bundler/definition.rb

@@ -70,7 +70,16 @@ module Bundler
     end
 
     def specs
-      @specs ||= resolve.materialize(requested_dependencies)
+      @specs ||= begin
+        specs = resolve.materialize(requested_dependencies)
+
+        unless specs["bundler"].any?
+          bundler = index.search(Gem::Dependency.new('bundler', VERSION)).last
+          specs["bundler"] = bundler if bundler
+        end
+
+        specs
+      end
     end
 
     def missing_specs

data/lib/bundler/dsl.rb

@@ -44,6 +44,10 @@ module Bundler
     end
 
     def gem(name, *args)
+      if name.is_a?(Symbol)
+        raise GemfileError, %{You need to specify gem names as Strings. Use 'gem "#{name.to_s}"' instead.}
+      end
+
       options = Hash === args.last ? args.pop : {}
       version = args.last || ">= 0"
       if group = options[:groups] || options[:group]
@@ -80,6 +84,17 @@ module Bundler
     end
 
     def git(uri, options = {}, source_options = {}, &blk)
+      unless block_given?
+        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"
+        raise DeprecatedError, msg
+      end
+
       source Source::Git.new(_normalize_hash(options).merge("uri" => uri)), source_options, &blk
     end
 
@@ -121,7 +136,7 @@ module Bundler
           message << "and is no longer supported."
         end
         message << "\nSee the README for more information on upgrading from Bundler 0.8."
-        raise DeprecatedMethod, message
+        raise DeprecatedError, message
       end
     end
 
@@ -158,7 +173,7 @@ module Bundler
     def _normalize_options(name, version, opts)
       _normalize_hash(opts)
 
-      invalid_keys = opts.keys - %w(group git path name branch ref tag require)
+      invalid_keys = opts.keys - %w(group git path name branch ref tag require submodules)
       if invalid_keys.any?
         plural = invalid_keys.size > 1
         message = "You passed #{invalid_keys.map{|k| ':'+k }.join(", ")} "
@@ -186,7 +201,7 @@ module Bundler
       ["git", "path"].each do |type|
         if param = opts[type]
           options = _version?(version) ? opts.merge("name" => name, "version" => version) : opts.dup
-          source = send(type, param, options, :prepend => true)
+          source = send(type, param, options, :prepend => true) {}
           opts["source"] = source
         end
       end
@@ -199,13 +214,13 @@ module Bundler
 
     def _deprecated_options(options)
       if options.include?(:require_as)
-        raise DeprecatedOption, "Please replace :require_as with :require"
+        raise DeprecatedError, "Please replace :require_as with :require"
       elsif options.include?(:vendored_at)
-        raise DeprecatedOption, "Please replace :vendored_at with :path"
+        raise DeprecatedError, "Please replace :vendored_at with :path"
       elsif options.include?(:only)
-        raise DeprecatedOption, "Please replace :only with :group"
+        raise DeprecatedError, "Please replace :only with :group"
       elsif options.include?(:except)
-        raise DeprecatedOption, "The :except option is no longer supported"
+        raise DeprecatedError, "The :except option is no longer supported"
       end
     end
   end

data/lib/bundler/environment.rb

@@ -7,6 +7,10 @@ module Bundler
       @definition = definition
     end
 
+    def inspect
+      @definition.to_lock.inspect
+    end
+
     # TODO: Remove this method. It's used in cli.rb still
     def index
       @definition.index
@@ -29,6 +33,9 @@ module Bundler
     end
 
     def lock
+      env_file = root.join('.bundle/environment.rb')
+      env_file.rmtree if env_file.exist?
+
       File.open(root.join('Gemfile.lock'), 'w') do |f|
         f.puts @definition.to_lock
       end

data/lib/bundler/installer.rb

@@ -1,3 +1,4 @@
+require 'erb'
 require 'rubygems/dependency_installer'
 
 module Bundler
@@ -21,7 +22,7 @@ module Bundler
         @definition.resolve_remotely!
 
       # Ensure that BUNDLE_PATH exists
-      FileUtils.mkdir_p(Bundler.bundle_path)
+      Bundler.mkdir_p(Bundler.bundle_path)
 
       # Must install gems in the order that the resolver provides
       # as dependencies might actually affect the installation of
@@ -36,7 +37,7 @@ module Bundler
 
         spec.source.install(spec)
         Bundler.ui.info ""
-        generate_bundler_executable_stubs(spec)
+        generate_bundler_executable_stubs(spec) if Bundler.settings[:bin]
         FileUtils.rm_rf(Bundler.tmp)
       end
 
@@ -46,13 +47,16 @@ module Bundler
   private
 
     def generate_bundler_executable_stubs(spec)
+      bin_path = Bundler.bin_path
+      template = File.read(File.expand_path('../templates/Executable', __FILE__))
+      relative_gemfile_path = Bundler.default_gemfile.relative_path_from(bin_path)
+
       spec.executables.each do |executable|
         next if executable == "bundle"
-        File.open "#{Bundler.bin_path}/#{executable}", 'w', 0755 do |f|
-          f.puts File.read(File.expand_path('../templates/Executable', __FILE__))
+        File.open "#{bin_path}/#{executable}", 'w', 0755 do |f|
+          f.puts ERB.new(template, nil, '-').result(binding)
         end
       end
     end
-
   end
 end

data/lib/bundler/lazy_specification.rb

@@ -52,6 +52,10 @@ module Bundler
       super || @specification.respond_to?(*args)
     end
 
+    def to_s
+      "#{name} (#{version})"
+    end
+
   private
 
     def method_missing(method, *args, &blk)

data/lib/bundler/lockfile_parser.rb

@@ -39,11 +39,17 @@ module Bundler
         @current_source = TYPES[@type].from_lock(@opts)
         @sources << @current_source
       when /^  ([a-z]+): (.*)$/i
-        if @opts[$1]
-          @opts[$1] = Array(@opts[$1])
-          @opts[$1] << $2
+        value = $2
+        value = true if value == "true"
+        value = false if value == "false"
+
+        key = $1
+
+        if @opts[key]
+          @opts[key] = Array(@opts[key])
+          @opts[key] << value
         else
-          @opts[$1] = $2
+          @opts[key] = value
         end
       else
         parse_spec(line)

data/lib/bundler/resolver.rb

@@ -87,6 +87,10 @@ module Bundler
         @specs[platform]
       end
 
+      def to_s
+        "#{name} (#{version})"
+      end
+
     private
 
       def __dependencies
@@ -187,12 +191,13 @@ module Bundler
 
       # Check if the gem has already been activated, if it has, we will make sure
       # that the currently activated gem satisfies the requirement.
-      if existing = activated[current.name] or current.name == 'bundler'
+      existing = activated[current.name]
+      if existing || current.name == 'bundler'
         # Force the current
         if current.name == 'bundler' && !existing
-          # TODO: handle existing still == nil
           existing = search(DepProxy.new(Gem::Dependency.new('bundler', VERSION), Gem::Platform::RUBY)).first
-          activated[current.name] = existing
+          activated['bundler'] = existing
+          raise GemNotFound, %Q{Bundler could not find gem "bundler" (#{VERSION})} unless existing
         end
 
         if current.requirement.satisfied_by?(existing.version)
@@ -267,13 +272,10 @@ module Bundler
             raise GemNotFound, message
           else
             if @missing_gems[current] >= 5
-              msg = "When trying to resolve #{current.required_by.last}, \n" \
-                    "Bundler could not find its dependency \n" \
-                    "#{current} in any source\n"
-
-              raise Bundler::GemNotFound, msg
+              message =  "Bundler could not find find gem #{current.required_by.last},"
+              message << "which is required by gem #{current}."
+              raise GemNotFound, message
             end
-
             @missing_gems[current] += 1
 
             debug { "    Could not find #{current} by #{current.required_by.last}" }
@@ -342,7 +344,7 @@ module Bundler
 
     def search(dep)
       if base = @base[dep.name] and base.any?
-        d = Gem::Dependency.new(base.first.name, base.first.version)
+        d = Gem::Dependency.new(base.first.name, *[dep.requirement.as_list, base.first.version].flatten)
       else
         d = dep.dep
       end
@@ -365,32 +367,80 @@ module Bundler
       end
     end
 
+    def clean_req(req)
+      if req.to_s.include?(">= 0")
+        req.to_s.gsub(/ \(.*?\)$/, '')
+      else
+        req.to_s.gsub(/\, (runtime|development)\)$/, ')')
+      end
+    end
+
     def version_conflict
-      VersionConflict.new(
-        errors.keys,
-        "No compatible versions could be found for required dependencies:\n  #{error_message}")
+      VersionConflict.new(errors.keys, error_message)
+    end
+
+    # For a given conflicted requirement, print out what exactly went wrong
+    def gem_message(requirement)
+      m = ""
+
+      # A requirement that is required by itself is actually in the Gemfile, and does
+      # not "depend on" itself
+      if requirement.required_by.first && requirement.required_by.first.name != requirement.name
+        m << "    #{clean_req(requirement.required_by.first)} depends on\n"
+        m << "      #{clean_req(requirement)}\n"
+      else
+        m << "    #{clean_req(requirement)}\n"
+      end
+      m << "\n"
     end
 
     def error_message
       output = errors.inject("") do |o, (conflict, (origin, requirement))|
+
+        # origin is the SpecSet of specs from the Gemfile that is conflicted with
         if origin
-          o << "  Conflict on: #{conflict.inspect}:\n"
-          if origin.respond_to?(:required_by) && required_by = origin.required_by.first
-            o << "    * #{conflict} (#{origin.version}) activated by #{required_by}\n"
-          else
-            o << "    * #{conflict} (#{origin.version}) in Gemfile.lock\n"
+
+          o << %{Bundler could not find compatible versions for gem "#{origin.name}":\n}
+          o << "  In Gemfile:\n"
+
+          o << gem_message(requirement)
+
+          # If the origin is a LockfileParser, it does not respond_to :required_by
+          unless origin.respond_to?(:required_by) && required_by = origin.required_by.first
+            o << "  In snapshot (Gemfile.lock):\n"
           end
-          o << "    * #{requirement} required"
-          if requirement.required_by.first
-            o << " by #{requirement.required_by.first}\n"
+
+          o << gem_message(origin)
+
+        # origin is nil if the required gem and version cannot be found in any of
+        # the specified sources
+        else
+
+          # if the gem cannot be found because of a version conflict between lockfile and gemfile,
+          # print a useful error that suggests running `bundle update`, which may fix things
+          #
+          # @base is a SpecSet of the gems in the lockfile
+          # conflict is the name of the gem that could not be found
+          if locked = @base[conflict].first
+            o << "Bundler could not find compatible versions for gem #{conflict.inspect}:\n"
+            o << "  In snapshot (Gemfile.lock):\n"
+            o << "    #{clean_req(locked)}\n\n"
+
+            o << "  In Gemfile:\n"
+            o << gem_message(requirement)
+            o << "Running `bundle update` will rebuild your snapshot from scratch, using only\n"
+            o << "the gems in your Gemfile, which may resolve the conflict.\n"
+
+          # the rest of the time, the gem cannot be found because it does not exist in the known sources
           else
-            o << " in Gemfile\n"
+            if requirement.required_by.first
+              o << "Could not find gem '#{clean_req(requirement)}', required by '#{clean_req(requirement.required_by.first)}', in any of the sources\n"
+            else
+              o << "Could not find gem '#{clean_req(requirement)} in any of the sources\n"
+            end
           end
-        else
-          o << "  #{requirement} not found in any of the sources\n"
-          o << "      required by #{requirement.required_by.first}\n"
+
         end
-        o << "    All possible versions of origin requirements conflict."
       end
     end
   end

data/lib/bundler/rubygems_ext.rbc

@@ -0,0 +1,2921 @@
+!RBIX
+1993355899764403924
+x
+M
+1
+n
+n
+x
+10
+__script__
+i
+132
+5
+7
+0
+64
+47
+49
+1
+1
+15
+26
+93
+0
+15
+29
+24
+0
+7
+2
+98
+3
+1
+30
+8
+30
+25
+92
+0
+27
+8
+35
+15
+7
+4
+8
+36
+1
+9
+41
+1
+8
+58
+5
+7
+5
+64
+47
+49
+1
+1
+15
+5
+7
+6
+64
+47
+49
+1
+1
+15
+26
+93
+1
+15
+29
+78
+0
+45
+2
+7
+7
+8
+3
+98
+9
+3
+30
+8
+84
+25
+92
+1
+27
+8
+89
+15
+7
+4
+8
+90
+1
+9
+102
+45
+2
+10
+43
+8
+49
+11
+0
+8
+103
+1
+15
+99
+7
+2
+65
+49
+12
+2
+13
+99
+12
+7
+13
+12
+7
+14
+12
+65
+12
+49
+15
+4
+15
+49
+13
+0
+15
+2
+11
+I
+8
+I
+0
+I
+0
+I
+0
+n
+p
+16
+s
+8
+pathname
+x
+7
+require
+x
+3
+Gem
+x
+16
+vm_const_defined
+s
+8
+constant
+s
+8
+rubygems
+s
+22
+rubygems/specification
+n
+x
+11
+QuickLoader
+x
+22
+vm_const_defined_under
+n
+x
+26
+load_full_rubygems_library
+x
+11
+open_module
+x
+15
+__module_init__
+M
+1
+n
+n
+x
+3
+Gem
+i
+67
+5
+66
+45
+0
+1
+56
+2
+50
+3
+0
+38
+4
+15
+99
+7
+5
+1
+65
+49
+6
+3
+13
+99
+12
+7
+7
+12
+7
+8
+12
+65
+12
+49
+9
+4
+15
+49
+7
+0
+15
+99
+7
+10
+1
+65
+49
+6
+3
+13
+99
+12
+7
+7
+12
+7
+11
+12
+65
+12
+49
+9
+4
+15
+49
+7
+0
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+12
+x
+4
+Hash
+n
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+3
+Gem
+i
+25
+58
+36
+37
+19
+0
+15
+37
+19
+1
+15
+15
+20
+0
+20
+1
+35
+0
+13
+18
+3
+49
+0
+2
+15
+11
+I
+7
+I
+2
+I
+2
+I
+2
+n
+p
+1
+x
+3
+[]=
+p
+3
+I
+0
+I
+d
+I
+19
+x
+54
+/Users/wycats/Code/bundler/lib/bundler/rubygems_ext.rb
+p
+2
+x
+1
+h
+x
+1
+k
+x
+3
+new
+x
+14
+@loaded_stacks
+x
+13
+Specification
+x
+10
+open_class
+x
+14
+__class_init__
+M
+1
+n
+n
+x
+13
+Specification
+i
+178
+5
+66
+5
+7
+0
+7
+1
+7
+2
+47
+49
+3
+3
+15
+5
+7
+4
+7
+5
+47
+49
+6
+2
+15
+5
+7
+7
+7
+8
+47
+49
+6
+2
+15
+99
+7
+5
+7
+9
+65
+67
+49
+10
+0
+49
+11
+4
+15
+99
+7
+8
+7
+12
+65
+67
+49
+10
+0
+49
+11
+4
+15
+99
+7
+13
+7
+14
+65
+67
+49
+10
+0
+49
+11
+4
+15
+99
+7
+15
+7
+16
+65
+67
+49
+10
+0
+49
+11
+4
+15
+99
+7
+17
+7
+18
+65
+67
+49
+10
+0
+49
+11
+4
+15
+99
+7
+19
+7
+20
+65
+67
+49
+10
+0
+49
+11
+4
+15
+99
+7
+21
+7
+22
+65
+67
+49
+10
+0
+49
+11
+4
+15
+99
+7
+23
+7
+24
+65
+67
+49
+10
+0
+49
+11
+4
+15
+99
+7
+25
+7
+26
+65
+67
+49
+10
+0
+49
+11
+4
+15
+5
+48
+27
+15
+99
+7
+28
+7
+29
+65
+67
+49
+10
+0
+49
+11
+4
+11
+I
+5
+I
+0
+I
+0
+I
+0
+n
+p
+30
+x
+6
+source
+x
+8
+location
+x
+20
+relative_loaded_from
+x
+13
+attr_accessor
+x
+16
+rg_full_gem_path
+x
+13
+full_gem_path
+x
+12
+alias_method
+x
+14
+rg_loaded_from
+x
+11
+loaded_from
+M
+1
+n
+n
+x
+13
+full_gem_path
+i
+55
+5
+48
+0
+7
+1
+49
+2
+1
+9
+51
+45
+3
+4
+13
+71
+5
+47
+9
+34
+47
+49
+6
+0
+13
+5
+48
+7
+47
+49
+8
+1
+15
+8
+40
+5
+48
+7
+49
+5
+1
+49
+9
+0
+49
+10
+0
+49
+11
+0
+8
+54
+5
+48
+12
+11
+I
+3
+I
+0
+I
+0
+I
+0
+n
+p
+13
+x
+6
+source
+x
+4
+path
+x
+11
+respond_to?
+x
+8
+Pathname
+n
+x
+3
+new
+x
+8
+allocate
+x
+11
+loaded_from
+x
+10
+initialize
+x
+7
+dirname
+x
+11
+expand_path
+x
+4
+to_s
+x
+16
+rg_full_gem_path
+p
+9
+I
+0
+I
+15
+I
+0
+I
+16
+I
+a
+I
+17
+I
+33
+I
+18
+I
+37
+x
+54
+/Users/wycats/Code/bundler/lib/bundler/rubygems_ext.rb
+p
+0
+x
+17
+method_visibility
+x
+15
+add_defn_method
+M
+1
+n
+n
+x
+11
+loaded_from
+i
+26
+5
+48
+0
+9
+22
+5
+48
+1
+49
+2
+0
+5
+48
+0
+49
+3
+1
+49
+4
+0
+8
+25
+5
+48
+5
+11
+I
+2
+I
+0
+I
+0
+I
+0
+n
+p
+6
+x
+20
+relative_loaded_from
+x
+6
+source
+x
+4
+path
+x
+4
+join
+x
+4
+to_s
+x
+14
+rg_loaded_from
+p
+9
+I
+0
+I
+1b
+I
+0
+I
+1c
+I
+5
+I
+1d
+I
+16
+I
+1e
+I
+1a
+x
+54
+/Users/wycats/Code/bundler/lib/bundler/rubygems_ext.rb
+p
+0
+x
+10
+load_paths
+M
+1
+n
+n
+x
+10
+load_paths
+i
+9
+5
+48
+0
+56
+1
+50
+2
+0
+11
+I
+2
+I
+0
+I
+0
+I
+0
+n
+p
+3
+x
+13
+require_paths
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+10
+load_paths
+i
+30
+57
+19
+0
+15
+20
+0
+5
+48
+0
+49
+1
+1
+9
+18
+20
+0
+8
+29
+45
+2
+3
+5
+48
+0
+20
+0
+49
+4
+2
+11
+I
+5
+I
+1
+I
+1
+I
+1
+n
+p
+5
+x
+13
+full_gem_path
+x
+8
+include?
+x
+4
+File
+n
+x
+4
+join
+p
+9
+I
+0
+I
+22
+I
+4
+I
+23
+I
+e
+I
+24
+I
+12
+I
+26
+I
+1e
+x
+54
+/Users/wycats/Code/bundler/lib/bundler/rubygems_ext.rb
+p
+1
+x
+12
+require_path
+x
+3
+map
+p
+5
+I
+0
+I
+21
+I
+0
+I
+22
+I
+9
+x
+54
+/Users/wycats/Code/bundler/lib/bundler/rubygems_ext.rb
+p
+0
+x
+6
+groups
+M
+1
+n
+n
+x
+6
+groups
+i
+11
+39
+0
+13
+10
+10
+15
+35
+0
+38
+0
+11
+I
+2
+I
+0
+I
+0
+I
+0
+n
+p
+1
+x
+7
+@groups
+p
+5
+I
+0
+I
+2b
+I
+0
+I
+2c
+I
+b
+x
+54
+/Users/wycats/Code/bundler/lib/bundler/rubygems_ext.rb
+p
+0
+x
+11
+git_version
+M
+1
+n
+n
+x
+11
+git_version
+i
+66
+39
+0
+13
+9
+24
+15
+45
+1
+2
+45
+1
+3
+5
+48
+4
+7
+5
+64
+49
+6
+2
+49
+7
+1
+9
+64
+45
+8
+9
+5
+48
+4
+56
+10
+50
+11
+1
+19
+0
+15
+7
+12
+20
+0
+44
+43
+13
+78
+4
+6
+49
+14
+2
+49
+15
+1
+47
+49
+16
+0
+63
+2
+8
+65
+1
+11
+I
+6
+I
+1
+I
+0
+I
+0
+n
+p
+17
+x
+12
+@loaded_from
+x
+4
+File
+n
+n
+x
+13
+full_gem_path
+s
+4
+.git
+x
+4
+join
+x
+6
+exist?
+x
+3
+Dir
+n
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+11
+git_version
+i
+12
+5
+7
+0
+64
+47
+49
+1
+1
+49
+2
+0
+11
+I
+3
+I
+0
+I
+0
+I
+0
+I
+-2
+p
+3
+s
+18
+git rev-parse HEAD
+x
+1
+`
+x
+5
+strip
+p
+3
+I
+0
+I
+31
+I
+c
+x
+54
+/Users/wycats/Code/bundler/lib/bundler/rubygems_ext.rb
+p
+0
+x
+5
+chdir
+s
+1
+ 
+x
+5
+Range
+x
+3
+new
+x
+2
+[]
+x
+4
+to_s
+p
+11
+I
+0
+I
+2f
+I
+0
+I
+30
+I
+1a
+I
+31
+I
+28
+I
+32
+I
+40
+I
+30
+I
+42
+x
+54
+/Users/wycats/Code/bundler/lib/bundler/rubygems_ext.rb
+p
+1
+x
+3
+sha
+x
+7
+to_lock
+M
+1
+n
+n
+x
+7
+to_lock
+i
+42
+7
+0
+5
+48
+1
+47
+49
+2
+0
+7
+3
+5
+48
+4
+47
+49
+2
+0
+7
+5
+63
+5
+19
+0
+15
+5
+48
+6
+56
+7
+50
+8
+0
+56
+9
+50
+10
+0
+15
+20
+0
+11
+I
+6
+I
+1
+I
+0
+I
+0
+n
+p
+11
+s
+4
+    
+x
+4
+name
+x
+4
+to_s
+s
+2
+ (
+x
+7
+version
+s
+2
+)
+
+x
+12
+dependencies
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+7
+to_lock
+i
+10
+57
+19
+0
+15
+20
+0
+49
+0
+0
+11
+I
+3
+I
+1
+I
+1
+I
+1
+n
+p
+1
+x
+4
+name
+p
+3
+I
+0
+I
+39
+I
+a
+x
+54
+/Users/wycats/Code/bundler/lib/bundler/rubygems_ext.rb
+p
+1
+x
+1
+d
+x
+7
+sort_by
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+7
+to_lock
+i
+43
+57
+19
+0
+15
+20
+0
+49
+0
+0
+7
+1
+83
+2
+9
+19
+1
+11
+8
+20
+1
+15
+21
+1
+0
+7
+3
+20
+0
+49
+4
+0
+47
+49
+5
+0
+7
+6
+63
+3
+49
+7
+1
+11
+I
+6
+I
+1
+I
+1
+I
+1
+n
+p
+8
+x
+4
+type
+x
+11
+development
+x
+2
+==
+s
+4
+    
+x
+7
+to_lock
+x
+4
+to_s
+s
+1
+
+
+x
+2
+<<
+p
+7
+I
+0
+I
+39
+I
+4
+I
+3a
+I
+15
+I
+3b
+I
+2b
+x
+54
+/Users/wycats/Code/bundler/lib/bundler/rubygems_ext.rb
+p
+1
+x
+3
+dep
+x
+4
+each
+p
+9
+I
+0
+I
+36
+I
+0
+I
+37
+I
+19
+I
+39
+I
+27
+I
+3e
+I
+2a
+x
+54
+/Users/wycats/Code/bundler/lib/bundler/rubygems_ext.rb
+p
+1
+x
+3
+out
+x
+10
+to_gemfile
+M
+1
+n
+n
+x
+10
+to_gemfile
+i
+67
+23
+0
+10
+8
+1
+19
+0
+15
+7
+0
+64
+19
+1
+15
+20
+1
+5
+5
+48
+1
+47
+49
+2
+1
+49
+3
+1
+15
+5
+48
+4
+49
+5
+0
+9
+39
+1
+8
+63
+20
+1
+7
+6
+64
+49
+3
+1
+15
+20
+1
+5
+5
+48
+4
+7
+7
+47
+49
+2
+2
+49
+3
+1
+15
+20
+1
+11
+I
+6
+I
+2
+I
+0
+I
+1
+n
+p
+8
+s
+18
+source :gemcutter
+
+x
+27
+nondevelopment_dependencies
+x
+23
+dependencies_to_gemfile
+x
+2
+<<
+x
+24
+development_dependencies
+x
+6
+empty?
+s
+1
+
+
+x
+11
+development
+p
+15
+I
+0
+I
+41
+I
+8
+I
+42
+I
+e
+I
+43
+I
+1c
+I
+44
+I
+27
+I
+45
+I
+30
+I
+46
+I
+40
+I
+48
+I
+43
+x
+54
+/Users/wycats/Code/bundler/lib/bundler/rubygems_ext.rb
+p
+2
+x
+4
+path
+x
+7
+gemfile
+x
+27
+nondevelopment_dependencies
+M
+1
+n
+n
+x
+27
+nondevelopment_dependencies
+i
+9
+5
+48
+0
+5
+48
+1
+82
+2
+11
+I
+2
+I
+0
+I
+0
+I
+0
+n
+p
+3
+x
+12
+dependencies
+x
+24
+development_dependencies
+x
+1
+-
+p
+5
+I
+0
+I
+4b
+I
+0
+I
+4c
+I
+9
+x
+54
+/Users/wycats/Code/bundler/lib/bundler/rubygems_ext.rb
+p
+0
+x
+24
+add_bundler_dependencies
+M
+1
+n
+n
+x
+24
+add_bundler_dependencies
+i
+32
+20
+0
+49
+0
+0
+9
+15
+7
+1
+35
+1
+19
+0
+8
+16
+1
+15
+45
+2
+3
+49
+4
+0
+49
+5
+0
+56
+6
+50
+7
+0
+11
+I
+3
+I
+1
+I
+0
+I
+0
+I
+0
+p
+8
+x
+6
+empty?
+x
+7
+default
+x
+7
+Bundler
+n
+x
+10
+definition
+x
+12
+dependencies
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+24
+add_bundler_dependencies
+i
+72
+57
+19
+0
+15
+20
+0
+49
+0
+0
+7
+1
+49
+2
+1
+9
+35
+5
+20
+0
+49
+3
+0
+20
+0
+49
+4
+0
+49
+5
+0
+49
+6
+2
+8
+71
+20
+0
+49
+0
+0
+21
+1
+0
+49
+7
+1
+49
+8
+0
+9
+70
+5
+20
+0
+49
+3
+0
+20
+0
+49
+4
+0
+49
+5
+0
+49
+9
+2
+8
+71
+1
+11
+I
+5
+I
+1
+I
+1
+I
+1
+n
+p
+10
+x
+6
+groups
+x
+11
+development
+x
+8
+include?
+x
+4
+name
+x
+11
+requirement
+x
+4
+to_s
+x
+26
+add_development_dependency
+x
+1
+&
+x
+4
+any?
+x
+14
+add_dependency
+p
+13
+I
+0
+I
+51
+I
+4
+I
+52
+I
+10
+I
+53
+I
+23
+I
+54
+I
+33
+I
+55
+I
+46
+I
+54
+I
+48
+x
+54
+/Users/wycats/Code/bundler/lib/bundler/rubygems_ext.rb
+p
+1
+x
+3
+dep
+x
+4
+each
+p
+7
+I
+0
+I
+4f
+I
+0
+I
+50
+I
+11
+I
+51
+I
+20
+x
+54
+/Users/wycats/Code/bundler/lib/bundler/rubygems_ext.rb
+p
+1
+x
+6
+groups
+x
+7
+private
+x
+23
+dependencies_to_gemfile
+M
+1
+n
+n
+x
+23
+dependencies_to_gemfile
+i
+76
+23
+1
+10
+8
+1
+19
+1
+15
+7
+0
+64
+19
+2
+15
+20
+0
+49
+1
+0
+9
+71
+20
+1
+9
+44
+20
+2
+7
+2
+20
+1
+47
+49
+3
+0
+7
+4
+63
+3
+49
+5
+1
+8
+45
+1
+15
+20
+0
+56
+6
+50
+7
+0
+15
+20
+1
+9
+68
+20
+2
+7
+8
+64
+49
+5
+1
+8
+69
+1
+8
+72
+1
+15
+20
+2
+11
+I
+7
+I
+3
+I
+1
+I
+2
+n
+p
+9
+s
+0
+
+x
+4
+any?
+s
+7
+group :
+x
+4
+to_s
+s
+4
+ do
+
+x
+2
+<<
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+23
+dependencies_to_gemfile
+i
+91
+57
+19
+0
+15
+21
+1
+1
+9
+20
+21
+1
+2
+7
+0
+64
+49
+1
+1
+8
+21
+1
+15
+21
+1
+2
+7
+2
+20
+0
+49
+3
+0
+47
+49
+4
+0
+7
+5
+63
+3
+49
+1
+1
+15
+20
+0
+49
+6
+0
+49
+7
+0
+19
+1
+15
+20
+1
+9
+79
+21
+1
+2
+7
+8
+20
+1
+47
+49
+4
+0
+7
+5
+63
+3
+49
+1
+1
+8
+80
+1
+15
+21
+1
+2
+7
+9
+64
+49
+1
+1
+11
+I
+7
+I
+2
+I
+1
+I
+1
+n
+p
+10
+s
+2
+  
+x
+2
+<<
+s
+5
+gem "
+x
+4
+name
+x
+4
+to_s
+s
+1
+"
+x
+17
+requirements_list
+x
+5
+first
+s
+3
+, "
+s
+1
+
+
+p
+13
+I
+0
+I
+60
+I
+4
+I
+61
+I
+16
+I
+62
+I
+2c
+I
+63
+I
+37
+I
+64
+I
+51
+I
+65
+I
+5b
+x
+54
+/Users/wycats/Code/bundler/lib/bundler/rubygems_ext.rb
+p
+2
+x
+10
+dependency
+x
+3
+req
+x
+4
+each
+s
+4
+end
+
+p
+17
+I
+0
+I
+5c
+I
+8
+I
+5d
+I
+e
+I
+5e
+I
+15
+I
+5f
+I
+2e
+I
+60
+I
+36
+I
+67
+I
+47
+I
+5e
+I
+49
+I
+69
+I
+4c
+x
+54
+/Users/wycats/Code/bundler/lib/bundler/rubygems_ext.rb
+p
+3
+x
+12
+dependencies
+x
+5
+group
+x
+7
+gemfile
+p
+29
+I
+2
+I
+10
+I
+e
+I
+12
+I
+18
+I
+13
+I
+22
+I
+15
+I
+30
+I
+1b
+I
+3e
+I
+21
+I
+4c
+I
+2b
+I
+5a
+I
+2f
+I
+68
+I
+36
+I
+76
+I
+41
+I
+84
+I
+4b
+I
+92
+I
+4f
+I
+a0
+I
+5a
+I
+a4
+I
+5c
+I
+b2
+x
+54
+/Users/wycats/Code/bundler/lib/bundler/rubygems_ext.rb
+p
+0
+x
+13
+attach_method
+x
+10
+Dependency
+M
+1
+n
+n
+x
+10
+Dependency
+i
+50
+5
+66
+5
+7
+0
+7
+1
+47
+49
+2
+2
+15
+65
+7
+3
+7
+4
+47
+49
+5
+2
+15
+99
+7
+6
+7
+7
+65
+67
+49
+8
+0
+49
+9
+4
+15
+99
+7
+10
+7
+11
+65
+67
+49
+8
+0
+49
+9
+4
+11
+I
+5
+I
+0
+I
+0
+I
+0
+n
+p
+12
+x
+6
+source
+x
+6
+groups
+x
+13
+attr_accessor
+x
+4
+eql?
+x
+2
+==
+x
+12
+alias_method
+x
+18
+to_yaml_properties
+M
+1
+n
+n
+x
+18
+to_yaml_properties
+i
+9
+5
+48
+0
+56
+1
+50
+2
+0
+11
+I
+2
+I
+0
+I
+0
+I
+0
+n
+p
+3
+x
+18
+instance_variables
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+18
+to_yaml_properties
+i
+21
+57
+19
+0
+15
+7
+0
+64
+7
+1
+64
+35
+2
+20
+0
+49
+2
+0
+49
+3
+1
+11
+I
+4
+I
+1
+I
+1
+I
+1
+n
+p
+4
+s
+7
+@source
+s
+7
+@groups
+x
+4
+to_s
+x
+8
+include?
+p
+3
+I
+0
+I
+74
+I
+15
+x
+54
+/Users/wycats/Code/bundler/lib/bundler/rubygems_ext.rb
+p
+1
+x
+1
+p
+x
+6
+reject
+p
+5
+I
+0
+I
+73
+I
+0
+I
+74
+I
+9
+x
+54
+/Users/wycats/Code/bundler/lib/bundler/rubygems_ext.rb
+p
+0
+x
+17
+method_visibility
+x
+15
+add_defn_method
+x
+7
+to_lock
+M
+1
+n
+n
+x
+7
+to_lock
+i
+57
+7
+0
+5
+48
+1
+47
+49
+2
+0
+63
+2
+19
+0
+15
+5
+48
+3
+45
+4
+5
+43
+6
+49
+7
+0
+83
+8
+9
+32
+1
+8
+53
+20
+0
+7
+9
+5
+48
+3
+49
+2
+0
+47
+49
+2
+0
+7
+10
+63
+3
+49
+11
+1
+15
+20
+0
+11
+I
+5
+I
+1
+I
+0
+I
+0
+n
+p
+12
+s
+2
+  
+x
+4
+name
+x
+4
+to_s
+x
+11
+requirement
+x
+3
+Gem
+n
+x
+11
+Requirement
+x
+7
+default
+x
+2
+==
+s
+2
+ (
+s
+1
+)
+x
+2
+<<
+p
+11
+I
+0
+I
+77
+I
+0
+I
+78
+I
+e
+I
+79
+I
+20
+I
+7a
+I
+36
+I
+7c
+I
+39
+x
+54
+/Users/wycats/Code/bundler/lib/bundler/rubygems_ext.rb
+p
+1
+x
+3
+out
+p
+9
+I
+2
+I
+6f
+I
+c
+I
+71
+I
+16
+I
+73
+I
+24
+I
+77
+I
+32
+x
+54
+/Users/wycats/Code/bundler/lib/bundler/rubygems_ext.rb
+p
+0
+p
+7
+I
+2
+I
+d
+I
+d
+I
+f
+I
+28
+I
+6e
+I
+43
+x
+54
+/Users/wycats/Code/bundler/lib/bundler/rubygems_ext.rb
+p
+0
+x
+13
+attach_method
+p
+17
+I
+0
+I
+1
+I
+9
+I
+3
+I
+29
+I
+4
+I
+32
+I
+5
+I
+3b
+I
+8
+I
+5c
+I
+9
+I
+66
+I
+8
+I
+68
+I
+c
+I
+84
+x
+54
+/Users/wycats/Code/bundler/lib/bundler/rubygems_ext.rb
+p
+0