kuby-core 0.18.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c537d5778b44ceab6bbd75ae91b2c8569bdba7356c25112c172ce10533a5b073
-  data.tar.gz: c8fda1880975e51a5e398ccb5e42474ead68e7a179ea403ded3b15ee615dc4f1
+  metadata.gz: c3e98a72e5798436209eb36042b9cb6e59ea7491d772c3b04ea04ea12b81b612
+  data.tar.gz: 1a8b6a6e8704c885d3326e4a8e4e2aaf77fff5f67d9a9c4d8bb3cac546798fd6
 SHA512:
-  metadata.gz: ea78f96fa54b86a8917e252af444e92465b43e9017c52e25e9e643df50095a31a15462ba48f8db1f94063aff414ce9d2eb2a9e3617e2c9581823d339c810a0af
-  data.tar.gz: b791c2e2190e8c16a52b1039f565f9e6f04d55bc47395d0133581503beb882019139199da14efecf2d488a26e6229e7beaf649375c5067df69db6c0c7787fcf2
+  metadata.gz: 17f78515bf3e52d54299f678e3f55a6a11e4b5ad0272aff8051b447bc0904787df10f382fea3ecb470d6c46f67b0fb935817f4bd3816d292a4e5f55f37e8594a
+  data.tar.gz: 200a1df0299181a7334e4deaa737f69b6d3f30cbc5583c71be73b7ae088cb7f71e3bdf4b3418b6f1173ed3161bde00387410ecbe2b85d8f4c10bca6fa8a5ad64

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## Unreleased
+
+## 0.20.0
+* Modify the Rails generator to add the `activerecord-cockroachdb-adapter` to your bundle.
+* Add the `LayerStack#replace` and corresponding `Docker::Spec#replace` methods for replacing phases. This can be a lot easier than using `#insert` and `#delete`, which can mess with the relative order of the phases and cause surprising results.
+* Don't run init containers for creating and migrating the database if database management is turned off.
+
+## 0.19.0
+* Add support for configuring the number of web workers for puma (#124, @zhalltyemill)
+
 ## 0.18.0
 * Add the ability to specify your app's root directory.
   - Call `app_root <path>` inside the `docker` section of your Kuby config file.

data/Gemfile

@@ -7,7 +7,7 @@ group :development, :test do
   gem 'rake'
 
   gem 'curdle', '~> 1.2'
-  gem 'parlour', github: 'camertron/parlour', branch: 'initialize_void' # '~> 7.0'
+  gem 'parlour', '~> 8.0'
   gem 'tapioca', '~> 0.7'
   gem 'sorbet-runtime', '= 0.5.9897'
   gem 'sorbet-static', '= 0.5.9897'

data/bin/kuby

@@ -2,5 +2,7 @@
 
 $stdout.sync = true
 
+require 'sorbet-runtime'
+
 require 'kuby'
 exit Kuby::Commands.run(ARGV)

data/lib/kuby/docker/layer_stack.rb

@@ -94,6 +94,15 @@ module Kuby
         end
       end
 
+      # T::Sig::WithoutRuntime.sig { params(name: Symbol, layer: Layer).void }
+      def replace(name, layer)
+        unless layers.include?(name)
+          raise ArgumentError, "Could not find existing layer '#{name}'"
+        end
+
+        layers[name] = layer
+      end
+
       # T::Sig::WithoutRuntime.sig { params(name: Symbol).void }
       def delete(name)
         stack.delete(name)

data/lib/kuby/docker/spec.rb

@@ -145,6 +145,11 @@ module Kuby
         layer_stack.insert(name, layer, options, &block)
       end
 
+      # T::Sig::WithoutRuntime.sig { params(name: Symbol, layer: Layer).void }
+      def replace(name, layer)
+        layer_stack.replace(name, layer)
+      end
+
       # T::Sig::WithoutRuntime.sig { params(name: Symbol).void }
       def delete(name)
         layer_stack.delete(name)

data/lib/kuby/docker/webserver_phase.rb

@@ -28,7 +28,7 @@ module Kuby
         def apply_to(dockerfile)
           dockerfile.cmd(
             'puma',
-            '--workers', '4',
+            '--workers', phase.workers.to_s,
             '--bind', 'tcp://0.0.0.0',
             '--port', phase.port.to_s,
             '--pidfile', './server.pid',
@@ -40,11 +40,15 @@ module Kuby
       end
 
       DEFAULT_PORT = 8080
+      DEFAULT_WORKERS = 4
       WEBSERVER_MAP = { puma: Puma }.freeze
 
       # T::Sig::WithoutRuntime.sig { params(port: Integer).returns(Integer) }
       attr_writer :port
 
+      # T::Sig::WithoutRuntime.sig { params(workers: Integer).returns(Integer) }
+      attr_writer :workers
+
       # T::Sig::WithoutRuntime.sig { returns(T.nilable(Symbol)) }
       attr_reader :webserver
 
@@ -56,6 +60,7 @@ module Kuby
         super
 
         # @port = T.let(@port, T.nilable(Integer))
+        # @workers = T.let(@workers, T.nilable(Integer))
         # @webserver = T.let(@webserver, T.nilable(Symbol))
       end
 
@@ -73,6 +78,11 @@ module Kuby
         @port || DEFAULT_PORT
       end
 
+      # T::Sig::WithoutRuntime.sig { returns(Integer) }
+      def workers
+        @workers || DEFAULT_WORKERS
+      end
+
       private
 
       # T::Sig::WithoutRuntime.sig { returns(T.nilable(Symbol)) }

data/lib/kuby/plugins/rails_app/generators/kuby.rb

@@ -1,4 +1,4 @@
-# typed: false
+# typed: ignore
 
 require 'rails/generators'
 require 'rails/generators/base'
@@ -109,6 +109,14 @@ class KubyGenerator < Rails::Generators::Base
     )
   end
 
+  def add_cockroach_adapter
+    if Rails::VERSION::STRING > '5.2'
+      gem 'activerecord-cockroachdb-adapter', version: '~> 6.0'
+    else
+      gem 'activerecord-cockroachdb-adapter', version: '~> 5.2'
+    end
+  end
+
   private
 
   def app_name

data/lib/kuby/plugins/rails_app/plugin.rb

@@ -106,12 +106,14 @@ module Kuby
                     image image_with_tag
                   end
 
-                  init_container(:create_db) do
-                    image image_with_tag
-                  end
+                  if spec.manage_database?
+                    init_container(:create_db) do
+                      image image_with_tag
+                    end
 
-                  init_container(:migrate_db) do
-                    image image_with_tag
+                    init_container(:migrate_db) do
+                      image image_with_tag
+                    end
                   end
                 end
               end
@@ -308,36 +310,38 @@ module Kuby
                     end
                   end
 
-                  init_container(:create_db) do
-                    name "#{kube_spec.selector_app}-create-db"
-                    command %w(bundle exec rake kuby:rails_app:db:bootstrap)
+                  if kube_spec.manage_database?
+                    init_container(:create_db) do
+                      name "#{kube_spec.selector_app}-create-db"
+                      command %w(bundle exec rake kuby:rails_app:db:bootstrap)
 
-                    env_from do
-                      config_map_ref do
-                        name kube_spec.config_map.metadata.name
+                      env_from do
+                        config_map_ref do
+                          name kube_spec.config_map.metadata.name
+                        end
                       end
-                    end
 
-                    env_from do
-                      secret_ref do
-                        name kube_spec.app_secrets.metadata.name
+                      env_from do
+                        secret_ref do
+                          name kube_spec.app_secrets.metadata.name
+                        end
                       end
                     end
-                  end
 
-                  init_container(:migrate_db) do
-                    name "#{kube_spec.selector_app}-migrate-db"
-                    command %w(bundle exec rake kuby:rails_app:db:migrate)
+                    init_container(:migrate_db) do
+                      name "#{kube_spec.selector_app}-migrate-db"
+                      command %w(bundle exec rake kuby:rails_app:db:migrate)
 
-                    env_from do
-                      config_map_ref do
-                        name kube_spec.config_map.metadata.name
+                      env_from do
+                        config_map_ref do
+                          name kube_spec.config_map.metadata.name
+                        end
                       end
-                    end
 
-                    env_from do
-                      secret_ref do
-                        name kube_spec.app_secrets.metadata.name
+                      env_from do
+                        secret_ref do
+                          name kube_spec.app_secrets.metadata.name
+                        end
                       end
                     end
                   end

data/lib/kuby/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuby-core
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-07 00:00:00.000000000 Z
+date: 2023-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize