kuby-core 0.17.0 → 0.18.0

data/lib/kuby/definition.rb

@@ -2,23 +2,23 @@
 
 module Kuby
   class Definition
-    extend T::Sig
+    # extend T::Sig
 
-    sig { returns(String) }
+    # T::Sig::WithoutRuntime.sig { returns(String) }
     attr_reader :app_name
 
-    sig { params(app_name: String, block: T.nilable(T.proc.void)).void }
+    # T::Sig::WithoutRuntime.sig { params(app_name: String, block: T.nilable(T.proc.void)).void }
     def initialize(app_name, &block)
       @app_name = app_name
-      @environments = T.let(@environments, T.nilable(T::Hash[Symbol, Environment]))
+      # @environments = T.let(@environments, T.nilable(T::Hash[Symbol, Environment]))
     end
 
-    sig {
-      params(
-        name: Symbol,
-        block: T.nilable(T.proc.void)
-      ).returns(Environment)
-    }
+    # T::Sig::WithoutRuntime.sig {
+    #   params(
+    #     name: Symbol,
+    #     block: T.nilable(T.proc.void)
+    #   ).returns(Kuby::Environment)
+    # }
     def environment(name = Kuby.env, &block)
       name = name.to_s
 
@@ -28,10 +28,10 @@ module Kuby
         environments[name].instance_eval(&block)
       end
 
-      T.must(environments[name])
+      environments[name]
     end
 
-    sig { returns(T::Hash[Symbol, Environment]) }
+    # T::Sig::WithoutRuntime.sig { returns(T::Hash[Symbol, Kuby::Environment]) }
     def environments
       @environments ||= {}
     end

data/lib/kuby/dependable.rb

@@ -0,0 +1,20 @@
+module Kuby
+  class Dependable
+    attr_reader :name, :version_or_callable
+
+    def initialize(name, version_or_callable)
+      @name = name
+      @version_or_callable = version_or_callable
+    end
+
+    def version
+      @version ||= Kuby::Utils::SemVer.parse_version(
+        if version_or_callable.respond_to?(:call)
+          version_or_callable.call
+        else
+          version_or_callable
+        end
+      )
+    end
+  end
+end

data/lib/kuby/dependency.rb

@@ -0,0 +1,14 @@
+module Kuby
+  class Dependency
+    attr_reader :name, :constraints
+
+    def initialize(name, *constraints)
+      @name = name
+      @constraints = Kuby::Utils::SemVer.parse_constraints(*constraints)
+    end
+
+    def satisfied_by?(dependable)
+      constraints.satisfied_by?(dependable.version)
+    end
+  end
+end

data/lib/kuby/docker/alpine.rb

@@ -3,42 +3,42 @@
 module Kuby
   module Docker
     class Alpine < Distro
-      SHELL_EXE = T.let('/bin/sh'.freeze, String)
+      SHELL_EXE = '/bin/sh'.freeze
 
-      DEFAULT_PACKAGES = T.let([
+      DEFAULT_PACKAGES = [
         [:ca_certificates, nil],
         [:nodejs, '12.14.1'],
         [:yarn, '1.21.1'],
         [:c_toolchain, nil],
         [:tzdata, nil],
         [:git, nil]
-      ].freeze, T::Array[[Symbol, T.nilable(String)]])
+      ].freeze
 
-      sig { returns(Layer) }
+      # T::Sig::WithoutRuntime.sig { returns(Layer) }
       attr_reader :phase
 
-      sig { override.params(packages: T::Array[Distro::PackageImpl], into: Dockerfile).void }
+      # T::Sig::WithoutRuntime.sig { override.params(packages: T::Array[Distro::PackageImpl], into: Dockerfile).void }
       def install(packages, into:)
         dockerfile = into
         install_managed(packages, dockerfile)
         install_unmanaged(packages, dockerfile)
       end
 
-      sig { override.returns(T::Array[[Symbol, T.nilable(String)]]) }
+      # T::Sig::WithoutRuntime.sig { override.returns(T::Array[[Symbol, T.nilable(String)]]) }
       def default_packages
         DEFAULT_PACKAGES
       end
 
-      sig { override.returns(String) }
+      # T::Sig::WithoutRuntime.sig { override.returns(String) }
       def shell_exe
         SHELL_EXE
       end
 
       private
 
