From e8ddbc0239b9dfa32787e93c6942f085e5c42b49 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Mon, 15 Jul 2019 08:54:34 +0900
Subject: [PATCH] Put colorize to library directory.

  Same as 66299e7ca83d379d13abaa5411f3e0419334cabb
---
 tool/extlibs.rb            | 2 +-
 tool/generic_erb.rb        | 2 +-
 tool/leaked-globals        | 2 +-
 tool/{ => lib}/colorize.rb | 0
 tool/lib/test/unit.rb      | 2 +-
 tool/make-snapshot         | 2 +-
 tool/pure_parser.rb        | 2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename tool/{ => lib}/colorize.rb (100%)

diff --git a/tool/extlibs.rb b/tool/extlibs.rb
index efae167bfa..f021a2bf01 100755
--- a/tool/extlibs.rb
+++ b/tool/extlibs.rb
@@ -5,7 +5,7 @@
 
 require 'digest'
 require_relative 'downloader'
-require_relative 'colorize'
+require_relative 'lib/colorize'
 
 class ExtLibs
   def initialize
diff --git a/tool/generic_erb.rb b/tool/generic_erb.rb
index 3904b570c4..3184cbb9f8 100644
--- a/tool/generic_erb.rb
+++ b/tool/generic_erb.rb
@@ -7,7 +7,7 @@ require 'erb'
 require 'optparse'
 $:.unshift(File.dirname(__FILE__))
 require 'vpath'
-require 'colorize'
+require_relative 'lib/colorize'
 
 vpath = VPath.new
 timestamp = nil
diff --git a/tool/leaked-globals b/tool/leaked-globals
index 48e8ec74c7..de17038704 100755
--- a/tool/leaked-globals
+++ b/tool/leaked-globals
@@ -1,5 +1,5 @@
 #!/usr/bin/ruby
-require_relative 'colorize'
+require_relative 'lib/colorize'
 
 until ARGV.empty?
   case ARGV[0]
diff --git a/tool/colorize.rb b/tool/lib/colorize.rb
similarity index 100%
rename from tool/colorize.rb
rename to tool/lib/colorize.rb
diff --git a/tool/lib/test/unit.rb b/tool/lib/test/unit.rb
index 5a980603a5..d237a9a0e9 100644
--- a/tool/lib/test/unit.rb
+++ b/tool/lib/test/unit.rb
@@ -6,7 +6,7 @@ end
 require 'minitest/unit'
 require 'test/unit/assertions'
 require_relative '../envutil'
-require_relative '../../../tool/colorize'
+require_relative '../colorize'
 require 'test/unit/testcase'
 require 'optparse'
 
diff --git a/tool/make-snapshot b/tool/make-snapshot
index d6530b3842..ad5fd879f3 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -8,7 +8,7 @@ require 'shellwords'
 require 'tmpdir'
 require 'pathname'
 require File.expand_path("../lib/vcs", __FILE__)
-require File.expand_path("../colorize", __FILE__)
+require File.expand_path("../lib/colorize", __FILE__)
 STDOUT.sync = true
 
 $srcdir ||= nil
diff --git a/tool/pure_parser.rb b/tool/pure_parser.rb
index 20d71079a0..4d5e86e543 100755
--- a/tool/pure_parser.rb
+++ b/tool/pure_parser.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby -pi
 BEGIN {
-  require_relative 'colorize'
+  require_relative 'lib/colorize'
 
   colorize = Colorize.new
   file = ARGV.shift