kuby-core 0.17.0 → 0.18.0

data/spec/docker/spec_spec.rb

@@ -12,7 +12,9 @@ describe Kuby::Docker::Spec do
     end
 
     context 'when the distro is set to Alpine' do
-      before { spec.distro(:alpine) }
+      before do
+        on_define { |env| env.docker.distro(:alpine) }
+      end
 
       it 'uses the Alpine base image' do
         expect(subject).to include("FROM ruby:#{RUBY_VERSION}-alpine\n")
@@ -20,7 +22,9 @@ describe Kuby::Docker::Spec do
     end
 
     context 'when the base image is set to something custom' do
-      before { spec.base_image('foo/bar') }
+      before do
+        on_define { |env| env.docker.base_image('foo/bar') }
+      end
 
       it 'uses the base image as given' do
         expect(subject).to include("FROM foo/bar\n")
@@ -42,7 +46,9 @@ describe Kuby::Docker::Spec do
     end
 
     context 'when the working dir is set to something custom' do
-      before { spec.working_dir('/foo/bar') }
+      before do
+        on_define { |env| env.docker.working_dir('/foo/bar') }
+      end
 
       it 'uses the working dir as given' do
         expect(subject).to include("WORKDIR /foo/bar\n")
@@ -59,7 +65,9 @@ describe Kuby::Docker::Spec do
     end
 
     context 'when the environment is set to something custom' do
-      before { spec.rails_env('foobar') }
+      before do
+        on_define { |env| env.docker.rails_env('foobar') }
+      end
 
       it 'uses the environment as given' do
         expect(subject).to include("ENV RAILS_ENV=foobar\n")
@@ -81,7 +89,9 @@ describe Kuby::Docker::Spec do
     end
 
     context 'when the bundler version is set to something custom' do
-      before { spec.bundler_version('1.17.3') }
+      before do
+        on_define { |env| env.docker.bundler_version('1.17.3') }
+      end
 
       it 'installs the given version' do
         expect(subject).to include("RUN gem install bundler -v 1.17.3\n")
@@ -93,30 +103,34 @@ describe Kuby::Docker::Spec do
     subject { spec.image.dockerfile.to_s }
 
     it 'uses the default Gemfile' do
-      expect(subject).to include("COPY Gemfile .\n")
-      expect(subject).to include("COPY Gemfile.lock .\n")
-      expect(subject).to match(/RUN bundle install .* --gemfile Gemfile/)
+      expect(subject).to include("COPY Gemfile /usr/src/app/Gemfile\n")
+      expect(subject).to include("COPY Gemfile.lock /usr/src/app/Gemfile.lock\n")
+      expect(subject).to include("ENV BUNDLE_GEMFILE=/usr/src/app/Gemfile")
     end
 
     context 'when the gemfile path is set to something custom' do
-      before { spec.gemfile('foo/bar/Gemfile') }
+      before do
+        on_define { |env| env.docker.gemfile('foo/bar/Gemfile') }
+      end
 
       it 'uses the given gemfile' do
-        expect(subject).to include("COPY foo/bar/Gemfile .\n")
-        expect(subject).to include("COPY foo/bar/Gemfile.lock .\n")
-        expect(subject).to match(/RUN bundle install .* --gemfile foo\/bar\/Gemfile/)
+        expect(subject).to include("COPY foo/bar/Gemfile /usr/src/app/foo/bar/Gemfile\n")
+        expect(subject).to include("COPY foo/bar/Gemfile.lock /usr/src/app/foo/bar/Gemfile.lock\n")
+        expect(subject).to include("ENV BUNDLE_GEMFILE=/usr/src/app/foo/bar/Gemfile")
       end
     end
 
     context 'when multiple gemfiles are specified' do
-      before { spec.bundler_phase.gemfiles('gemfiles/a.gemfile', 'gemfiles/b.gemfile') }
+      before do
+        on_define { |env| env.docker.bundler_phase.gemfiles('gemfiles/a.gemfile', 'gemfiles/b.gemfile') }
+      end
 
       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/)
