kuby-core 0.11.15 → 0.14.0

data/lib/kuby/tasks.rb

@@ -9,65 +9,67 @@ module Kuby
       @environment = environment
     end
 
-    def print_dockerfile
-      theme = Rouge::Themes::Base16::Solarized.new
-      formatter = Rouge::Formatters::Terminal256.new(theme)
-      lexer = Rouge::Lexers::Docker.new
-      tokens = lexer.lex(Kuby.environment.docker.to_dockerfile.to_s)
-      puts formatter.format(tokens)
+    def print_dockerfiles(only = nil)
+      kubernetes.docker_images.each do |image|
+        next if only && image.identifier != only
+
+        image = image.current_version
+        identifier = image.identifier ? " ##{image.identifier}" : ""
+        Kuby.logger.info("Dockerfile for#{identifier} image #{image.image_url} with tags #{image.tags.join(', ')}")
+        theme = Rouge::Themes::Base16::Solarized.new
+        formatter = Rouge::Formatters::Terminal256.new(theme)
+        lexer = Rouge::Lexers::Docker.new
+        tokens = lexer.lex(image.dockerfile.to_s)
+        puts formatter.format(tokens)
+      end
     end
 
     def setup
       environment.kubernetes.setup
     end
 
-    def build
-      build_args = {}
+    def build(build_args = {}, docker_args = [], only = nil)
+      kubernetes.docker_images.each do |image|
+        next if only && image.identifier != only
 
-      unless ENV.fetch('RAILS_MASTER_KEY', '').empty?
-        build_args['RAILS_MASTER_KEY'] = ENV['RAILS_MASTER_KEY']
+        image = image.new_version
+        Kuby.logger.info("Building image #{image.image_url} with tags #{image.tags.join(', ')}")
+        image.build(build_args, docker_args)
       end
-
-      docker.cli.build(
-        dockerfile: docker.to_dockerfile,
-        image_url:  docker.metadata.image_url,
-        tags:       docker.metadata.tags,
-        build_args: build_args
-      )
     end
 
-    def push
-      if environment.development?
-        fail 'Cannot push Docker images built for the development environment'
-      end
+    def push(only = nil)
+      kubernetes.docker_images.each do |image|
+        next if only && image.identifier != only
 
-      host = docker.metadata.image_host
+        image = image.current_version
+        Kuby.logger.info("Pushing image #{image.image_url} with tags #{image.tags.join(', ')}")
+        push_image(image)
+      end
+    end
 
-      if docker.credentials.username && !docker.cli.auths.include?(host)
-        Kuby.logger.info("Attempting to log in to registry at #{host}")
+    def push_image(image)
+      if image.credentials.username && !image.docker_cli.auths.include?(image.image_host)
+        Kuby.logger.info("Attempting to log in to registry at #{image.image_host}")
 
         begin
