Skip to content

Commit

Permalink
Auto merge of rubygems#6195 - dr-itz:unbreak-warbler, r=segiddins
Browse files Browse the repository at this point in the history
Include bundler.gemspec in the gem because warbler breaks w/o it

f06405 caused a regression with warbler, described in rubygems#6165 and jruby/warbler#421

If the fix is ok, it should probably be cherry-picked to 1-16-stable.

### What was the end-user problem that led to this PR?

Upgrading from bundler v1.15.x to v1.16.0 causes warbler to break/abort with error.

### What was your diagnosis of the problem?

1. error message from warbler: missing file
2. see why file is missing
3. google to see if it's just me 😄

### What is your fix for the problem, implemented in this PR?

Put the missing (from warblers point of view at least) back.

### Why did you choose this fix out of the possible options?

Seems easier than to fix warbler.
  • Loading branch information
bundlerbot authored and hsbt committed Dec 11, 2017
1 parent 47c4bbb commit 3a0c85f
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions bundler.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ Gem::Specification.new do |s|
s.files += Dir.glob("man/**/*")
# Include the CHANGELOG.md, LICENSE.md, README.md manually
s.files += %w[CHANGELOG.md LICENSE.md README.md]
# include the gemspec itself because warbler breaks w/o it
s.files += %w[bundler.gemspec]

s.bindir = "exe"
s.executables = %w[bundle bundler]
Expand Down

0 comments on commit 3a0c85f

Please sign in to comment.