-      sig { params(packages: T::Array[Distro::PackageImpl], dockerfile: Dockerfile).void }
+      # T::Sig::WithoutRuntime.sig { params(packages: T::Array[Distro::PackageImpl], dockerfile: Dockerfile).void }
       def install_managed(packages, dockerfile)
-        pkgs = T.cast(packages.select(&:managed?), T::Array[Distro::ManagedPackageImpl])
+        pkgs = packages.select(&:managed?)
 
         unless pkgs.empty?
           package_names = pkgs.map { |pkg| pkg.package_name_for(:alpine) }
@@ -48,7 +48,7 @@ module Kuby
         end
       end
 
-      sig { params(packages: T::Array[Distro::PackageImpl], dockerfile: Dockerfile).void }
+      # T::Sig::WithoutRuntime.sig { params(packages: T::Array[Distro::PackageImpl], dockerfile: Dockerfile).void }
       def install_unmanaged(packages, dockerfile)
         packages
           .reject(&:managed?)

data/lib/kuby/docker/app_image.rb

@@ -4,18 +4,18 @@
 module Kuby
   module Docker
     class AppImage < ::Kuby::Docker::TimestampedImage
-      extend T::Sig
+      # extend T::Sig
 
-      sig {
-        params(
-          dockerfile: T.any(Dockerfile, T.proc.returns(Dockerfile)),
-          image_url: String,
-          credentials: Credentials,
-          registry_index_url: T.nilable(String),
-          main_tag: T.nilable(String),
-          alias_tags: T::Array[String]
-        ).void
-      }
+      # T::Sig::WithoutRuntime.sig {
+      #   params(
+      #     dockerfile: T.any(Dockerfile, T.proc.returns(Dockerfile)),
+      #     image_url: String,
+      #     credentials: Credentials,
+      #     registry_index_url: T.nilable(String),
+      #     main_tag: T.nilable(String),
+      #     alias_tags: T::Array[String]
+      #   ).void
+      # }
       def initialize(dockerfile, image_url, credentials, registry_index_url = nil, main_tag = nil, alias_tags = [])
         super
         @identifier = "app"

data/lib/kuby/docker/app_phase.rb

@@ -0,0 +1,36 @@
+# typed: strict
+
+module Kuby
+  module Docker
+    class AppPhase < Layer
+      # extend T::Sig
+
+      # T::Sig::WithoutRuntime.sig { params(environment: Environment).void }
+      def initialize(environment)
+        super
+
+        @env_vars = {}
+      end
+
+      # T::Sig::WithoutRuntime.sig { override.params(dockerfile: Dockerfile).void }
+      def apply_to(dockerfile)
+        @env_vars.each_pair do |key, value|
+          dockerfile.env("#{key}='#{value}'")
+        end
+
+        absolute_app_root = Pathname(dockerfile.current_workdir)
+          .join(environment.docker.app_root_path)
+          .to_s
+
+        if dockerfile.current_workdir != absolute_app_root
+          dockerfile.workdir(absolute_app_root)
+        end
+      end
+
+      # T::Sig::WithoutRuntime.sig { params(key: String, value: String).void }
+      def env(key, value)
+        @env_vars[key] = value
+      end
+    end
+  end
+end

data/lib/kuby/docker/assets_phase.rb

@@ -3,9 +3,9 @@
 module Kuby
   module Docker
     class AssetsPhase < Layer
-      extend T::Sig
+      # extend T::Sig
 
-      sig { override.params(dockerfile: Dockerfile).void }
+      # T::Sig::WithoutRuntime.sig { override.params(dockerfile: Dockerfile).void }
       def apply_to(dockerfile)
         dockerfile.run(
           'bundle', 'exec', 'rake', 'assets:precompile'

data/lib/kuby/docker/bundler_phase.rb

@@ -5,101 +5,103 @@ require 'pathname'
 module Kuby
   module Docker
     class BundlerPhase < Layer
-      extend T::Sig
+      # extend T::Sig
 
-      DEFAULT_WITHOUT = T.let(
-        ['development', 'test', 'deploy'].freeze, T::Array[String]
-      )
+      DEFAULT_GEMFILE = 'Gemfile'.freeze
+      DEFAULT_WITHOUT = 
+        ['development', 'test', 'deploy'].freeze
+      
 
-      sig { returns(T.nilable(String)) }
+      # T::Sig::WithoutRuntime.sig { returns(T.nilable(String)) }
       attr_reader :version
 
-      sig { params(version: String).void }
+      # T::Sig::WithoutRuntime.sig { params(version: String).returns(String) }
       attr_writer :version
 
-      sig { returns(T.nilable(String)) }
+      # T::Sig::WithoutRuntime.sig { returns(T.nilable(String)) }
       attr_reader :gemfile
 
-      sig { params(gemfile: String).void }
+      # T::Sig::WithoutRuntime.sig { params(gemfile: String).returns(String) }
       attr_writer :gemfile
 
-      sig { returns(T.nilable(T::Array[String])) }
+      # T::Sig::WithoutRuntime.sig { returns(T.nilable(T::Array[String])) }
       attr_reader :without
 
-      sig { params(without: T::Array[String]).void }
+      # T::Sig::WithoutRuntime.sig { params(without: T::Array[String]).returns(T::Array[String]) }
       attr_writer :without
 
-      sig { returns(T.nilable(String)) }
+      # T::Sig::WithoutRuntime.sig { returns(T.nilable(String)) }
       attr_reader :executable
 
-      sig { params(executable: String).void }
+      # T::Sig::WithoutRuntime.sig { params(executable: String).returns(String) }
       attr_writer :executable
 
-      sig { params(environment: Environment).void }
+      # T::Sig::WithoutRuntime.sig { params(environment: Environment).void }
       def initialize(environment)
         super
 
-        @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]))
-        @executable = T.let(@executable, T.nilable(String))
+        # @version = T.let(@version, T.nilable(String))
+        # @gemfile = T.let(@gemfile, T.nilable(String))
+        @gemfiles = []
+        # @without = T.let(@without, T.nilable(T::Array[String]))
+        # @executable = T.let(@executable, T.nilable(String))
       end
 
-      sig { override.params(dockerfile: Dockerfile).void }
+      # T::Sig::WithoutRuntime.sig { override.params(dockerfile: Dockerfile).void }
       def apply_to(dockerfile)
-        gf = gemfile || default_gemfile
+        gf = gemfile || DEFAULT_GEMFILE
         lf = "#{gf}.lock"
         v = version || default_version
         wo = without || DEFAULT_WITHOUT
 
-        dockerfile.run('gem', 'install', 'bundler', '-v', v)
+        host_path = Pathname(environment.docker.app_root_path)
+        container_path = Pathname(dockerfile.current_workdir).join(environment.docker.app_root_path)
 
-        # bundle install
-        dockerfile.copy(gf, '.')
-        dockerfile.copy(lf, '.')
+        dockerfile.run('gem', 'install', 'bundler', '-v', v)
 
+        dockerfile.copy(host_path.join(gf), container_path.join(gf))
+        dockerfile.copy(host_path.join(lf), container_path.join(lf))
         @gemfiles.each do |file|
-          dockerfile.copy(file, file)
+          dockerfile.copy(host_path.join(file), container_path.join(file))
+          extra_lf = host_path.join("#{file}.lock")
+
+          if extra_lf.exist?
+            dockerfile.copy(extra_lf, container_path.join("#{file}.lock"))
+          end
         end
 
+        dockerfile.env("BUNDLE_GEMFILE=#{container_path.join(gf)}")
+
         unless wo.empty?
           dockerfile.env("BUNDLE_WITHOUT='#{wo.join(' ')}'")
         end
 
+        dockerfile.run(
+          executable || 'bundle', 'lock', '--lockfile', container_path.join(lf)
+        )
+
         dockerfile.run(
           executable || 'bundle', 'install',
           '--jobs', '$(nproc)',
-          '--retry', '3',
-          '--gemfile', gf
+          '--retry', '3'
         )
 
         # generate binstubs and add the bin directory to our path
         dockerfile.run(executable || 'bundle', 'binstubs', '--all')
-        dockerfile.env("PATH=./bin:$PATH")
+        dockerfile.env("PATH=#{container_path.join('bin')}:$PATH")
       end
 
-      sig { params(paths: String).void }
+      # T::Sig::WithoutRuntime.sig { params(paths: String).void }
       def gemfiles(*paths)
         @gemfiles.concat(paths)
       end
 
       private
 
-      sig { returns(String) }
+      # T::Sig::WithoutRuntime.sig { returns(String) }
       def default_version
         Bundler::VERSION
       end
-
-      sig { returns(String) }
-      def default_gemfile
-        Bundler
-          .definition
-          .gemfiles
-          .first
-          .relative_path_from(Pathname(Dir.getwd))
-          .to_s
-      end
     end
   end
 end

