prebundler 0.11.0 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdbc2df59f7a6b2a3cd74528a7d7616e66f77f3db95b33c0e8711a9f02e76fca
-  data.tar.gz: 3567b92be6e9e2758eb355793afcbeb29b610d075f10a2c9b854ea2549e4b4a2
+  metadata.gz: 23e5c0e7fe7ae30eebcbcf95a220f33f5266c5afafdb2264dcd993822a9242bd
+  data.tar.gz: 4828d877ee9720d864381c47fb3e66dfb7690350194941f0be7c4f0220b8c8db
 SHA512:
-  metadata.gz: 4d363752272279c388473875acaeae4d87d6cdb88d0effc192f685c7391f43ff5d6bb8c9278df2a92227d8fcf2534ce4b6289c7e9236607e91501a2d8ee0754e
-  data.tar.gz: f3e839f0e5cf217638741833400bb47005d5ef6b86045513871ea779c00c03bd209efc80c2e6dd3cb61d8eca66aea49d1539ba2d5418e6cdbe4baf078487851d
+  metadata.gz: 578be20b017a8132b04685b52d87737cb2b97a7549f4e02f4051b781a6e732399895d333f5696acb38019b0883957bb324c61cf05d988b7eb00be8dd4178f194
+  data.tar.gz: 670fc343ab7c1287a1a8c44fdd891025dbe8fc937566550b6a1aa79a2d7ff10f986665b36a833014523ca7d0d7dad868227244e4f587243b9f8474b6128a3576

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+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.
+
 0.11.0
 ===
 - Allow the caller to pass in a s3 client for non-standard setups

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

@@ -6,13 +6,26 @@ require 'yaml'
 
 module Prebundler
   module Cli
+    class BundleFailedError < StandardError
+      attr_reader :exitstatus
+
+      def initialize(message, exitstatus)
+        super(message)
+        @exitstatus = exitstatus
+      end
+    end
+
     class Install < Base
       def run
         prepare
         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
       end
 
       private
@@ -105,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
 
@@ -124,12 +138,19 @@ module Prebundler
         out.puts 'Done generating binstubs'
       end
 
-      def check
+      def bundle_install
+        system "bundle install #{bundle_install_args}"
+
+        if $?.exitstatus != 0
+          raise BundleFailedError.new(
+            "bundler exited with status code #{$?.exitstatus}", $?.exitstatus
+          )
+        end
+
         system "bundle check --gemfile #{gemfile_path}"
 
         if $?.exitstatus != 0
-          out.puts 'Bundle not satisfied, falling back to `bundle install`'
-          system "bundle install #{bundle_install_args}"
+          raise BundleFailedError.new('bundle could not be satisfied', $?.exitstatus)
         end
       end
 

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.0'
+  VERSION = '0.11.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prebundler
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.5
 platform: ruby
 authors:
 - Cameron Dutro
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-06 00:00:00.000000000 Z
+date: 2020-11-12 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
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Gem dependency prebuilder
 test_files: []