Skip to content
Commits on Feb 11, 2016
  1. @homu

    Auto merge of #4291 - RochesterinNYC:add-clarifying-usage-message-for…

    homu committed
    …-deployment-and-system, r=indirect
    
    Add alternative error message for when `--deployment` and `--system` flags are both used on `bundle install`
    
    Calling `bundle install --deployment --system` currently results in the following error message:
    
    ```
    $ bundle install --deployment --system
    You have specified both a path to install your gems to,
    as well as --system. Please choose.
    ```
     which is a little confusing.
    
    This PR changes the behavior to:
    
    ```
    $ bundle install --deployment --system
    You have specified both --deployment as well as --system. Please choose. #<-- in red
    ```
  2. @homu

    Auto merge of #4292 - RochesterinNYC:add-error-message-for-shared-hel…

    homu committed
    …pers-EPROTO, r=indirect
    
    Raise new `Bundler::VirtualProtocolError` in response to `Errno::EPROTO`
    
    - Related to #4163, #3932, and #3581
    
    Ideally, a custom error and/or error message would be returned in these cases rather than just error out because of the uncaught `Errno::EPROTO`.
    
    I'd like some feedback on what the appropriate error message should be however. The caveat is that it seems like a wide range of errors (possibly any error?) that occur in the presence of virtualization will raise this `Errno::EPROTO` error.
  3. @homu

    Auto merge of #4268 - Elffers:hhh_fix_ruby-I, r=indirect

    homu committed
    Place bundler loaded gems after -I and RUBYLIB
    
    Previously, gems were being placed at the front of the LOAD_PATH. This
    meant you couldn't override a gem by setting -I or RUBYLIB.
    
    This patch places -I and RUBYLIB in front of loaded gems and matches the
    behavior in RubyGems.
Commits on Feb 10, 2016
  1. @Elffers

    Remove unnecessary after block

    Elffers committed
  2. @Elffers

    Remove space betweeen -I and dir name for 1.8.7

    Elffers committed
    The way Ruby 1.8.7 parses RUBYOPT differs from later rubies in that it
    does not recognize spaces between the dir name and the -I option. This
    addresses
    #4268 (comment)
  3. @RochesterinNYC

    Create `Bundler::VirtualProtocolError` that `Bundler::SharedHelpers#f…

    RochesterinNYC committed
    …ilesystem_access`
    
    will raise in response to Errno::EPROTO
    
    - Provides better error message/handling for #4163
  4. @RochesterinNYC

    Add alternative error message for when `--deployment` and `--system`

    RochesterinNYC committed
    flags are both used on `bundle install`
  5. @RochesterinNYC

    Refactor, clean up, and reformat unit tests for `Bundler::SharedHelpers`

    RochesterinNYC committed
    - Adhere to more rspec functionality and increase readability
Commits on Feb 9, 2016
  1. @homu

    Auto merge of #4286 - bundler:seg-rubocop-0.37.1, r=segiddins

    homu committed
    [RuboCop] Update to 0.37.1
  2. @segiddins

    [RuboCop] Update to 0.37.1

    segiddins committed
  3. @segiddins

    Merge tag 'v1.12.0.pre.1'

    segiddins committed
    Version 1.12.0.pre.1
  4. @segiddins
Commits on Feb 8, 2016
  1. @Elffers
  2. @homu

    Auto merge of #4282 - bundler:seg-travis-remove-frozen-string, r=segi…

    homu committed
    …ddins
    
    [Travis] Remove special frozen string literal build
    
    That build entry is redundant  -- we test frozen string literals in all of the 2.3.0 builds now.
  3. @homu

    Auto merge of #4280 - RochesterinNYC:add-porcelain-parseable-flag-bun…

    homu committed
    …dle-outdated, r=indirect
    
    Add --parseable (with --porcelain alias) to `bundle outdated` for minimal output
    
    - This flag changes the output of bundle outdated from:
    ```
      * activesupport (newest 3.0, installed 2.3.5, requested = 2.3.5) in groups "development, test"
    ```
    to
    ```
    activesupport (newest 3.0, installed 2.3.5, requested = 2.3.5)"
    ```
    and removes the extraneous output relating to fetching gem metadata,
    version metadata, git updates, and resolving dependencies.
    
    - Addresses bundler/bundler-features#85
  4. @indirect

    Merge pull request #4283 from RochesterinNYC/improve-error-message-in…

    indirect committed
    …valid-gemspec-for-dependency
    
    Add helpful invalid gemspec error message for `bundle install --standalone`
