kuby-core 0.17.0 → 0.18.0

data/lib/kuby/docker/layer_stack.rb

@@ -3,44 +3,44 @@
 module Kuby
   module Docker
     class LayerStack
-      extend T::Sig
-      extend T::Generic
+      # extend T::Sig
+      # extend T::Generic
 
-      Elem = type_member(fixed: Layer)
+      # Elem = type_member { { fixed: Kuby::Docker::Layer } }
 
       include Enumerable
 
-      sig { returns(T::Array[Symbol]) }
+      # T::Sig::WithoutRuntime.sig { returns(T::Array[Symbol]) }
       attr_reader :stack
 
-      sig { returns(T::Hash[Symbol, Layer]) }
+      # T::Sig::WithoutRuntime.sig { returns(T::Hash[Symbol, Kuby::Docker::Layer]) }
       attr_reader :layers
 
-      sig { void }
+      # T::Sig::WithoutRuntime.sig { void }
       def initialize
-        @stack = T.let([], T::Array[Symbol])
-        @layers = T.let({}, T::Hash[Symbol, Layer])
+        @stack = []
+        @layers = {}
       end
 
-      sig {
-        override.params(
-          block: T.nilable(T.proc.params(layer: Layer).void)
-        )
-        .void
-      }
+      # T::Sig::WithoutRuntime.sig {
+      #   override.params(
+      #     block: T.nilable(T.proc.params(layer: Kuby::Docker::Layer).void)
+      #   )
+      #   .void
+      # }
       def each(&block)
-        return to_enum(T.must(__method__)) unless block_given?
-        @stack.each { |name| yield T.must(layers[name]) }
+        return to_enum(__method__) unless block_given?
+        @stack.each { |name| yield layers[name] }
       end
 
-      sig {
-        params(
-          name: Symbol,
-          layer: T.nilable(Layer),
-          block: T.nilable(T.proc.params(df: Dockerfile).void)
-        )
-        .void
-      }
+      # T::Sig::WithoutRuntime.sig {
+      #   params(
+      #     name: Symbol,
+      #     layer: T.nilable(Layer),
+      #     block: T.nilable(T.proc.params(df: Kuby::Docker::Dockerfile).void)
+      #   )
+      #   .void
+      # }
       def use(name, layer = nil, &block)
         stack << name
 
@@ -53,15 +53,15 @@ module Kuby
         end
       end
 
-      sig {
-        params(
-          name: Symbol,
-          layer: T.nilable(T.any(Layer, T::Hash[Symbol, T.untyped])),
-          options: T::Hash[Symbol, T.untyped],
-          block: T.nilable(T.proc.params(df: Dockerfile).void)
-        )
-        .void
-      }
+      # T::Sig::WithoutRuntime.sig {
+      #   params(
+      #     name: Symbol,
+      #     layer: T.nilable(T.any(Layer, T::Hash[Symbol, T.untyped])),
+      #     options: T::Hash[Symbol, T.untyped],
+      #     block: T.nilable(T.proc.params(df: Kuby::Docker::Dockerfile).void)
+      #   )
+      #   .void
+      # }
       def insert(name, layer = nil, options = {}, &block)
         # this is truly gross but it's the only way I can think of to be able
         # to call insert these two ways:
@@ -94,13 +94,13 @@ module Kuby
         end
       end
 
-      sig { params(name: Symbol).void }
+      # T::Sig::WithoutRuntime.sig { params(name: Symbol).void }
       def delete(name)
         stack.delete(name)
         layers.delete(name)
       end
 
-      sig { params(name: Symbol).returns(T::Boolean) }
+      # T::Sig::WithoutRuntime.sig { params(name: Symbol).returns(T::Boolean) }
       def includes?(name)
         layers.include?(name)
       end

data/lib/kuby/docker/local_tags.rb

@@ -3,34 +3,34 @@
 module Kuby
   module Docker
     class LocalTags