-          docker.cli.login(
-            url: docker.metadata.image_host,
-            username: docker.credentials.username,
-            password: docker.credentials.password
+          image.docker_cli.login(
+            url: image.image_host,
+            username: image.credentials.username,
+            password: image.credentials.password
           )
         rescue Kuby::Docker::LoginError => e
-          Kuby.logger.fatal("Couldn't log in to the registry at #{host}")
+          Kuby.logger.fatal("Couldn't log in to the registry at #{image.image_host}")
           Kuby.logger.fatal(e.message)
           return
         end
       end
 
-      image_url = docker.metadata.image_url
-
       begin
-        docker.tags.local.latest_tags.each do |tag|
-          docker.cli.push(image_url, tag)
-        end
+        image.tags.each { |tag| image.push(tag) }
       rescue Kuby::Docker::MissingTagError => e
         msg = "#{e.message} Run kuby build to build the "\
-          'Docker image before running this task.'
+          'Docker images before running this task.'
 
         Kuby.logger.fatal(msg)
         Kuby.logger.fatal(e.message)
@@ -82,10 +84,16 @@ module Kuby
       environment.kubernetes.rollback
     end
 
-    def print_resources
+    def print_resources(kind = nil, name_pattern = nil)
       kubernetes.before_deploy
 
+      name_rxp = Regexp.new(name_pattern) if name_pattern
+
       kubernetes.resources.each do |res|
+        next if kind && res.kind_sym.to_s != kind
+
+        next if name_rxp && !name_rxp.match?(res.metadata.name)
+
         puts res.to_resource.serialize.to_yaml
       end
     end
@@ -135,40 +143,6 @@ module Kuby
       kubernetes_cli.restart_deployment(namespace, deployment)
     end
 
-    def dev_deployment_ok
-      return true unless Kuby.environment.development?
-
-      deployments = kubernetes_cli.get_objects(
-        'deployments', namespace, match_labels.serialize
-      )
-
-      if deployments.empty?
-        puts 'No development environment detected.'
-        STDOUT.write('Set up development environment? (y/n): ')
-        answer = STDIN.gets.strip.downcase
-        return false unless answer =~ /ye?s?/
-        return DevSetup.new(environment).run
-      else
-        depl = deployments.first
-        deployed_checksum = depl.dig('metadata', 'annotations', 'getkuby.io/dockerfile-checksum')
-        current_checksum = docker.to_dockerfile.checksum
-
-        if deployed_checksum != current_checksum
-          puts "Development environment appears to be out-of-date."
-          puts "Environment checksum: #{deployed_checksum}"
-          puts "Current checksum:     #{current_checksum}"
-          STDOUT.write('Update development environment? (y/n): ')
-          answer = STDIN.gets.strip.downcase
-          # return true here to prevent letting an out-of-date deployment
-          # stop us from running commands
-          return true unless answer =~ /ye?s?/
-          return DevSetup.new(environment).run
-        end
-      end
-
-      true
-    end
-
     private
 
     def get_first_pod

data/lib/kuby/version.rb

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

data/lib/kuby.rb

@@ -13,7 +13,6 @@ module Kuby
   autoload :CLIBase,        'kuby/cli_base'
   autoload :Commands,       'kuby/commands'
   autoload :Definition,     'kuby/definition'
-  autoload :DevSetup,       'kuby/dev_setup'
   autoload :Docker,         'kuby/docker'
   autoload :Environment,    'kuby/environment'
   autoload :Kubernetes,     'kuby/kubernetes'
@@ -21,7 +20,6 @@ module Kuby
   autoload :Plugin,         'kuby/plugin'
   autoload :PluginRegistry, 'kuby/plugin_registry'
   autoload :Plugins,        'kuby/plugins'
-  autoload :RailsCommands,  'kuby/rails_commands'
   autoload :Tasks,          'kuby/tasks'
   autoload :TrailingHash,   'kuby/trailing_hash'
 
@@ -52,24 +50,6 @@ module Kuby
       @definition = Definition.new(name.to_s)
       @definition.instance_eval(&block)
 
-      # default development environment
-      @definition.environment(:development) do
-        kubernetes do
-          add_plugin(:rails_app) do
-            tls_enabled false
-
-            database do
-              if requires_credentials?
-                user(DEFAULT_DB_USER)
-                password(DEFAULT_DB_PASSWORD)
-              end
-            end
-          end
-
-          provider :docker_desktop
-        end
-      end
-
       @definition.environments.each do |_, env|
         env.kubernetes.after_configuration
       end
@@ -174,3 +154,5 @@ Kuby.register_package(:c_toolchain,
   debian: 'build-essential',
   alpine: 'build-base'
 )
+
+Kuby.register_package(:git, 'git')

data/spec/docker/spec_spec.rb

@@ -1,12 +1,11 @@
 # typed: false
 require 'spec_helper'
-require 'timecop'
 
 describe Kuby::Docker::Spec do
   let(:spec) { definition.environment.docker }
 
   describe '#base_image' do
-    subject { spec.to_dockerfile.to_s }
+    subject { spec.image.dockerfile.to_s }
 
     it 'uses the default base image for Debian' do
       expect(subject).to include("FROM ruby:#{RUBY_VERSION}\n")
@@ -34,7 +33,7 @@ describe Kuby::Docker::Spec do
       Kuby::Docker::SetupPhase::DEFAULT_WORKING_DIR
     end
 
-    subject { spec.to_dockerfile.to_s }
+    subject { spec.image.dockerfile.to_s }
 
     it 'uses the default working dir' do
       expect(subject).to(
@@ -52,7 +51,7 @@ describe Kuby::Docker::Spec do
   end
 
   describe '#rails_env' do
-    subject { spec.to_dockerfile.to_s }
+    subject { spec.image.dockerfile.to_s }
 
     it 'uses the name of the current Kuby environment' do
       expect(subject).to include("ENV RAILS_ENV=#{spec.environment.name}\n")
@@ -73,7 +72,7 @@ describe Kuby::Docker::Spec do
   end
 
   describe '#bundler_version' do
-    subject { spec.to_dockerfile.to_s }
+    subject { spec.image.dockerfile.to_s }
 
     it 'installs the current bundler version' do
       expect(subject).to(
@@ -91,7 +90,7 @@ describe Kuby::Docker::Spec do
   end
 
   describe '#gemfile' do
-    subject { spec.to_dockerfile.to_s }
+    subject { spec.image.dockerfile.to_s }
 
     it 'uses the default Gemfile' do
       expect(subject).to include("COPY Gemfile .\n")
@@ -108,10 +107,22 @@ 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
-    subject { spec.to_dockerfile.to_s }
+    subject { spec.image.dockerfile.to_s }
 
     it 'installs the given package' do
       # configured in spec_helper.rb
@@ -122,7 +133,7 @@ describe Kuby::Docker::Spec do
   end
 
   describe '#files' do
-    subject { spec.to_dockerfile.to_s }
+    subject { spec.image.dockerfile.to_s }
 
     it 'copies the current directory contents by default' do
       expect(subject).to include("COPY ./ .\n")
@@ -142,7 +153,7 @@ describe Kuby::Docker::Spec do
       Kuby::Docker::WebserverPhase::DEFAULT_PORT
     end
 
-    subject { spec.to_dockerfile.to_s }
+    subject { spec.image.dockerfile.to_s }
 
     it 'exposes the default port' do
       expect(subject).to include("EXPOSE #{default_port}\n")
@@ -157,116 +168,8 @@ describe Kuby::Docker::Spec do
     end
   end
 
-  describe '#tag' do
-    let(:tag) { make_ts_tag(Time.now) }
-
-    subject { spec.tag }
-
-    context 'with no local or remote tags' do
-      it 'raises an error' do
-        expect { subject }.to raise_error(Kuby::Docker::MissingTagError)
-      end
-    end
-
-    context 'with an available remote tag' do
-      before { docker_remote_client.tags << tag }
-
-      it { is_expected.to eq(tag) }
-    end
-
-    context 'with an available local tag' do
-      before do
-        docker_cli.build(
-          dockerfile: nil,
-          image_url: docker_image_url,
-          tags: [tag]
-        )
-      end
-
-      it { is_expected.to eq(tag) }
-    end
-
-    context 'with multiple remote tags' do
-      let(:time) { Time.now }
-
-      before do
-        docker_remote_client.tags +=
-          [time - 5, time + 10, time - 10, time + 15].map do |t|
-            make_ts_tag(t)
-          end
-      end
-
-      it { is_expected.to eq(make_ts_tag(time + 15)) }
-    end
-
-    context 'with multiple local and remote tags' do
-      let(:time) { Time.now }
-
-      before do
-        docker_remote_client.tags +=
-          [time - 5, time + 10, time - 10, time + 15].map do |t|
-            make_ts_tag(t)
-          end
-
-        docker_cli.build(
-          dockerfile: nil,
-          image_url: docker_image_url,
-          tags: [time - 3, time + 6, time - 6, time + 18].map do |t|
-            make_ts_tag(t)
-          end
-        )
-      end
-
-      it { is_expected.to eq(make_ts_tag(time + 18)) }
-    end
-  end
-
-  describe '#previous_tag' do
-    let(:time) { Time.now }
-    let(:current_tag) { make_ts_tag(time) }
-
-    before do
-      docker_remote_client.tags << current_tag
-      docker_cli.build(
-        dockerfile: nil,
-        image_url: docker_image_url,
-        tags: [current_tag]
-      )
-    end
-
-    subject { spec.previous_tag(current_tag) }
-
-    context 'with no previous local or remote tag' do
-      it 'raises an error' do
-        expect { subject }.to raise_error(Kuby::Docker::MissingTagError)
-      end
-    end
-
-    context 'with an available previous remote tag' do
-      let(:previous_tag) { make_ts_tag(time - 5) }
-
-      before { docker_remote_client.tags << previous_tag }
-
-      it { is_expected.to eq(previous_tag) }
-    end
-
-    context 'with an available previous local tag' do
-      let(:previous_tag) { make_ts_tag(time - 5) }
-
-      before do
-        docker_cli.build(
-        dockerfile: nil,
-        image_url: docker_image_url,
-        tags: [previous_tag]
-        )
-      end
-
-      it { is_expected.to eq(previous_tag) }
-    end
-  end
-
   describe '#insert' do
-    subject { spec.to_dockerfile.to_s }
+    subject { spec.image.dockerfile.to_s }
 
     context 'with a custom class-based build phase' do
       before do

data/spec/docker/timestamped_image_spec.rb

@@ -0,0 +1,123 @@
+# typed: false
+require 'spec_helper'
+
+describe Kuby::Docker::TimestampedImage do
+  let(:dockerfile) { Kuby::Docker::Dockerfile.new }
+  let(:image_url) { docker_image_url }
+  let(:credentials) do
+    Kuby::Docker::Credentials.new do
+      username 'foo'
+      password 'bar'
+      email 'foo@bar.com'
+    end
+  end
+  let(:image) { described_class.new(dockerfile, image_url, credentials) }
+
+  describe '#current_version' do
+    let(:tag) { make_ts_tag(Time.now) }
+
+    subject { image.current_version&.main_tag }
+
+    context 'with no local or remote tags' do
+      it 'raises an error' do
+        expect { subject }.to raise_error(Kuby::Docker::MissingTagError)
+      end
+    end
+
+    context 'with an available remote tag' do
+      before { docker_remote_client.tags << tag }
+
+      it { is_expected.to eq(tag) }
+    end
+
+    context 'with an available local tag' do
+      before do
+        docker_cli.build(
+          dockerfile: nil,
+          image_url: docker_image_url,
+          tags: [tag]
+        )
+      end
+
+      it { is_expected.to eq(tag) }
+    end
+
+    context 'with multiple remote tags' do
+      let(:time) { Time.now }
+
+      before do
+        docker_remote_client.tags +=
+          [time - 5, time + 10, time - 10, time + 15].map do |t|
+            make_ts_tag(t)
+          end
+      end
+
+      it { is_expected.to eq(make_ts_tag(time + 15)) }
+    end
+
+    context 'with multiple local and remote tags' do
+      let(:time) { Time.now }
+
+      before do
+        docker_remote_client.tags +=
+          [time - 5, time + 10, time - 10, time + 15].map do |t|
+            make_ts_tag(t)
+          end
+
+        docker_cli.build(
+          dockerfile: nil,
+          image_url: docker_image_url,
+          tags: [time - 3, time + 6, time - 6, time + 18].map do |t|
+            make_ts_tag(t)
+          end
+        )
+      end
+
+      it { is_expected.to eq(make_ts_tag(time + 18)) }
+    end
+  end
+
+  describe '#previous_version' do
+    let(:time) { Time.now }
+    let(:current_tag) { make_ts_tag(time) }
+
+    before do
+      docker_remote_client.tags << current_tag
+      docker_cli.build(
+        dockerfile: nil,
+        image_url: docker_image_url,
+        tags: [current_tag]
+      )
+    end
+
+    subject { image.previous_version(current_tag)&.main_tag }
+
+    context 'with no previous local or remote tag' do
+      it 'raises an error' do
+        expect { subject }.to raise_error(Kuby::Docker::MissingTagError)
+      end
+    end
+
+    context 'with an available previous remote tag' do
+      let(:previous_tag) { make_ts_tag(time - 5) }
+
+      before { docker_remote_client.tags << previous_tag }
+
+      it { is_expected.to eq(previous_tag) }
+    end
+
+    context 'with an available previous local tag' do
+      let(:previous_tag) { make_ts_tag(time - 5) }
+
+      before do
+        docker_cli.build(
+        dockerfile: nil,
+        image_url: docker_image_url,
+        tags: [previous_tag]
+        )
+      end
+
+      it { is_expected.to eq(previous_tag) }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -71,24 +71,23 @@ module SpecHelpers
           end
         end
       end
-
-      environment(:development) do
-        kubernetes do
-          configure_plugin(:rails_app) do
-            root File.expand_path(File.join(*%w(. dummy)), __dir__)
-          end
-        end
-      end
     end
 
     docker = definition.environment.docker
 
-    docker.instance_variable_set(:@remote_client, docker_remote_client)
-    docker.instance_variable_set(:@cli, docker_cli)
-
     definition
   end
 
+  before do
+    allow_any_instance_of(Kuby::Docker::TimestampedImage).to(
+      receive(:remote_client).and_return(docker_remote_client)
+    )
+
+    allow_any_instance_of(Kuby::Docker::Image).to(
+      receive(:docker_cli).and_return(docker_cli)
+    )
+  end
+
   def make_ts_tag(time)
     Kuby::Docker::TimestampTag.new(time).to_s
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuby-core
 version: !ruby/object:Gem::Version
-  version: 0.11.15
+  version: 0.14.0
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-04 00:00:00.000000000 Z
+date: 2021-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -219,25 +219,24 @@ files:
 - lib/kuby/cli_base.rb
 - lib/kuby/commands.rb
 - lib/kuby/definition.rb
-- lib/kuby/dev_setup.rb
 - lib/kuby/docker.rb
 - lib/kuby/docker/alpine.rb
+- lib/kuby/docker/app_image.rb
 - lib/kuby/docker/assets_phase.rb
 - lib/kuby/docker/bundler_phase.rb
 - lib/kuby/docker/cli.rb
 - lib/kuby/docker/copy_phase.rb
 - lib/kuby/docker/credentials.rb
 - lib/kuby/docker/debian.rb
-- lib/kuby/docker/dev_spec.rb
 - lib/kuby/docker/distro.rb
 - lib/kuby/docker/docker_uri.rb
 - lib/kuby/docker/dockerfile.rb
 - lib/kuby/docker/errors.rb
+- lib/kuby/docker/image.rb
 - lib/kuby/docker/inline_layer.rb
 - lib/kuby/docker/layer.rb
 - lib/kuby/docker/layer_stack.rb
 - lib/kuby/docker/local_tags.rb
-- lib/kuby/docker/metadata.rb
 - lib/kuby/docker/package_list.rb
 - lib/kuby/docker/package_phase.rb
 - lib/kuby/docker/packages.rb
@@ -249,8 +248,8 @@ files:
 - lib/kuby/docker/remote_tags.rb
 - lib/kuby/docker/setup_phase.rb
 - lib/kuby/docker/spec.rb
-- lib/kuby/docker/tags.rb
 - lib/kuby/docker/timestamp_tag.rb
+- lib/kuby/docker/timestamped_image.rb
 - lib/kuby/docker/webserver_phase.rb
 - lib/kuby/docker/yarn_phase.rb
 - lib/kuby/environment.rb
@@ -274,6 +273,7 @@ files:
 - lib/kuby/plugins/rails_app.rb
 - 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/database.rb
 - lib/kuby/plugins/rails_app/generators/kuby.rb
 - lib/kuby/plugins/rails_app/mysql.rb
@@ -282,16 +282,14 @@ files:
 - 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/rails_commands.rb
 - lib/kuby/railtie.rb
 - lib/kuby/tasks.rb
 - lib/kuby/trailing_hash.rb
 - lib/kuby/version.rb
-- spec/docker/metadata_spec.rb
 - spec/docker/spec_spec.rb
 - 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
@@ -335,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
@@ -352,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
@@ -375,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.