Permalink
Commits on May 28, 2012
  1. Changelog for v1.2.0.pre.1

    indirect committed May 28, 2012
  2. Merge v1.1.4 from branch '1-1-stable'

    Conflicts:
    	CHANGELOG.md
    	bin/bundle
    	lib/bundler/version.rb
    	spec/install/gems/dependency_api_spec.rb
    indirect committed May 28, 2012
  3. Version 1.1.4 with changelog

    indirect committed May 27, 2012
  4. Revert "suppress rubygems deprecations during artifice setup"

    It turns out suppressing the errors like this changes the output and causes
    the tests to fail. So oh well. Back to deprecation warnings...
    
    This reverts commit 040430d.
    indirect committed May 28, 2012
  5. make tests pass under travis.

    sudo tests were failing under travis because they were not
    being run as root.  this change runs the root tests as root,
    and chowns the tests' "tmp" directory back to the original
    user to allow the subsequent 'realworld' tests to pass.
    echohead committed with indirect May 2, 2012
Commits on May 27, 2012
  1. work around Ruby bug empty files in YAML.load_file

    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.
    indirect committed May 24, 2012
  2. grammar fix for spec name

    indirect committed May 27, 2012
  3. add vendored_persistent

    This clears up fetcher.rb's implicit dependency on being loaded after vendored_thor (which added lib/vendor/ to the load path).
    indirect committed May 27, 2012
  4. revamp ISSUES

     - remove frequent issues that aren't so frequent anymore
     - move Heroku instructions first, rewrite for clarity
     - link directly to the new ticket page
    indirect committed May 27, 2012
  5. Revert "Revert "work around Ruby bug empty files in YAML.load_file""

    Travis is failing on 1.9.3p194 without this patch.
    
    This reverts commit 4449672.
    indirect committed May 27, 2012
  6. fixes for capistrano integration

    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
    indirect committed May 23, 2012
  7. Merge pull request #1951 from gilesbowkett/error_message_punctuation_fix

    correct punctuation
    André Arko committed May 27, 2012
  8. correct punctuation

    gilesbowkett committed May 27, 2012
  9. Revert "return the right error code for bundle exec with ruby version"

    This is based on the previously-reverted commit, so I'm reverting it as well for now.
    
    This reverts commit 5ba2081.
    indirect committed May 27, 2012
  10. Revert "bundle exec does less work"

    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.
    indirect committed May 27, 2012
Commits on May 25, 2012
  1. spacing

    hone committed May 25, 2012
  2. extract rescue logic in bin/bundle

    paired with @wycats
    hone committed May 25, 2012
  3. bundle exec does less work

    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.
    tomhuda committed with hone May 20, 2012
  4. Revert "work around Ruby bug empty files in YAML.load_file"

    This reverts commit 4e855b9.
    hone committed May 25, 2012
  5. Revert "test for 4e855b9"

    This reverts commit b7ff1a1.
    hone committed May 25, 2012
  6. test for 4e855b9

    hone committed May 25, 2012
Commits on May 24, 2012
  1. work around Ruby bug empty files in YAML.load_file

    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.
    indirect committed May 24, 2012
  2. Fixing "bundle clean --force" banner.

    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.
    dougbarth committed with hone May 10, 2012
  3. Merge pull request #1911 from dougbarth/bundler

    ---
    
    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.
    hone committed May 24, 2012
Commits on May 23, 2012
  1. fixes for capistrano integration

    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
    indirect committed May 23, 2012
Commits on May 22, 2012
  1. Merge pull request #1944 from nwwatson/fix-issue-1935

    Fixed Issue #1935: Gemfile :submodules => true only pulls first level submodules
    André Arko committed May 22, 2012
Commits on May 21, 2012
  1. updated copy_to method for recursive git sumodule update.

    Nicholas Watson committed May 21, 2012