kuby-core 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a072588afc0cc4e0cf815c276628b90c192bf24310ed6c4c53089bc467ba278
-  data.tar.gz: 364b1265256eda0eea1f57469f241a1c78f1bdb2be0d37d8a23b5c6f01f4ff43
+  metadata.gz: a443b66d4dff19f6a2112b6365a9579b0490b049ef51ab612ad9e6cf4a807901
+  data.tar.gz: 2b38151be094c758a64ecdc95c585f184f4e9eea1affbdc4d071cc7a20d499a0
 SHA512:
-  metadata.gz: 866438d8c0880d949150d337b01fce94dfab9d0606ab3e2358e4c7cad376bb36cb3ff958ea72188967abf1192216c3b7586ddcfba6d7e0324ab4fbe37a085e49
-  data.tar.gz: 87e438bd3f4783b1b3d0e7609d773f5eeee91f7b9ae980446c8ca63084bddeb3a525d944750fe13fb36e98d782188cf6bd06c3df5edff742d8a1d5d80aa53966
+  metadata.gz: 6cf93a88bc24ab142fa497daddc7227d417c138391f46db6f5b77a862c96e9c2733d880eded21d464170963902364ac0f2806f84cd083d0a5b408231987bcf2b
+  data.tar.gz: dab2dcd180ff19421ef44aef1a3384e1faa0b49511925e6557d54500a652a5c854217a8c463cd738cd6a745b2eb1804262e35539635fdb4d98ed13d2abc90aa2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.13.0
+* Fix handling rails/rake options in remote exec (@palkan, #60)
+* Add `bundler_phase.gemfiles(*paths)` to allow adding additional gemfiles (@palkan, #61)
+
 ## 0.12.0
 * Fix issue causing volume mount errors when k8s tries to schedule asset pods on multiple nodes (fixes #42).
   - Persistent volumes can only be mounted on a single physical node.

data/README.md

@@ -1,6 +1,7 @@
 ## Kuby
 
-[![Build Status](https://travis-ci.com/getkuby/kuby-core.svg?branch=master)](https://travis-ci.com/getkuby/kuby-core)
+![Unit Tests](https://github.com/getkuby/kuby-core/actions/workflows/unit_tests.yml/badge.svg?branch=master)
+![Integration Tests](https://github.com/getkuby/kuby-core/actions/workflows/integration_tests.yml/badge.svg?branch=master)
 
 Deploy your Rails app the easy way.
 

data/lib/kuby/commands.rb

@@ -25,9 +25,10 @@ module Kuby
       def run(args)
         if idx = args.index('rails') || idx = args.index('rake')
           @rails_options = T.let(@rails_options, T.nilable(T::Array[String]))
-          @rails_options = args[idx..-1]
+          @rails_options = args[(idx + 1)..-1]
           super(args[0..idx])
         else
+          @rails_options = []
           super
         end
       end
@@ -164,7 +165,7 @@ module Kuby
       rc.desc 'Runs an arbitrary command inside a running Rails pod.'
       rc.command :exec do |c|
         c.action do |global_options, options, args|
-          tasks.remote_exec(args)
+          tasks.remote_exec([*args, *@rails_options])
         end
       end
 

data/lib/kuby/docker/bundler_phase.rb

@@ -35,6 +35,7 @@ module Kuby
 
         @version = T.let(@version, T.nilable(String))
         @gemfile = T.let(@gemfile, T.nilable(String))
+        @gemfiles = T.let([], T::Array[String])
         @without = T.let(@without, T.nilable(T::Array[String]))
       end
 
@@ -51,6 +52,10 @@ module Kuby
         dockerfile.copy(gf, '.')
         dockerfile.copy(lf, '.')
 
+        @gemfiles.each do |file|
+          dockerfile.copy(file, file)
+        end
+
         unless wo.empty?
           dockerfile.env("BUNDLE_WITHOUT='#{wo.join(' ')}'")
         end
@@ -67,6 +72,11 @@ module Kuby
         dockerfile.env("PATH=./bin:$PATH")
       end
 
+      sig { params(paths: String).void }
+      def gemfiles(*paths)
+        @gemfiles.concat(paths)
+      end
+
       private
 
       sig { returns(String) }

data/lib/kuby/version.rb

@@ -1,5 +1,5 @@
 # typed: true
 
 module Kuby
-  VERSION = '0.12.0'.freeze
+  VERSION = '0.13.0'.freeze
 end

data/spec/docker/spec_spec.rb

@@ -107,6 +107,18 @@ describe Kuby::Docker::Spec do
         expect(subject).to match(/RUN bundle install .* --gemfile foo\/bar\/Gemfile/)
       end
     end
+
+    context 'when multiple gemfiles are specified' do
+      before { spec.bundler_phase.gemfiles('gemfiles/a.gemfile', 'gemfiles/b.gemfile') }
+
+      it 'uses all gemfiles including the default one' do
+        expect(subject).to include("COPY Gemfile .\n")
+        expect(subject).to include("COPY Gemfile.lock .\n")
+        expect(subject).to include("COPY gemfiles/a.gemfile gemfiles/a.gemfile\n")
+        expect(subject).to include("COPY gemfiles/b.gemfile gemfiles/b.gemfile\n")
+        expect(subject).to match(/RUN bundle install .* --gemfile Gemfile/)
+      end
+    end
   end
 
   describe '#package' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuby-core
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-07 00:00:00.000000000 Z
+date: 2021-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -290,7 +290,6 @@ files:
 - spec/docker/timestamp_tag_spec.rb
 - spec/docker/timestamped_image_spec.rb
 - spec/dummy/Gemfile
-- spec/dummy/Gemfile.lock
 - spec/dummy/README.md
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/config/manifest.js
@@ -334,7 +333,6 @@ files:
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
-- spec/dummy/config/master.key
 - spec/dummy/config/puma.rb
 - spec/dummy/config/routes.rb
 - spec/dummy/config/spring.rb
@@ -351,7 +349,6 @@ files:
 - spec/dummy/test/application_system_test_case.rb
 - spec/dummy/test/channels/application_cable/connection_test.rb
 - spec/dummy/test/test_helper.rb
-- spec/dummy/tmp/cache/bootsnap-load-path-cache
 - spec/spec_helper.rb
 - spec/support/docker/fake_cli.rb
 - spec/support/docker/remote/fake_client.rb
@@ -374,7 +371,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Deploy your Rails app onto Kubernetes the easy way.

data/spec/dummy/Gemfile.lock

@@ -1,223 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activejob (= 6.0.3.2)
-      activerecord (= 6.0.3.2)
-      activestorage (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-      mail (>= 2.7.1)
-    actionmailer (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      actionview (= 6.0.3.2)
-      activejob (= 6.0.3.2)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (6.0.3.2)
-      actionview (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-      rack (~> 2.0, >= 2.0.8)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activerecord (= 6.0.3.2)
-      activestorage (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-      nokogiri (>= 1.8.5)
-    actionview (6.0.3.2)
-      activesupport (= 6.0.3.2)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.3.2)
-      activesupport (= 6.0.3.2)
-      globalid (>= 0.3.6)
-    activemodel (6.0.3.2)
-      activesupport (= 6.0.3.2)
-    activerecord (6.0.3.2)
-      activemodel (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-    activestorage (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activejob (= 6.0.3.2)
-      activerecord (= 6.0.3.2)
-      marcel (~> 0.3.1)
-    activesupport (6.0.3.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    bindex (0.8.1)
-    bootsnap (1.4.8)
-      msgpack (~> 1.0)
-    builder (3.2.4)
-    byebug (11.1.3)
-    capybara (3.33.0)
-      addressable
-      mini_mime (>= 0.1.3)
-      nokogiri (~> 1.8)
-      rack (>= 1.6.0)
-      rack-test (>= 0.6.3)
-      regexp_parser (~> 1.5)
-      xpath (~> 3.2)
-    childprocess (3.0.0)
-    concurrent-ruby (1.1.7)
-    crass (1.0.6)
-    erubi (1.9.0)
-    ffi (1.13.1)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (1.8.5)
-      concurrent-ruby (~> 1.0)
-    jbuilder (2.10.0)
-      activesupport (>= 5.0.0)
-    listen (3.2.1)
-      rb-fsevent (~> 0.10, >= 0.10.3)
-      rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.7.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
-    method_source (1.0.0)
-    mimemagic (0.3.5)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.1)
-    msgpack (1.3.3)
-    nio4r (2.5.2)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    public_suffix (4.0.5)
-    puma (4.3.5)
-      nio4r (~> 2.0)
-    rack (2.2.3)
-    rack-proxy (0.6.5)
-      rack
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (6.0.3.2)
-      actioncable (= 6.0.3.2)
-      actionmailbox (= 6.0.3.2)
-      actionmailer (= 6.0.3.2)
-      actionpack (= 6.0.3.2)
-      actiontext (= 6.0.3.2)
-      actionview (= 6.0.3.2)
-      activejob (= 6.0.3.2)
-      activemodel (= 6.0.3.2)
-      activerecord (= 6.0.3.2)
-      activestorage (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-      bundler (>= 1.3.0)
-      railties (= 6.0.3.2)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
-    railties (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
-    rake (13.0.1)
-    rb-fsevent (0.10.4)
-    rb-inotify (0.10.1)
-      ffi (~> 1.0)
-    regexp_parser (1.7.1)
-    rubyzip (2.3.0)
-    sass-rails (6.0.0)
-      sassc-rails (~> 2.1, >= 2.1.1)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    sassc-rails (2.1.2)
-      railties (>= 4.0.0)
-      sassc (>= 2.0)
-      sprockets (> 3.0)
-      sprockets-rails
-      tilt
-    selenium-webdriver (3.142.7)
-      childprocess (>= 0.5, < 4.0)
-      rubyzip (>= 1.2.2)
-    spring (2.1.1)
-    spring-watcher-listen (2.0.1)
-      listen (>= 2.7, < 4.0)
-      spring (>= 1.2, < 3.0)
-    sprockets (4.0.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.4.2)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tilt (2.0.10)
-    turbolinks (5.2.1)
-      turbolinks-source (~> 5.2)
-    turbolinks-source (5.2.0)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    web-console (4.0.4)
-      actionview (>= 6.0.0)
-      activemodel (>= 6.0.0)
-      bindex (>= 0.4.0)
-      railties (>= 6.0.0)
-    webdrivers (4.4.1)
-      nokogiri (~> 1.6)
-      rubyzip (>= 1.3.0)
-      selenium-webdriver (>= 3.0, < 4.0)
-    webpacker (4.3.0)
-      activesupport (>= 4.2)
-      rack-proxy (>= 0.6.1)
-      railties (>= 4.2)
-    websocket-driver (0.7.3)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    xpath (3.2.0)
-      nokogiri (~> 1.8)
-    zeitwerk (2.4.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bootsnap (>= 1.4.2)
-  byebug
-  capybara (>= 2.15)
-  jbuilder (~> 2.7)
-  listen (~> 3.2)
-  puma (~> 4.1)
-  rails (~> 6.0.3, >= 6.0.3.2)
-  sass-rails (>= 6)
-  selenium-webdriver
-  spring
-  spring-watcher-listen (~> 2.0.0)
-  sqlite3 (~> 1.4)
-  turbolinks (~> 5)
-  tzinfo-data
-  web-console (>= 3.3.0)
-  webdrivers
-  webpacker (~> 4.0)
-
-RUBY VERSION
-   ruby 2.5.8p224
-
-BUNDLED WITH
-   2.1.4

data/spec/dummy/config/master.key

@@ -1 +0,0 @@
-e02c0a6ae84e2533f0f5a02962d0ac35