[DRE-commits] [bundler] 01/05: Merge tag 'upstream/1.6.0+dfsg'

Christian Hofstaedtler zeha at moszumanska.debian.org
Wed Apr 2 16:01:11 UTC 2014


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

zeha pushed a commit to branch master
in repository bundler.

commit aca34e96997e0c3f36b42749aaa335a3a4fd9ccb
Merge: 8ab3f82 0f4c4fc
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Wed Apr 2 17:18:48 2014 +0200

    Merge tag 'upstream/1.6.0+dfsg'
    
    Upstream version 1.6.0+dfsg

 .travis.yml                                        |  25 +-
 CHANGELOG.md                                       |  39 +-
 CONTRIBUTING.md                                    |  33 +-
 DEVELOPMENT.md                                     |   4 +-
 README.md                                          |   7 +-
 Rakefile                                           |  60 +-
 bundler.gemspec                                    |   2 +-
 checksums.yaml.gz                                  | Bin 269 -> 267 bytes
 lib/bundler.rb                                     |  24 +-
 lib/bundler/cli.rb                                 | 665 ++-------------------
 lib/bundler/cli/binstubs.rb                        |  36 ++
 lib/bundler/cli/cache.rb                           |  34 ++
 lib/bundler/cli/check.rb                           |  35 ++
 lib/bundler/cli/clean.rb                           |  19 +
 lib/bundler/cli/common.rb                          |  54 ++
 lib/bundler/cli/config.rb                          |  84 +++
 lib/bundler/cli/console.rb                         |  42 ++
 lib/bundler/cli/exec.rb                            |  37 ++
 lib/bundler/cli/gem.rb                             |  77 +++
 lib/bundler/cli/init.rb                            |  33 +
 lib/bundler/cli/inject.rb                          |  33 +
 lib/bundler/cli/install.rb                         | 123 ++++
 lib/bundler/cli/open.rb                            |  25 +
 lib/bundler/cli/outdated.rb                        |  80 +++
 lib/bundler/cli/package.rb                         |  36 ++
 lib/bundler/cli/platform.rb                        |  43 ++
 lib/bundler/cli/show.rb                            |  48 ++
 lib/bundler/cli/update.rb                          |  73 +++
 lib/bundler/cli/viz.rb                             |  27 +
 lib/bundler/definition.rb                          |   6 +-
 lib/bundler/dependency.rb                          |   4 +-
 lib/bundler/dsl.rb                                 |  90 ++-
 lib/bundler/endpoint_specification.rb              |   2 +-
 lib/bundler/fetcher.rb                             |  77 ++-
 lib/bundler/friendly_errors.rb                     |   2 +-
 lib/bundler/graph.rb                               |   2 +-
 lib/bundler/index.rb                               |   2 +-
 lib/bundler/installer.rb                           |  45 +-
 lib/bundler/man/bundle                             |   2 +-
 lib/bundler/man/bundle-config                      |  16 +-
 lib/bundler/man/bundle-config.txt                  |  51 +-
 lib/bundler/man/bundle-exec                        |   2 +-
 lib/bundler/man/bundle-exec.txt                    |   2 +-
 lib/bundler/man/bundle-install                     |  18 +-
 lib/bundler/man/bundle-install.txt                 |  15 +-
 lib/bundler/man/bundle-package                     |   2 +-
 lib/bundler/man/bundle-package.txt                 |   2 +-
 lib/bundler/man/bundle-platform                    |   2 +-
 lib/bundler/man/bundle-platform.txt                |   2 +-
 lib/bundler/man/bundle-update                      |   8 +-
 lib/bundler/man/bundle-update.txt                  |  80 +--
 lib/bundler/man/bundle.txt                         |   2 +-
 lib/bundler/man/gemfile.5                          |   2 +-
 lib/bundler/man/gemfile.5.txt                      |   2 +-
 lib/bundler/parallel_workers/worker.rb             |   6 +-
 lib/bundler/remote_specification.rb                |   2 +-
 lib/bundler/resolver.rb                            | 407 +++++++------
 lib/bundler/retry.rb                               |   2 +-
 lib/bundler/rubygems_ext.rb                        |   6 +-
 lib/bundler/rubygems_integration.rb                |   7 +-
 lib/bundler/runtime.rb                             |  39 +-
 lib/bundler/safe_catch.rb                          | 101 ----
 lib/bundler/settings.rb                            |   6 +-
 lib/bundler/setup.rb                               |   2 +-
 lib/bundler/source.rb                              |  12 +-
 lib/bundler/source/git.rb                          |  20 +-
 lib/bundler/source/git/git_proxy.rb                |  41 +-
 lib/bundler/source/path.rb                         |  35 +-
 lib/bundler/source/path/installer.rb               |   2 +-
 lib/bundler/source/rubygems.rb                     |  28 +-
 lib/bundler/ssl_certs/certificate_manager.rb       |  41 ++
 lib/bundler/templates/newgem/README.md.tt          |   4 +-
 lib/bundler/templates/newgem/Rakefile.tt           |   8 +
 .../templates/newgem/ext/newgem/extconf.rb.tt      |   3 +
 .../templates/newgem/ext/newgem/newgem.c.tt        |   9 +
 .../templates/newgem/ext/newgem/newgem.h.tt        |   6 +
 lib/bundler/templates/newgem/gitignore.tt          |   5 +
 lib/bundler/templates/newgem/lib/newgem.rb.tt      |   3 +
 lib/bundler/templates/newgem/newgem.gemspec.tt     |   6 +
 .../templates/newgem/spec/newgem_spec.rb.tt        |   8 +-
 lib/bundler/ui.rb                                  | 145 +----
 lib/bundler/ui/rg_proxy.rb                         |  21 +
 lib/bundler/{ui.rb => ui/shell.rb}                 |  50 +-
 lib/bundler/ui/silent.rb                           |  44 ++
 lib/bundler/version.rb                             |   2 +-
 man/bundle-config.ronn                             |  18 +-
 man/bundle-install.ronn                            |  13 +
 man/bundle-update.ronn                             |   5 +-
 metadata.yml                                       |  54 +-
 spec/bundler/bundler_spec.rb                       |  93 ++-
 spec/bundler/{cli_rspec.rb => cli_spec.rb}         |   1 -
 spec/bundler/definition_spec.rb                    |   6 +-
 spec/bundler/dsl_spec.rb                           |  60 +-
 spec/bundler/gem_helper_spec.rb                    | 275 +++++----
 spec/bundler/retry_spec.rb                         |  13 +-
 spec/bundler/safe_catch_spec.rb                    |  37 --
 spec/bundler/settings_spec.rb                      |  13 +
 spec/bundler/source_spec.rb                        |   6 +-
 spec/cache/gems_spec.rb                            |  36 ++
 spec/commands/config_spec.rb                       |  32 +
 spec/commands/console_spec.rb                      |  22 +
 spec/commands/exec_spec.rb                         |   1 +
 spec/commands/newgem_spec.rb                       |  34 +-
 spec/commands/open_spec.rb                         |  13 +
 spec/commands/outdated_spec.rb                     |  11 +
 .../packed_spec.rb => commands/package_spec.rb}    |  30 +
 spec/commands/show_spec.rb                         | 165 ++---
 spec/install/binstubs_spec.rb                      |   2 +-
 spec/install/bundler_spec.rb                       |   2 +-
 spec/install/gemfile/git_spec.rb                   |   2 +-
 spec/install/gemfile/path_spec.rb                  |  12 +
 spec/install/gemfile_spec.rb                       |   2 +-
 spec/install/gems/dependency_api_spec.rb           |  41 ++
 spec/install/gems/groups_spec.rb                   |   2 +-
 spec/install/gems/platform_spec.rb                 |   1 -
 spec/install/gems/post_install_spec.rb             |  74 +++
 spec/install/gems/resolving_spec.rb                |  48 +-
 spec/install/gems/simple_case_spec.rb              |   2 +-
 spec/install/gemspecs_spec.rb                      |   2 +-
 spec/install/path_spec.rb                          |   2 +-
 spec/install/prereleases_spec.rb                   |   2 +-
 spec/other/ssl_cert_spec.rb                        |  10 +
 spec/realworld/edgecases_spec.rb                   |   2 +-
 spec/resolver/basic_spec.rb                        |  29 +
 spec/runtime/load_spec.rb                          |   2 +-
 spec/runtime/setup_spec.rb                         |   2 +-
 .../endpoint_strict_basic_authentication.rb        |  18 +
 spec/support/helpers.rb                            |   4 +-
 spec/support/indexes.rb                            | 130 +++-
 spec/update/gems_spec.rb                           |  48 ++
 spec/update/git_spec.rb                            |  25 +-
 spec/update/source_spec.rb                         |  15 +-
 132 files changed, 2942 insertions(+), 1782 deletions(-)

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



More information about the Pkg-ruby-extras-commits mailing list