bundler 1.10.0.pre.2 → 1.10.0.rc

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2029d69f6f96ac800b5ee5b83df956338b5e2670
-  data.tar.gz: c95b3b9baf42bd197d8167dd78f1e833db419462
+  metadata.gz: 13b6866c1bca64b1f7b086fe404f97694736ad07
+  data.tar.gz: ed15e5be200b5c249138408d21bc6100d6111be3
 SHA512:
-  metadata.gz: 579493891195fa22de78c686052d557b8935246f8abc4f620a129979d6ba35364326ea187da31904b1e5fedc8eab39c6da4af9cdc919c7500fe83c84fef564ee
-  data.tar.gz: 4b4f0a4c10b915be02b6ca77af03c7986d82ab749cda3f0a0463abc30ce2a62681337557befcad0e43dd30f0d191429905e8885944ad6dba104d4e238eefbdd3
+  metadata.gz: 7627557b7ad3a3f97d425b30c8a7c0ea73ad993a6b2ae5352bcbbade321b289682f79bb0c94293d620cda54e4cb5f2f4fa677bf10ed294ae3a05c48c4b714724
+  data.tar.gz: 2e38fed048910f874c5979c27e8abcb360ba2a6bc4078c9dfb298650229f7ab86e02aee03d6ae3f81b2595f20e19b452fb175c5f6cbf6f9a186f3390caeef614

data/.travis.yml

@@ -5,6 +5,7 @@ before_script: travis_retry rake spec:travis:deps
 branches:
   only:
     - master
+    - 1-10-stable
     - 1-9-stable
     - 1-8-stable
     - 1-7-stable
@@ -41,7 +42,7 @@ env:
   # We need to know if changes to rubygems will break bundler on release
   - RGV=master
   # Test the latest rubygems release with all of our supported rubies
-  - RGV=v2.4.6
+  - RGV=v2.4.7
 
 matrix:
   fast_finish: true
@@ -99,7 +100,7 @@ matrix:
     # Ruby 1.9.2 sanity check
     # (but it's just too slow and sometimes goes over the Travis limit)
     - rvm: 1.9.2
