Issue #2000 Add test for conflict markers in Gemfile.lock
Raise error if Gemfile.lock contains conflict markers, closes #2000
Check for nil PATH

fixes #2006
Handle error messages caused by missing binary libraries.
Issue #2000 improve error message
loosen ruby directive for engines

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
Don't actually care if git repo is inside the repository, always cache it, closes #1989
Prune git and path directories inside vendor/cache, closes #1988

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.
remove unnecessary '|| nil'
add warning message for `bundle pack --all` if not used with git repos
don't display warning if Bundler.settings[:cache_all] is set
Make locking the Gemfile optional on $ bundle check

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?
rename --no-lock to --dry-run
special case `ruby` directive

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.
Version 1.1.5 with changelog
Merge branch '1-1-stable'

Conflicts:
	CHANGELOG.md
	lib/bundler/dsl.rb
	lib/bundler/version.rb
don't need these tests in 1.2
Version 1.2.0.rc with changelog
Fix 'LICENSCE' typo in CHANGELOG
Merge pull request #1931 from coding46/patch-1

Simple Typo