summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* [Travis] Allow building the auto branchaa-new-travis-infraSamuel E. Giddins2015-07-211-0/+1
|
* Switch to speedy new Travis boxesAndre Arko2015-07-212-1/+2
|
* Fix RuboCop style violationsStefan Lance2015-07-212-8/+6
|
* Merge pull request #3837 from smlance/sml-fix-default-install-path-2-0-devAndré Arko2015-07-203-5/+28
|\ | | | | Ensure configured relative paths are expanded from the Gemfile directory
| * Fix infinite recursion bugStefan Lance2015-07-201-3/+1
| |
| * Move installation path logic to Bundler.settings.pathStefan Lance2015-07-202-17/+24
| |
| * Modify installation pathStefan Lance2015-07-203-3/+21
| | | | | | | | | | Conflicts: lib/bundler/source_list.rb
| * Merge pull request #3831 from bundler/seg-default-command-helpAndré Arko2015-07-200-0/+0
|/ | | | [CLI] Print help as the default no-args command
* Merge pull request #3842 from smlance/sml-drop-ruby-from-travis-2-0-devStefan Lance2015-07-201-46/+0
|\ | | | | Drop Travis builds for Ruby versions below 2.0.0
| * Drop Travis builds for Ruby versions below 2.0.0Stefan Lance2015-07-201-46/+0
|/ | | | | - Bundler 2.0 will not support Ruby versions less than 2.0.0, so we don't need to run the Travis builds for these versions.
* Merge pull request #3843 from smlance/sml-fix-2-0-devStefan Lance2015-07-207-92/+5
|\ | | | | Fix conflict resolution mistakes
| * Fix failing specsStefan Lance2015-07-201-1/+1
| |
| * Fix more conflict resolution errorsStefan Lance2015-07-173-60/+2
| |
| * Fix conflict resolution mistakesStefan Lance2015-07-177-91/+62
| |
* | Fix bug in settings.rbStefan Lance2015-07-201-0/+2
| |
* | Merge pull request #3836 from smlance/sml-undo-forgetting-flags-2-0-devAndré Arko2015-07-182-53/+6
|\ \ | |/ |/| Undo changes in initial "stop autoremembering flags" commit
| * Undo changes in initial "stop autoremembering flags" commitStefan Lance2015-07-172-53/+6
| | | | | | | | | | Conflicts: lib/bundler/settings.rb
* | Merge pull request #3841 from smlance/sml-rubocop-resolution-2-0-devStefan Lance2015-07-1722-147/+233
|\ \ | |/ |/| Resolve merge conflicts introduced by RuboCop and fix failing specs
| * Fix failing specs introduced by RuboCop mergeStefan Lance2015-07-1712-116/+132
| |
| * Merge branch '2-0-dev' of github.com:bundler/bundler into 2-0-devStefan Lance2015-07-1710-31/+101
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .travis.yml bin/bundle bin/bundler lib/bundler/cli/config.rb lib/bundler/deployment.rb lib/bundler/dsl.rb lib/bundler/settings.rb lib/bundler/shared_helpers.rb lib/bundler/source_list.rb lib/bundler/ui/shell.rb man/bundle-config.ronn man/bundle-install.ronn spec/bundler/source_list_spec.rb spec/bundler/ui/shell_spec.rb spec/commands/binstubs_spec.rb spec/commands/exec_spec.rb spec/commands/open_spec.rb spec/commands/package_spec.rb spec/deprecation_spec.rb spec/install/bundler_spec.rb spec/install/gemfile/git_spec.rb spec/install/gemfile/path_spec.rb spec/install/gems/flex_spec.rb spec/install/gems/sources_spec.rb spec/install/gems/standalone_spec.rb spec/install/gems/sudo_spec.rb spec/install/path_spec.rb spec/other/cli_dispatch_spec.rb spec/other/platform_spec.rb spec/quality_spec.rb spec/runtime/executable_spec.rb spec/runtime/require_spec.rb spec/support/matchers.rb
* [CLI] Print help as the default no-args commandSamuel E. Giddins2015-07-162-1/+8
|
* Make a path_spec fail [reminder]Stefan Lance2015-07-161-1/+2
|
* Fix sudo specs that fail remotelyStefan Lance2015-07-161-5/+7
|
* Fix config specStefan Lance2015-07-161-3/+8
|
* Fix failing path specsStefan Lance2015-07-161-4/+3
|
* Fix `Bundler.settings.path`Stefan Lance2015-07-162-5/+9
| | | | - `File.expand_path`s may be unnecessary
* Change bin_path back to `Bundler.system_bindir`Stefan Lance2015-07-161-1/+1
|
* Handle relative bundle paths by expanding `Bundler.settings.path`Stefan Lance2015-07-161-0/+1
|
* Change default install path for gemspecsStefan Lance2015-07-161-1/+1
|
* Change relative `path_spec.rb` specsStefan Lance2015-07-161-1/+4
|
* Change `install --deployment` pathStefan Lance2015-07-161-1/+1
| | | | | | - Ensure --deployment path always include `Bundler.settings.path`. Note: this makes the --deployment path redundant, which is undesirable.
* Change default install path in source/rubygems.rbStefan Lance2015-07-161-2/+2
|
* Fix failing sudo specsStefan Lance2015-07-161-5/+5
|
* update clean spec to explicitly call --systemAndre Arko2015-07-168-27/+40
| | | | | | | | | | | | | | | - Change more clean specs to explicitly use --system - Fix failing platform.rb specs by adding --system - Previously, `install_gemfile` and `bundle :install` installed gems to the system gem path by default (when given no flags). This caused some of the specs to fail, since the default installation path and the `default_bundle_path` have changed. So, we needed to add the `system` flag to the install commands in certain specs and change the expected output to include the `system_gem_path`. - Fix failing spec re: conflicting path configs
* Handle conflicting path config settingsStefan Lance2015-07-162-0/+38
| | | | | - behavior may be undefined if the user sets both manually in their config file
* Change default install path to ./.bundle/gemsStefan Lance2015-07-162-2/+2
|
* Remove deprecation warningStefan Lance2015-07-162-9/+1
| | | | - It will be displayed in 1-99-dev, instead
* Fix failing executable specStefan Lance2015-07-161-1/+1
|
* Add back in bundle install --binstubs specsStefan Lance2015-07-161-0/+145
| | | | - but change them so they test bundle binstubs instead
* Place ./bin in backticks in UPGRADING.mdStefan Lance2015-07-161-1/+1
|
* Fix failing specStefan Lance2015-07-161-7/+0
|
* Stop auto-remembering flags in 2.0Patrick Metcalfe2015-07-164-8/+61
|
* Edit manpagesStefan Lance2015-07-163-8/+10
|
* Edit manpages and UPGRADING.mdStefan Lance2015-07-163-6/+8
|
* Remove specs that used `bundle install --binstubs`Stefan Lance2015-07-162-145/+0
|
* Remove --binstubs from cli/install.rbStefan Lance2015-07-163-21/+2
| | | | | - Also, remove `bundle install --binstubs` documentation from the config and install manpages
* Check that err includes error msgs in specsStefan Lance2015-07-161-0/+20
|
* Fix version number and some specsStefan Lance2015-07-162-2/+2
|
* Clean up invocation of Bundler CLISamuel E. Giddins2015-07-162-22/+2
|
* don’t hit rubygems.org in a test o_OAndre Arko2015-07-161-1/+1
|