data/lib/kuby/docker/cli.rb

@@ -7,29 +7,29 @@ require 'shellwords'
 module Kuby
   module Docker
     class CLI < CLIBase
-      extend T::Sig
+      # extend T::Sig
 
-      sig { returns(String) }
+      # T::Sig::WithoutRuntime.sig { returns(String) }
       attr_reader :executable
 
-      sig { params(executable: T.nilable(String)).void }
+      # T::Sig::WithoutRuntime.sig { params(executable: T.nilable(String)).void }
       def initialize(executable = nil)
-        @executable = T.let(executable || `which docker`.strip, String)
+        @executable = executable || Kuby::Utils.which('docker')
       end
 
-      sig { returns(T.nilable(String)) }
+      # T::Sig::WithoutRuntime.sig { returns(T.nilable(String)) }
       def config_file
         if File.exist?(default_config_file)
           default_config_file
         end
       end
 
-      sig { returns(String) }
+      # T::Sig::WithoutRuntime.sig { returns(String) }
       def default_config_file
         File.join(Dir.home, '.docker', 'config.json')
       end
 
-      sig { params(url: String, username: String, password: String).void }
+      # T::Sig::WithoutRuntime.sig { params(url: String, username: String, password: String).void }
       def login(url:, username:, password:)
         cmd = [
           executable, 'login', url, '--username', username, '--password-stdin'
@@ -39,35 +39,43 @@ module Kuby
           stdin.puts(password)
         end
 
-        unless T.must(last_status).success?
+        unless last_status.success?
           raise LoginError, 'build failed: docker command exited with '\
-            "status code #{T.must(last_status).exitstatus}"
+            "status code #{last_status.exitstatus}"
         end
       end
 
-      sig { returns(T::Array[String]) }
+      # T::Sig::WithoutRuntime.sig { returns(T::Array[String]) }
       def auths
         return [] unless config_file
 
-        config = JSON.parse(File.read(T.must(config_file)))
+        config = JSON.parse(File.read(config_file))
         config.fetch('auths', {}).keys
       end
 
-      sig {
-        params(
-          image: Image,
-          build_args: T::Hash[T.any(Symbol, String), String],
-          docker_args: T::Array[String],
-          context: T.nilable(String)
-        ).void
-      }
-      def build(image, build_args: {}, docker_args: [], context: nil)
+      # T::Sig::WithoutRuntime.sig {
+      #   params(
+      #     image: Image,
+      #     build_args: T::Hash[T.any(Symbol, String), String],
+      #     docker_args: T::Array[String],
+      #     context: T.nilable(String),
+      #     cache_from: T.nilable(String)
+      #   ).void
+      # }
+      def build(image, build_args: {}, docker_args: [], context: nil, cache_from: nil)
         cmd = [
           executable, 'build',
           *image.tags.flat_map { |tag| ['-t', "#{image.image_url}:#{tag}"] },
           *build_args.flat_map do |arg, val|
             ['--build-arg', Shellwords.shellescape("#{arg}=#{val}")]
-          end,
+          end
+        ]
+
+        if cache_from
+          cmd += ['--cache-from', cache_from]
+        end
+
+        cmd += [
           '-f-',
           *docker_args,
           context || '.'
@@ -77,21 +85,21 @@ module Kuby
           stdin.puts(image.dockerfile.to_s)
         end
 
-        unless T.must(last_status).success?
+        unless last_status.success?
           raise BuildError, 'build failed: docker command exited with '\
-            "status code #{T.must(last_status).exitstatus}"
+            "status code #{last_status.exitstatus}"
         end
       end
 
-      sig {
-        params(
-          image_url: String,
-          tag: String,
-          env: T::Hash[T.any(Symbol, String), String],
-          ports: T::Array[T.any(String, Integer)]
-        )
-        .void
-      }
+      # T::Sig::WithoutRuntime.sig {
+      #   params(
+      #     image_url: String,
+      #     tag: String,
+      #     env: T::Hash[T.any(Symbol, String), String],
+      #     ports: T::Array[T.any(String, Integer)]
+      #   )
+      #   .void
+      # }
       def run(image_url:, tag: 'latest', env: {}, ports: [])
         cmd = [
           executable, 'run',
@@ -105,13 +113,33 @@ module Kuby
         execc(cmd)
       end
 
-      sig { params(image_url: String).returns(T::Array[T::Hash[Symbol, String]]) }
-      def images(image_url)
+      # T::Sig::WithoutRuntime.sig { params(container: String, command: String, tty: T::Boolean).returns(String) }
+      def exec_capture(container:, command:, tty: true)
+        cmd = [executable, 'exec']
+        cmd << '-it' if tty
+        cmd += [container, command]
+
+        backticks(cmd)
+      end
+
+      # T::Sig::WithoutRuntime.sig { params(image_url: String, tag: String, format: T.nilable(String)).returns(String) }
+      def inspect(image_url:, tag: 'latest', format: nil)
+        cmd = [executable, 'inspect']
+        cmd += ['--format', "'#{format}'"]
+        cmd << "#{image_url}:#{tag}"
+
+        backticks(cmd)
+      end
+
+      # T::Sig::WithoutRuntime.sig { params(image_url: String, digests: T::Boolean).returns(T::Array[T::Hash[Symbol, String]]) }
+      def images(image_url, digests: true)
         cmd = [
           executable, 'images', image_url,
           '--format', '"{{json . }}"'
         ]
 
+        cmd << '--digests' if digests
+
         backticks(cmd).split("\n").map do |image_data|
           JSON.parse(image_data).each_with_object({}) do |(k, v), ret|
             ret[k.underscore.to_sym] = v
@@ -119,41 +147,41 @@ module Kuby
         end
       end
 
-      sig { params(image_url: String, tag: String).void }
+      # T::Sig::WithoutRuntime.sig { params(image_url: String, tag: String).void }
       def push(image_url, tag)
         systemm([
           executable, 'push', "#{image_url}:#{tag}"
         ])
 
-        unless T.must(last_status).success?
+        unless last_status.success?
           raise PushError, 'push failed: docker command exited with '\
-            "status code #{T.must(last_status).exitstatus}"
+            "status code #{last_status.exitstatus}"
         end
       end
 
-      sig { params(image_url: String, tag: String).void }
+      # T::Sig::WithoutRuntime.sig { params(image_url: String, tag: String).void }
       def pull(image_url, tag)
         systemm([
           executable, 'pull', "#{image_url}:#{tag}"
         ])
 
-        unless T.must(last_status).success?
+        unless last_status.success?
           raise PullError, 'pull failed: docker command exited with '\
-            "status code #{T.must(last_status).exitstatus}"
+            "status code #{last_status.exitstatus}"
         end
       end
 
-      sig { returns(Symbol) }
+      # T::Sig::WithoutRuntime.sig { returns(Symbol) }
       def status_key
         :kuby_docker_cli_last_status
       end
 
-      sig { returns(Symbol) }
+      # T::Sig::WithoutRuntime.sig { returns(Symbol) }
       def stdout_key
         :kuby_docker_stdout
       end
 
-      sig { returns(Symbol) }
+      # T::Sig::WithoutRuntime.sig { returns(Symbol) }
       def stderr_key
         :kuby_docker_stderr
       end

data/lib/kuby/docker/copy_phase.rb

@@ -3,25 +3,25 @@
 module Kuby
   module Docker
     class CopyPhase < Layer
-      extend T::Sig
+      # extend T::Sig
 
-      DEFAULT_PATHS = T.let(['./'].freeze, T::Array[String])
+      DEFAULT_PATHS = ['./'].freeze
 
-      sig { returns(T::Array[String]) }
+      # T::Sig::WithoutRuntime.sig { returns(T::Array[String]) }
       attr_reader :paths
 
-      sig { params(environment: Environment).void }
+      # T::Sig::WithoutRuntime.sig { params(environment: Environment).void }
       def initialize(environment)
         super
-        @paths = T.let([], T::Array[String])
+        @paths = []
       end
 
-      sig { params(path: String).void }
+      # T::Sig::WithoutRuntime.sig { params(path: String).void }
       def <<(path)
         paths << path
       end
 
-      sig { params(dockerfile: Dockerfile).void }
+      # T::Sig::WithoutRuntime.sig { params(dockerfile: Dockerfile).void }
       def apply_to(dockerfile)
         to_copy = paths.empty? ? DEFAULT_PATHS : paths
         to_copy.each { |path| dockerfile.copy(path, '.') }

data/lib/kuby/docker/credentials.rb

@@ -1,4 +1,5 @@
 # typed: strict
+
 require 'kube-dsl'
 
 module Kuby