summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* [Setup] Fix multiple non-additive invocations of Bundler.setup with ↵seg-fix-setupSamuel E. Giddins2015-03-222-6/+16
| | | | different groups
* Merge pull request #3491 from smlance/1-99-devAndré Arko2015-03-212-10/+28
|\ | | | | Add bundle_ruby deprecation warning
| * Add bundle_ruby deprecation warningStefan Lance2015-03-202-10/+28
|/
* Merge pull request #3487 from marutosi/rake-mingw-20André Medeiros2015-03-201-2/+2
|\ | | | | fix "rake spec:deps" fails on MinGW Ruby 2.0
| * fix "rake spec:deps" fails on MinGW Ruby 2.0Toshi MARUYAMA2015-03-201-2/+2
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` $ ruby --version ruby 2.0.0p598 (2014-11-13) [x64-mingw32] $ rake spec:deps DL is deprecated, please use Fiddle c:/Ruby200-x64/bin/ruby.exe -S gem list -i '^mustache$' -v '= 0.99.6' || c:/Ruby 200-x64/bin/ruby.exe -S gem install mustache -v '= 0.99.6' --no-ri --no-rdoc true c:/Ruby200-x64/bin/ruby.exe -S gem list -i '^rdiscount$' -v '~> 1.6' || c:/Ruby2 00-x64/bin/ruby.exe -S gem install rdiscount -v '~> 1.6' --no-ri --no-rdoc ERROR: While executing gem ... (Gem::Requirement::BadRequirementError) Illformed requirement ["~ "] ERROR: While executing gem ... (Gem::Requirement::BadRequirementError) Illformed requirement ["~ --no-ri --no-rdoc"] rake aborted! Command failed with status (1): [c:/Ruby200-x64/bin/ruby.exe -S gem list -i...] c:/workdir/git-workdir/bundler/Rakefile:90:in `block (3 levels) in <top (require d)>' c:/workdir/git-workdir/bundler/Rakefile:89:in `each' c:/workdir/git-workdir/bundler/Rakefile:89:in `block (2 levels) in <top (require d)>' c:/workdir/git-workdir/bundler/Rakefile:23:in `block in invoke' c:/workdir/git-workdir/bundler/Rakefile:22:in `invoke' Tasks: TOP => spec:deps (See full trace by running task with --trace) ```
* Merge pull request #3486 from niku4i/missing-regex-escapeAndré Arko2015-03-191-1/+1
|\ | | | | Missing regex escape in bin/bundler
| * Missing regex escapeNobuhiro Nikushi2015-03-201-1/+1
| |
* | Merge pull request #3439 from segiddins/seg-lockAndré Arko2015-03-194-3/+147
|\ \ | | | | | | [Lock] Add lock command
| * | [Man] Add manpage entry for bundle lock, and remove the obsolete obsolete ↵Samuel E. Giddins2015-03-181-3/+3
| | | | | | | | | | | | entries for bundle lock & bundle unlock
| * | [Lock] Add specs for bundle lockSamuel E. Giddins2015-03-181-0/+94
| | |
| * | [Lock] Add lock commandSamuel E. Giddins2015-03-182-0/+50
| | |
* | | Merge pull request #3480 from bundler/seg-dsl-errorAndré Arko2015-03-194-17/+113
|\ \ \ | |_|/ |/| | [DSL] Add prettier DSL error
| * | [DSLError] Update specs for pre-2.0 rubyseg-dsl-errorSamuel E. Giddins2015-03-182-3/+3
| | |
| * | [DSLError] Update specs for re-wording of descriptionSamuel E. Giddins2015-03-161-4/+4
| | |
| * | [DSLError] Fix for #lines returning an enumeratorSamuel E. Giddins2015-03-161-1/+1
| | |
| * | [DSL] Fix failing specs related to new DSLErrorSamuel E. Giddins2015-03-162-2/+7
| | |
| * | [DSL] Make the DSL error description friendly by saying there was an error ↵Samuel E. Giddins2015-03-161-1/+1
| | | | | | | | | | | | instead of using the word invalid
| * | [DSL] Add prettier DSL errorSamuel E. Giddins2015-03-163-15/+106
| | |
* | | Merge pull request #3440 from segiddins/seg-inlineAndré Arko2015-03-192-0/+138
|\ \ \ | | | | | | | | [Inline] Add bundler/inline to allow using Bundler without a Gemfile
| * | | [Inline] Add YARD comments to gemfileSamuel E. Giddins2015-03-181-2/+31
| | | |
| * | | [Inline] Remove dependence on #define_singleton_method so things work on 1.8.7Samuel E. Giddins2015-03-162-7/+6
| | | |
| * | | [Inline] Add some basic specsSamuel E. Giddins2015-03-161-0/+90
| | | |
| * | | [Inline] No. Tabs did NOT get committed. You saw nothing.Samuel E. Giddins2015-02-261-16/+16
| | | |
| * | | [Inline] Add bundler/inline to allow using Bundler without a GemfileSamuel E. Giddins2015-02-261-0/+20
| | | |
* | | | Merge pull request #3481 from vassilevsky/typoAndré Arko2015-03-181-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Fix a typo [ci skip]
| * | | Fix a typoIlya Vassilevsky2015-03-181-1/+1
|/ / /
* | | Merge pull request #3478 from TimMoore/new-rubygems-remoteAndré Arko2015-03-158-34/+139
|\ \ \ | | | | | | | | Move remote URI resolution logic into Remote
| * | | Make Fetcher take a Remote instead of a URI.Tim Moore2015-03-152-7/+4
| | | |
| * | | Move remote URI resolution logic into Remote.Tim Moore2015-03-153-14/+39
| | | |
| * | | Move lookup of mirror into Remote.Tim Moore2015-03-153-1/+17
| | | |
| * | | Add Settings#credentials_for(uri).Tim Moore2015-03-153-1/+32
| | | |
| * | | Move Bundler::Source.mirror_for to Settings.Tim Moore2015-03-155-15/+51
|/ / /
* | | Merge pull request #3476 from TimMoore/rubygems-remote-refactorAndré Arko2015-03-1412-95/+119
|\ \ \ | | | | | | | | Rubygems remote refactor
| * | | Rename Specification#source_uri to remote.Tim Moore2015-03-147-14/+12
| | | |
| * | | Change AnonymizableURI to Source::Rubygems::Remote.Tim Moore2015-03-147-85/+111
|/ / /
* | | date the changelogAndre Arko2015-03-131-1/+1
| | | | | | | | | | | | [ci skip]
* | | Version 1.9.0.rc with changelogv1.9.0.rcAndre Arko2015-03-132-1/+8
| | |
* | | Fix Bundler::whichJunichi Morimoto2015-03-121-1/+2
| |/ |/| | | | | | | | | | | Bundler::which doesn't return nil if the argument is a name of directory. This is because File::executable? returns true when its argument is a name of directory. similar to 628927b6eebf2523ad18f7042da6ac598d000d61
* | Merge pull request #3470 from bundler/seg-fix-prerelease-gemAndré Arko2015-03-111-1/+1
|\ \ | | | | | | [Gem] Fix the generated bundler dependency version for weird pre-release...
| * | [Gem] Fix the generated bundler dependency version for weird pre-release ↵Samuel E. Giddins2015-03-111-1/+1
|/ / | | | | | | versions
* | Version 1.9.0.pre.1 with changelogv1.9.0.pre.1Andre Arko2015-03-112-1/+7
| |
* | Merge pull request #3469 from arthurnn/catch_runtime_errorAndré Medeiros2015-03-112-1/+9
|\ \ | | | | | | Catch and report RuntimeError on Gemfile eval
| * | Catch and report RuntimeError on Gemfile evalArthur Neves2015-03-112-1/+9
|/ /
* | Fix spec failures.Andre Medeiros2015-03-112-1/+2
| |
* | Version 1.9.0.pre with changelogv1.9.0.preAndre Arko2015-03-111-0/+12
| |
* | Merge tag 'v1.8.5'Andre Arko2015-03-1116-62/+154
|\ \ | | | | | | | | | | | | | | | | | | | | | Version 1.8.5 Conflicts: lib/bundler/templates/newgem/newgem.gemspec.tt lib/bundler/version.rb
| * | Version 1.8.5 with changelogv1.8.5Andre Arko2015-03-112-1/+8
| | |
| * | test to ensure 1.8 can read 1.7 mirror settingsAndre Arko2015-03-111-0/+6
| | |
| * | fix tests for MIT in gemspec to match settingsAndre Arko2015-03-111-8/+3
| | |
| * | test each firstrun questionAndre Arko2015-03-111-0/+41
| | |