Permalink
Switch branches/tags
Commits on Jul 17, 2012
  1. Version 1.2.0.rc with changelog

    hone committed Jul 17, 2012
  2. don't need these tests in 1.2

    hone committed Jul 17, 2012
  3. Merge branch '1-1-stable'

    hone committed Jul 17, 2012
    Conflicts:
    	CHANGELOG.md
    	lib/bundler/dsl.rb
    	lib/bundler/version.rb
  4. Version 1.1.5 with changelog

    hone committed Jul 17, 2012
  5. special case `ruby` directive

    hone committed Jul 17, 2012
    This is light of the upcoming 1.2.0 release which adds this feature.
    This way people still using 1.1.x can run 1.2.0 Gemfiles that employ
    this feature and get a notification about upgrading.
  6. rename --no-lock to --dry-run

    hone committed Jul 17, 2012
  7. Make locking the Gemfile optional on $ bundle check

    Sven Fuchs authored and hone committed Apr 1, 2012
    Currently `bundle check` locks the Gemfile. According to @indirect this
    behaviour is intentional (see
    https://twitter.com/#!/indirect/status/186493694013210624).
    
    I am working on a CLI monitoring tool that makes it easier to work with
    cross-repository changes on projects that are split up into several
    repositories.
    
    This tool is supposed to display status information such as out-of-date
    bundler Gemfiles etc. To do so it watches the filesystem and queries for
    information on demand. Using `bundle check` to do so currently leads to
    highly confusing side-effects because suddenly the git working directory
    might be dirty - having changed the Gemfile.lock - because `bundle
    check` has been run in the background.
    
    This patch adds a boolean method option `--[no-]lock` to `bundle check`
    that defaults to `true` in order to not change the current behaviour but
    make it possible for users to turn it off.
    
    Sidenote: apparently the same behaviour also applies to `bundle show`.
    Am I the only one who finds this highly confusing?
  8. remove unnecessary '|| nil'

    hone committed Jul 17, 2012
  9. Prune git and path directories inside vendor/cache, closes #1988

    josevalim committed Jul 17, 2012
    From this commit on, we add a .bundlecache file inside
    each git/path directory in vendor/cache so we know it
    came from bundler. This allow us to delete those specific
    directories without messing with user's specific ones.
Commits on Jul 13, 2012
  1. loosen ruby directive for engines

    hone committed Jul 13, 2012
    allow other engines to qualify when the engine is omitted. So, in the
    Gemfile:
    
    ruby "1.9.3"
    
    will work with JRuby and RBX as long as the RUBY_VERSION matches
Commits on Jul 5, 2012
  1. Check for nil PATH

    indirect committed Jul 5, 2012
    fixes #2006
Commits on Jun 22, 2012
  1. Merge pull request #1998 from postmodern/patch-1

    radar committed Jun 22, 2012
    Fixed typo. $/ and NOT $\
  2. Merge pull request #2001 from postmodern/txt

    radar committed Jun 22, 2012
    LICENSE.txt
Commits on Jun 21, 2012
Commits on Jun 15, 2012
Commits on Jun 14, 2012
  1. kill the stray space

    indirect committed Jun 14, 2012
  2. minor grammar tweak

    indirect committed Jun 14, 2012
  3. specs: check :branch for local overrides on runtime

    dlee authored and josevalim committed Apr 11, 2012
    Signed-off-by: José Valim <jose.valim@plataformatec.com.br>
Commits on Jun 13, 2012
  1. Merge remote-tracking branch 'rkh/optional-branch'

    indirect committed Jun 13, 2012
    Conflicts:
    	lib/bundler/source.rb
    	spec/install/git_spec.rb
  2. Merge pull request #1980 from phil-monroe/master

    indirect committed Jun 13, 2012
    Remove all requirements from local override
Commits on Jun 12, 2012
Commits on Jun 9, 2012
  1. handle syntax errors in Ruby gemspecs

    indirect committed Jun 9, 2012
    fixes #1974
  2. require 'newgem/version'

    indirect committed Jun 8, 2012
    because require hashes based on the string, not the expanded path of 
    the file, it's important that we require the version file the same 
    way that it will be required elsewhere to avoid constant warnings.
Commits on Jun 7, 2012
  1. Merge pull request #1920 from drogus/gem_path_fix

    indirect committed Jun 7, 2012
    Always try to keep original GEM_PATH
  2. Always try to keep original GEM_PATH

    drogus committed May 16, 2012
    This fixes a problem which occures when you want to run `bundle` command
    inside code that already loads `Gemfile`. When you start a command with
    `bundle exec` it sets `RUBYOPT` to
    `-I$PATH_TO_BUNDLER -r"bundler/setup"`. Because of that, when you run
    the actual command it already requires bundler, which is fine, but since
    `GEM_PATH` was cleared on the first run `ORIGINAL_ENV` will include
    empty `GEM_PATH`. Now when you run `Bundler.with_clean_env`, you will
    not have any bundler specific env variables, but you will also not have
    original gem path, which will make it impossible to run any gem.
    
    To fix this I try to always keep a reference to original gem path, so
    it's not emptied along the way.