aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-10-05 08:32:01 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-10-05 08:32:01 +0000
commitaaf2491c1fa1edc628e468128462788c497b86ba (patch)
treef4a7f2fa106e1968ffb25ac61ff083c27bb03aa2
parent67879c4f2e29baeb97c61a0a811eaff6096d9c95 (diff)
downloadruby-aaf2491c1fa1edc628e468128462788c497b86ba.tar.gz
Fixed broken `bundle gem` command.
This patch is provided by @gyugyu (Yusuke Yagyu) * Remove README* entry from no_install that there is no README* files except README.md.tt * Rename .travis.yml.tt to travis.yml.tt like gitignore.tt [Bug #13975][ruby-dev:50278][fix GH-1710] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60122 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--lib/bundler.gemspec2
-rw-r--r--lib/bundler/cli/gem.rb2
-rw-r--r--lib/bundler/templates/newgem/travis.yml.tt (renamed from lib/bundler/templates/newgem/.travis.yml.tt)0
-rwxr-xr-xtool/rbinstall.rb2
4 files changed, 3 insertions, 3 deletions
diff --git a/lib/bundler.gemspec b/lib/bundler.gemspec
index 65713eb..49f82ba 100644
--- a/lib/bundler.gemspec
+++ b/lib/bundler.gemspec
@@ -154,7 +154,6 @@ Gem::Specification.new do |s|
"lib/bundler/templates/Executable",
"lib/bundler/templates/Executable.standalone",
"lib/bundler/templates/Gemfile",
- "lib/bundler/templates/newgem/.travis.yml.tt",
"lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt",
"lib/bundler/templates/newgem/Gemfile.tt",
"lib/bundler/templates/newgem/LICENSE.txt.tt",
@@ -175,6 +174,7 @@ Gem::Specification.new do |s|
"lib/bundler/templates/newgem/spec/spec_helper.rb.tt",
"lib/bundler/templates/newgem/test/newgem_test.rb.tt",
"lib/bundler/templates/newgem/test/test_helper.rb.tt",
+ "lib/bundler/templates/newgem/travis.yml.tt",
"lib/bundler/ui.rb",
"lib/bundler/ui/rg_proxy.rb",
"lib/bundler/ui/shell.rb",
diff --git a/lib/bundler/cli/gem.rb b/lib/bundler/cli/gem.rb
index 45782d7..fed904e 100644
--- a/lib/bundler/cli/gem.rb
+++ b/lib/bundler/cli/gem.rb
@@ -82,7 +82,7 @@ module Bundler
config[:test] = test_framework
config[:test_framework_version] = TEST_FRAMEWORK_VERSIONS[test_framework]
- templates.merge!(".travis.yml.tt" => ".travis.yml")
+ templates.merge!("travis.yml.tt" => ".travis.yml")
case test_framework
when "rspec"
diff --git a/lib/bundler/templates/newgem/.travis.yml.tt b/lib/bundler/templates/newgem/travis.yml.tt
index fe0761c..fe0761c 100644
--- a/lib/bundler/templates/newgem/.travis.yml.tt
+++ b/lib/bundler/templates/newgem/travis.yml.tt
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index fc45897..2f060f4 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
@@ -530,7 +530,7 @@ end
install?(:local, :comm, :lib) do
prepare "library scripts", rubylibdir
- noinst = %w[README* *.txt *.rdoc *.gemspec]
+ noinst = %w[*.txt *.rdoc *.gemspec]
install_recursive(File.join(srcdir, "lib"), rubylibdir, :no_install => noinst, :mode => $data_mode)
end