-      extend T::Sig
+      # extend T::Sig
 
-      sig { returns CLI }
+      # T::Sig::WithoutRuntime.sig { returns Kuby::Docker::CLI }
       attr_reader :cli
 
-      sig { returns(String) }
+      # T::Sig::WithoutRuntime.sig { returns(String) }
       attr_reader :image_url
 
-      sig {
-        params(
-          cli: CLI,
-          image_url: String
-        )
-        .void
-      }
+      # T::Sig::WithoutRuntime.sig {
+      #   params(
+      #     cli: Kuby::Docker::CLI,
+      #     image_url: String
+      #   )
+      #   .void
+      # }
       def initialize(cli, image_url)
         @cli = cli
         @image_url = image_url
-        @latest_timestamp_tag = T.let(@latest_timestamp_tag, T.nilable(TimestampTag))
+        # @latest_timestamp_tag = T.let(@latest_timestamp_tag, T.nilable(TimestampTag))
       end
 
-      sig { returns(T::Array[String]) }
+      # T::Sig::WithoutRuntime.sig { returns(T::Array[String]) }
       def tags
         images = cli.images(image_url)
-        images.map { |image| T.must(image[:tag]) }
+        images.map { |image| image[:tag] }
       end
 
-      sig { returns(T::Array[String]) }
+      # T::Sig::WithoutRuntime.sig { returns(T::Array[String]) }
       def latest_tags
         # find "latest" tag
         images = cli.images(image_url)
@@ -48,12 +48,12 @@ module Kuby
         end
       end
 
-      sig { returns(T::Array[TimestampTag]) }
+      # T::Sig::WithoutRuntime.sig { returns(T::Array[Kuby::Docker::TimestampTag]) }
       def timestamp_tags
         tags.map { |t| TimestampTag.try_parse(t) }.compact
       end
 
-      sig { returns(T.nilable(TimestampTag)) }
+      # T::Sig::WithoutRuntime.sig { returns(T.nilable(Kuby::Docker::TimestampTag)) }
       def latest_timestamp_tag
         @latest_timestamp_tag ||= timestamp_tags.sort.last
       end

data/lib/kuby/docker/package_list.rb

@@ -3,48 +3,48 @@
 module Kuby
   module Docker
     class PackageList
-      extend T::Sig
-      extend T::Generic
+      # extend T::Sig
+      # extend T::Generic
 
-      Elem = type_member(fixed: Distro::PackageImpl)
+      # Elem = type_member { { fixed: Distro::PackageImpl } }
 
       include Enumerable
 
-      sig { returns(T::Array[Distro::PackageImpl]) }
+      # T::Sig::WithoutRuntime.sig { returns(T::Array[Distro::PackageImpl]) }
       attr_reader :packages
 
-      sig { params(package_tuples: T::Array[[Symbol, T.nilable(String)]]).void }
+      # T::Sig::WithoutRuntime.sig { params(package_tuples: T::Array[[Symbol, T.nilable(String)]]).void }
       def initialize(package_tuples)
-        @packages = T.let([], T::Array[Distro::PackageImpl])
+        @packages = []
         package_tuples.each { |name, version| add(name, version) }
       end
 
-      sig { params(name: Symbol).returns(T.nilable(Distro::PackageImpl)) }
+      # T::Sig::WithoutRuntime.sig { params(name: Symbol).returns(T.nilable(Distro::PackageImpl)) }
       def [](name)
         packages.find { |pkg| pkg.name == name }
       end
 
-      sig { params(name: Symbol, version: T.nilable(String)).void }
+      # T::Sig::WithoutRuntime.sig { params(name: Symbol, version: T.nilable(String)).void }
       def add(name, version = nil)
         packages << Packages::Package.new(name, version)
       end
 
-      sig { params(name: String).void }
+      # T::Sig::WithoutRuntime.sig { params(name: String).void }
       def delete(name)
         packages.delete_if { |pkg| pkg.name == name }
       end
 
-      sig {
-        override.params(
-          block: T.proc.params(package: Distro::PackageImpl).void
-        )
-        .void
-      }
+      # T::Sig::WithoutRuntime.sig {
+      #   override.params(
+      #     block: T.proc.params(package: Distro::PackageImpl).void
+      #   )
+      #   .void
+      # }
       def each(&block)
         packages.each(&block)
       end
 
-      sig { returns(T::Boolean) }
+      # T::Sig::WithoutRuntime.sig { returns(T::Boolean) }
       def empty?
         packages.empty?
       end

data/lib/kuby/docker/package_phase.rb

@@ -3,31 +3,31 @@
 module Kuby
   module Docker
     class PackagePhase < Layer
-      extend T::Sig
+      # extend T::Sig
 
-      Operation = T.type_alias { [Symbol, Symbol, T.nilable(String)] }
+      # Operation = T.type_alias { [Symbol, Symbol, T.nilable(String)] }
 
-      sig { returns(T::Array[Operation]) }
+      # T::Sig::WithoutRuntime.sig { returns(T::Array[Operation]) }
       attr_reader :operations
 
-      sig { params(environment: Environment).void }
+      # T::Sig::WithoutRuntime.sig { params(environment: Kuby::Environment).void }
       def initialize(environment)
         super
 
-        @operations = T.let([], T::Array[Operation])
+        @operations = []
       end
 
-      sig { params(package_name: Symbol, version: T.nilable(String)).void }
+      # T::Sig::WithoutRuntime.sig { params(package_name: Symbol, version: T.nilable(String)).void }
       def add(package_name, version = nil)
         operations << [:add, package_name, version]
       end
 
-      sig { params(package_name: Symbol).void }
+      # T::Sig::WithoutRuntime.sig { params(package_name: Symbol).void }
       def remove(package_name)
         operations << [:remove, package_name, nil]
       end
 
-      sig { override.params(dockerfile: Dockerfile).void }
+      # T::Sig::WithoutRuntime.sig { override.params(dockerfile: Kuby::Docker::Dockerfile).void }
       def apply_to(dockerfile)
         packages = distro_spec.default_packages.dup
 
@@ -50,18 +50,18 @@ module Kuby
 
       private
 
-      sig { returns(Distro) }
+      # T::Sig::WithoutRuntime.sig { returns(Kuby::Docker::Distro) }
       def distro_spec
         environment.docker.distro_spec
       end
 
-      sig {
-        params(
-          package_name: Symbol,
-          version: T.nilable(String)
-        )
-        .returns(Distro::PackageImpl)
-      }
+      # T::Sig::WithoutRuntime.sig {
+      #   params(
+      #     package_name: Symbol,
+      #     version: T.nilable(String)
+      #   )
+      #   .returns(Kuby::Docker::Distro::PackageImpl)
+      # }
       def get_package(package_name, version)
         if package = Kuby.packages[package_name]
           package.with_version(version)

data/lib/kuby/docker/packages/managed_package.rb

@@ -4,27 +4,27 @@ module Kuby
   module Docker
     module Packages
       class ManagedPackage
-        extend T::Sig
+        # extend T::Sig
 
-        sig { returns(Symbol) }
+        # T::Sig::WithoutRuntime.sig { returns(Symbol) }
         attr_reader :name
 
-        sig { returns(T::Hash[Symbol, String]) }
+        # T::Sig::WithoutRuntime.sig { returns(T::Hash[Symbol, String]) }
         attr_reader :names_per_distro
 
-        sig {
-          params(
-            name: Symbol,
-            names_per_distro: T::Hash[Symbol, String]
-          )
-          .void
-        }
+        # T::Sig::WithoutRuntime.sig {
+        #   params(
+        #     name: Symbol,
+        #     names_per_distro: T::Hash[Symbol, String]
+        #   )
+        #   .void
+        # }
         def initialize(name, names_per_distro)
           @name = name
           @names_per_distro = names_per_distro
         end
 
-        sig { params(distro: Symbol).returns(String) }
+        # T::Sig::WithoutRuntime.sig { params(distro: Symbol).returns(String) }
         def package_name_for(distro)
           names_per_distro.fetch(distro) do
             raise UnsupportedDistroError, "Couldn't install #{name} "\
@@ -32,12 +32,12 @@ module Kuby
           end
         end
 
-        sig { params(ver: String).returns(T.self_type) }
+        # T::Sig::WithoutRuntime.sig { params(ver: String).returns(T.self_type) }
         def with_version(ver)
           self
         end
 
-        sig { returns(T::Boolean) }
+        # T::Sig::WithoutRuntime.sig { returns(T::Boolean) }
         def managed?
           true
         end

data/lib/kuby/docker/packages/nodejs.rb

@@ -4,26 +4,26 @@ module Kuby
   module Docker
     module Packages
       class Nodejs < Package
-        extend T::Sig
+        # extend T::Sig
 
-        sig { params(dockerfile: Dockerfile).void }
+        # T::Sig::WithoutRuntime.sig { params(dockerfile: Dockerfile).void }
         def install_on_debian(dockerfile)
           install_from_image("node:#{version}", dockerfile)
         end
 
-        sig { params(dockerfile: Dockerfile).void }
+        # T::Sig::WithoutRuntime.sig { params(dockerfile: Dockerfile).void }
         def install_on_alpine(dockerfile)
           install_from_image("node:#{version}-alpine", dockerfile)
         end
 
-        sig { returns(String) }
+        # T::Sig::WithoutRuntime.sig { returns(String) }
         def version
           @version || 'current'
         end
 
         private
 
-        sig { params(image: String, dockerfile: Dockerfile).void }
+        # T::Sig::WithoutRuntime.sig { params(image: String, dockerfile: Dockerfile).void }
         def install_from_image(image, dockerfile)
           dockerfile.insert_at(0) do
             dockerfile.from(image, as: 'nodejs')

data/lib/kuby/docker/packages/package.rb

@@ -4,29 +4,29 @@ module Kuby
   module Docker
     module Packages
       class Package
-        extend T::Sig
-        extend T::Helpers
+        # extend T::Sig
+        # extend T::Helpers
 
-        abstract!
+        # abstract!
 
-        sig { returns(Symbol) }
+        # T::Sig::WithoutRuntime.sig { returns(Symbol) }
         attr_reader :name
 
-        sig { returns(T.nilable(String)) }
+        # T::Sig::WithoutRuntime.sig { returns(T.nilable(String)) }
         attr_reader :version
 
-        sig { params(name: Symbol, version: T.nilable(String)).void }
+        # T::Sig::WithoutRuntime.sig { params(name: Symbol, version: T.nilable(String)).void }
         def initialize(name, version = nil)
           @name = name
           @version = version
         end
 
-        sig { params(ver: String).returns(T.self_type) }
+        # T::Sig::WithoutRuntime.sig { params(ver: String).returns(T.self_type) }
         def with_version(ver)
           self.class.new(name, ver)
         end
 
-        sig { returns(T::Boolean) }
+        # T::Sig::WithoutRuntime.sig { returns(T::Boolean) }
         def managed?
           false
         end

data/lib/kuby/docker/packages/simple_managed_package.rb

@@ -4,27 +4,27 @@ module Kuby
   module Docker
     module Packages
       class SimpleManagedPackage
-        extend T::Sig
+        # extend T::Sig
 
-        sig { returns(String) }
+        # T::Sig::WithoutRuntime.sig { returns(String) }
         attr_reader :name
 
-        sig { params(name: String).void }
+        # T::Sig::WithoutRuntime.sig { params(name: T.any(String, Symbol)).void }
         def initialize(name)
