prebundler 0.11.7 → 0.11.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3aede9a82a409f6be7544d071dc88d550eca1d958eab7b45cdd77d40c4dbd02
-  data.tar.gz: 12e5d87c3ae82b1843c2012be18cb1e5c0c0b123ce15578df4c382968b045f94
+  metadata.gz: 2b7bea8849dcfbf9020cff5c2c1b9b680cf791db9d2c9b8f3281433001e33bb2
+  data.tar.gz: 121f2dc97ae36b8fa7da226bb87de592597b7dfcd97f3a26b90e3c85e2270ad1
 SHA512:
-  metadata.gz: 53c6230c94e22514c3001ed18ca32f74cb627e6ff981004665bc1ca36e6554d2293b442dd0bef7a28fa00a59d7e0caba3498db58460df699cde50c320ce071d4
-  data.tar.gz: df51e8ab2d6927d91481c4232599f1de1b68ed234247ba9b2e5714189072b1bde36bcc4751ebaf825f5661f5f74c302f7d3d8f8e6ede13c4deb8eeb202215b00
+  metadata.gz: 20fd4208dbef759aa79fc2c98364073fe02a58d277eecb8f27192b7c1ac112cd6112d8b381b77f4d31c2225cbbff91bd96322f360d7708d060e8d5d62b1272fc
+  data.tar.gz: 3d5d817a64373717bab3e2e40ae46db92d1e20d05cd637c5efbbd41fe27404214ac0bb034c3fb76cca16592220680b0f7810122f7ba52258482916828c5281e0

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+0.11.8
+===
+- Don't store gems in the backend if they failed to install.
+- Use an absolute bundle path.
+- Only consider a gem from the lockfile if it matches the current platform.
+- Fix `#install` methods so they all return true/false.
+
 0.11.7
 ===
 - Fix bug causing platform-specific gems to be installed from source even if they were already present in the backend.

data/lib/prebundler/cli/install.rb

@@ -102,8 +102,12 @@ module Prebundler
           FileUtils.rm(dest_file)
         else
           out.puts "Installing #{gem_ref.id} from source"
-          gem_ref.install
-          store_gem(gem_ref, dest_file) if gem_ref.storable?
+
+          if gem_ref.install
+            store_gem(gem_ref, dest_file) if gem_ref.storable?
+          else
+            out.puts "Failed to install #{gem_ref.id} from source"
+          end
         end
       end
 
@@ -179,7 +183,7 @@ module Prebundler
       end
 
       def bundle_path
-        options.fetch(:'bundle-path')
+        File.expand_path(options.fetch(:'bundle-path'))
       end
 
       def config

data/lib/prebundler/gem_ref.rb

@@ -48,11 +48,19 @@ module Prebundler
     end
 
     def install
+      # NOTE: the --platform argument doesn't work when --ignore-dependencies
+      # is specified, no idea why
       Bundler.with_unbundled_env do
-        system({ "GEM_HOME" => bundle_path }, "gem install -N --ignore-dependencies --source #{source} #{name} -v #{version}")
+        system(
+          { "GEM_HOME" => bundle_path },
+          'gem install -N --ignore-dependencies '\
+            "--source #{source} #{name} "\
+            "--version #{version} "\
+            "--platform #{Bundler.local_platform.to_s}"
+        )
       end
 
-      $?.exitstatus
+      $?.exitstatus == 0
     end
 
     def install_from_tar(tar_file)

data/lib/prebundler/gemfile_interpreter.rb

@@ -17,8 +17,11 @@ module Prebundler
       instance_eval(File.read(gemfile_path))
 
       lockfile = Bundler::LockfileParser.new(File.read("#{gemfile_path}.lock"))
+      local_platform = Bundler.local_platform.to_s
 
       lockfile.specs.each do |spec|
+        next if spec.platform != 'ruby' && spec.platform.to_s != local_platform
+
         gems[spec.name] ||= GemRef.create(spec.name, bundle_path, options)
         gems[spec.name].spec = spec
         gems[spec.name].dependencies = spec.dependencies.map(&:name)

data/lib/prebundler/git_gem_ref.rb

@@ -22,15 +22,15 @@ module Prebundler
       FileUtils.mkdir_p(install_path)
       FileUtils.mkdir_p(cache_path)
 
-      return if File.exist?(cache_dir) || File.exist?(install_dir)
+      return true if File.exist?(cache_dir) || File.exist?(install_dir)
       system "git clone #{uri} \"#{cache_dir}\" --bare --no-hardlinks --quiet"
-      return $? if $?.exitstatus != 0
+      return false if $?.exitstatus != 0
       system "git clone --no-checkout --quiet \"#{cache_dir}\" \"#{install_dir}\""
-      return $? if $?.exitstatus != 0
+      return false if $?.exitstatus != 0
       Dir.chdir(install_dir) { system "git reset --hard --quiet #{revision}" }
       serialize_gemspecs
       copy_gemspecs
-      $?
+      $?.exitstatus == 0
     end
 
     def to_gem

data/lib/prebundler/version.rb

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

metadata

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