[前][次][番号順一覧][スレッド一覧]

ruby-changes:48008

From: hsbt <ko1@a...>
Date: Thu, 5 Oct 2017 17:32:06 +0900 (JST)
Subject: [ruby-changes:48008] hsbt:r60122 (trunk): Fixed broken `bundle gem` command.

hsbt	2017-10-05 17:32:01 +0900 (Thu, 05 Oct 2017)

  New Revision: 60122

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=60122

  Log:
    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]

  Added files:
    trunk/lib/bundler/templates/newgem/travis.yml.tt
  Removed files:
    trunk/lib/bundler/templates/newgem/.travis.yml.tt
  Modified files:
    trunk/lib/bundler/cli/gem.rb
    trunk/lib/bundler.gemspec
    trunk/tool/rbinstall.rb
Index: lib/bundler/templates/newgem/.travis.yml.tt
===================================================================
--- lib/bundler/templates/newgem/.travis.yml.tt	(revision 60121)
+++ lib/bundler/templates/newgem/.travis.yml.tt	(nonexistent)
@@ -1,5 +0,0 @@ https://github.com/ruby/ruby/blob/trunk/lib/bundler/templates/newgem/.travis.yml.tt#L0
-sudo: false
-language: ruby
-rvm:
-  - <%= RUBY_VERSION %>
-before_install: gem install bundler -v <%= Bundler::VERSION %>
Index: lib/bundler.gemspec
===================================================================
--- lib/bundler.gemspec	(revision 60121)
+++ lib/bundler.gemspec	(revision 60122)
@@ -154,7 +154,6 @@ Gem::Specification.new do |s| https://github.com/ruby/ruby/blob/trunk/lib/bundler.gemspec#L154
     "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| https://github.com/ruby/ruby/blob/trunk/lib/bundler.gemspec#L174
     "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",
Index: lib/bundler/templates/newgem/travis.yml.tt
===================================================================
--- lib/bundler/templates/newgem/travis.yml.tt	(nonexistent)
+++ lib/bundler/templates/newgem/travis.yml.tt	(revision 60122)
@@ -0,0 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/lib/bundler/templates/newgem/travis.yml.tt#L1
+sudo: false
+language: ruby
+rvm:
+  - <%= RUBY_VERSION %>
+before_install: gem install bundler -v <%= Bundler::VERSION %>
Index: lib/bundler/cli/gem.rb
===================================================================
--- lib/bundler/cli/gem.rb	(revision 60121)
+++ lib/bundler/cli/gem.rb	(revision 60122)
@@ -82,7 +82,7 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/cli/gem.rb#L82
         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"
Index: tool/rbinstall.rb
===================================================================
--- tool/rbinstall.rb	(revision 60121)
+++ tool/rbinstall.rb	(revision 60122)
@@ -530,7 +530,7 @@ end https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L530
 
 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
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]