summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* [Definition] Lazily create gem_version_promoterseg-gvp-majorSamuel Giddins2017-09-051-14/+14
| | | | This way, it can be reset in #missing_specs?
* [GemVersionPromoter] Avoid checking ENV for debug every timeSamuel Giddins2017-09-051-2/+4
|
* [Resolver] Use the GVP for major updates in 2.0Samuel Giddins2017-09-054-1/+5
|
* Auto merge of #6003 - greysteil:handle-missing-socket, r=segiddinsThe Bundler Bot2017-09-052-0/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle missing socket when warning about OpenSSL version ### What was the end-user problem that led to this PR? Stubbing Rubygems requests with WebMock was causing `undefined method 'io' for nil:NilClass` errors when using Bundler 1.16.0.pre.1 ### What was your diagnosis of the problem? My diagnosis was that the new warning text about old OpenSSL versions didn't consider the case that a connection might not have an `@socket` variable set. ### What is your fix for the problem, implemented in this PR? Guard against this by returning early in that case. ### Why did you choose this fix out of the possible options? I chose this fix because it works, and because `Net::HTTP` itself has some guards in it around `nil` values for `@socket` ([example](https://github.com/ruby/ruby/blob/trunk/lib/net/http.rb#L858-L860)). This isn't my area, though, so it could be that a fix is needed in WebMock, not here...
| * Handle missing socket when warning about OpenSSL versionGrey Baker2017-09-052-0/+7
|/
* Merge branch '1-16-stable'Samuel Giddins2017-09-042-1/+44
|\
| * Version 1.16.0.pre.1 with changelogv1.16.0.pre.1Samuel Giddins2017-09-042-1/+44
|/
* Auto merge of #5983 - asehra:master, r=segiddinsThe Bundler Bot2017-08-311-0/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation for packaging with --no-install ### What was the end-user problem that led to this PR? I need to package gems for deployment but don't want to install them on the local system. ### What was your diagnosis of the problem? The behaviour is a part of bundler but it is not documented anywhere in man pages or the bundler site. To find the answer, one has to look at issues that were closed a few years ago. ### What is your fix for the problem, implemented in this PR? I've updated the man page for the `bundle package` command. Hopefully, this will trickle down to bundler site pages for package command whenever CI publishes it. Followed the doc [here](https://github.com/bundler/bundler/blob/master/doc/documentation/WRITING.md) to run tests. ### Why did you choose this fix out of the possible options? It felt appropriate to document a flag available on a CLI in its help pages.
| * Add documentation for packaging with `--no-install`Ashish Sehra2017-08-301-0/+5
| |
* | Auto merge of #5978 - torcido:master, r=segiddinsThe Bundler Bot2017-08-303-7/+49
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support bundle_path used by war files generated with jruby's warbler ### What was the end-user problem that led to this PR? Issue #5975. The problem was that recent code to detect a bad bundle_path by looking for the PATH_SEPARATOR character broke when running from a war file generated by jruby's warbler. ### What was your diagnosis of the problem? My diagnosis was that the path separator used was not appropriate in this circumstance. ### What is your fix for the problem, implemented in this PR? My fix implements the suggestion from @segiddins to use the same path splitting logic used by RubyGems under jruby to determine if the bad path is present. ### Why did you choose this fix out of the possible options? I chose this fix because it provides a way to detect the original problem that is consistent with the handling within RubyGems.
| * Stub the new rubygems integration method, rather than the underlying Gem ↵Michael Pitman2017-08-301-2/+2
| | | | | | | | method in the bundle path regex specs
| * Fix inappropriate use of single quotesMichael Pitman2017-08-301-1/+1
| |
| * Improved the way the string was interpreted as a Regex by using the regex ↵Michael Pitman2017-08-301-5/+1
| | | | | | | | constructor
| * Change let block in spec from curly braces to a do/end block to conform with ↵Michael Pitman2017-08-301-2/+2
| | | | | | | | style guide while retaining the explanatory comments
| * Move the path_separator logic into the appropriate RubygemsIntegration classesMichael Pitman2017-08-302-1/+9
| |
| * Change the literal regex to an eval expression in order to enable loading of ↵Michael Pitman2017-08-301-2/+7
| | | | | | | | the file under ruby 1.8
| * Use a ruby declaration, rather than relying on RUBY_VERSION to run the specs ↵Michael Pitman2017-08-301-27/+25
| | | | | | | | that rely on a ruby >= 1.9 style regex
| * Fix spec to obey style rulesMichael Pitman2017-08-291-1/+0
| |
| * Exclude the specs that require ruby 1.9 regexes from spec runs under ruby 1.8Michael Pitman2017-08-291-26/+28
| |
| * Ensure that we use the appropriate path separator in the error message when ↵Michael Pitman2017-08-291-2/+2
| | | | | | | | displaying the bundle_path error for a RubyGems version earlier than 2.0
| * Support ruby version 1.8.7 and rubygems earlier than version 2.0.0Michael Pitman2017-08-292-4/+9
| |
| * Add more specs to cover the particular issue discovered when running under jrubyMichael Pitman2017-08-281-1/+30
| |
| * Use Gem.path_separator instead of File::PATH_SEPARATOR to detect an invalid ↵Michael Pitman2017-08-282-6/+6
| | | | | | | | bundle_path in order to work with jruby-generated war files. Fixes issue 5975
* | Auto merge of #5979 - bundler:seg-pretty-bundle-help, r=indirectThe Bundler Bot2017-08-293-19/+55
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CLI] Prettify the output in cli_help ### What was the end-user problem that led to this PR? The problem was the new help output for `bundle` was very verbose and unorganized, making it look a bit like work vomit. ### What was your diagnosis of the problem? My diagnosis was we should Closes https://github.com/bundler/bundler/issues/5963. ### What is your fix for the problem, implemented in this PR? My fix prints the full version info, as well as grouping the commands into `primary` and `utility` as done in the man pages. ### Why did you choose this fix out of the possible options? I chose this fix because it makes the output pleasing to visually parse. ``` $ bundle Bundler version 1.15.4 (2017-08-25 commit 3203fdd2a) Bundler commands: Primary commands: bundle install [OPTIONS] # Install the current environment to the system bundle update [OPTIONS] # Update the current environment bundle package [OPTIONS] # Locks and then caches all of the gems into vendor/cache bundle exec [OPTIONS] # Run the command in context of the bundle bundle config NAME [VALUE] # Retrieve or set a configuration value bundle help [COMMAND] # Describe available commands or one specific command Utilities: bundle add GEM VERSION # Add gem to Gemfile and run bundle install bundle binstubs GEM [OPTIONS] # Install the binstubs of the listed gem bundle check [OPTIONS] # Checks if the dependencies listed in Gemfile are satisfied by currently installed gems bundle console [GROUP] # Opens an IRB session with the bundle pre-loaded bundle doctor [OPTIONS] # Checks the bundle for common problems bundle env # Print information about the environment Bundler is running under bundle gem NAME [OPTIONS] # Creates a skeleton for creating a rubygem bundle info GEM [OPTIONS] # Show information for the given gem bundle init [OPTIONS] # Generates a Gemfile into the current working directory bundle issue # Learn how to report an issue in Bundler bundle licenses # Prints the license of all gems in the bundle bundle lock # Creates a lockfile without installing bundle open GEM # Opens the source directory of the given bundled gem bundle outdated GEM [OPTIONS] # List installed gems with newer versions available bundle platform [OPTIONS] # Displays platform compatibility information bundle plugin # Manage the bundler plugins bundle pristine [GEMS...] # Restores installed gems to pristine condition from files located in the gem cache. Gem installed from a git reposit... bundle show GEM [OPTIONS] # Shows all gems that are part of the bundle, or the path to a given gem bundle version # Prints the bundler's version information Options: [--no-color] # Disable colorization in output -r, [--retry=NUM] # Specify the number of times you wish to attempt network commands -V, [--verbose], [--no-verbose] # Enable verbose output mode ```
| * | Add a spec for no-args bundle on 2.0Samuel Giddins2017-08-292-2/+16
| | |
| * | Fix outdated bundler suggestion logicSamuel Giddins2017-08-292-4/+4
| | |
| * | [CLI] Prettify the output in cli_helpSamuel Giddins2017-08-292-15/+37
|/ /
* | Auto merge of #5961 - bundler:seg-auto-clean, r=indirectThe Bundler Bot2017-08-2924-32/+83
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [2.0] Automatically bundle clean without a path set ### What was the end-user problem that led to this PR? The problem was with the switch to defaulting to a local install in 2.0, we're concerned about taking up too much disk space. ### What was your diagnosis of the problem? My diagnosis was we'd like to run `bundle clean` when possible. Closes https://github.com/bundler/bundler/issues/5875. ### What is your fix for the problem, implemented in this PR? My fix runs `clean` automatically on 2.0 when a `path` has _not_ been set. ### Why did you choose this fix out of the possible options? I chose this fix because it avoids the possibility of accidentally cleaning a shared location.
| * | Ensure the rackup binstub is present on 2.0 when it should beseg-auto-cleanSamuel Giddins2017-08-281-0/+1
| | |
| * | Pretty-print commad invocationsSamuel Giddins2017-08-281-1/+12
| | |
| * | [Index] Return self in #eachSamuel Giddins2017-08-281-0/+1
| | |
| * | Automatically bundle clean without a path set on 2.0Samuel Giddins2017-08-2822-31/+69
| | |
* | | Auto merge of #5977 - bundler:seg-github-release, r=indirectThe Bundler Bot2017-08-291-1/+80
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Rakefile] Add a task to generate GitHub releases ### What was the end-user problem that led to this PR? The problem was we spend all this time writing up an awesome changelog, yet don't have proper GitHub releases. Closes https://github.com/bundler/bundler/issues/4904. ### What was your diagnosis of the problem? My diagnosis was we needed to automate creating new GH releases, and tie that into the existing `rake release` process. I've already taken the liberty of backfilling existing releases, see https://github.com/bundler/bundler/releases/tag/v1.14.5 for an example
| * | | [Rakefile] Add a task to generate GitHub releasesseg-github-releaseSamuel Giddins2017-08-271-1/+80
| | |/ | |/|
* | | Auto merge of #5980 - NickLaMuro:change-gem-pristine-desc-to-long-desc, ↵The Bundler Bot2017-08-291-1/+6
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | r=segiddins Convert pristine command desc to long_desc What was the end-user problem that led to this PR? -------------------------------------------------- When taking a look at the output that was shown when doing `bundle cli_help`, half of the output for describing the `bundle pristine` command is truncated. What was your diagnosis of the problem? --------------------------------------- My diagnosis was that we had to long of a "basic description" (`desc`) for the `bundle pristine` command. What is your fix for the problem, implemented in this PR? --------------------------------------------------------- Convert the existing `desc` to a `long_desc`, and provide a shorter one for `desc`. Why did you choose this fix out of the possible options? -------------------------------------------------------- I chose this fix because it retained the same info that was there previously, but provided a much more terse description in summary like situations like `bundle cli_help`.
| * | Convert pristine command desc to long_descNick LaMuro2017-08-291-1/+6
|/ / | | | | | | | | | | | | | | | | | | The default command description for `bundle pristine` was way too long for simple description, and can trail off far beyond when called from `bundle cli_help`. That said, this is perfect info for a `long_desc`, so the current content has been moved there, and the regular desc was a trimmed version of that.
* | Auto merge of #5638 - bundler:seg-warn-old-tls, r=indirectThe Bundler Bot2017-08-283-2/+107
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Warn when making an outdated TLS connection to rubygems.org Right now, output looks like ``` Your Ruby version does not support TLSv1.1 or newer, which will be required to connect to https://index.rubygems.org by June 2018. Fetching gem metadata from https://rubygems.org/........... Fetching version metadata from https://rubygems.org/.. Resolving dependencies... Using rake 11.3.0 Using automatiek 0.1.2 from source at `.` Using rspec-support 3.5.0 Using diff-lcs 1.3 Using bundler 1.15.0.pre.3 Using rspec-core 3.5.4 Using rspec-expectations 3.5.0 Using rspec-mocks 3.5.0 Using rspec 3.5.0 Bundle updated! ``` Obviously this requires tests, and also backing out forcing the TLS version (which I did to make testing easier). The message could also use improvement, but I figured I'd ask for input from @indirect and @dwradcliffe
| * | Update outdated TLS warning to link to new bundler guideseg-warn-old-tlsSamuel Giddins2017-08-122-7/+14
| | |
| * | Use URI#host instead of #hostname for 1.8.7 compatibilitySamuel Giddins2017-08-121-1/+1
| | |
| * | Add specs for warning for old TLS versionsSamuel Giddins2017-08-121-0/+68
| | |
| * | Warn when making an outdated TLS connection to rubygems.orgSamuel Giddins2017-08-122-2/+32
| | |
* | | Auto merge of #5955 - bundler:seg-bundler-2-defaults, r=indirectThe Bundler Bot2017-08-2814-29/+38
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default to packaging all on 2.0 This is going to be the last set of changes to defaults in Bundler 2. @colby-swandale @indirect are there other changes I should be making here?
| * | | Completely remove the package --all option on 2.0 and force its behaviorseg-bundler-2-defaultsSamuel Giddins2017-08-2813-29/+36
| | | |
| * | | Default to packaging all on 2.0Samuel Giddins2017-08-283-4/+6
| | |/ | |/|
* | | Auto merge of #5973 - bundler:seg-molinillo-0.6.2, r=segiddinsThe Bundler Bot2017-08-282-8/+9
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Molinillo to 0.6.2 ### What was the end-user problem that led to this PR? The problem was Molinillo 0.6.2 fixes a potential problem. ### What is your fix for the problem, implemented in this PR? My fix is to update to Molinillo 0.6.2.
| * | Update Molinillo to 0.6.2seg-molinillo-0.6.2Samuel Giddins2017-08-252-8/+9
| | |
* | | Auto merge of #5976 - bundler:colby/bundler-binstubs-standalone, r=segiddinsThe Bundler Bot2017-08-284-9/+40
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bundle binstubs stanadlone flag ### What was the end-user problem that led to this PR? Currently, specifying the `--standalone` flag breaks `bundler binstubs` unless you have the `path` setting set in your bundle config. This is breaking in different ways but mostly for the same reason. Bundler Master: ``` RuntimeError: Can't standalone without an explicit path set /Users/c/Desktop/Projects/bundler/lib/bundler/installer.rb:158:in `generate_standalone_bundler_executable_stubs' /Users/c/Desktop/Projects/bundler/lib/bundler/cli/binstubs.rb:36:in `block in run' /Users/c/Desktop/Projects/bundler/lib/bundler/cli/binstubs.rb:26:in `each' ``` Bundler 1.15.4: ``` TypeError: no implicit conversion of nil into String /Users/c/.rubies/ruby-2.4.1/lib/ruby/2.4.0/pathname.rb:409:in `initialize' /Users/c/.rubies/ruby-2.4.1/lib/ruby/2.4.0/pathname.rb:409:in `new' /Users/c/.rubies/ruby-2.4.1/lib/ruby/2.4.0/pathname.rb:409:in `join' /Users/c/.gem/ruby/2.4.1/gems/bundler-1.15.4/lib/bundler/installer.rb:142:in `generate_standalone_bundler_executable_stubs' ``` This was not caught in our tests because the `--standalone` flag was infact not being tested. Another issue is that we have command options for the `bundle binstubs` command which are missing documentation in the man pages. ### What was your diagnosis of the problem? This error occurs when the `path` setting is not set which `generate_standalone_bundler_executable_stubs` expects to be set ### What is your fix for the problem, implemented in this PR? Set a temporary path setting in the binstubs command of either any currently set `path` setting or use `Bundler.root` instead. ### Why did you choose this fix out of the possible options? This was the most simplest solution that i can think of without having to change the standalone binstub generator.
| * | | fix breaking binstubs standalone flagcolby/bundler-binstubs-standaloneColby Swandale2017-08-263-9/+37
| | | | | | | | | | | | | | | | | | | | Also move the bundler-install standalone flag tests into the the bundle install tests
| * | | document `shebang` option for bundler-binstubColby Swandale2017-08-261-0/+3
| | | |
* | | | Auto merge of #5957 - bundler:seg-bundler-binstub-under-2, r=indirectThe Bundler Bot2017-08-273-11/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the locked bundler is under 2.0, allow any version < 2 ### What was the end-user problem that led to this PR? The problem was the bin stub would lock to a specific version even for a 1.x version, which was an incompatible change. See @indirect's comment in https://github.com/rubygems/rubygems/pull/1977#issuecomment-322852799 ### What was your diagnosis of the problem? My diagnosis was we needed to only pin to a specific version for 2.0+. ### What is your fix for the problem, implemented in this PR? My fix transforms any 1.x bundler version to a "< 2" constraint.
View Lorry Controller Status