-      env: RGV=v2.4.6
+      env: RGV=v2.4.7
     # Ruby-head (we want to know how we're doing, but not fail the build)
     - rvm: ruby-head
       env: RGV=master

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 1.10.0.rc (2015-05-16)
+
+Features:
+
+  - dramatically speed up resolving some slow Gemfiles (#3635, @segiddins)
+  - track CI platforms running Bundler (#3646, @fotanus)
+
+Bugfixes:
+
+  - allow `viz` to work with prereleases (#3621, #3217, @aprescott)
+  - validate gemspecs used in path and git gems (#3639, @segiddins, @indirect)
+  - stop printing config warnings when config is unchanged (#3649, @fotanus, @indirect)
+
 ## 1.10.0.pre.2 (2015-05-07)
 
 Bugfixes:
@@ -41,6 +54,24 @@ Deprecations:
 
   - deprecated the (never enabled) `bundle_ruby` binary (@smlance)
 
+## 1.9.9 (2015-05-16)
+
+Bugfixes:
+
+  - read mirror and credential settings from older versions (#3557, @Strech)
+
+## 1.9.8 (2015-05-12)
+
+Bugfixes:
+
+  - fix regression in sudo mode introduced by 1.9.7 (#3642, @segiddins)
+
+## 1.9.7 (2015-05-11)
+
+Bugfixes:
+
+  - always clean up tmp dirs (#3277, @hone, @indirect, @segiddins)
+
 ## 1.9.6 (2015-05-02)
 
 Bugfixes:

data/CODE_OF_CONDUCT.md

@@ -4,7 +4,7 @@ The Bundler project strongly values contributors from anywhere, regardless of ge
 
 ### Summary
 
-Harassment in code and discussion or violation of physical boundaries is completely unacceptable anywhere in the Bundler project’s codebases, issue trackers, IRC channel, Campfire, mailing lists, meetups, and other events. Violators will be warned and then blocked or banned by the core team at or before the 3rd violation.
+Harassment in code and discussion or violation of physical boundaries is completely unacceptable anywhere in the Bundler project’s codebases, issue trackers, chat rooms, mailing lists, meetups, and any other events. Violators will be warned and then blocked or banned by the core team at or before the 3rd violation.
 
 ### In detail
 

data/Rakefile

@@ -114,8 +114,10 @@ namespace :spec do
       system "sudo sed -i 's/1000::/1000:Travis:/g' /etc/passwd"
       # Strip secure_path so that RVM paths transmit through sudo -E
       system "sudo sed -i '/secure_path/d' /etc/sudoers"
-      # Install groff for the ronn gem
+      # Install groff so ronn can generate man/help pages
       sh "sudo apt-get install groff -y"
+      # Install graphviz so that the viz specs can run
+      sh "sudo apt-get install graphviz -y 2>&1 | tail -n 2"
       if RUBY_VERSION < '1.9'
         # Downgrade Rubygems on 1.8 so Ronn can be required
         # https://github.com/rubygems/rubygems/issues/784
@@ -169,7 +171,7 @@ begin
       rubyopt = ENV["RUBYOPT"]
       # When editing this list, also edit .travis.yml!
       branches = %w(master)
-      releases = %w(v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.29 v2.0.14 v2.1.11 v2.2.3 v2.4.6)
+      releases = %w(v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.29 v2.0.14 v2.1.11 v2.2.3 v2.4.7)
       (branches + releases).each do |rg|
         desc "Run specs with Rubygems #{rg}"
         RSpec::Core::RakeTask.new(rg) do |t|
@@ -269,8 +271,9 @@ begin
   namespace :man do
     directory "lib/bundler/man"
 
-    Dir["man/*.ronn"].each do |ronn|
-      basename = File.basename(ronn, ".ronn")
+    sources = Dir["man/*.ronn"].map{|f| File.basename(f, ".ronn") }
+    sources.map do |basename|
+      ronn = "man/#{basename}.ronn"
       roff = "lib/bundler/man/#{basename}"
 
       file roff => ["lib/bundler/man", ronn] do
@@ -284,11 +287,19 @@ begin
       task :build_all_pages => "#{roff}.txt"
     end
 
+    task :clean do
+      leftovers = Dir["lib/bundler/man/*"].reject do |f|
+        basename = File.basename(f).sub(/\.(txt|ronn)/, '')
+        sources.include?(basename)
+      end
+      rm leftovers if leftovers.any?
+    end
+
     desc "Build the man pages"
-    task :build => "man:build_all_pages"
+    task :build => ["man:clean", "man:build_all_pages"]
 
-    desc "Clean up from the built man pages"
-    task :clean do
+    desc "Remove all built man pages"
+    task :clobber do
       rm_rf "lib/bundler/man"
     end
 
@@ -299,7 +310,6 @@ rescue LoadError
   namespace :man do
     task(:require) { abort "Install the ronn gem to be able to release!" }
     task(:build) { warn "Install the ronn gem to build the help pages" }
-    task(:clean) { }
   end
 end
 
@@ -310,7 +320,7 @@ task :update_certs => "spec:rubygems:clone_rubygems_master" do
 end
 
 require 'bundler/gem_tasks'
-task :build => ["man:clean", "man:build"]
-task :release => ["man:require", "man:clean", "man:build"]
+task :build => ["man:build"]
+task :release => ["man:require", "man:build"]
 
 task :default => :spec

data/bundler.gemspec

@@ -17,10 +17,10 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = '>= 1.3.6'
 
   s.add_development_dependency 'mustache',  '0.99.6'
+  s.add_development_dependency 'rake',      '~> 10.0'
   s.add_development_dependency 'rdiscount', '~> 1.6'
   s.add_development_dependency 'ronn',      '~> 0.7.3'
   s.add_development_dependency 'rspec',     '~> 3.0'
-  s.add_development_dependency 'rake'
 
   s.files       = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   # we don't check in man pages, but we need to ship them because

data/lib/bundler.rb

@@ -85,14 +85,19 @@ module Bundler
   class MarshalError < StandardError; end
 
   class << self
-    attr_writer :ui, :bundle_path
+    attr_writer :bundle_path
 
     def configure
       @configured ||= configure_gem_home_and_path
     end
 
     def ui
-      @ui ||= UI::Silent.new
+      @ui || (self.ui = UI::Silent.new)
+    end
+
+    def ui=(ui)
+      Bundler.rubygems.ui = UI::RGProxy.new(ui)
+      @ui = ui
     end
 
     # Returns absolute path of where gems are installed on the filesystem.
@@ -341,27 +346,32 @@ module Bundler
       raise MarshalError, "#{e.class}: #{e.message}"
     end
 
-    def load_gemspec(file)
+    def load_gemspec(file, validate = false)
       @gemspec_cache ||= {}
       key = File.expand_path(file)
-      spec = ( @gemspec_cache[key] ||= load_gemspec_uncached(file) )
+      @gemspec_cache[key] ||= load_gemspec_uncached(file, validate)
       # Protect against caching side-effected gemspecs by returning a
       # new instance each time.
-      spec.dup if spec
+      @gemspec_cache[key].dup if @gemspec_cache[key]
     end
 
-    def load_gemspec_uncached(file)
+    def load_gemspec_uncached(file, validate = false)
       path = Pathname.new(file)
       # Eval the gemspec from its parent directory, because some gemspecs
       # depend on "./" relative paths.
       SharedHelpers.chdir(path.dirname.to_s) do
         contents = path.read
         if contents[0..2] == "---" # YAML header
-          eval_yaml_gemspec(path, contents)
+          spec = eval_yaml_gemspec(path, contents)
         else
-          eval_gemspec(path, contents)
+          spec = eval_gemspec(path, contents)
         end
+        Bundler.rubygems.validate(spec) if spec && validate
+        spec
       end
+    rescue Gem::InvalidSpecificationException => e
+      raise InvalidOption, "The gemspec at #{file} is not valid. " \
+        "The validation error was '#{e.message}'"
     end
 
     def clear_gemspec_cache

data/lib/bundler/cli.rb

@@ -19,7 +19,6 @@ module Bundler
       custom_gemfile = options[:gemfile] || Bundler.settings[:gemfile]
       ENV['BUNDLE_GEMFILE']   = File.expand_path(custom_gemfile) if custom_gemfile
       Bundler.settings[:retry] = options[:retry] if options[:retry]
-      Bundler.rubygems.ui = UI::RGProxy.new(Bundler.ui)
       auto_install if AUTO_INSTALL_CMDS.include?(current_cmd)
     rescue UnknownArgumentError => e
       raise InvalidOption, e.message

data/lib/bundler/cli/config.rb

@@ -46,34 +46,37 @@ module Bundler
           return
         end
 
+        new_value = args.join(" ")
         locations = Bundler.settings.locations(name)
 
         if scope == "global"
-          if local = locations[:local]
-            Bundler.ui.info "Your application has set #{name} to #{local.inspect}. This will override the " \
-              "global value you are currently setting"
+          if locations[:local]
+            Bundler.ui.info "Your application has set #{name} to #{locations[:local].inspect}. " \
+              "This will override the global value you are currently setting"
           end
 
-          if env = locations[:env]
-            Bundler.ui.info "You have a bundler environment variable for #{name} set to #{env.inspect}. " \
-              "This will take precedence over the global value you are setting"
+          if locations[:env]
+            Bundler.ui.info "You have a bundler environment variable for #{name} set to " \
+              "#{locations[:env].inspect}. This will take precedence over the global value you are setting"
           end
 
-          if global = locations[:global]
-            Bundler.ui.info "You are replacing the current global value of #{name}, which is currently #{global.inspect}"
+          if locations[:global] && locations[:global] != new_value
+            Bundler.ui.info "You are replacing the current global value of #{name}, which is currently " \
+              "#{locations[:global].inspect}"
           end
         end
 
-        if scope == "local" && local = locations[:local]
-          Bundler.ui.info "You are replacing the current local value of #{name}, which is currently #{local.inspect}"
+        if scope == "local" && locations[:local] != new_value
+          Bundler.ui.info "You are replacing the current local value of #{name}, which is currently " \
+            "#{locations[:local].inspect}"
         end
 
         if name.match(/\Alocal\./)
           pathname = Pathname.new(args.join(" "))
-          self.args = [pathname.expand_path.to_s] if pathname.directory?
+          new_value = pathname.expand_path.to_s if pathname.directory?
         end
 
-        Bundler.settings.send("set_#{scope}", name, args.join(" "))
+        Bundler.settings.send("set_#{scope}", name, new_value)
       else
         Bundler.ui.error "Invalid scope --#{scope} given. Please use --local or --global."
         exit 1

data/lib/bundler/cli/gem.rb

@@ -66,6 +66,7 @@ module Bundler
           "of enforcing it, so be sure that you are prepared to do that. For suggestions about " \
           "how to enforce codes of conduct, see bit.ly/coc-enforcement."
         )
+        config[:coc] = true
         Bundler.ui.info "Code of conduct enabled in config"
         templates.merge!("CODE_OF_CONDUCT.md.tt" => "CODE_OF_CONDUCT.md")
       end

data/lib/bundler/cli/install.rb

@@ -103,6 +103,7 @@ module Bundler
 
       definition = Bundler.definition
       definition.validate_ruby!
+
       Installer.install(Bundler.root, definition, options)
       Bundler.load.cache if Bundler.app_cache.exist? && !options["no-cache"] && !Bundler.settings[:frozen]
 

data/lib/bundler/definition.rb

@@ -47,11 +47,16 @@ module Bundler
     def initialize(lockfile, dependencies, sources, unlock, ruby_version = nil, optional_groups = [])
       @unlocking = unlock == true || !unlock.empty?
 
-      @dependencies, @sources, @unlock, @optional_groups = dependencies, sources, unlock, optional_groups
-      @remote            = false
-      @specs             = nil
-      @lockfile_contents = ""
-      @ruby_version      = ruby_version
+      @dependencies    = dependencies
+      @sources         = sources
+      @unlock          = unlock
+      @optional_groups = optional_groups
+      @remote          = false
+      @specs           = nil
+      @ruby_version    = ruby_version
+
+      @lockfile_contents      = ""
+      @locked_bundler_version = nil
 
       if lockfile && File.exist?(lockfile)
         @lockfile_contents = Bundler.read_file(lockfile)

data/lib/bundler/dsl.rb

@@ -49,8 +49,14 @@ module Bundler
       case gemspecs.size
       when 1
         spec = Bundler.load_gemspec(gemspecs.first)
-        raise InvalidOption, "There was an error loading the gemspec at #{gemspecs.first}." unless spec
+
+        unless spec
+          raise InvalidOption, "There was an error loading the gemspec at " \
+            "#{file}. Make sure you can build the gem, then try again."
+        end
+
         gem spec.name, :path => path, :glob => glob
+
         group(development_group) do
           spec.development_dependencies.each do |dep|
             gem dep.name, *(dep.requirement.as_list + [:type => :development])
@@ -59,7 +65,8 @@ module Bundler
       when 0
         raise InvalidOption, "There are no gemspecs at #{expanded_path}."
       else
-        raise InvalidOption, "There are multiple gemspecs at #{expanded_path}. Please use the :name option to specify which one."
+        raise InvalidOption, "There are multiple gemspecs at #{expanded_path}. " \
+          "Please use the :name option to specify which one should be used."
       end
     end
 

data/lib/bundler/fetcher.rb

@@ -155,6 +155,8 @@ module Bundler
 
         agent << " options/#{Bundler.settings.all.join(",")}"
 
+        agent << " ci/#{cis.join(",")}" if cis.any?
+
         # add a random ID so we can consolidate runs server-side
         agent << " " << SecureRandom.hex(8)
 
@@ -178,6 +180,21 @@ module Bundler
 
     FETCHERS = [Dependency, Index]
 
+    def cis
+      env_cis = {
+        "TRAVIS" => "travis",
+        "CIRCLECI" => "circle",
+        "SEMAPHORE" => "semaphore",
+        "JENKINS_URL" => "jenkins",
+        "BUILDBOX" => "buildbox",
+        "GO_SERVER_URL" => "go",
+        "SNAP_CI" => "snap",
+        "CI_NAME" => ENV["CI_NAME"],
+        "CI" => "ci"
+      }
+      env_cis.find_all{ |env, ci| ENV[env]}.map{ |env, ci| ci }
+    end
+
     def connection
       @connection ||= begin
         needs_ssl = remote_uri.scheme == "https" ||

data/lib/bundler/graph.rb

@@ -36,6 +36,9 @@ module Bundler
         else
           tmp = Set.new
           parent_dependencies.each do |dependency|
+            # if the dependency is a prerelease, allow to_spec to be non-nil
+            dependency.prerelease = true
+
             child_dependencies = dependency.to_spec.runtime_dependencies.to_set
             @relations[dependency.name] += child_dependencies.map(&:name).to_set
             tmp += child_dependencies

data/lib/bundler/inline.rb

@@ -25,7 +25,7 @@
 #            gem 'cocoapods', '~> 0.34.1'
 #          end
 #
-#          puts Pod::VERSION => "0.34.4"
+#          puts Pod::VERSION # => "0.34.4"
 #
 def gemfile(install = false, &gemfile)
   require 'bundler'
@@ -37,10 +37,19 @@ def gemfile(install = false, &gemfile)
 
   builder = Bundler::Dsl.new
   builder.instance_eval(&gemfile)
+
   definition = builder.to_definition(nil, true)
   def definition.lock(file); end
   definition.validate_ruby!
-  Bundler::Installer.install(Bundler.root, definition, :system => true) if install
+
+  if install
+    Bundler.ui = Bundler::UI::Shell.new
+    Bundler::Installer.install(Bundler.root, definition, :system => true)
+    Bundler::Installer.post_install_messages.each do |name, message|
+      Bundler.ui.info "Post install message from #{name}:\n#{message}"
+    end
+  end
+
   runtime = Bundler::Runtime.new(nil, definition)
   runtime.setup_environment
   runtime.setup.require

data/lib/bundler/lockfile_parser.rb

@@ -22,12 +22,13 @@ module Bundler
     PATH         = "PATH"
     SPECS        = "  specs:"
     OPTIONS      = /^  ([a-z]+): (.*)$/i
+    SOURCE       = [GIT, GEM, PATH]
 
     def initialize(lockfile)
       @platforms    = []
       @sources      = []
       @dependencies = []
-      @state        = :source
+      @state        = nil
       @specs        = {}
 
       @rubygems_aggregate = Source::Rubygems.new
@@ -38,13 +39,18 @@ module Bundler
       end
 
       lockfile.split(/(?:\r?\n)+/).each do |line|
-        if line == DEPENDENCIES
+        if SOURCE.include?(line)
+          @state = :source
+          parse_source(line)
+        elsif line == DEPENDENCIES
           @state = :dependency
         elsif line == PLATFORMS
           @state = :platform
         elsif line == BUNDLED
           @state = :bundled_with
-        else
+        elsif line =~ /^[^\s]/
+          @state = nil
+        elsif @state
           send("parse_#{@state}", line)
         end
       end
@@ -179,7 +185,7 @@ module Bundler
     end
 
     def parse_bundled_with(line)
-      line = line[3..-1]
+      line = line.strip
       if Gem::Version.correct?(line)
         @bundler_version = Gem::Version.create(line)
       end

data/lib/bundler/resolver.rb

@@ -190,7 +190,6 @@ module Bundler
       @base = base
       @resolver = Molinillo::Resolver.new(self, self)
       @search_for = {}
-      @prereleases_cache = Hash.new { |h,k| h[k] = k.prerelease? }
       @base_dg = Molinillo::DependencyGraph.new
       @base.each { |ls| @base_dg.add_root_vertex ls.name, Dependency.new(ls.name, ls.version) }
     end
@@ -296,13 +295,26 @@ module Bundler
         name = name_for(dependency)
         [
           activated.vertex_named(name).payload ? 0 : 1,
-          @prereleases_cache[dependency.requirement] ? 0 : 1,
+          amount_constrained(dependency),
           conflicts[name] ? 0 : 1,
           activated.vertex_named(name).payload ? 0 : search_for(dependency).count,
         ]
       end
     end
 
+    def amount_constrained(dependency)
+      @amount_constrained ||= {}
+      @amount_constrained[dependency.name] ||= begin
+        base_dep = Dependency.new dependency.name, '>= 0.a'
+        all = search_for(DepProxy.new base_dep, dependency.__platform)
+        if all.size == 0
+          0
+        else
+          search_for(dependency).size.to_f / all.size.to_f
+        end
+      end
+    end
+
     def verify_gemfile_dependencies_are_found!(requirements)
       requirements.each do |requirement|
         next if requirement.name == 'bundler'

data/lib/bundler/rubygems_integration.rb

@@ -4,6 +4,11 @@ require 'rubygems/config_file'
 
 module Bundler
   class RubygemsIntegration
+    if defined?(Gem::Ext::Builder::CHDIR_MONITOR)
+      EXT_LOCK = Gem::Ext::Builder::CHDIR_MONITOR
+    else
+      EXT_LOCK = Monitor.new
+    end
 
     def self.version
       @version ||= Gem::Version.new(Gem::VERSION)
@@ -34,9 +39,18 @@ module Bundler
     end
 
     def mark_loaded(spec)
+      if spec.respond_to?(:activated=)
+        current = Gem.loaded_specs[spec.name]
+        current.activated = false if current
+        spec.activated = true
+      end
       Gem.loaded_specs[spec.name] = spec
     end
 
+    def validate(spec)
+      Bundler.ui.silence { spec.validate }
+    end
+
     def path(obj)
       obj.to_s
     end
@@ -149,7 +163,7 @@ module Bundler
     end
 
     def ext_lock
-      @ext_lock ||= Monitor.new
+      EXT_LOCK
     end
 
     def fetch_specs(all, pre, &blk)
@@ -446,6 +460,13 @@ module Bundler
       def find_name(name)
         Gem.source_index.find_name(name)
       end
+
+      def validate(spec)
+        # Missing summary is downgraded to a warning in later versions,
+        # so we set it to an empty string to prevent an exception here.
+        spec.summary ||= ""
+        super
+      end
     end
 
     # Rubygems versions 1.3.6 and 1.3.7
@@ -603,10 +624,6 @@ module Bundler
         end
       end
 
-      def ext_lock
-        Gem::Ext::Builder::CHDIR_MONITOR
-      end
-
       if Gem::Specification.respond_to?(:stubs_for)
         def find_name(name)
           Gem::Specification.stubs_for(name).map(&:to_spec)

data/lib/bundler/settings.rb

@@ -228,7 +228,7 @@ module Bundler
         config_regex = /^(BUNDLE_.+): (['"]?)(.*(?:\n(?!BUNDLE).+)?)\2$/
         config_pairs = config_file.read.scan(config_regex).map do |m|
           key, _, value = m
-          [key, value.gsub(/\s+/, " ").tr('"', "'")]
+          [convert_to_backward_compatible_key(key), value.gsub(/\s+/, " ").tr('"', "'")]
         end
         Hash[config_pairs]
       else
@@ -236,6 +236,12 @@ module Bundler
       end
     end
 
+    def convert_to_backward_compatible_key(key)
+      key = "#{key}/" if key =~ /https?:/i && key !~ %r[/\Z]
+      key = key.gsub(".", "__") if key.include?(".")
+      key
+    end
+
     # TODO: duplicates Rubygems#normalize_uri
     # TODO: is this the correct place to validate mirror URIs?
     def normalize_uri(uri)

data/lib/bundler/source/path.rb

@@ -1,6 +1,5 @@
 module Bundler
   class Source
-
     class Path < Source
       autoload :Installer, 'bundler/source/path/installer'
 
@@ -132,8 +131,7 @@ module Bundler
         if File.directory?(expanded_path)
           # We sort depth-first since `<<` will override the earlier-found specs
           Dir["#{expanded_path}/#{@glob}"].sort_by { |p| -p.split(File::SEPARATOR).size }.each do |file|
-            spec = Bundler.load_gemspec(file)
-            if spec
+            if spec = Bundler.load_gemspec(file, :validate)
               spec.loaded_from = file.to_s
               spec.source = self
               index << spec
@@ -220,7 +218,7 @@ module Bundler
           end
         end
       end
-    end
 
+    end
   end
 end

data/lib/bundler/templates/newgem/README.md.tt

@@ -26,14 +26,16 @@ TODO: Write usage instructions here
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.<% if config[:bin] %> Run `bundle exec <%= config[:name] %>` to use the code located in this directory, ignoring other installed copies of this gem.<% end %>
+After checking out the repo, run `bin/setup` to install dependencies.<% if config[:test] %> Then, run `rake <%= config[:test].sub('mini', '') %>` to run the tests.<% end %> You can also run `bin/console` for an interactive prompt that will allow you to experiment.<% if config[:bin] %> Run `bundle exec <%= config[:name] %>` to use the gem in this directory, ignoring other installed copies of this gem.<% end %>
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/<%=config[:name]%>/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/<%= config[:name] %>.<% if config[:coc] %> This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.<% end %>
+<% if config[:mit] %>
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+<% end %>

data/lib/bundler/ui/shell.rb

@@ -1,3 +1,5 @@
+require 'bundler/vendored_thor'
+
 module Bundler
   module UI
     class Shell

data/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.10.0.pre.2" unless defined?(::Bundler::VERSION)
+  VERSION = "1.10.0.rc" unless defined?(::Bundler::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.10.0.pre.2
+  version: 1.10.0.rc
 platform: ruby
 authors:
 - André Arko
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
@@ -28,61 +28,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.99.6
 - !ruby/object:Gem::Dependency
-  name: rdiscount
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: ronn
+  name: rdiscount
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: ronn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.7.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 description: Bundler manages an application's dependencies through its entire life,
   across many machines, systematically and repeatably
 email: