rubygems-update 2.7.1 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba913d1f15fcbb87aa5e85a13f080ba2f3bd0e4df466617447da75fdb0b7c0b7
-  data.tar.gz: 50c69bcefbed82ac149f8bb0daa152901b7db39f5e9824c68fd4a704c170dbc4
+  metadata.gz: 3ea44a86262942cc9381a4c361b856716d959ea3f27d12d7f3a7cc37add42495
+  data.tar.gz: 13f531a5157a93c69acd9cf69669026377a359baa67dc09b0c4ff34897238068
 SHA512:
-  metadata.gz: e24ef886cac09752a824235ce18869b1cb972063a7f834ed16282fdd5df48b71945382dea9ea957b8060063b8c7f2a88d835efb4ce53a3b98fe1d4c44271c9d6
-  data.tar.gz: e4a57e729bbe21f0a627ecb52f35e97e8cb50e30c3c8fd3ae04264e2beeb55e01abb4bc8b4ba9bb55a59d1da5ee2fa4aec5702bd545e59154499ca47bce9ca51
+  metadata.gz: 17d9721ea2535d7141f7df7685b991d99b9a1a6112a4e7e17c066e5041fe9f57b60fa36cc09d9c5b753a59a2cb2278b03d74de611629fbaa1abeb67b515d2323
+  data.tar.gz: 12f6af1ed4585e46e6801094ce314bd1d0bcf62e8c471696008fa583ae437bf0f1719164b5957d3d3bc0215d561ff8c6a7c70506d60a7f91693c043641bde61d

data/.travis.yml

@@ -47,5 +47,12 @@ matrix:
     - rvm: ruby-head
       env: "TEST_TOOL=rubygems YAML=syck"
   allow_failures:
+    - rvm: 1.8.7
+      env: "TEST_TOOL=bundler RGV=master"
+    - rvm: 1.9.3
+      env: "TEST_TOOL=bundler RGV=master"
+    - rvm: 2.0.0
+      env: "TEST_TOOL=bundler RGV=master"
+    - rvm: 2.1.10
+      env: "TEST_TOOL=bundler RGV=master"
     - rvm: ruby-head
-

data/History.txt

@@ -1,5 +1,14 @@
 # coding: UTF-8
 
+=== 2.7.2
+
+Bug fixes:
+
+* Added template files to vendoerd bundler. Pull request #2065 by SHIBATA
+  Hiroshi.
+* Added workaround for non-git environment. Pull request #2066 by SHIBATA
+  Hiroshi.
+
 === 2.7.1 (2017-11-03)
 
 Bug fixes:

data/lib/rubygems.rb

@@ -10,7 +10,7 @@ require 'rbconfig'
 require 'thread'
 
 module Gem
-  VERSION = "2.7.1"
+  VERSION = "2.7.2"
 end
 
 # Must be first since it unloads the prelude from 1.9.2

data/lib/rubygems/commands/setup_command.rb

@@ -294,6 +294,8 @@ By default, this RubyGems will install gem as:
       say "Installing #{tool}" if @verbose
 
       lib_files = rb_files_in path
+      lib_files.concat(template_files) if tool == 'Bundler'
+
       pem_files = pem_files_in path
 
       Dir.chdir path do
@@ -354,6 +356,10 @@ By default, this RubyGems will install gem as:
 
     mkdir_p Gem::Specification.default_specifications_dir
 
+    # Workaround for non-git environment.
+    gemspec = File.read('bundler/bundler.gemspec').gsub(/`git ls-files -z`/, "''")
+    File.open('bundler/bundler.gemspec', 'w'){|f| f.write gemspec }
+
     bundler_spec = Gem::Specification.load("bundler/bundler.gemspec")
     bundler_spec.files = Dir.chdir("bundler") { Dir["{*.md,{lib,exe,man}/**/*}"] }
     bundler_spec.executables -= %w[bundler bundle_ruby]
@@ -433,6 +439,22 @@ By default, this RubyGems will install gem as:
     end
   end
 
+  # for installation of bundler as default gems
+  def template_files
+    Dir.chdir "bundler/lib" do
+      (Dir[File.join('bundler', 'templates', '**', '*')] + Dir[File.join('bundler', 'templates', '**', '.*')]).
+        select{|f| !File.directory?(f)}
+    end
+  end
+
+  # for cleanup old bundler files
+  def template_files_in dir
+    Dir.chdir dir do
+      (Dir[File.join('templates', '**', '*')] + Dir[File.join('templates', '**', '.*')]).
+        select{|f| !File.directory?(f)}
+    end
+  end
+
   def remove_old_bin_files(bin_dir)
     old_bin_files = {
       'gem_mirror' => 'gem mirror',
@@ -470,8 +492,10 @@ abort "#{deprecation_message}"
     lib_dirs[File.join(lib_dir, 'bundler')] = 'bundler/lib/bundler' if Gem::USE_BUNDLER_FOR_GEMDEPS
     lib_dirs.each do |old_lib_dir, new_lib_dir|
       lib_files = rb_files_in(new_lib_dir)
+      lib_files.concat(template_files_in(new_lib_dir)) if new_lib_dir =~ /bundler/
 
       old_lib_files = rb_files_in(old_lib_dir)
+      old_lib_files.concat(template_files_in(old_lib_dir)) if old_lib_dir =~ /bundler/
 
       to_remove = old_lib_files - lib_files
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-update
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.2
 platform: ruby
 authors:
 - Jim Weirich
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-04 00:00:00.000000000 Z
+date: 2017-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -803,7 +803,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.0
+rubygems_version: 2.7.2
 signing_key: 
 specification_version: 4
 summary: ''