Commits on Feb 7, 2016
  1. @RochesterinNYC

    Add helpful invalid gemspec error message for `bundle install

    RochesterinNYC committed
    --standalone` when a gem/dependency has an invalid gemspec
  2. @Elffers

    Address feedback on spec.

    Elffers committed
    - Use real -I and RUBYLIB variable setting
    - Use Array#index to find path for loaded gem
Commits on Feb 5, 2016
  1. @homu

    Auto merge of #4281 - bundler:seg-rubocop-0.37, r=segiddins

    homu committed
    [RuboCop] Update to 0.37.0
  2. @segiddins
  3. @segiddins

    [RuboCop] Update to 0.37.0

    segiddins committed
  4. @RochesterinNYC

    Add --parseable (with --porcelain alias) to `bundle outdated` for min…

    RochesterinNYC committed
    …imal output
    
    - This flag changes the output of bundle outdated from:
    ```
      * activesupport (newest 3.0, installed 2.3.5, requested = 2.3.5) in groups "development, test"
    ```
    to
    ```
    activesupport (newest 3.0, installed 2.3.5, requested = 2.3.5)"
    ```
    and removes the extraneous output relating to fetching gem metadata,
    version metadata, git updates, and resolving dependencies.
    
    - Addresses bundler/bundler-features#85
  5. @homu

    Auto merge of #4278 - jbodah:gemspec-comment, r=segiddins

    homu committed
    Clarify comment in `bundle gem` gemspec
    
    The comment feels a bit misleading. It sounds like this allows Rubygems pushes by default which it does not
Commits on Feb 4, 2016
  1. @jbodah

    Clarify comment in `bundle gem` gemspec

    jbodah committed
    The comment feels a bit misleading. It sounds like this allows Rubygems
    pushes by default which it does not
  2. @homu

    Auto merge of #4264 - glennpratt:GH-4144-standalone-load-path, r=segi…

    homu committed
    …ddins
    
    Make standalone bin load path relative to Bundler.root rather than CWD.
    
    See #4144
  3. @glennpratt
  4. @homu

    Auto merge of #4265 - bundler:seg-simplify-exec, r=indirect

    homu committed
    [Exec] Avoid loading the definition before exec-ing
    
    Closes #2951, #2952.
    
    @indirect it feels like I'm missing something?
Commits on Feb 3, 2016
  1. @homu

    Auto merge of #4267 - bundler:seg-current-ruby, r=indirect

    homu committed
    [CurrentRuby] Refactor
    
    Closes #4266.
  2. @homu

    Auto merge of #4257 - bundler:seg-ruby-version-fixes, r=indirect

    homu committed
    Ruby version fixes
    
    I believe these bugs should be blockers for 1.12, but I don't have it in me to write specs yet.
    
    \c @indirect
  3. @Elffers

    Place bundler loaded gems after -I and RUBYLIB

    Elffers committed
    Previously, gems were being placed at the front of the LOAD_PATH. This
    meant you couldn't override a gem by setting -I or RUBYLIB.
    
    This patch places -I and RUBYLIB in front of loaded gems and matches the
    behavior in RubyGems.
Commits on Feb 2, 2016
  1. @segiddins

    [CurrentRuby] Refactor

    segiddins committed
  2. @segiddins
  3. @homu

    Auto merge of #4245 - lamont-granquist:lcg/inline-ui, r=segiddins

    homu committed
    Allow passing UI object into bundler/inline
    
    Added an argument to the gemfile method to allow overriding the
    UI object.  Useful to override the default output format and
    send those log events to a logfile or decorate them (timestamps,
    severity, etc) before emitting them.
  4. @segiddins
Commits on Feb 1, 2016
  1. @lamont-granquist

    more hashrocket fixes

    lamont-granquist committed
Something went wrong with that request. Please try again.