prebundler 0.11.6 → 0.11.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdf192e38f6f57692d64316b8b3d2ae645ee28a482c47e6e2bf1f14adfa283bc
-  data.tar.gz: 66c8f18686a990bcc1b222e4c76c6c7069793a92cd2f4bc1f102bcd2ed978b7c
+  metadata.gz: b3aede9a82a409f6be7544d071dc88d550eca1d958eab7b45cdd77d40c4dbd02
+  data.tar.gz: 12e5d87c3ae82b1843c2012be18cb1e5c0c0b123ce15578df4c382968b045f94
 SHA512:
-  metadata.gz: 446f73025c6af47a142eba416e109805977fba9486a1120c6b726c20b3edddfd747ac459206b7780b75218a9abf6507ee502d50d6a4040b6de40769259af7f0b
-  data.tar.gz: 72e86b825eae349a11a6b606faba2cc6280a3b125415bcf1dd2df28f80dbc3312dfeb56de4fceafc4bbe0d017528aab45710857f912c5934f7c228e4f4e049da
+  metadata.gz: 53c6230c94e22514c3001ed18ca32f74cb627e6ff981004665bc1ca36e6554d2293b442dd0bef7a28fa00a59d7e0caba3498db58460df699cde50c320ce071d4
+  data.tar.gz: df51e8ab2d6927d91481c4232599f1de1b68ed234247ba9b2e5714189072b1bde36bcc4751ebaf825f5661f5f74c302f7d3d8f8e6ede13c4deb8eeb202215b00

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+0.11.7
+===
+- Fix bug causing platform-specific gems to be installed from source even if they were already present in the backend.
+
 0.11.6
 ===
 - Fix bug causing native extension compile errors.

data/lib/prebundler/gem_ref.rb

@@ -73,8 +73,10 @@ module Prebundler
         system "tar -C #{bundle_path} -rf #{tar_file} #{relative_extension_dir}"
       end
 
-      executables.each do |executable|
-        system "tar -C #{bundle_path} -rf #{tar_file} #{File.join(relative_gem_dir, 'bin', executable)}"
+      gemspecs.each do |gemspec|
+        gemspec.executables.each do |executable|
+          system "tar -C #{bundle_path} -rf #{tar_file} #{File.join(relative_gem_dir, gemspec.bindir, executable)}"
+        end
       end
     end
 
@@ -105,7 +107,13 @@ module Prebundler
     end
 
     def install_dir
-      File.join(install_path, id)
+      @install_dir ||= begin
+        base = File.join(install_path, id)
+
+        find_platform_dir(base) do |dir|
+          File.directory?(dir)
+        end
+      end
     end
 
     def extension_dir
@@ -119,14 +127,10 @@ module Prebundler
     def relative_gem_dir
       @relative_gem_dir ||= begin
         base = File.join('gems', id)
-        platform = Bundler.local_platform.to_a
 
-        platform.size.downto(0) do |i|
-          dir = [base, *platform[0...i]].join('-')
-          return dir if File.directory?(File.join(bundle_path, dir))
+        find_platform_dir(base) do |dir|
+          File.directory?(File.join(bundle_path, dir))
         end
-
-        base
       end
     end
 
@@ -140,5 +144,18 @@ module Prebundler
       file = File.join(Bundler.local_platform.to_s, Prebundler.platform_version, Gem.extension_api_version.to_s, "#{id}.tar")
       prefix && !prefix.empty? ? File.join(prefix, file) : file
     end
+
+    private
+
+    def find_platform_dir(base)
+      platform = Bundler.local_platform.to_a
+
+      platform.size.downto(0) do |i|
+        dir = [base, *platform[0...i]].join('-')
+        return dir if yield(dir)
+      end
+
+      base
+    end
   end
 end

data/lib/prebundler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Prebundler
-  VERSION = '0.11.6'
+  VERSION = '0.11.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prebundler
 version: !ruby/object:Gem::Version
-  version: 0.11.6
+  version: 0.11.7
 platform: ruby
 authors:
 - Cameron Dutro