Update Rakefile

Author: ntkme

ext/sass/Rakefile

@@ -290,7 +290,7 @@ end
 module FileUtils
   def unarchive(archive)
     if Gem.win_platform?
-      sh File.absolute_path('tar.exe', SassConfig.windows_system_directory), '-vxf', archive
+      sh File.absolute_path('tar.exe', Utils.windows_system_directory), '-vxf', archive
     elsif archive.downcase.end_with?('.zip')
       sh 'unzip', '-o', archive
     else
@@ -299,37 +299,12 @@ module FileUtils
   end
 
   def fetch(source_uri, dest_path = nil)
-    require 'rubygems/remote_fetcher'
+    dest_path = File.basename(source_uri) if dest_path.nil?
 
-    source_uri = "/#{source_uri}" if !source_uri.start_with?('/') && File.absolute_path?(source_uri)
-
-    source_uri = begin
-      Gem::Uri.parse!(source_uri)
-    rescue NoMethodError
-      begin
-        URI.parse(source_uri)
-      rescue StandardError
-        URI.parse(URI::DEFAULT_PARSER.escape(source_uri.to_s))
-      end
-    end
-
-    scheme = source_uri.scheme
-    source_path = begin
-      Gem::URI::DEFAULT_PARSER
-    rescue NameError
-      URI::DEFAULT_PARSER
-    end.unescape(source_uri.path)
-
-    dest_path = File.basename(source_path) if dest_path.nil?
-
-    fetcher = Gem::RemoteFetcher.fetcher
-    symbol = :"fetch_#{scheme.nil? ? 'file' : scheme}"
-    raise ArgumentError, "Unsupported URI scheme #{scheme}" unless fetcher.respond_to?(symbol)
-
-    Rake.rake_output_message "fetch #{Gem::Uri.new(source_uri).redacted}" if Rake::FileUtilsExt.verbose_flag
+    Rake.rake_output_message "fetch #{source_uri}" if Rake::FileUtilsExt.verbose_flag
 
     unless Rake::FileUtilsExt.nowrite_flag
-      data = fetcher.public_send(symbol, source_uri)
+      data = Utils.fetch_https(source_uri)
       Gem.write_binary(dest_path, data)
     end
 
@@ -574,8 +549,6 @@ module SassConfig
   end
 
   def protoc
-    require 'rubygems/remote_fetcher'
-
     repo = 'https://repo.maven.apache.org/maven2/com/google/protobuf/protoc'
 
     dependency = Gem::Dependency.new('google-protobuf')
@@ -614,7 +587,7 @@ module SassConfig
 
     uri = "#{repo}/#{version}/protoc-#{version}-#{os}-#{cpu}.exe"
 
-    Gem::RemoteFetcher.fetcher.fetch_https(Gem::Uri.new("#{uri}.sha1"))
+    Utils.fetch_https("#{uri}.sha1")
 
     uri
   rescue Gem::RemoteFetcher::FetchError
@@ -627,7 +600,7 @@ module SassConfig
     versions.sort.reverse_each do |v|
       uri = "#{repo}/#{v}/protoc-#{v}-#{os}-#{cpu}.exe"
 
-      Gem::RemoteFetcher.fetcher.fetch_https(Gem::Uri.new("#{uri}.sha1"))
+      Utils.fetch_https("#{uri}.sha1")
 
       return uri
     rescue Gem::RemoteFetcher::FetchError
@@ -692,6 +665,23 @@ module SassConfig
       platform
     end
   end
+end
+
+# The {Utils} module.
+module Utils
+  module_function
+
+  def fetch_https(source_uri)
+    require 'rubygems/remote_fetcher'
+
+    source_uri = begin
+      Gem::Uri.parse!(source_uri)
+    rescue NoMethodError
+      URI.parse(source_uri)
+    end
+
+    Gem::RemoteFetcher.fetcher.fetch_https(source_uri)
+  end
 
   def windows_system_directory
     require 'open3'