+        expect(subject).to include("COPY Gemfile /usr/src/app/Gemfile\n")
+        expect(subject).to include("COPY Gemfile.lock /usr/src/app/Gemfile.lock\n")
+        expect(subject).to include("COPY gemfiles/a.gemfile /usr/src/app/gemfiles/a.gemfile\n")
+        expect(subject).to include("COPY gemfiles/b.gemfile /usr/src/app/gemfiles/b.gemfile\n")
+        expect(subject).to include("ENV BUNDLE_GEMFILE=/usr/src/app/Gemfile")
       end
     end
   end
@@ -125,8 +139,10 @@ describe Kuby::Docker::Spec do
     subject { spec.image.dockerfile.to_s }
 
     it 'installs the given package' do
-      # configured in spec_helper.rb
-      spec.package(:fake_package)
+      on_define do |env|
+        # configured in spec_helper.rb
+        env.docker.package(:fake_package)
+      end
 
       expect(subject).to match(/apt-get install .* fake_package/m)
     end
@@ -140,7 +156,9 @@ describe Kuby::Docker::Spec do
     end
 
     context 'when given a custom path to copy' do
-      before { spec.files('./foo/bar') }
+      before do
+        on_define { |env| env.docker.files('./foo/bar') }
+      end
 
       it 'copies the given paths only' do
         expect(subject).to include("COPY ./foo/bar .\n")
@@ -160,7 +178,9 @@ describe Kuby::Docker::Spec do
     end
 
     context 'when given a custom port' do
-      before { spec.port(5555) }
+      before do
+        on_define { |env| env.docker.port(5555) }
+      end
 
       it 'exposes the given port' do
         expect(subject).to include("EXPOSE 5555\n")
@@ -181,7 +201,9 @@ describe Kuby::Docker::Spec do
           end
         end
 
-        spec.insert :foo_phase, foo_phase.new, after: :webserver_phase
+        on_define do |env|
+          env.docker.insert :foo_phase, foo_phase.new, after: :webserver_phase
+        end
       end
 
       it 'inserts the commands' do
@@ -191,9 +213,11 @@ describe Kuby::Docker::Spec do
 
     context 'with a custom inline build phase' do
       before do
-        spec.insert :hello, after: :webserver_phase do |dockerfile|
-          dockerfile.insert_at(0) do
-            dockerfile.run('echo "foo"')
+        on_define do |env|
+          env.docker.insert :hello, after: :webserver_phase do |dockerfile|
+            dockerfile.insert_at(0) do
+              dockerfile.run('echo "foo"')
+            end
           end
         end
       end

data/spec/dummy/app/channels/application_cable/channel.rb

@@ -1,4 +1,5 @@
-# typed: strict
+# typed: ignore
+
 module ApplicationCable
   class Channel < ActionCable::Channel::Base
   end

data/spec/dummy/app/channels/application_cable/connection.rb

@@ -1,4 +1,5 @@
-# typed: strict
+# typed: ignore
+
 module ApplicationCable
   class Connection < ActionCable::Connection::Base
   end

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,3 +1,4 @@
-# typed: strict
+# typed: ignore
+
 class ApplicationController < ActionController::Base
 end

data/spec/dummy/app/jobs/application_job.rb

@@ -1,4 +1,5 @@
-# typed: strict
+# typed: ignore
+
 class ApplicationJob < ActiveJob::Base
   # Automatically retry jobs that encountered a deadlock
   # retry_on ActiveRecord::Deadlocked

data/spec/dummy/app/mailers/application_mailer.rb

@@ -1,4 +1,5 @@
-# typed: false
+# typed: ignore
+
 class ApplicationMailer < ActionMailer::Base
   default from: 'from@example.com'
   layout 'mailer'

data/spec/dummy/app/models/application_record.rb

@@ -1,4 +1,5 @@
-# typed: false
+# typed: ignore
+
 class ApplicationRecord < ActiveRecord::Base
   self.abstract_class = true
 end

data/spec/dummy/config/application.rb

@@ -1,4 +1,5 @@
-# typed: false
+# typed: ignore
+
 require_relative 'boot'
 
 require 'rails/all'

data/spec/dummy/config/initializers/wrap_parameters.rb

