diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-03-06 08:48:50 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-03-06 08:48:50 +0000 |
| commit | fbc070d14aead827a6d5250b36d8119e079162e0 (patch) | |
| tree | d11403456f053eebd6c2756095482174224f28b9 /lib | |
| parent | e0d6392791a4a81091c7e3016312316f1415bf3c (diff) | |
merge revision(s) 66984: [Backport #15582]
Fixed gemspec location of bundler.
FileCollector of rbinstall.rb requires location of gemspec under
the sub-direcotry with the same name as default gems.
I forgot to fix it with r66867.
[Bug #15582][ruby-core:91374]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67180 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bundler/bundler.gemspec (renamed from lib/bundler.gemspec) | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/bundler.gemspec b/lib/bundler/bundler.gemspec index 2b2bb412d5..b229ab224d 100644 --- a/lib/bundler.gemspec +++ b/lib/bundler/bundler.gemspec @@ -5,11 +5,9 @@ begin require File.expand_path("../lib/bundler/version", __FILE__) rescue LoadError # for Ruby core repository - require File.expand_path("../bundler/version", __FILE__) + require File.expand_path("../version", __FILE__) end -require "shellwords" - Gem::Specification.new do |s| s.name = "bundler" s.version = Bundler::VERSION @@ -49,7 +47,9 @@ Gem::Specification.new do |s| s.add_development_dependency "ronn", "~> 0.7.3" s.add_development_dependency "rspec", "~> 3.6" - # s.files = `git ls-files -z`.split("\x0").select {|f| f.match(%r{^(lib|exe)/}) } + # base_dir = File.dirname(__FILE__).gsub(%r{([^A-Za-z0-9_\-.,:\/@\n])}, "\\\\\\1") + # s.files = IO.popen("git -C #{base_dir} ls-files -z", &:read).split("\x0").select {|f| f.match(%r{^(lib|exe)/}) } + # we don't check in man pages, but we need to ship them because # we use them to generate the long-form help for each command. # s.files += Dir.glob("man/**/*") |