Skip to content
Commits on May 28, 2012
  1. @indirect

    Merge v1.1.4 from branch '1-1-stable'

    indirect committed
    Conflicts:
    	CHANGELOG.md
    	bin/bundle
    	lib/bundler/version.rb
    	spec/install/gems/dependency_api_spec.rb
  2. @indirect

    Version 1.1.4 with changelog

    indirect committed
Commits on May 27, 2012
  1. @indirect

    work around Ruby bug empty files in YAML.load_file

    indirect committed
    Ruby 1.9.3p194 includes a change to Psych to support BOM markers. Unfortunately, that change means that Psych will sometimes throw an exception when you try to call YAML.load_file on a file with zero bytes in it. This commit includes a workaround so that we don't call YAML.load_file if the config file is empty.
  2. @indirect
  3. @indirect
  4. @indirect
  5. @indirect
  6. @indirect

    add vendored_persistent

    indirect committed
    This clears up fetcher.rb's implicit dependency on being loaded after vendored_thor (which added lib/vendor/ to the load path).
  7. @indirect

    Revert "Revert "work around Ruby bug empty files in YAML.load_file""

    indirect committed
    Travis is failing on 1.9.3p194 without this patch.
    
    This reverts commit 4449672.
  8. @indirect

    fixes for capistrano integration

    indirect committed
    switch the bundler hook to before "deploy:finalize_update", so that finalize_update will not run if `bundle install` fails. (thanks @leehambley)
    
    change from `current_release` to `latest_release`, because both cap and vlad provide more robust directory-finding code behind `latest_release`. (thanks @dontangg)
    
    closes #1264
  9. @gilesbowkett

    correct punctuation

    gilesbowkett committed
  10. @indirect

    Revert "return the right error code for bundle exec with ruby version"

    indirect committed
    This is based on the previously-reverted commit, so I'm reverting it as well for now.
    
    This reverts commit 5ba2081.
  11. @indirect

    Revert "bundle exec does less work"

    indirect committed
    Based on reports from Piotr Sarnacki, this commit breaks BUNDLE_BIN_PATH when you run e.g. `bundle exec bundle -v`. Reverting to stabilize master while we investigate and hopefully fix.
    
    This reverts commit f96d7e7.
Commits on May 25, 2012
  1. @hone
  2. @hone

    extract rescue logic in bin/bundle

    hone committed
    paired with @wycats
  3. @hone

    bundle exec does less work

    tomhuda committed with hone
    It isn't necessary for bundle exec to load up
    and test the entire environment, when the process
    it is exec'ing into has to do the same work
    anyway.
    
    This change makes bundle exec do the minimal env
    setup work, and defer the checking to the
    subprocess it is `exec`ing to.
  4. @hone

    Revert "work around Ruby bug empty files in YAML.load_file"

    hone committed
    This reverts commit 4e855b9.
Commits on May 24, 2012
  1. @indirect

    work around Ruby bug empty files in YAML.load_file

    indirect committed
    Ruby 1.9.3p194 includes a change to Psych to support BOM markers. Unfortunately, that change means that Psych will sometimes throw an exception when you try to call YAML.load_file on a file with zero bytes in it. This commit includes a workaround so that we don't call YAML.load_file if the config file is empty.
  2. @dougbarth @hone

    Fixing "bundle clean --force" banner.

    dougbarth committed with hone
    The --force option was incorrectly stating that it forces a clean if --path IS set. It actually forces a clean if --path is NOT set.
  3. @hone

    Merge pull request #1911 from dougbarth/bundler

    hone committed
    ---
    
    The --force option was incorrectly stating that it forces a clean if --path IS set. It actually forces a clean if --path is NOT set.
Commits on May 23, 2012
  1. @indirect
  2. @indirect

    fixes for capistrano integration

    indirect committed
    switch the bundler hook to before "deploy:finalize_update", so that finalize_update will not run if `bundle install` fails. (thanks @leehambley)
    
    change from `current_release` to `latest_release`, because both cap and vlad provide more robust directory-finding code behind `latest_release`. (thanks @dontangg)
    
    closes #1264
Commits on May 21, 2012
  1. updated copy_to method for recursive git sumodule update.

    Nicholas Watson committed
Commits on May 10, 2012
  1. @dougbarth

    Fixing "bundle clean --force" banner.

    dougbarth committed
    The --force option was incorrectly stating that it forces a clean if --path IS set. It actually forces a clean if --path is NOT set.
Commits on May 9, 2012
  1. @hone

    bundle check fails w/o Gemfile.lock and frozen

    hone committed
    There are cases where frozen is set but the Gemfile.lock is missing
    (like the user forgot to check the lockfile into version control). This
    means check will pass but Bundler.setup will fail. This fixes this case.
Commits on May 4, 2012
  1. @hone
  2. @hone
Commits on May 3, 2012
  1. @hone
  2. @hone

    change dsl for ruby_version to ruby

    hone committed
  3. @hone

    add a --ruby flag to platform

    hone committed
  4. @hone
  5. @hone
  6. @hone
  7. @hone
  8. @hone

    ruby version check for bundle#exec

    hone committed
Something went wrong with that request. Please try again.