lib/mini_magick/utilities.rb in mini_magick-3.8.1 vs lib/mini_magick/utilities.rb in mini_magick-4.0.0.rc

@@ -1,62 +1,35 @@
-require 'rbconfig'
-require 'shellwords'
-require 'pathname'
+require "tempfile"
 
 module MiniMagick
+  # @private
   module Utilities
-    class << self
-      # Cross-platform way of finding an executable in the $PATH.
-      #
-      #   which('ruby') #=> /usr/bin/ruby
-      def which(cmd)
-        exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
-        ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-          exts.each do |ext|
-            exe = File.join(path, "#{cmd}#{ext}")
-            return exe if File.executable? exe
-          end
-        end
-        nil
-      end
 
-      # Finds out if the host OS is windows
-      def windows?
-        RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
-      end
+    module_function
 
-      def escape(value)
-        if windows?
-          windows_escape(value)
-        else
-          shell_escape(value)
+    ##
+    # Cross-platform way of finding an executable in the $PATH.
+    #
+    # @example
+    #   MiniMagick::Utilities.which('ruby') #=> "/usr/bin/ruby"
+    #
+    def which(cmd)
+      exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+        exts.each do |ext|
+          exe = File.join(path, "#{cmd}#{ext}")
+          return exe if File.executable? exe
         end
       end
+      nil
+    end
 
-      def shell_escape(value)
-        Shellwords.escape(value)
+    def tempfile(extension)
+      Tempfile.new(["mini_magick", extension]).tap do |tempfile|
+        tempfile.binmode
+        yield tempfile if block_given?
+        tempfile.close
       end
-
-      def windows_escape(value)
-        # For Windows, ^ is the escape char, equivalent to \ in Unix.
-        escaped = value.gsub(/\^/, '^^').gsub(/>/, '^>')
-        if escaped !~ /^".+"$/ && escaped.include?("'")
-          escaped.inspect
-        else
-          escaped
-        end
-      end
-
-      def path(path)
-        if windows?
-          # For Windows, if a path contains space char, you need to quote it,
-          # otherwise you SHOULD NOT quote it. If you quote a path that does
-          # not contains space, it will not work.
-          pathname = Pathname.new(path).to_s
-          path.include?(' ') ? pathname.inspect : pathname
-        else
-          path
-        end
-      end
     end
+
   end
 end