Harmonize loading resources from ports directory

Author: andyundso

lib/tiny_tds.rb

@@ -10,8 +10,7 @@
 module TinyTds
   # Is this file part of a fat binary gem with bundled freetds?
   # This path must be enabled by add_dll_directory on Windows.
-  gplat = ::Gem::Platform.local
-  FREETDS_LIB_PATH = Dir[File.expand_path("../ports/#{gplat.cpu}-#{gplat.os}*/{bin,lib}", __dir__)].first
+  FREETDS_LIB_PATH = TinyTds::Gem.ports_bin_and_lib_paths.first
 
   add_dll_path = proc do |path, &block|
     if RUBY_PLATFORM =~ /(mswin|mingw)/i && path

lib/tiny_tds/bin.rb

@@ -50,7 +50,7 @@ def with_ports_paths
 
       begin
         ENV["PATH"] = [
-          Gem.ports_bin_paths,
+          Gem.ports_bin_and_lib_paths,
           old_path
         ].flatten.join File::PATH_SEPARATOR
 
@@ -65,7 +65,7 @@ def find_bin
     end
 
     def find_exe
-      Gem.ports_bin_paths.each do |bin|
+      Gem.ports_bin_and_lib_paths.each do |bin|
         @exts.each do |ext|
           f = File.join bin, "#{name}#{ext}"
           return f if File.exist?(f)

lib/tiny_tds/gem.rb

@@ -1,5 +1,3 @@
-require "rbconfig"
-
 module TinyTds
   module Gem
     class << self
@@ -11,12 +9,14 @@ def ports_root_path
         File.join(root_path, "ports")
       end
 
-      def ports_bin_paths
-        Dir.glob(File.join(ports_root_path, "**", "bin"))
+      def ports_bin_and_lib_paths
+        Dir.glob(File.join(ports_root_path, "#{gem_platform.cpu}-#{gem_platform.os}*", "{bin,lib}"))
       end
 
-      def ports_lib_paths
-        Dir.glob(File.join(ports_root_path, "**", "lib"))
+      private
+
+      def gem_platform
+        ::Gem::Platform.local
       end
     end
   end

test/gem_test.rb

@@ -7,11 +7,9 @@ class GemTest < Minitest::Spec
   describe TinyTds::Gem do
     # We're going to muck with some system globals so lets make sure
     # they get set back later
-    original_platform = RbConfig::CONFIG["arch"]
     original_pwd = Dir.pwd
 
     after do
-      RbConfig::CONFIG["arch"] = original_platform
       Dir.chdir original_pwd
     end
 
@@ -43,56 +41,53 @@ class GemTest < Minitest::Spec
       end
     end
 
-    describe "#ports_bin_paths" do
-      let(:ports_bin_paths) { TinyTds::Gem.ports_bin_paths }
+    describe "#ports_bin_and_lib_paths" do
+      let(:ports_bin_and_lib_paths) { TinyTds::Gem.ports_bin_and_lib_paths }
 
       describe "when the ports directories exist" do
-        let(:fake_bin_paths) do
-          ports_host_root = File.join(gem_root, "ports", "fake-host-with-dirs")
-          [
-            File.join("a", "bin"),
-            File.join("a", "inner", "bin"),
-            File.join("b", "bin")
-          ].map do |p|
+        let(:fake_bin_and_lib_path) do
+          ports_host_root = File.join(gem_root, "ports", "x86_64-unknown")
+          ["bin", "lib"].map do |p|
             File.join(ports_host_root, p)
           end
         end
 
         before do
-          RbConfig::CONFIG["arch"] = "fake-host-with-dirs"
-          fake_bin_paths.each do |path|
+          fake_bin_and_lib_path.each do |path|
             FileUtils.mkdir_p(path)
           end
         end
 
         after do
           FileUtils.remove_entry_secure(
-            File.join(gem_root, "ports", "fake-host-with-dirs"), true
+            File.join(gem_root, "ports", "x86_64-unknown"), true
           )
         end
 
         it "should return all the bin directories" do
-          _(ports_bin_paths.sort).must_equal fake_bin_paths.sort
-        end
+          fake_platform = Gem::Platform.new("x86_64-unknown")
+
+          Gem::Platform.stub(:local, fake_platform) do
+            _(ports_bin_and_lib_paths.sort).must_equal fake_bin_and_lib_path.sort
 
-        it "should return all the bin directories regardless of cwd" do
-          Dir.chdir "/"
-          _(ports_bin_paths.sort).must_equal fake_bin_paths.sort
+            # should return the same regardless of path
+            Dir.chdir "/"
+            _(ports_bin_and_lib_paths.sort).must_equal fake_bin_and_lib_path.sort
+          end
         end
       end
 
       describe "when the ports directories are missing" do
-        before do
-          RbConfig::CONFIG["arch"] = "fake-host-without-dirs"
-        end
-
         it "should return no directories" do
-          _(ports_bin_paths).must_be_empty
-        end
+          fake_platform = Gem::Platform.new("x86_64-unknown")
 
-        it "should return no directories regardless of cwd" do
-          Dir.chdir "/"
-          _(ports_bin_paths).must_be_empty
+          Gem::Platform.stub(:local, fake_platform) do
+            _(ports_bin_and_lib_paths).must_be_empty
+
+            # should be empty regardless of path
+            Dir.chdir "/"
+            _(ports_bin_and_lib_paths).must_be_empty
+          end
         end
       end
     end