summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Auto merge of #5108 - chrismo:cons_update_docs, r=indirectHomu2016-11-011-8/+8
|\ | | | | | | | | | | [WIP] New patch level and conservative options documented. Fixes #4775.
| * Add bundle-outdated man pagechrismo2016-10-311-3/+3
| |
| * Update bundle lock man pagechrismo2016-10-241-3/+3
| |
| * New bundle update options documented.chrismo2016-10-221-3/+3
| | | | | | | | Fixes #4775.
* | Auto merge of #5100 - bronzdoc:fix_shebang_check_in_exec, r=segiddinsHomu2016-10-311-0/+6
|\ \ | | | | | | | | | | | | | | | Warn if executable in bundle exec is empty closes https://github.com/bundler/bundler/issues/5084
| * | Warn if executable in bundle exec is emptybronzdoc2016-10-301-0/+6
| | |
* | | Update vendored Molinillo to 0.5.3seg-molinillo-0.5.3Samuel Giddins2016-10-2711-15/+102
| | |
* | | use `Bunder.which` instead of `system` for otool and ldd detectionColby Swandale2016-10-251-2/+2
| | |
* | | use `system -v` to check for otool and lddColby Swandale2016-10-241-2/+2
| | |
* | | Merge tag 'v1.13.6'Samuel Giddins2016-10-221-1/+1
|\ \ \ | |_|/ |/| | | | | Version 1.13.6
| * | Version 1.13.6 with changelogv1.13.6Samuel Giddins2016-10-221-1/+1
| | |
| * | Auto merge of #5106 - bundler:seg-public-gem, r=indirectHomu2016-10-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [RubygemsIntegration] Temporarily make #gem public again Closes #5102 \c @indirect @schneems (cherry picked from commit 90b99f2c35b38724fd7a9fef3e96587bd5aed2b4)
* | | Auto merge of #5061 - chrismo:cons_outdated, r=indirectHomu2016-10-225-18/+46
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conservative updates on outdated Add conservative resolving behavior to outdated command. - [x] convert existing flags to --filter-* - [x] deal with strict flag - [x] make a 2.0 issue to consider making strict flags more consistent - [x] fix #5065 (outdated filter options don't work with `--strict') - [x] fix #5076 (outdated shouldn't say "Bundle up to date!" if results are just filtered out.) - [ ] document breaking change reasons? (_commit comment has something at least now_) - [x] what about `bundle show --outdated`? (_it's a much simpler version ... prolly just going to leave it alone for now?_) The flags as passed to the GemVersionPromoter _change_ resolution. <=1.13.2 of bundle outdated, those flags merely filter the output, with no influence on resolution. If the lockfile is set to foo 1.0.0, and all of the following exist: 1.0.1, 1.1.0, 2.0.0, then <=1.13.2 bundle outdated currently will show: `foo (newest 2.0.0, installed 1.0.0)` <=1.13.2 `bundle outdated --minor` simply filters away that line and won't show it. With these changes, `bundle outdated --minor` would be fed to the GemVersionPromoter and actually only resolve `foo` up to `1.1.0`. This gist shows how it currently works, filtering the output: https://gist.github.com/chrismo/0bc6cfa00f539787101a9a2c900616d3 It's unfortunate timing. They were only added in 1.12 ... I'm biased, but feel like the affect the flags have on resolution is of greater value, and would be better to keep in sync with how they work fed to the `bundle update` command as of 1.13, and we could add new --filter-patch flags to replace what they do currently. IIRC, there was some confusion at the time that Andre perhaps even thought these flags as of 1.12 would be affecting what the newest would resolve to, instead of just filtering the output, so - _if_ I'm remembering correctly, that's also influencing my opinion. But, I can be swayed by the breaking behavior argument. from @indirect in [this comment](https://github.com/bundler/bundler/pull/4841#discussion_r82021277): "IMO, this is what we were trying to do in 1.12, and failed to do because resolving is complicated. :/ I would be okay with this change on the grounds that the previous flags were documented so it sounded like they cause the new resolver aware behavior. đź‘Ť"
| * | | filtered outdated msg shouldn't say 'up to date'chrismo2016-10-191-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #5076. When a filter option is in use and it filters out everything in the requested categories, it's safer to say there were no %{level} updates to display rather than "Bundle up to date!" Tracking an additional local variable with the exact info to know that even when filtered there was nothing to update anyway I didn't feel was worth it with the current design.
| * | | Enable cons updates in outdated and other fixes.chrismo2016-10-125-17/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4772 - Changes previous `--patch` / `--minor` / `--major` options to `--filter-patch` / `--filter-minor` / `--filter-major` and adds back `--patch` / `--minor` / `--major` as conservative the patch level update options to match the behavior of these options in `bundle update` in 1.13. This is a breaking change for the previous filtering options added in 1.12, but we're allowing it because there was some confusion as to what those options did in 1.12, some thinking that it would perform the resolution constraints that these options _now_ actually do. A problem with merging in conservative bundle update options was the pre-existing `--strict` `outdated` option, which has been in `outdated` since 1.5. `--strict` for `outdated` means to only report on newer gem versions that still satisfy declared requirements in the Gemfile. Without `--strict`, `outdated` reports the most recent available regardless of declared requirements in the Gemfile. `--strict` in `update` in 1.13 means to not allow _any_ dependency to update past the patch level option. Rather than break the longer standing `--strict` option, the new `--update-strict` option has been added which maps to the conservative bundle update `--strict` option. We can revisit this in 2.0. This also fixes #5065, where the new filtering options were ignored if the `--strict` option was used.
* | | | Auto merge of #4980 - chrismo:lock_shared_deps, r=indirectHomu2016-10-224-16/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | replicate cons. bundle install in update cmd In the discussion on new 1.13 [Conservative Bundle Updates](https://github.com/bundler/bundler-features/issues/122), some users would like to have the same [Conservative Updating](http://bundler.io/v1.12/man/bundle-install.1.html#CONSERVATIVE-UPDATING) behavior available in `bundle install` when a declared dependency is altered in the Gemfile, also available in the `bundle update` command.
| * | | | Add bundle install conservative updating to updatechrismo2016-10-214-16/+24
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the discussion on new 1.13 Conservative Bundle Updates (see https://github.com/bundler/bundler-features/issues/122), some users would like to have the same Conservative Updating (see http://bundler.io/v1.12/man/bundle-install.1.html#CONSERVATIVE-UPDATING) behavior available in `bundle install` when a declared dependency is altered in the Gemfile, also available in the `bundle update` command. This adds a new option called `--conservative` to both `bundle update` and `bundle lock`. The option only applies on `bundle lock` if the `--update` option is in use. The internal flag is more descriptive as to what actually takes place: It locks any shared dependencies from the gem(s) being updated. This also promotes the previously added patch level options to being shown in command-line help, anticipating a 1.14 release, to make these public and documented.
* | | | [RubygemsIntegration] Temporarily make #gem public againseg-public-gemSamuel Giddins2016-10-201-0/+4
| | | |
* | | | Auto merge of #5071 - bundler:seg-use-gemdeps, r=indirectHomu2016-10-212-0/+36
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [RubyGemsIntegration] Add a single method for #use_gemdeps Closes #5040 \c @indirect
| * | | | [RubyGemsIntegration] Add a single method for #use_gemdepsseg-use-gemdepsSamuel Giddins2016-10-092-0/+36
| | |/ / | |/| |
* | | | Fixed bundler incorrectly printing the following error message when ↵hiren mistry2016-10-201-1/+1
| |/ / |/| | | | | | | | attempting to use a gem from the bundle before running the first bundle install. The gem version does exist in the remote gem server. Incorrect error message: '... that version could not be found in any of the sources listed in your Gemfile. If you haven't changed sources, that means the author of (the gem) has removed it'.
* | | Merge tag 'v1.13.5'Samuel Giddins2016-10-151-1/+1
|\ \ \ | | |/ | |/| | | | Version 1.13.5
| * | Version 1.13.5 with changelogv1.13.5Samuel Giddins2016-10-151-1/+1
| | |
| * | Auto merge of #5090 - bundler:aa-missing-specs, r=indirectHomu2016-10-151-1/+2
| | | | | | | | | | | | | | | | | | [Index] Allow pre-release versions in search when the base is pre-release Closes #5089
* | | Auto merge of #5090 - bundler:aa-missing-specs, r=indirectHomu2016-10-151-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | [Index] Allow pre-release versions in search when the base is pre-release Closes #5089
| * | | [Index] Allow pre-release versions when the base is pre-releaseSamuel Giddins2016-10-141-1/+2
| | | |
* | | | Auto merge of #5053 - hmistry:fix-clean-dry-run, r=segiddinsHomu2016-10-151-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the behavior of 'bundle clean --dry-run' to output the list regardless of path set or force option Changed the behavior of 'bundle clean --dry-run' to output the list of gems bundle without having the local path set or providing the '--force' option. This change does not affect the actual behavior of 'bundle clean' which requires either the path being set or use of '--force'. Closes #5027.
| * | | | Changed the behavior of 'bundle clean --dry-run' to output the list of gems ↵hiren mistry2016-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | bundle without having the local path set or providing the '--force' option. This change does not affect the actual behavior of 'bundle clean' which requires either the path being set or use of '--force'.
* | | | | Merge tag 'v1.13.4'aa-merge-1-13-4Andre Arko2016-10-132-2/+2
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | Version 1.13.4
| * | | initialize ivar correctly /ht @segiddinsv1.13.4Andre Arko2016-10-131-1/+1
| | | |
| * | | initialize ivar before useAndre Arko2016-10-121-0/+1
| | | |
| * | | oops, backported something that doesn't existAndre Arko2016-10-121-1/+1
| | | |
| * | | Auto merge of #5077 - bundler:aa-revert-4998, r=indirectHomu2016-10-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Revert "::Rake::CommandFailedError doesn't exist." This reverts commit c5a889ce865cc0314597e9de11e2bee366e797ac.
| * | | Version 1.13.4 with changelogAndre Arko2016-10-111-1/+1
| | | |
| * | | Auto merge of #4977 - chrismo:cons_lock_shared_deps, r=segiddinsHomu2016-10-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #4934. Make GVP _after_ eager unlock. When Definition creates the GemVersionPromoter, it needs to do so _after_ it's performed the eager_unlock so the GVP gets the correct list of unlocked gems. Prior to this fix, it had a stricter list of gems being updated with the new `--patch` or `--minor` options used with `bundle update` and in some cases would have inconsistent results when used without a conservative switch or the `--major` option. See #4934 for details.
| * | | Auto merge of #5010 - ↵Homu2016-10-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aycabta:use-require-instead-of-autoload-for-plugin-api, r=indirect [workaround] Use `require` instead of `autoload` for bundler/plugin/api Please read https://github.com/bundler/bundler/pull/4981#issuecomment-248674155. > But it's elusive reproduction (and lack of test case) makes me think that the problem is a bit deeper and may recur. I think so. This Pull Request is just *workaround*.
| * | | Auto merge of #5043 - bundler:aa-use-tmp, r=segiddinsHomu2016-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use /tmp for mktmpdir As we noticed in #4519, we need to use a temporary directory to hold compact index downloads so that multiple processes don't write to the same files at the same time and break everything. The fix for that was #4561, which added temporary directories to hold all files as they download, and then uses the (atomic) `FileUtils.cp` to move the completed downloads into place, so there is never a point where multiple processes are trying to write into the file at once. Unfortunately, using `Dir.mktmpdir` requires that the parent directory be _either_ world writable or sticky, but not both. Based on #4599, it looks like it's common for home directories to be both world writable and sticky. While that's a security problem by itself, it's not a big concern for Bundler and the compact index. So we want to let users continue to use Bundler, even with the compact index, without having to change the permissions on their home directories. This commit changes the `mktmpdir` call to create the temporary directory inside the default OS tempdir, which is typically `/tmp` or `/var/tmp` depending on distro. Since that directory is designed to hold other temporary directories, that change should (theoretically) reduce or eliminate the problem reported in #4599.
| * | | Auto merge of #5064 - bundler:aa-debug-etag-mismatch, r=indirectHomu2016-10-112-13/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change checksum warning to debug print This was super helpful when the server was continuously returning bad checksums, but it’s a scary warning to see anytime we update the versions file. And we’re going to need to update the versions file at least twice a year, so it seems like a good idea to head off users worrying about a message that is actually things working as intended.
* | | | Merge tag 'v1.13.3'Samuel Giddins2016-10-101-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Version 1.13.3 # Conflicts: # lib/bundler/vendor/compact_index_client/lib/compact_index_client/updater.rb
| * | | Version 1.13.3 with changelogv1.13.3Samuel Giddins2016-10-101-1/+1
| | | |
| * | | [CompactIndexClient::Updater] Support weak etagsSamuel Giddins2016-10-101-1/+1
| | | | | | | | | | | | | | | | (cherry picked from commit ece6829c46e4768aae13f970a54017c272bf974d)
* | | | Auto merge of #5055 - bundler:seg-sort-dep-api-gem-names, r=segiddinsHomu2016-10-101-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Fetcher::Dependency] Sort gem names in query string This might slightly help the fastly hit rate? \c @indirect @dwradcliffe
| * | | | [Fetcher::Dependency] Sort gem names in query stringSamuel Giddins2016-10-091-1/+1
| | | | |
* | | | | Add platform information to envbronzdoc2016-10-091-0/+1
|/ / / /
* | | | clearer objects, fix fetch_url typoaa-debug-etag-mismatchAndre Arko2016-10-081-4/+7
| | | |
* | | | change checksum warning to debug printAndre Arko2016-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This was super helpful when the server was continuously returning bad checksums, but it’s a scary warning to see anytime we update the versions file. And we’re going to need to update the versions file at least twice a year, so it seems like a good idea to head off users worrying about a message that is actually things working as intended.
* | | | make lambda an object with explicit attributesAndre Arko2016-10-071-9/+8
| | | |
* | | | unless var.nil? → if varAndre Arko2016-10-071-2/+2
| | | |
* | | | begin/end so the indentation matches the endsAndre Arko2016-10-071-1/+2
| |_|/ |/| |
* | | Better gem outdated list grouped by groups.Guillermo Guerrero2016-10-062-28/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore default outdated. Added command in cli: - bundle outdated --groups Added --group option. Groups with alphabetical order. Added test. Reverted.
View Lorry Controller Status