prebundler 0.11.4 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a1d8c42efac97a9a231f819c72b4882edaa990267bdba2409f67cbb0a475e44
-  data.tar.gz: a34cacca7e651248c255c46d357b52c8ac3535f50972cd56d696f7bfe6f121cb
+  metadata.gz: b42e430112189e660d94c9d8c1b95217b88b96da88a546c4786061b446c892d8
+  data.tar.gz: e06e950923a142dd513d8331d732a65b7f09a004381289895a5541ea6315faeb
 SHA512:
-  metadata.gz: 4d7008ebbf5314f02bbf992e4a6a8a7a2c05fae161427b902a12565a46bb70747a0d2e3c912d4ed45e557cc5b8616d7c906cf3d12dbade1733206664971f15e5
-  data.tar.gz: 63a314e575817c6123e3895322c507349753c383afd541a92343c6d0999306d9ea1d381492057febe7779c6098a0dd10078328bd87080ead9a99d9dbe1e0f76d
+  metadata.gz: 3dae5bd84ab46ddbe6263997c1c453ff9c0534141c5e250d5d2af89e3213584e875821d0430c35886e407af45f727c0a105110a790e78fac165a0a12a1fcb90a
+  data.tar.gz: db940690b64c743540cb952651f9c8f729965392a9d93dc1b4607a39dc7b765f1600d1d51bbd2ea62ed52e4f40c45448b62c3670c7e503eb0c9f8320e577d7f5

data/CHANGELOG.md

@@ -1,3 +1,28 @@
+0.12.0
+===
+- Switch out ohai for ohey.
+
+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.

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.rb

@@ -1,4 +1,4 @@
-require 'ohai'
+require 'ohey'
 
 module Prebundler
   autoload :Cli,                'prebundler/cli'
@@ -27,13 +27,13 @@ module Prebundler
     end
 
     def platform_version
-      @platform_version ||= "#{system_info['platform']}-#{system_info['platform_version']}"
+      @platform_version ||= "#{platform.name}-#{platform.version}"
     end
 
     private
 
-    def system_info
-      @@system_info ||= Ohai::System.new.all_plugins(['platform'])
+    def platform
+      @platform ||= Ohey.current_platform
     end
   end
 end

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,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.4'
+  VERSION = '0.12.0'
 end

data/prebundler.gemspec

@@ -9,14 +9,12 @@ 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'
   s.add_dependency 'gli', '~> 2.0'
-  s.add_dependency 'ohai', '~> 14.0'
+  s.add_dependency 'ohey', '~> 1.0'
 
   # @TODO: move s3 support into separate gem
   s.add_dependency 'aws-sdk', '~> 2.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prebundler
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.12.0
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-09 00:00:00.000000000 Z
+date: 2021-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: ohai
+  name: ohey
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '14.0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '14.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement