Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Commits on Nov 28, 2015
  1. @homu

    Auto merge of #4127 - TimMoore:comment-on-git-vs-https-github-urls, r…

    homu committed
    Explain why we don't use HTTPS for github sources
    There are frequent pull requests proposing this change, which has already been merged to 2-0-dev.
    Hopefully, this will help avoid so much wasted time.
Commits on Nov 27, 2015
  1. @TimMoore

    Explain why we don't use HTTPS for github sources

    TimMoore committed
    There are frequent pull requests proposing this change, which has
    already been merged to 2-0-dev.
  2. @homu

    Auto merge of #4124 - bundler:seg-rubocop, r=indirect

    homu committed
    More rubocop_todo cleanup
  3. @homu

    Auto merge of #4114 - smellsblue:restrict-gemspec-platforms, r=segiddins

    homu committed
    Restrict platforms when using gemspec in DSL
    When referencing a `gemspec` in the `Gemfile`, restrict what platforms to check against to just those defined by the `gemspec` itself.
    This fixes #4102
  4. @homu

    Auto merge of #4105 - JuanitoFatas:feature/lock-takes-gems, r=indirect

    homu committed
    [Lock] Add support for specify gems to `bundle lock` command
    This Pull Request adds the ability to specify gems in bundle lock command via command-line option,
    so that this is allowed:
    bundle lock --gems devise
    bundle lock --gems devise ominiauth
    In this way, we can use lock command for specific gems without downloading any gem.
  5. @homu

    Auto merge of #4103 - jingweno:master, r=indirect

    homu committed
    Retry `Fetcher#specs` with `Bundler::Retry`
    As mentioned in heroku/heroku-buildpack-ruby#435, bundler failed at the step of fetching version metadata:
    Fetching version metadata from <?xml version=\"1.0\" encoding=\"UTF-8\"?>
           <Error><Code>InternalError</Code><Message>We encountered an internal error.
           Please try
    It turns out the retry logic doesn’t cover fetching source index, gem metadata, version metadata and dependency metadata. A new method `Fetcher#specs_with_retry` is added to wrap `Fetcher#specs` with `Bundler::Retry` which reties when bundler fails in the mentioned cases.
    /cc @schneems
Commits on Nov 26, 2015
  1. @homu

    Auto merge of #4021 - jaym:bin-move, r=segiddins

    homu committed
    Use exe instead of bin for BUNDLE_BIN_PATH fallback
    Looks like these got moved.
    I'm having a hard time getting this to actually fail in the tests. Here's a gist of something that fails:
    source '';
    gem 'rake'
    desc "foo"
    task :foo do
      sh 'bundle -v'
    > bundle install
    > bundle install --deployment
    > bundle exec rake foo
    bundle -v
    /Users/jmundrawala/.rbenv/versions/2.1.2/bin/bundle:23:in `load': cannot load such file -- /Users/jmundrawala/.rbenv/versions/2.1.2/lib/ruby/gems/2.1.0/gems/bundler-1.10.6/bin/bundle (LoadError)
    	from /Users/jmundrawala/.rbenv/versions/2.1.2/bin/bundle:23:in `<main>'
    rake aborted!
    Command failed with status (1): [bundle -v...]
    /Users/jmundrawala/workspace/bundler/foo/Rakefile:4:in `block in <top (required)>'
    Tasks: TOP => foo
    (See full trace by running task with --trace)
  2. @segiddins
  3. @homu

    Auto merge of #4120 - CoralineAda:contributor_covenant_1_3_0, r=indirect

    homu committed
    Updates Contributor Covenant to 1.3.0
    The code of conduct template also now inserts email address for contact purposes.
  4. @homu

    Auto merge of #4123 - bundler:seg-fix-realworld-specs, r=segiddins

    homu committed
    Fix edgecases spec for new gxapi_rails version
    \c @indirect
  5. @segiddins
  6. @segiddins
  7. @segiddins
  8. @segiddins
  9. @segiddins
  10. @segiddins
  11. @segiddins
  12. @segiddins

    [RuboCop] Enable Style/Next

    segiddins committed
  13. @segiddins
  14. @segiddins
  15. @segiddins
  16. @segiddins
  17. @segiddins

    [RuboCop] Enable Style/AndOr

    segiddins committed
  18. @segiddins
  19. @segiddins
  20. @segiddins
Commits on Nov 24, 2015
  1. @CoralineAda

    Updates Contributor Covenant to 1.3.0

    CoralineAda committed
    The code of conduct template also now inserts email address for contact purposes.
Commits on Nov 21, 2015
  1. @homu

    Auto merge of #4113 - blackxored:silence-root-warning, r=segiddins

    homu committed
    Check silence_root_warning option to skip warning on root install cmds
    Adds a new setting `silence_root_warning` (environment variable: `BUNDLE_SILENCE_ROOT_WARNING`) that skips the default warning when `install` is run as root.
    The warning is useful but I think it should be able to be disabled if the user knows what he's doing, it's handy when run inside Docker containers (which by default run as root), or other environments where root is used.
    Also adds a new `preserve_env` option to `bundle` helper in tests which allows running commands under sudo with the `-E` flag (preserve environment) as opposed to the default env_reset. Without this, the command would be run without our flag which makes it impossible to test. There might be cleaner ways to achieve this, though.
  2. @homu

    Auto merge of #4110 - felixbuenemann:fix-bundle-console-irb-fallback,…

    homu committed
    … r=segiddins
    Fix bundle console IRB fallback
    The fallback to IRB for `bundle console` is currently broken, due to a missing `require 'irb'`:
    bundle config console pry
    bundle console
    Couldn't load console pry
    Could not find constant IRB
    This fixes the fallback and also alters the error message to indicate the fallback to irb.
    While investigating the fix I noticed that the `bundle console` specs were broken and only worked because the expected strings were both contained in the error message.
    In order to test an alternate console and the fallback behavior, I added a fake pry gem that implements the minimum required api. I also replaced `__callee__` with `__method__` for ruby 1.8.7 compatibility.
  3. @homu

    Auto merge of #4117 - bundler:seg-rubocop-0.35.1, r=segiddins

    homu committed
    [RuboCop] Update to 0.35.1
  4. @segiddins

    [RuboCop] Update to 0.35.1

    segiddins committed
Commits on Nov 19, 2015
  1. @smellsblue
Commits on Nov 18, 2015
  1. @blackxored
Commits on Nov 17, 2015
  1. @homu

    Auto merge of #4063 - A5308Y:master, r=segiddins

    homu committed
    Extracting a new "GemInstaller" from installer.rb
    My goal was to reveal the main part of install_gem_from_spec. From my
    perspective the main part is:
    1. Install
    2. Generate stubs
    3. Print message to the user
    (4. handle exceptions)
    While working on it I found that Bundler::Installer's run method and
    instance variables weren't used when installing gems with
    install_gem_from_spec. The installer was (and still is) only used to
    generate executable stubs.
    So I inserted the new GemInstaller in ParallelInstaller; passing the
    instantiated Bundler::Installer to the GemInstaller only to generate
    the executable stubs.
    Based on this I would continue by extracting two BinstubGenerator
    classes and removing GemInstaller's dependency on Bundler::Installer,
    possibly allowing for a more concise way to generate binstubs in other
    parts of bundler.
    I was a bit intimidated by the amount of installers and weary to add
    another one to this contested namespace. So I checked in with
    @indirect who approved of the general direction of the refactoring and
    suggested to rename the old GemInstaller to RubyGemsGemInstaller.
  2. @blackxored
Something went wrong with that request. Please try again.