prebundler 0.11.3 → 0.11.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58c4ae382f45ded05a5d464ece05649f9908040cffc272d7b3969e1916b3a8f8
-  data.tar.gz: 2cc5be058b8c06f8b116e857175de0e98f5d5267719098fe59944730cac1016c
+  metadata.gz: 2b7bea8849dcfbf9020cff5c2c1b9b680cf791db9d2c9b8f3281433001e33bb2
+  data.tar.gz: 121f2dc97ae36b8fa7da226bb87de592597b7dfcd97f3a26b90e3c85e2270ad1
 SHA512:
-  metadata.gz: 144ea989dddf9d08228df39b9546de46359f44a751732f8d550caff65c3cc2ccb052d6b8140d2180082708ad7ac4e8662d07fb4d28edb24185057ffc9e1b4aa4
-  data.tar.gz: 10787d0ae6fea5816c31effcd1c1ca68e7bb74420d6696a209b234e158751f3d3bcb523f51839a58dc951f7abad1d85628e546e91ff233f0b4aaa151e1c334f6
+  metadata.gz: 20fd4208dbef759aa79fc2c98364073fe02a58d277eecb8f27192b7c1ac112cd6112d8b381b77f4d31c2225cbbff91bd96322f360d7708d060e8d5d62b1272fc
+  data.tar.gz: 3d5d817a64373717bab3e2e40ae46db92d1e20d05cd637c5efbbd41fe27404214ac0bb034c3fb76cca16592220680b0f7810122f7ba52258482916828c5281e0

data/CHANGELOG.md

@@ -1,3 +1,28 @@
+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.
+
+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).
+
+0.11.4
+===
+- Ensure .bundle/config directory exists before writing to it.
+
 0.11.3
 ===
 - Support (well, add stubs for) `ruby` and `git_source` methods in Gemfiles.

data/bin/prebundle

@@ -51,6 +51,10 @@ command :install do |c|
   c.default_value true
   c.switch :binstubs
 
+  c.desc 'Retry failed network requests n times (currently not implemented).'
+  c.default_value 1
+  c.flag [:retry], type: Integer
+
   c.action do |global_options, options, args|
     raise 'Must specify a non-zero number of jobs' if options[:jobs] < 1
     Prebundler::Cli::Install.run($out, global_options, options, args)

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
 
@@ -118,6 +122,7 @@ module Prebundler
         config = File.exist?(file) ? YAML.load_file(file) : {}
         config['BUNDLE_WITH'] = with_groups.join(':') unless with_groups.empty?
         config['BUNDLE_WITHOUT'] = without_groups.join(':') unless without_groups.empty?
+        FileUtils.mkdir_p(File.dirname(file))
         File.write(file, YAML.dump(config))
       end
 
@@ -178,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,8 +48,19 @@ module Prebundler
     end
 
     def install
-      system({ "GEM_HOME" => bundle_path }, "gem install -N --ignore-dependencies --source #{source} #{name} -v #{version}")
-      $?.exitstatus
+      # 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} "\
+            "--version #{version} "\
+            "--platform #{Bundler.local_platform.to_s}"
+        )
+      end
+
+      $?.exitstatus == 0
     end
 
     def install_from_tar(tar_file)
@@ -70,8 +81,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('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
 
@@ -102,7 +115,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
@@ -114,7 +133,13 @@ module Prebundler
     end
 
     def relative_gem_dir
-      File.join('gems', id)
+      @relative_gem_dir ||= begin
+        base = File.join('gems', id)
+
+        find_platform_dir(base) do |dir|
+          File.directory?(File.join(bundle_path, dir))
+        end
+      end
     end
 
     def relative_gemspec_files
@@ -127,5 +152,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/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.3'
+  VERSION = '0.11.8'
 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.3
+  version: 0.11.8
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-09 00:00:00.000000000 Z
+date: 2021-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler