kuby-core 0.16.0 → 0.18.0

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,52 +39,67 @@ 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]).void }
-      def build(image, build_args: {}, docker_args: [])
+      # 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 || '.'
         ]
 
         open3_w(cmd) do |stdin, _wait_threads|
           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',
@@ -98,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
@@ -112,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

data/lib/kuby/docker/debian.rb

@@ -3,39 +3,39 @@
 module Kuby
   module Docker
     class Debian < Distro
-      SHELL_EXE = T.let('/bin/bash'.freeze, String)
+      SHELL_EXE = '/bin/bash'.freeze
 
-      DEFAULT_PACKAGES = T.let([
+      DEFAULT_PACKAGES = [
         [:ca_certificates, nil],
         [:nodejs, '12.14.1'],
         [:yarn, '1.21.1']
-      ].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?)
 
         pkg_cmd = <<~CMD.strip
           apt-get update -qq && \\
@@ -52,7 +52,7 @@ module Kuby
         dockerfile.run(pkg_cmd)
       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/distro.rb

@@ -3,37 +3,37 @@
 module Kuby
   module Docker
     class Distro
-      extend T::Sig
-      extend T::Helpers
+      # extend T::Sig
+      # extend T::Helpers
 
-      abstract!
+      # abstract!
 
-      PackageImpl = T.type_alias {
-        T.any(Packages::Package, Packages::ManagedPackage, Packages::SimpleManagedPackage)
-      }
+      # PackageImpl = T.type_alias {
+      #   T.any(Packages::Package, Packages::ManagedPackage, Packages::SimpleManagedPackage)
+      # }
 
-      ManagedPackageImpl = T.type_alias {
-        T.any(Packages::ManagedPackage, Packages::SimpleManagedPackage)
-      }
+      # ManagedPackageImpl = T.type_alias {
+      #   T.any(Packages::ManagedPackage, Packages::SimpleManagedPackage)
+      # }
 
-      sig { params(phase: Layer).void }
+      # T::Sig::WithoutRuntime.sig { params(phase: Layer).void }
       def initialize(phase)
         @phase = phase
       end
 
-      sig { params(packages: T::Array[PackageImpl], into: Dockerfile).void }
+      # T::Sig::WithoutRuntime.sig { params(packages: T::Array[PackageImpl], into: Dockerfile).void }
       def install(packages, into:)
         raise NotImplementedError,
           "#{__method__} must be defined in derived classes"
       end
 
-      sig { returns(T::Array[[Symbol, T.nilable(String)]]) }
+      # T::Sig::WithoutRuntime.sig { returns(T::Array[[Symbol, T.nilable(String)]]) }
       def default_packages
         raise NotImplementedError,
           "#{__method__} must be defined in derived classes"
       end
 
-      sig { returns(String) }
+      # T::Sig::WithoutRuntime.sig { returns(String) }
       def shell_exe
         raise NotImplementedError,
           "#{__method__} must be defined in derived classes"

data/lib/kuby/docker/docker_uri.rb

@@ -3,13 +3,13 @@
 module Kuby
   module Docker
     class DockerURI
-      extend T::Sig
+      # extend T::Sig
 
-      DEFAULT_REGISTRY_HOST = T.let('docker.io'.freeze, String)
-      DEFAULT_REGISTRY_INDEX_HOST = T.let('index.docker.io'.freeze, String)
-      DEFAULT_PORT = T.let(443, Integer)
+      DEFAULT_REGISTRY_HOST = 'docker.io'.freeze
+      DEFAULT_REGISTRY_INDEX_HOST = 'index.docker.io'.freeze
+      DEFAULT_PORT = 443
 
-      sig { params(url: String).returns(DockerURI) }
+      # T::Sig::WithoutRuntime.sig { params(url: String).returns(DockerURI) }
       def self.parse_uri(url)
         parse(
           url,
@@ -18,7 +18,7 @@ module Kuby
         )
       end
 
-      sig { params(url: String).returns(DockerURI) }
+      # T::Sig::WithoutRuntime.sig { params(url: String).returns(DockerURI) }
       def self.parse_index_uri(url)
         parse(
           url,
@@ -27,13 +27,13 @@ module Kuby
         )
       end
 
-      sig {
-        params(
-          url: String,
-          default_host: T.nilable(String),
-          default_port: T.nilable(Integer)
-        ).returns(DockerURI)
-      }
+      # T::Sig::WithoutRuntime.sig {
+      #   params(
+      #     url: String,
+      #     default_host: T.nilable(String),
+      #     default_port: T.nilable(Integer)
+      #   ).returns(DockerURI)
+      # }
       def self.parse(url, default_host:, default_port:)
         if idx = url.index('://')
           url = url[(idx + 3)..-1] || ''
@@ -41,8 +41,8 @@ module Kuby
 
         host_port, *path = url.split('/')
         host, port, *path = if host_port =~ /[.:]/
-          hst, prt = T.must(host_port).split(':')
-          [T.must(hst), prt || default_port, *path]
+          hst, prt = host_port.split(':')
+          [hst, prt || default_port, *path]
         else
           [default_host, default_port, host_port, *path]
         end
@@ -50,23 +50,23 @@ module Kuby
         new(host.to_s, port.to_i, (path || []).join('/'))
       end
 
-      sig { returns(String) }
+      # T::Sig::WithoutRuntime.sig { returns(String) }
       attr_reader :host
 
-      sig { returns(Integer) }
+      # T::Sig::WithoutRuntime.sig { returns(Integer) }
       attr_reader :port
 
-      sig { returns(String) }
+      # T::Sig::WithoutRuntime.sig { returns(String) }
       attr_reader :path
 
-      sig { params(host: String, port: Integer, path: String).void }
+      # T::Sig::WithoutRuntime.sig { params(host: String, port: Integer, path: String).void }
       def initialize(host, port, path)
         @host = host
         @port = port
         @path = path
       end
 
-      sig { returns(T::Boolean) }
+      # T::Sig::WithoutRuntime.sig { returns(T::Boolean) }
       def has_default_port?
         port == DEFAULT_PORT
       end

data/lib/kuby/docker/dockerfile.rb

@@ -5,39 +5,39 @@ require 'digest'
 module Kuby
   module Docker
     class Dockerfile
-      extend T::Sig
+      # extend T::Sig
 
       class Command
-        extend T::Sig
+        # extend T::Sig
 
-        sig { returns(T::Array[T.any(String, Integer)]) }
+        # T::Sig::WithoutRuntime.sig { returns(T::Array[T.any(String, Integer)]) }
         attr_reader :args
 
-        sig { params(args: T::Array[T.any(String, Integer)]).void }
+        # T::Sig::WithoutRuntime.sig { params(args: T::Array[T.any(String, Integer)]).void }
         def initialize(args)
           @args = args
         end
 
-        sig { returns(String) }
+        # T::Sig::WithoutRuntime.sig { returns(String) }
         def to_s
           args.join(' ')
         end
       end
 
       class From < Command
-        sig { returns(String) }
+        # T::Sig::WithoutRuntime.sig { returns(String) }
         attr_reader :image_url
 
-        sig { returns(T.nilable(String)) }
+        # T::Sig::WithoutRuntime.sig { returns(T.nilable(String)) }
         attr_reader :as
 
-        sig { params(image_url: String, as: T.nilable(String)).void }
+        # T::Sig::WithoutRuntime.sig { params(image_url: String, as: T.nilable(String)).void }
         def initialize(image_url, as: nil)
           @image_url = image_url
           @as = as
         end
 
-        sig { returns(String) }
+        # T::Sig::WithoutRuntime.sig { returns(String) }
         def to_s
           str = "FROM #{image_url}"
           str << " AS #{as}" if as
@@ -46,38 +46,38 @@ module Kuby
       end
 
       class Workdir < Command
-        sig { returns(String) }
+        # T::Sig::WithoutRuntime.sig { returns(String) }
         def to_s; "WORKDIR #{super}"; end
       end
 
       class Env < Command
-        sig { returns(String) }
+        # T::Sig::WithoutRuntime.sig { returns(String) }
         def to_s; "ENV #{super}"; end
       end
 
       class Run < Command
-        sig { returns(String) }
+        # T::Sig::WithoutRuntime.sig { returns(String) }
         def to_s; "RUN #{super}"; end
       end
 
       class Copy < Command
-        sig { returns(String) }
+        # T::Sig::WithoutRuntime.sig { returns(String) }
         attr_reader :source
 
-        sig { returns(String) }
+        # T::Sig::WithoutRuntime.sig { returns(String) }
         attr_reader :dest
 
-        sig { returns(T.nilable(String)) }
+        # T::Sig::WithoutRuntime.sig { returns(T.nilable(String)) }
         attr_reader :from
 
-        sig { params(source: String, dest: String, from: T.nilable(String)).void }
+        # T::Sig::WithoutRuntime.sig { params(source: String, dest: String, from: T.nilable(String)).void }
         def initialize(source, dest, from: nil)
           @source = source
           @dest = dest
           @from = from
         end
 
-        sig { returns(String) }
+        # T::Sig::WithoutRuntime.sig { returns(String) }
         def to_s
           cmd = ['COPY']
           cmd << "--from=#{from}" if from
@@ -87,91 +87,100 @@ module Kuby
       end
 
       class Expose < Command
-        sig { returns(String) }
+        # T::Sig::WithoutRuntime.sig { returns(String) }
         def to_s; "EXPOSE #{super}"; end
       end
 
       class Cmd < Command
-        sig { returns(String) }
+        # T::Sig::WithoutRuntime.sig { returns(String) }
         def to_s; "CMD #{super}"; end
       end
 
       class Arg < Command
-        sig { returns(String) }
+        # T::Sig::WithoutRuntime.sig { returns(String) }
         def to_s; "ARG #{super}"; end
       end
 
-      sig { returns(T::Array[Command]) }
+      # T::Sig::WithoutRuntime.sig { returns(T::Array[Command]) }
       attr_reader :commands
 
-      sig { returns(Integer) }
+      # T::Sig::WithoutRuntime.sig { returns(Integer) }
       attr_reader :cursor
 
-      sig { void }
+      # T::Sig::WithoutRuntime.sig { void }
       def initialize
-        @commands = T.let([], T::Array[Command])
-        @cursor = T.let(0, Integer)
+        @commands = []
+        @cursor = 0
       end
 
-      sig { params(image_url: String, as: T.nilable(String)).void }
+      # T::Sig::WithoutRuntime.sig { params(image_url: String, as: T.nilable(String)).void }
       def from(image_url, as: nil)
         add From.new(image_url, as: as)
       end
 
-      sig { params(args: String).void }
+      # T::Sig::WithoutRuntime.sig { params(args: String).void }
       def workdir(*args)
         add Workdir.new(args)
       end
 
-      sig { params(args: String).void }
+      # T::Sig::WithoutRuntime.sig { params(args: String).void }
       def env(*args)
         add Env.new(args)
       end
 
-      sig { params(args: String).void }
+      # T::Sig::WithoutRuntime.sig { params(args: String).void }
       def arg(*args)
         add Arg.new(args)
       end
 
-      sig { params(args: String).void }
+      # T::Sig::WithoutRuntime.sig { params(args: String).void }
       def run(*args)
         add Run.new(args)
       end
 
-      sig { params(source: String, dest: String, from: T.nilable(String)).void }
+      # T::Sig::WithoutRuntime.sig { params(source: String, dest: String, from: T.nilable(String)).void }
       def copy(source, dest, from: nil)
         add Copy.new(source, dest, from: from)
       end
 
-      sig { params(port: Integer).void }
+      # T::Sig::WithoutRuntime.sig { params(port: Integer).void }
       def expose(port)
         add Expose.new([port])
       end
 
-      sig { params(args: String).void }
+      # T::Sig::WithoutRuntime.sig { params(args: String).void }
       def cmd(*args)
         add Cmd.new(args)
       end
 
-      sig { returns(String) }
+      # T::Sig::WithoutRuntime.sig { returns(String) }
       def to_s
         # ensure trailing newline
         "#{commands.map(&:to_s).join("\n")}\n"
       end
 
-      sig { returns(String) }
+      # T::Sig::WithoutRuntime.sig { returns(String) }
       def checksum
         Digest::SHA256.hexdigest(to_s)
       end
 
-      sig { returns(T::Array[Integer]) }
+      # T::Sig::WithoutRuntime.sig { returns(T::Array[Integer]) }
       def exposed_ports
         commands
           .select { |c| c.is_a?(Expose) }
-          .map { |c| T.cast(c.args.first, Integer) }
+          .map { |c| c.args.first }
       end
 
-      sig { params(pos: Integer, block: T.proc.void).void }
+      # T::Sig::WithoutRuntime.sig { returns(T.nilable(String)) }
+      def current_workdir
+        found = commands.reverse_each.find do |command|
+          command.is_a?(Kuby::Docker::Dockerfile::Workdir)
+        end
+
+        found.args.first if found
+      end
+
+      # T::Sig::WithoutRuntime.sig { params(pos: Integer, block: T.proc.void).void }
       def insert_at(pos, &block)
         @cursor = pos
         yield
@@ -181,7 +190,7 @@ module Kuby
 
       private
 
-      sig { params(cmd: Command).void }
+      # T::Sig::WithoutRuntime.sig { params(cmd: Command).void }
       def add(cmd)
         commands.insert(cursor, cmd)
         @cursor += 1