-          @name = name
+          @name = name.to_s
         end
 
-        sig { params(distro: Symbol).returns(String) }
+        # T::Sig::WithoutRuntime.sig { params(distro: Symbol).returns(String) }
         def package_name_for(distro)
           name
         end
 
-        sig { params(ver: String).returns(T.self_type) }
+        # T::Sig::WithoutRuntime.sig { params(ver: String).returns(T.self_type) }
         def with_version(ver)
           self
         end
 
-        sig { returns(T::Boolean) }
+        # T::Sig::WithoutRuntime.sig { returns(T::Boolean) }
         def managed?
           true
         end

data/lib/kuby/docker/packages/yarn.rb

@@ -4,16 +4,16 @@ module Kuby
   module Docker
     module Packages
       class Yarn < Package
-        extend T::Sig
+        # extend T::Sig
 
-        sig { params(name: Symbol, version: T.nilable(String)).void }
+        # T::Sig::WithoutRuntime.sig { params(name: Symbol, version: T.nilable(String)).void }
         def initialize(name, version = nil)
           super
 
-          @url = T.let(@url, T.nilable(String))
+          # @url = T.let(@url, T.nilable(String))
         end
 
-        sig { params(dockerfile: Dockerfile).void }
+        # T::Sig::WithoutRuntime.sig { params(dockerfile: Dockerfile).void }
         def install_on_debian(dockerfile)
           dockerfile.run(<<~CMD.strip)
             wget #{url} && \\
@@ -29,7 +29,7 @@ module Kuby
           dockerfile.env("PATH=$PATH:/opt/yarn/bin")
         end
 
-        sig { params(dockerfile: Dockerfile).void }
+        # T::Sig::WithoutRuntime.sig { params(dockerfile: Dockerfile).void }
         def install_on_alpine(dockerfile)
           dockerfile.run(<<~CMD.strip)
             wget #{url} && \\
@@ -47,7 +47,7 @@ module Kuby
 
         private
 
-        sig { returns(String) }
+        # T::Sig::WithoutRuntime.sig { returns(String) }
         def url
           @url ||= if version
             "https://github.com/yarnpkg/yarn/releases/download/v#{version}/yarn-v#{version}.tar.gz"

data/lib/kuby/docker/remote_tags.rb

@@ -5,41 +5,41 @@ require 'docker/remote'
 module Kuby
   module Docker
     class RemoteTags
-      extend T::Sig
+      # extend T::Sig
 
-      sig { returns(::Docker::Remote::Client) }
+      # T::Sig::WithoutRuntime.sig { returns(::Docker::Remote::Client) }
       attr_reader :remote_client
 
-      sig { returns(String) }
+      # T::Sig::WithoutRuntime.sig { returns(String) }
       attr_reader :image_url
 
-      sig {
-        params(
-          remote_client: ::Docker::Remote::Client,
-          image_url: String
-        )
-        .void
-      }
+      # T::Sig::WithoutRuntime.sig {
+      #   params(
+      #     remote_client: ::Docker::Remote::Client,
+      #     image_url: String
+      #   )
+      #   .void
+      # }
       def initialize(remote_client, image_url)
         @remote_client = remote_client
         @image_url = image_url
       end
 
-      sig { returns(T::Array[String]) }
+      # T::Sig::WithoutRuntime.sig { returns(T::Array[String]) }
       def tags
-        remote_client.tags
-      rescue ::Docker::Remote::UnknownRepoError
-        # this can happen if we've never pushed to the repo before
+        remote_client.tags || []
+      rescue ::Docker::Remote::UnknownRepoError, ::Docker::Remote::UnauthorizedError, ::Docker::Remote::TooManyRetriesError
+        # these can happen if we've never pushed to the repo before
         []
       end
 
