prebundler 0.11.5 → 0.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23e5c0e7fe7ae30eebcbcf95a220f33f5266c5afafdb2264dcd993822a9242bd
-  data.tar.gz: 4828d877ee9720d864381c47fb3e66dfb7690350194941f0be7c4f0220b8c8db
+  metadata.gz: fdf192e38f6f57692d64316b8b3d2ae645ee28a482c47e6e2bf1f14adfa283bc
+  data.tar.gz: 66c8f18686a990bcc1b222e4c76c6c7069793a92cd2f4bc1f102bcd2ed978b7c
 SHA512:
-  metadata.gz: 578be20b017a8132b04685b52d87737cb2b97a7549f4e02f4051b781a6e732399895d333f5696acb38019b0883957bb324c61cf05d988b7eb00be8dd4178f194
-  data.tar.gz: 670fc343ab7c1287a1a8c44fdd891025dbe8fc937566550b6a1aa79a2d7ff10f986665b36a833014523ca7d0d7dad868227244e4f587243b9f8474b6128a3576
+  metadata.gz: 446f73025c6af47a142eba416e109805977fba9486a1120c6b726c20b3edddfd747ac459206b7780b75218a9abf6507ee502d50d6a4040b6de40769259af7f0b
+  data.tar.gz: 72e86b825eae349a11a6b606faba2cc6280a3b125415bcf1dd2df28f80dbc3312dfeb56de4fceafc4bbe0d017528aab45710857f912c5934f7c228e4f4e049da

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+0.11.6
+===
+- Fix bug causing native extension compile errors.
+- Fix bug causing executables to not be included in tarballs.
+- Fix bug (maybe introduced by bundler 2?) causing incorrect directory to be tarred. Directory can now include platform apparently.
+
 0.11.5
 ===
 - Add `--retry` flag to CLI (currently does nothing).

data/lib/prebundler/gem_ref.rb

@@ -48,7 +48,10 @@ module Prebundler
     end
 
     def install
-      system({ "GEM_HOME" => bundle_path }, "gem install -N --ignore-dependencies --source #{source} #{name} -v #{version}")
+      Bundler.with_unbundled_env do
+        system({ "GEM_HOME" => bundle_path }, "gem install -N --ignore-dependencies --source #{source} #{name} -v #{version}")
+      end
+
       $?.exitstatus
     end
 
@@ -71,7 +74,7 @@ module Prebundler
       end
 
       executables.each do |executable|
-        system "tar -C #{bundle_path} -rf #{tar_file} #{File.join('bin', executable)}"
+        system "tar -C #{bundle_path} -rf #{tar_file} #{File.join(relative_gem_dir, 'bin', executable)}"
       end
     end
 
@@ -114,7 +117,17 @@ module Prebundler
     end
 
     def relative_gem_dir
-      File.join('gems', id)
+      @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))
+        end
+
+        base
+      end
     end
 
     def relative_gemspec_files

data/lib/prebundler/version.rb

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

data/prebundler.gemspec

@@ -9,9 +9,7 @@ Gem::Specification.new do |s|
   s.homepage = 'http://github.com/camertron'
 
   s.description = s.summary = 'Gem dependency prebuilder'
-
   s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
 
   s.add_dependency 'bundler'
   s.add_dependency 'parallel', '~> 1.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prebundler
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.11.6
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-12 00:00:00.000000000 Z
+date: 2020-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler