Ensure the preprocessor can be run without Truffle module defined.

Author: aardvark179

lib/truffle/truffle/cext_preprocessor.rb

@@ -9,89 +9,92 @@
 require_relative 'patches/json_patches'
 require_relative 'patches/nokogiri_patches'
 require_relative 'patches/pg_patches'
+module Truffle
+  module CExt
+    class Preprocessor
 
-class Truffle::CExt::Preprocessor
+      PATCHED_FILES = {}
 
-  PATCHED_FILES = {}
-
-  def self.add_gem_patches(patch_hash, gem_patches)
-    gem = gem_patches[:gem]
-    patch_list = gem_patches[:patches]
-    patch_list.each do |path_parts, patch|
-      processed_patch = {}
-      if path_parts.kind_of?(String)
-        key = path_parts
-      else
-        key = path_parts.last
-        processed_patch[:ext_dir] = path_parts.first if path_parts.size > 1
+      def self.add_gem_patches(patch_hash, gem_patches)
+        gem = gem_patches[:gem]
+        patch_list = gem_patches[:patches]
+        patch_list.each do |path_parts, patch|
+          processed_patch = {}
+          if path_parts.kind_of?(String)
+            key = path_parts
+          else
+            key = path_parts.last
+            processed_patch[:ext_dir] = path_parts.first if path_parts.size > 1
+          end
+          processed_patch[:patches] = patch
+          processed_patch[:gem] = gem
+          raise "Duplicate patch file #{key}." if patch_hash.include?(key)
+          patch_hash[key] = processed_patch
+        end
       end
-      processed_patch[:patches] = patch
-      processed_patch[:gem] = gem
-      raise "Duplicate patch file #{key}." if patch_hash.include?(key)
-      patch_hash[key] = processed_patch
-    end
-  end
 
-  add_gem_patches(PATCHED_FILES, ::JsonPatches::PATCHES)
-  add_gem_patches(PATCHED_FILES, ::NokogiriPatches::PATCHES)
-  add_gem_patches(PATCHED_FILES, ::PgPatches::PATCHES)
+      add_gem_patches(PATCHED_FILES, ::JsonPatches::PATCHES)
+      add_gem_patches(PATCHED_FILES, ::NokogiriPatches::PATCHES)
+      add_gem_patches(PATCHED_FILES, ::PgPatches::PATCHES)
 
-  def self.makefile_matcher(command1, command2)
-    file_list = {}
-    PATCHED_FILES.each_pair do |file, patch|
-      dir = if patch[:ext_dir]
-              File.join(patch[:gem], 'ext', patch[:ext_dir])
-            else
-              "/#{patch[:gem]}"
-            end
-      (file_list[dir] ||= []) << file
-    end
+      def self.makefile_matcher(command1, command2)
+        file_list = {}
+        PATCHED_FILES.each_pair do |file, patch|
+          dir = if patch[:ext_dir]
+                  File.join(patch[:gem], 'ext', patch[:ext_dir])
+                else
+                  "/#{patch[:gem]}"
+                end
+          (file_list[dir] ||= []) << file
+        end
 
-    make_function = <<-EOF
+        make_function = <<-EOF
 $(if\\
   $(or\\
 EOF
-    file_list.each_pair do |dir, files|
-      if !files.empty?
-        make_function += <<-EOF
+        file_list.each_pair do |dir, files|
+          if !files.empty?
+            make_function += <<-EOF
     $(and\\
       $(findstring #{dir}, $(realpath $(<))),\\
       $(or\\
 EOF
-        files.each do |file|
-          make_function += <<-EOF
+            files.each do |file|
+              make_function += <<-EOF
         $(findstring #{file}, $(<)),\\
 EOF
-        end
-        make_function += <<-EOF
+            end
+            make_function += <<-EOF
       )\\
     ),\\
 EOF
-      end
-    end
-    make_function += <<-EOF
+          end
+        end
+        make_function += <<-EOF
   ),\\
   #{command1},\\
   #{command2}\\
 )
 EOF
 
-  end
+      end
 
-  def self.patch(file, contents, directory)
-    if patched_file = PATCHED_FILES[File.basename(file)]
-      matched = if patched_file[:ext_dir]
-                  directory.end_with?(File.join(patched_file[:gem], 'ext', patched_file[:ext_dir]))
-                else
-                  regexp = /^#{Regexp.escape(patched_file[:gem])}\b/
-                  directory.split('/').last(3).any? { |part| part =~ regexp } || file.split('/').last(2).any? { |part| part =~ regexp }
-                end
-      if matched
-        patched_file[:patches].each do |patch|
-          contents = contents.gsub(patch[:match], patch[:replacement].rstrip)
+      def self.patch(file, contents, directory)
+        if patched_file = PATCHED_FILES[File.basename(file)]
+          matched = if patched_file[:ext_dir]
+                      directory.end_with?(File.join(patched_file[:gem], 'ext', patched_file[:ext_dir]))
+                    else
+                      regexp = /^#{Regexp.escape(patched_file[:gem])}\b/
+                      directory.split('/').last(3).any? { |part| part =~ regexp } || file.split('/').last(2).any? { |part| part =~ regexp }
+                    end
+          if matched
+            patched_file[:patches].each do |patch|
+              contents = contents.gsub(patch[:match], patch[:replacement].rstrip)
+            end
+          end
         end
+        contents
       end
     end
-    contents
   end
 end