@@ -1,4 +1,5 @@
-# typed: strict
+# typed: ignore
+
 # Be sure to restart your server when you modify this file.
 
 # This file contains settings for ActionController::ParamsWrapper which

data/spec/dummy/config/routes.rb

@@ -1,4 +1,5 @@
-# typed: strict
+# typed: ignore
+
 Rails.application.routes.draw do
   # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html
 end

data/spec/dummy/test/application_system_test_case.rb

@@ -1,4 +1,5 @@
-# typed: false
+# typed: ignore
+
 require "test_helper"
 
 class ApplicationSystemTestCase < ActionDispatch::SystemTestCase

data/spec/dummy/test/channels/application_cable/connection_test.rb

@@ -1,4 +1,5 @@
-# typed: strict
+# typed: ignore
+
 require "test_helper"
 
 class ApplicationCable::ConnectionTest < ActionCable::Connection::TestCase

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 # typed: false
+
 $:.push(File.expand_path('.', __dir__))
 
+require 'sorbet-runtime'
 require 'kuby'
 require 'pry-byebug'
 
@@ -43,11 +45,17 @@ module SpecHelpers
     )
   end
 
+  let(:on_define_blocks) { [] }
+
+  def on_define(&block)
+    on_define_blocks << block
+  end
+
   let(:definition) do
     context = self
 
     definition = Kuby.define('dummy') do
-      environment(:production) do
+      env = environment(:production) do
         docker do
           credentials do
             username context.docker_username
@@ -71,6 +79,10 @@ module SpecHelpers
           end
         end
       end
+
+      context.on_define_blocks.each do |blk|
+        blk.call(env)
+      end
     end
 
     docker = definition.environment.docker

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuby-core
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Cameron Dutro
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-01 00:00:00.000000000 Z
+date: 2022-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.21'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.21'
 - !ruby/object:Gem::Dependency
   name: helm-cli
   requirement: !ruby/object:Gem::Requirement
@@ -70,78 +70,72 @@ dependencies:
   name: krane
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.4
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.4
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: kuby-cert-manager
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: kube-dsl
+  name: kuby-crdb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: kuby-kube-db
+  name: kube-dsl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: kubernetes-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -171,19 +165,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: sorbet-runtime-stub
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -212,6 +206,7 @@ files:
 - README.md
 - Rakefile
 - bin/kuby
+- bin/tapioca
 - kuby-core.gemspec
 - lib/kuby-core.rb
 - lib/kuby.rb
@@ -219,9 +214,12 @@ files:
 - lib/kuby/cli_base.rb
 - lib/kuby/commands.rb
 - lib/kuby/definition.rb
+- lib/kuby/dependable.rb
+- lib/kuby/dependency.rb
 - lib/kuby/docker.rb
 - lib/kuby/docker/alpine.rb
 - lib/kuby/docker/app_image.rb
+- lib/kuby/docker/app_phase.rb
 - lib/kuby/docker/assets_phase.rb
 - lib/kuby/docker/bundler_phase.rb
 - lib/kuby/docker/cli.rb
@@ -274,20 +272,27 @@ files:
 - lib/kuby/plugins/rails_app/asset_copy_task.rb
 - lib/kuby/plugins/rails_app/assets.rb
 - lib/kuby/plugins/rails_app/assets_image.rb
+- lib/kuby/plugins/rails_app/crdb.rb
+- lib/kuby/plugins/rails_app/crdb/plugin.rb
 - lib/kuby/plugins/rails_app/database.rb
 - lib/kuby/plugins/rails_app/generators/kuby.rb
-- lib/kuby/plugins/rails_app/mysql.rb
 - lib/kuby/plugins/rails_app/plugin.rb
-- lib/kuby/plugins/rails_app/postgres.rb
 - lib/kuby/plugins/rails_app/rewrite_db_config.rb
 - lib/kuby/plugins/rails_app/sqlite.rb
 - lib/kuby/plugins/rails_app/tasks.rake
+- lib/kuby/plugins/system.rb
 - lib/kuby/railtie.rb
 - lib/kuby/tasks.rb
 - lib/kuby/trailing_hash.rb
 - lib/kuby/utils.rb
