[DRE-commits] [bundler] 02/03: Merge tag 'upstream/1.5.0_rc.1'

[Christian Hofstaedtler]

This is an automated email from the git hooks/post-receive script.

zeha pushed a commit to branch master
in repository bundler.

commit 2b91cb8b33830e6f62fefba487026039e6b0bcdb
Merge: ddbbd68 7e51085
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Sat Nov 30 11:56:35 2013 +0100

    Merge tag 'upstream/1.5.0_rc.1'
    
    Upstream version 1.5.0~rc.1
    
    # gpg: Signature made Sam 30 Nov 2013 11:56:32 CET using RSA key ID 93052E03
    # gpg: Good signature from "Christian Hofstaedtler <christian at hofstaedtler.name>"
    # gpg:                 aka "Christian Hofstaedtler <ch at zeha.at>"
    # gpg:                 aka "Christian Hofstaedtler <zeha at debian.org>"

 .travis.yml                                        |  33 +-
 CHANGELOG.md                                       |  25 +-
 Rakefile                                           |   4 +-
 bundler.gemspec                                    |   2 +-
 lib/bundler.rb                                     |   5 +-
 lib/bundler/capistrano.rb                          |   1 +
 lib/bundler/cli.rb                                 |  24 +-
 lib/bundler/definition.rb                          |   8 +-
 lib/bundler/dsl.rb                                 |  10 +-
 lib/bundler/endpoint_specification.rb              |   2 +-
 lib/bundler/fetcher.rb                             |  63 +--
 lib/bundler/installer.rb                           |  12 +-
 lib/bundler/lazy_specification.rb                  |   2 +-
 lib/bundler/man/bundle                             | 116 +++++
 lib/bundler/man/bundle-config                      | 161 +++++++
 lib/bundler/man/bundle-config.txt                  | 184 ++++++++
 lib/bundler/man/bundle-exec                        | 159 +++++++
 lib/bundler/man/bundle-exec.txt                    | 163 +++++++
 lib/bundler/man/bundle-install                     | 327 ++++++++++++++
 lib/bundler/man/bundle-install.txt                 | 387 ++++++++++++++++
 lib/bundler/man/bundle-package                     |  49 ++
 lib/bundler/man/bundle-package.txt                 |  67 +++
 lib/bundler/man/bundle-platform                    |  61 +++
 lib/bundler/man/bundle-platform.txt                |  57 +++
 lib/bundler/man/bundle-update                      | 202 +++++++++
 lib/bundler/man/bundle-update.txt                  | 207 +++++++++
 lib/bundler/man/bundle.txt                         |  97 ++++
 lib/bundler/man/gemfile.5                          | 492 ++++++++++++++++++++
 lib/bundler/man/gemfile.5.txt                      | 448 ++++++++++++++++++
 lib/bundler/parallel_workers/unix_worker.rb        |   6 +
 lib/bundler/remote_specification.rb                |   2 +-
 lib/bundler/retry.rb                               |   7 +-
 lib/bundler/ruby_version.rb                        |   2 +-
 lib/bundler/rubygems_ext.rb                        |   9 +-
 lib/bundler/rubygems_integration.rb                |  61 +--
 lib/bundler/settings.rb                            |  21 +
 lib/bundler/source.rb                              |  15 +-
 lib/bundler/source/git/git_proxy.rb                |   2 +-
 lib/bundler/source/rubygems.rb                     |  56 ++-
 lib/bundler/templates/newgem/README.md.tt          |   2 +-
 .../templates/newgem/spec/newgem_spec.rb.tt        |   4 +-
 lib/bundler/version.rb                             |   2 +-
 man/bundle-config.ronn                             |   9 +
 man/bundle-install.ronn                            |  14 +-
 man/gemfile.5.ronn                                 |   6 +
 metadata.yml                                       | 467 +++++++++++++++++++
 spec/bundler/retry_spec.rb                         |  29 +-
 spec/commands/config_spec.rb                       |  14 +
 .../inject.rb => commands/inject_spec.rb}          |   0
 spec/commands/newgem_spec.rb                       |   4 +-
 spec/commands/outdated_spec.rb                     |  17 +
 spec/install/binstubs_spec.rb                      |  24 +
 spec/install/bundler_spec.rb                       | 146 ++++++
 spec/install/{ => gemfile}/gemspec_spec.rb         |   0
 spec/install/{ => gemfile}/git_spec.rb             |   4 +-
 spec/install/{ => gemfile}/path_spec.rb            |   0
 spec/install/gemfile_spec.rb                       |  44 ++
 spec/install/gems/groups_spec.rb                   | 413 +++++++++--------
 spec/install/gems/mirror_spec.rb                   |  39 ++
 spec/install/gems/platform_spec.rb                 |  16 +-
 spec/install/gems/simple_case_spec.rb              | 451 +------------------
 spec/install/gemspecs_spec.rb                      |  50 +++
 spec/install/invalid_spec.rb                       |  50 ---
 spec/install/path_spec.rb                          | 500 ++++-----------------
 spec/install/prereleases_spec.rb                   |  43 ++
 spec/other/bundle_ruby_spec.rb                     |   4 +-
 spec/other/ext_spec.rb                             |   2 +-
 spec/other/platform_spec.rb                        |  31 +-
 spec/realworld/parallel_install_spec.rb            |   3 +-
 spec/realworld/parallel_update_spec.rb             |  31 ++
 spec/runtime/platform_spec.rb                      |   4 +-
 spec/spec_helper.rb                                |   4 +-
 spec/support/{rubygems_hax/platform.rb => hax.rb}  |   0
 73 files changed, 4712 insertions(+), 1264 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/bundler.git