kuby-prebundler 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7d463fee6e63a5f20acc3771a8a9b2d9f545b32d6f6cb9a0f9aae8478a75721
-  data.tar.gz: 194b616fac0ffca2102758cf6a639ef9e415bee951442fb4829e1fed366c04d5
+  metadata.gz: c6f45f6eecb45cfed9408bf4023807520ab3234dff370dc5549db578cefee5f6
+  data.tar.gz: f5f50608102e1ee4cbb4199697d33c5bd64df5db4083bb8d4eaa08e1aceed398
 SHA512:
-  metadata.gz: ba7f32361414c9b7b6757225f2171b31e66b7ef62399ee52857604a37b561bffe11e0d62d72c053d527062035cf04faae71b408eb774001407882a85c39be0af
-  data.tar.gz: 0ac60081f6d3de0d8889af5f454841a97b8ff2d3cdf2f1b165025b0c22a636b993810ad7899c5676d4788287dc978764e2c6ca17e6fb284d96eefafb1766f1f3
+  metadata.gz: 7a8fcd46da2fbeff38bf41d596b789156b7bb287de2729541aaebece6930c189226fb28f91e2dae73d66970c0fc0e5c0f4d307aecd925c831f84e2e3d7aab271
+  data.tar.gz: 7735408714047d242e9a9e530e23489ff78250c4bbd807e2bdad658c52fd9b969685a7f366bdf88d2e824914761a9dfd6f87ccb3a94d5af2b799e2aa6470f58f

data/CHANGELOG.md

@@ -1,2 +1,6 @@
+## 0.2.0
+* Use kuby-core's `LayerStack#replace` instead of `#delete` and `#insert`, which leads to unexpected phase order.
+* Allow configuring the path to the config file.
+
 ## 0.1.0
 * Birthday!

data/kuby-prebundler.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.platform = Gem::Platform::RUBY
 
-  s.add_dependency 'kuby-core', '>= 0.16.0', '< 1.0'
+  s.add_dependency 'kuby-core', '>= 0.20.0', '< 1.0'
 
   s.require_path = 'lib'
   s.files = Dir['{lib,spec}/**/*', 'Gemfile', 'LICENSE', 'CHANGELOG.md', 'README.md', 'Rakefile', 'kuby-prebundler.gemspec']

data/lib/kuby/prebundler/config.rb

@@ -0,0 +1,11 @@
+require 'kube-dsl'
+
+module Kuby
+  module Prebundler
+    class Config
+      extend ::KubeDSL::ValueFields
+
+      value_fields :config_path
+    end
+  end
+end

data/lib/kuby/prebundler/plugin.rb

@@ -3,14 +3,27 @@ require 'kuby'
 module Kuby
   module Prebundler
     class Plugin < ::Kuby::Plugin
+      attr_reader :config
+
+      def configure(&block)
+        config.instance_eval(&block) if block
+      end
+
       def after_configuration
         bundler_phase = docker.bundler_phase
-        docker.delete(:bundler_phase)
-        docker.insert(:bundler_phase, PrebundlerPhase.new(environment, bundler_phase), after: :package_phase)
+
+        docker.replace(
+          :bundler_phase,
+          PrebundlerPhase.new(environment, bundler_phase, config)
+        )
       end
 
       private
 
+      def after_initialize
+        @config = Config.new
+      end
+
       def docker
         environment.docker
       end

data/lib/kuby/prebundler/prebundler_phase.rb

@@ -3,11 +3,12 @@ require 'kuby'
 module Kuby
   module Prebundler
     class PrebundlerPhase < ::Kuby::Docker::Layer
-      attr_accessor :prebundle_config, :bundler_phase
+      attr_reader :bundler_phase, :config
 
-      def initialize(environment, bundler_phase)
+      def initialize(environment, bundler_phase, config)
         @bundler_phase = bundler_phase
         @bundler_phase.executable = 'prebundle'
+        @config = config
 
         super(environment)
       end
@@ -24,7 +25,7 @@ module Kuby
         dockerfile.arg('PREBUNDLER_ACCESS_KEY_ID')
         dockerfile.arg('PREBUNDLER_SECRET_ACCESS_KEY')
 
-        dockerfile.copy(prebundle_config || '.prebundle_config', '.')
+        dockerfile.copy(config.config_path || '.prebundle_config', '.')
         dockerfile.run('gem', 'install', 'prebundler', '-v', "'< 1'")
 
         bundler_phase.apply_to(dockerfile)

data/lib/kuby/prebundler/version.rb

@@ -1,5 +1,5 @@
 module Kuby
   module Prebundler
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

data/lib/kuby/prebundler.rb

@@ -1,5 +1,6 @@
 require 'kube-dsl'
 require 'kuby/prebundler/plugin'
+require 'kuby/prebundler/config'
 require 'kuby/prebundler/prebundler_phase'
 
 Kuby.register_plugin(:prebundler, ::Kuby::Prebundler::Plugin)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuby-prebundler
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-01 00:00:00.000000000 Z
+date: 2023-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kuby-core
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.20.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.20.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -44,6 +44,7 @@ files:
 - Rakefile
 - kuby-prebundler.gemspec
 - lib/kuby/prebundler.rb
+- lib/kuby/prebundler/config.rb
 - lib/kuby/prebundler/plugin.rb
 - lib/kuby/prebundler/prebundler_phase.rb
 - lib/kuby/prebundler/version.rb
@@ -65,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.5
 signing_key:
 specification_version: 4
 summary: Use Prebundler to install your bundle when building Docker images with Kuby.