prebundler 0.11.1 → 0.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a908fd14a0e3c7ce0342d02e4bcb8342071215b1b8f168d04ae84fadd09bfd70
-  data.tar.gz: db4b8827c8234bc052d7876c4282e211e7ca8b4291c21c641213143c8d403e9b
+  metadata.gz: fdf192e38f6f57692d64316b8b3d2ae645ee28a482c47e6e2bf1f14adfa283bc
+  data.tar.gz: 66c8f18686a990bcc1b222e4c76c6c7069793a92cd2f4bc1f102bcd2ed978b7c
 SHA512:
-  metadata.gz: 1c84b849e59d79d167b3f182369be1f387ad32b9df5c0c3b877d988db5be44e3377fbe77597965ba94b4195f7343f57d17a2201e20373b325dd3b854af57b4b9
-  data.tar.gz: 5ed4dda5f56215f0d073e7bcf3741b8c8511a49c425c699799fcbb3ed77e5603e7179e90af57bc599a2888ec3c4b680dea426571ef978940e6f8aafb88b6911d
+  metadata.gz: 446f73025c6af47a142eba416e109805977fba9486a1120c6b726c20b3edddfd747ac459206b7780b75218a9abf6507ee502d50d6a4040b6de40769259af7f0b
+  data.tar.gz: 72e86b825eae349a11a6b606faba2cc6280a3b125415bcf1dd2df28f80dbc3312dfeb56de4fceafc4bbe0d017528aab45710857f912c5934f7c228e4f4e049da

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+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.
+- Don't attempt to install gems we can't get a spec for.
+
+0.11.2
+===
+- Always run `bundle install` just in case.
+- Make sure `bundle check` is the _last_ thing that runs.
+
 0.11.1
 ===
 - Exit with nonzero status code if fallback `bundle install` fails.

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

@@ -21,7 +21,8 @@ module Prebundler
         install
         update_bundle_config
         generate_binstubs
-        check
+        # always run `bundle install` just in case
+        bundle_install
       rescue BundleFailedError => e
         out.puts e.message
         exit e.exitstatus
@@ -117,6 +118,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
 
@@ -136,18 +138,19 @@ module Prebundler
         out.puts 'Done generating binstubs'
       end
 
-      def check
-        system "bundle check --gemfile #{gemfile_path}"
+      def bundle_install
+        system "bundle install #{bundle_install_args}"
 
         if $?.exitstatus != 0
-          out.puts 'Bundle not satisfied, falling back to `bundle install`'
-          system "bundle install #{bundle_install_args}"
+          raise BundleFailedError.new(
+            "bundler exited with status code #{$?.exitstatus}", $?.exitstatus
+          )
+        end
 
-          if $?.exitstatus != 0
-            raise BundleFailedError.new(
-              "bundler exited with status code #{$?.exitstatus}", $?.exitstatus
-            )
-          end
+        system "bundle check --gemfile #{gemfile_path}"
+
+        if $?.exitstatus != 0
+          raise BundleFailedError.new('bundle could not be satisfied', $?.exitstatus)
         end
       end
 

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

@@ -23,6 +23,12 @@ module Prebundler
         gems[spec.name].spec = spec
         gems[spec.name].dependencies = spec.dependencies.map(&:name)
       end
+
+      # Get rid of gems without a spec, as they are likely not supposed
+      # to be installed. This happens for gems like tzinfo-data which are
+      # listed in the standard rails Gemfile but only installed on
+      # certain platforms.
+      gems.reject! { |_, g| g.spec.nil? }
     end
 
     def current_context
@@ -34,6 +40,13 @@ module Prebundler
       }
     end
 
+    def ruby(*args)
+    end
+
+    # this is probably the wrong thing to do
+    def git_source(*args)
+    end
+
     def gem(name, *args)
       options = args.find { |a| a.is_a?(Hash) } || {}
       gems[name] = GemRef.create(name, bundle_path, current_context.merge(options))

data/lib/prebundler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Prebundler
-  VERSION = '0.11.1'
+  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.1
+  version: 0.11.6
 platform: ruby
 authors:
 - Cameron Dutro
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-28 00:00:00.000000000 Z
+date: 2020-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,7 +114,7 @@ files:
 homepage: http://github.com/camertron
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -129,9 +129,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Gem dependency prebuilder
 test_files: []