prebundler 0.10.0 → 0.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f85ac1db1104a8d0cef038b2957c5745cabe60744cd042ec4d2f6112faba0dda
-  data.tar.gz: 70595a0b3f049f1a77066542107d74a5297e0e7572bcdcbc2a3603edcfcf331e
+  metadata.gz: 8a1d8c42efac97a9a231f819c72b4882edaa990267bdba2409f67cbb0a475e44
+  data.tar.gz: a34cacca7e651248c255c46d357b52c8ac3535f50972cd56d696f7bfe6f121cb
 SHA512:
-  metadata.gz: a339b1e9a90f87c3a67e1c418518902ac88663f1360511f9c04a2fe28469b295dbb947b5bc8689c716c87adea10dc4a4835a3133613ca6890d9bd02ff7f457fd
-  data.tar.gz: f64888ba39a9f1eb347cf395d1628f6e4c4e9aad714ab895ea84311813e1ab1240885543a7e40c6c82494a046d0d27d7a93de9d28f4499e78bd1985c7cfab1ef
+  metadata.gz: 4d7008ebbf5314f02bbf992e4a6a8a7a2c05fae161427b902a12565a46bb70747a0d2e3c912d4ed45e557cc5b8616d7c906cf3d12dbade1733206664971f15e5
+  data.tar.gz: 63a314e575817c6123e3895322c507349753c383afd541a92343c6d0999306d9ea1d381492057febe7779c6098a0dd10078328bd87080ead9a99d9dbe1e0f76d

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+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
+
 0.10.0
 ===
 - Update aws-sdk client creation to be able to support non-aws s3 api endpoints (e.g. minio)

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

@@ -1,16 +1,18 @@
+# frozen_string_literal: true
+
 require 'aws-sdk'
 
 module Prebundler
   class S3Backend
-    attr_reader :access_key_id, :secret_access_key, :bucket, :region, :endpoint, :force_path_style
+    attr_reader :access_key_id, :secret_access_key, :bucket, :region
 
     def initialize(options = {})
-      @access_key_id = options.fetch(:access_key_id)
-      @secret_access_key = options.fetch(:secret_access_key)
-      @bucket = options.fetch(:bucket)
-      @region = options.fetch(:region) { 'us-east-1' }
-      @endpoint = options.fetch(:endpoint) { 's3.amazonaws.com' }
-      @force_path_style = options.fetch(:force_path_style) { false }
+      @bucket             = options.fetch(:bucket)
+
+      @client             = options.fetch(:client, nil)
+      @access_key_id      = options.fetch(:access_key_id, nil)
+      @secret_access_key  = options.fetch(:secret_access_key, nil)
+      @region             = options.fetch(:region) { ENV['AWS_REGION'] || 'us-east-1' }
     end
 
     def store_file(source_file, dest_file)
@@ -33,7 +35,7 @@ module Prebundler
       files = []
       base_options = {
         bucket: bucket,
-        prefix: "#{Bundler.local_platform.to_s}/#{Prebundler.platform_version}/#{Gem.extension_api_version.to_s}"
+        prefix: "#{Bundler.local_platform}/#{Prebundler.platform_version}/#{Gem.extension_api_version}"
       }
 
       while truncated
@@ -62,7 +64,7 @@ module Prebundler
     private
 
     def client
-      @client ||= Aws::S3::Client.new(region: region, credentials: credentials, endpoint: endpoint, force_path_style: force_path_style)
+      @client ||= Aws::S3::Client.new(region: region, credentials: credentials)
     end
 
     def credentials

data/lib/prebundler/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prebundler
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.4
 platform: ruby
 authors:
 - Cameron Dutro
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-02 00:00:00.000000000 Z
+date: 2020-11-09 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: []