-      sig { returns(T::Array[String]) }
+      # T::Sig::WithoutRuntime.sig { returns(T::Array[String]) }
       def latest_tags
         # not available for remote repos
         []
       end
 
-      sig { returns(T::Array[TimestampTag]) }
+      # T::Sig::WithoutRuntime.sig { returns(T::Array[Kuby::Docker::TimestampTag]) }
       def timestamp_tags
         tags.map { |t| TimestampTag.try_parse(t) }.compact
       end

data/lib/kuby/docker/setup_phase.rb

@@ -3,39 +3,39 @@
 module Kuby
   module Docker
     class SetupPhase < Layer
-      extend T::Sig
+      # extend T::Sig
 
-      DEFAULT_WORKING_DIR = T.let('/usr/src/app'.freeze, String)
+      DEFAULT_WORKING_DIR = '/usr/src/app'.freeze
 
-      sig { params(base_image: String).void }
+      # T::Sig::WithoutRuntime.sig { params(base_image: String).returns(String) }
       attr_writer :base_image
 
-      sig { returns(T.nilable(String)) }
+      # T::Sig::WithoutRuntime.sig { returns(T.nilable(String)) }
       attr_reader :working_dir
 
-      sig { params(working_dir: String).void }
+      # T::Sig::WithoutRuntime.sig { params(working_dir: String).returns(String) }
       attr_writer :working_dir
 
-      sig { returns(T.nilable(String)) }
+      # T::Sig::WithoutRuntime.sig { returns(T.nilable(String)) }
       attr_reader :rails_env
 
-      sig { params(rails_env: String).void }
+      # T::Sig::WithoutRuntime.sig { params(rails_env: String).returns(String) }
       attr_writer :rails_env
 
-      sig { returns(T.nilable(Docker::Spec)) }
+      # T::Sig::WithoutRuntime.sig { returns(Docker::Spec) }
       attr_reader :docker_spec
 
-      sig { params(environment: Environment, docker_spec: Docker::Spec).void }
+      # T::Sig::WithoutRuntime.sig { params(environment: Environment, docker_spec: Docker::Spec).void }
       def initialize(environment, docker_spec)
         super(environment)
 
-        @base_image = T.let(@base_image, T.nilable(String))
-        @working_dir = T.let(@working_dir, T.nilable(String))
-        @rails_env = T.let(@rails_env, T.nilable(String))
-        @docker_spec = T.let(docker_spec, T.nilable(Docker::Spec))
+        # @base_image = T.let(@base_image, T.nilable(String))
+        # @working_dir = T.let(@working_dir, T.nilable(String))
+        # @rails_env = T.let(@rails_env, T.nilable(String))
+        @docker_spec = docker_spec
       end
 
-      sig { override.params(dockerfile: Dockerfile).void }
+      # T::Sig::WithoutRuntime.sig { override.params(dockerfile: Dockerfile).void }
       def apply_to(dockerfile)
         dockerfile.from(base_image)
         dockerfile.workdir(working_dir || DEFAULT_WORKING_DIR)
@@ -44,24 +44,22 @@ module Kuby
         dockerfile.arg('RAILS_MASTER_KEY')
       end
 
-      sig { returns(String) }
+      # T::Sig::WithoutRuntime.sig { returns(String) }
       def base_image
         @base_image || default_base_image
       end
 
       private
 
-      sig { returns(String) }
+      # T::Sig::WithoutRuntime.sig { returns(String) }
       def default_base_image
-        spec = T.must(docker_spec)
-
-        case spec.distro_name
+        case docker_spec.distro_name
           when :debian
             "ruby:#{RUBY_VERSION}"
           when :alpine
             "ruby:#{RUBY_VERSION}-alpine"
           else
-            raise MissingDistroError, "distro '#{spec.distro_name}' hasn't been registered"
+            raise MissingDistroError, "distro '#{docker_spec.distro_name}' hasn't been registered"
         end
       end
     end