+- lib/kuby/utils/sem_ver.rb
+- lib/kuby/utils/sem_ver/constraint.rb
+- lib/kuby/utils/sem_ver/constraint_set.rb
+- lib/kuby/utils/sem_ver/version.rb
 - lib/kuby/utils/table.rb
+- lib/kuby/utils/which.rb
 - lib/kuby/version.rb
+- rbi/kuby-core.rbi
 - spec/docker/spec_spec.rb
 - spec/docker/timestamp_tag_spec.rb
 - spec/docker/timestamped_image_spec.rb
@@ -358,7 +363,7 @@ files:
 homepage: http://github.com/getkuby/kuby-core
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -373,8 +378,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Deploy your Rails app onto Kubernetes the easy way.
 test_files: []

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

@@ -1,158 +0,0 @@
-# typed: false
-
-require 'kube-dsl'
-require 'kuby/kube-db'
-
-module Kuby
-  module Plugins
-    module RailsApp
-      class MySQL < ::Kuby::Plugin
-        ROLE = 'web'.freeze
-
-        attr_reader :environment, :configs
-
-        def initialize(environment, configs)
-          @environment = environment
-          @configs = configs
-        end
-
-        def requires_credentials?
-          true
-        end
-
-        def name
-          :mysql
-        end
-
-        def resources
-          @resources ||= [secret, database]
-        end
-
-        def after_configuration
-          environment.docker.package_phase.add(:mysql_dev)
-          environment.docker.package_phase.add(:mysql_client)
-        end
-
-        def host
-          # host is the same as the name thanks to k8s DNS
-          @host ||= database.metadata.name
-        end
-
-        def rewritten_configs
-          # deep dup
-          @rewritten_configs ||= Marshal.load(Marshal.dump(configs)).tap do |new_configs|
-            new_configs[environment.name]['host'] = host
-          end
-        end
-
-        def user(user)
-          secret do
-            data do
-              set :user, user
-            end
-          end
-        end
-
-        def password(password)
-          secret do
-            data do
-              set :password, password
-            end
-          end
-        end
-
-        def storage(amount)
-          database do
-            spec do
-              storage do
-                resources do
-                  requests do
-                    set :storage, amount
-                  end
-                end
-              end
-            end
-          end
-        end
-
-        def secret(&block)
-          context = self
-
-          @secret ||= KubeDSL.secret do
-            metadata do
-              name "#{context.base_name}-mysql-secret"
-              namespace context.kubernetes.namespace.metadata.name
-            end
-
-            type 'Opaque'
-          end
-
-          @secret.instance_eval(&block) if block
-          @secret
-        end
-
-        def database(&block)
-          context = self
-
-          @database ||= Kuby::KubeDB.my_sql do
-            api_version 'kubedb.com/v1alpha1'
-
-            metadata do
-              name "#{context.base_name}-mysql"
-              namespace context.kubernetes.namespace.metadata.name
-            end
-
-            spec do
-              database_secret do
-                secret_name context.secret.metadata.name
-              end
-
-              version '5.7-v2'
-              storage_type 'Durable'
-
-              storage do
-                storage_class_name context.kubernetes.provider.storage_class_name
-                access_modes ['ReadWriteOnce']
-
-                resources do
-                  requests do
-                    add :storage, '10Gi'
-                  end
-                end
-              end
-
-              termination_policy 'DoNotTerminate'
-            end
-          end
-
-          @database.instance_eval(&block) if block
-          @database
-        end
-
-        def base_name
-          @base_name ||= "#{kubernetes.selector_app}-#{ROLE}"
-        end
-
-        def kubernetes
-          environment.kubernetes
-        end
-
-        private
-
-        def config
-          configs[environment.name]
-        end
-      end
-    end
-  end
-end
-
-Kuby.register_package(:mysql_client,
-  debian: 'default-mysql-client',
-  alpine: 'mariadb-client'
-)
-
-Kuby.register_package(:mysql_dev,
-  debian: 'default-libmysqlclient-dev',
-  alpine: 'mariadb-dev'
-)