From bb8923dee093b615615cdfb83b34d1b0bb254f25 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Sat, 8 Dec 2012 17:18:10 -0700 Subject: [PATCH] Omit directories from gemspec.files for RubyGems 2 compat. RG2 packager expects each spec.files path to be a file and bombs when it tries to tarball a dir. May revert if rubygems/rubygems#413 is accepted. --- actionmailer/actionmailer.gemspec | 2 +- actionpack/actionpack.gemspec | 2 +- activemodel/activemodel.gemspec | 2 +- activerecord/activerecord.gemspec | 2 +- activesupport/activesupport.gemspec | 2 +- rails.gemspec | 2 +- railties/railties.gemspec | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/actionmailer/actionmailer.gemspec b/actionmailer/actionmailer.gemspec index 67ec0d1097..ea6df10a6f 100644 --- a/actionmailer/actionmailer.gemspec +++ b/actionmailer/actionmailer.gemspec @@ -15,7 +15,7 @@ s.email = 'david@loudthinking.com' s.homepage = 'http://www.rubyonrails.org' - s.files = Dir['CHANGELOG.md', 'README.rdoc', 'MIT-LICENSE', 'lib/**/*'] + s.files = Dir['CHANGELOG.md', 'README.rdoc', 'MIT-LICENSE', 'lib/**/*'].select { |path| File.file? path } s.require_path = 'lib' s.requirements << 'none' diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec index 89fdd528c2..883aaab6fb 100644 --- a/actionpack/actionpack.gemspec +++ b/actionpack/actionpack.gemspec @@ -15,7 +15,7 @@ s.email = 'david@loudthinking.com' s.homepage = 'http://www.rubyonrails.org' - s.files = Dir['CHANGELOG.md', 'README.rdoc', 'MIT-LICENSE', 'lib/**/*'] + s.files = Dir['CHANGELOG.md', 'README.rdoc', 'MIT-LICENSE', 'lib/**/*'].select { |path| File.file? path } s.require_path = 'lib' s.requirements << 'none' diff --git a/activemodel/activemodel.gemspec b/activemodel/activemodel.gemspec index 51655fe3da..018a60ba90 100644 --- a/activemodel/activemodel.gemspec +++ b/activemodel/activemodel.gemspec @@ -15,7 +15,7 @@ s.email = 'david@loudthinking.com' s.homepage = 'http://www.rubyonrails.org' - s.files = Dir['CHANGELOG.md', 'MIT-LICENSE', 'README.rdoc', 'lib/**/*'] + s.files = Dir['CHANGELOG.md', 'MIT-LICENSE', 'README.rdoc', 'lib/**/*'].select { |path| File.file? path } s.require_path = 'lib' s.add_dependency 'activesupport', version diff --git a/activerecord/activerecord.gemspec b/activerecord/activerecord.gemspec index 31ddb01123..2df874b525 100644 --- a/activerecord/activerecord.gemspec +++ b/activerecord/activerecord.gemspec @@ -15,7 +15,7 @@ s.email = 'david@loudthinking.com' s.homepage = 'http://www.rubyonrails.org' - s.files = Dir['CHANGELOG.md', 'MIT-LICENSE', 'README.rdoc', 'examples/**/*', 'lib/**/*'] + s.files = Dir['CHANGELOG.md', 'MIT-LICENSE', 'README.rdoc', 'examples/**/*', 'lib/**/*'].select { |path| File.file? path } s.require_path = 'lib' s.extra_rdoc_files = %w(README.rdoc) diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec index a4216d2cb4..2c536cbd05 100644 --- a/activesupport/activesupport.gemspec +++ b/activesupport/activesupport.gemspec @@ -15,7 +15,7 @@ s.email = 'david@loudthinking.com' s.homepage = 'http://www.rubyonrails.org' - s.files = Dir['CHANGELOG.md', 'MIT-LICENSE', 'README.rdoc', 'lib/**/*'] + s.files = Dir['CHANGELOG.md', 'MIT-LICENSE', 'README.rdoc', 'lib/**/*'].select { |path| File.file? path } s.require_path = 'lib' s.rdoc_options.concat ['--encoding', 'UTF-8'] diff --git a/rails.gemspec b/rails.gemspec index ba94354bf1..d7a1e10459 100644 --- a/rails.gemspec +++ b/rails.gemspec @@ -18,7 +18,7 @@ s.bindir = 'bin' s.executables = [] - s.files = Dir['guides/**/*'] + s.files = Dir['guides/**/*'].select { |path| File.file? path } s.add_dependency 'activesupport', version s.add_dependency 'actionpack', version diff --git a/railties/railties.gemspec b/railties/railties.gemspec index e39430560f..ec0f4266c0 100644 --- a/railties/railties.gemspec +++ b/railties/railties.gemspec @@ -15,7 +15,7 @@ s.email = 'david@loudthinking.com' s.homepage = 'http://www.rubyonrails.org' - s.files = Dir['CHANGELOG.md', 'README.rdoc', 'bin/**/*', 'lib/**/{*,.[a-z]*}'] + s.files = Dir['CHANGELOG.md', 'README.rdoc', 'bin/**/*', 'lib/**/{*,.[a-z]*}'].select { |path| File.file? path } s.require_path = 'lib' s.bindir = 'bin' -- GitLab