aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2012-12-08 17:18:10 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2012-12-08 17:18:46 -0700
commitbb8923dee093b615615cdfb83b34d1b0bb254f25 (patch)
tree746316dedd59282cf9164d7217aee456a378f725
parent314e4bbaeacc91297689761308eba0d2fac29e16 (diff)
downloadrails-bb8923dee093b615615cdfb83b34d1b0bb254f25.tar.gz
rails-bb8923dee093b615615cdfb83b34d1b0bb254f25.tar.bz2
rails-bb8923dee093b615615cdfb83b34d1b0bb254f25.zip
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.
-rw-r--r--actionmailer/actionmailer.gemspec2
-rw-r--r--actionpack/actionpack.gemspec2
-rw-r--r--activemodel/activemodel.gemspec2
-rw-r--r--activerecord/activerecord.gemspec2
-rw-r--r--activesupport/activesupport.gemspec2
-rw-r--r--rails.gemspec2
-rw-r--r--railties/railties.gemspec2
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 @@ Gem::Specification.new do |s|
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 @@ Gem::Specification.new do |s|
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 @@ Gem::Specification.new do |s|
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 @@ Gem::Specification.new do |s|
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 @@ Gem::Specification.new do |s|
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 @@ Gem::Specification.new do |s|
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 @@ Gem::Specification.new do |s|
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'