From aaf2491c1fa1edc628e468128462788c497b86ba Mon Sep 17 00:00:00 2001
From: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 5 Oct 2017 08:32:01 +0000
Subject: 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
---
 lib/bundler.gemspec                         | 2 +-
 lib/bundler/cli/gem.rb                      | 2 +-
 lib/bundler/templates/newgem/.travis.yml.tt | 5 -----
 lib/bundler/templates/newgem/travis.yml.tt  | 5 +++++
 tool/rbinstall.rb                           | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 lib/bundler/templates/newgem/.travis.yml.tt
 create mode 100644 lib/bundler/templates/newgem/travis.yml.tt

diff --git a/lib/bundler.gemspec b/lib/bundler.gemspec
index 65713ebd57..49f82ba3cb 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 45782d71a3..fed904e9aa 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
deleted file mode 100644
index fe0761cc23..0000000000
--- a/lib/bundler/templates/newgem/.travis.yml.tt
+++ /dev/null
@@ -1,5 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - <%= RUBY_VERSION %>
-before_install: gem install bundler -v <%= Bundler::VERSION %>
diff --git a/lib/bundler/templates/newgem/travis.yml.tt b/lib/bundler/templates/newgem/travis.yml.tt
new file mode 100644
index 0000000000..fe0761cc23
--- /dev/null
+++ b/lib/bundler/templates/newgem/travis.yml.tt
@@ -0,0 +1,5 @@
+sudo: false
+language: ruby
+rvm:
+  - <%= RUBY_VERSION %>
+before_install: gem install bundler -v <%= Bundler::VERSION %>
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index fc45897d40..2f060f42a8 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
 
-- 
cgit v1.2.3