kuby-core 0.16.0 → 0.18.0

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

data/lib/kuby/docker/spec.rb

@@ -3,201 +3,221 @@
 module Kuby
   module Docker
     class Spec
-      extend T::Sig
+      # extend T::Sig
 
       DEFAULT_DISTRO = :debian
+      DEFAULT_APP_ROOT_PATH = '.'.freeze
 
-      sig { returns(Environment) }
+      # T::Sig::WithoutRuntime.sig { returns(Kuby::Environment) }
       attr_reader :environment
 
-      sig { returns(T.nilable(String)) }
+      # T::Sig::WithoutRuntime.sig { returns(T.nilable(String)) }
       attr_reader :image_url_str
 
-      sig { returns(T.nilable(String)) }
+      # T::Sig::WithoutRuntime.sig { returns(T.nilable(String)) }
       attr_reader :registry_index_url_str
 
-      sig { params(environment: Environment).void }
+      # T::Sig::WithoutRuntime.sig { returns(T.nilable(String)) }
+      attr_reader :app_root_path
+
+      # T::Sig::WithoutRuntime.sig { returns T.nilable(Kuby::Docker::AppImage) }
+      attr_reader :image
+
+      # T::Sig::WithoutRuntime.sig { params(environment: Kuby::Environment).void }
       def initialize(environment)
         @environment = environment
 
-        @credentials = T.let(@credentials, T.nilable(Credentials))
-        @setup_phase = T.let(@setup_phase, T.nilable(SetupPhase))
-        @package_phase = T.let(@package_phase, T.nilable(PackagePhase))
-        @bundler_phase = T.let(@bundler_phase, T.nilable(BundlerPhase))
-        @yarn_phase = T.let(@yarn_phase, T.nilable(YarnPhase))
-        @copy_phase = T.let(@copy_phase, T.nilable(CopyPhase))
-        @assets_phase = T.let(@assets_phase, T.nilable(AssetsPhase))
-        @webserver_phase = T.let(@webserver_phase, T.nilable(WebserverPhase))
+        # @credentials = T.let(@credentials, T.nilable(Credentials))
+        # @setup_phase = T.let(@setup_phase, T.nilable(SetupPhase))
+        # @package_phase = T.let(@package_phase, T.nilable(PackagePhase))
+        # @bundler_phase = T.let(@bundler_phase, T.nilable(BundlerPhase))
+        # @yarn_phase = T.let(@yarn_phase, T.nilable(YarnPhase))
+        # @copy_phase = T.let(@copy_phase, T.nilable(CopyPhase))
+        # @app_phase = T.let(@app_phase, T.nilable(AppPhase))
+        # @assets_phase = T.let(@assets_phase, T.nilable(AssetsPhase))
+        # @webserver_phase = T.let(@webserver_phase, T.nilable(WebserverPhase))
 
-        @distro_name = T.let(@distro_name, T.nilable(Symbol))
-        @distro_spec = T.let(@distro_spec, T.nilable(Distro))
-        @layer_stack = T.let(@layer_stack, T.nilable(Kuby::Docker::LayerStack))
+        # @distro_name = T.let(@distro_name, T.nilable(Symbol))
+        # @distro_spec = T.let(@distro_spec, T.nilable(Distro))
+        # @layer_stack = T.let(@layer_stack, T.nilable(Kuby::Docker::LayerStack))
 
-        @image_url_str = T.let(@image_url_str, T.nilable(String))
-        @registry_index_url_str = T.let(@registry_index_url_str, T.nilable(String))
-        @image = T.let(@image, T.nilable(Docker::AppImage))
+        # @image_url_str = T.let(@image_url_str, T.nilable(String))
+        # @registry_index_url_str = T.let(@registry_index_url_str, T.nilable(String))
+        # @image = T.let(@image, T.nilable(Docker::AppImage))
+
+        @app_root_path = DEFAULT_APP_ROOT_PATH
       end
 
-      sig { returns(Symbol) }
+      # T::Sig::WithoutRuntime.sig { returns(Symbol) }
       def distro_name
         @distro_name || DEFAULT_DISTRO
       end
 
-      sig { params(image_url: String).void }
+      # T::Sig::WithoutRuntime.sig { params(image_url: String).void }
       def base_image(image_url)
         setup_phase.base_image = image_url
       end
 
-      sig { params(dir: String).void }
+      # T::Sig::WithoutRuntime.sig { params(dir: String).void }
       def working_dir(dir)
         setup_phase.working_dir = dir
       end
 
-      sig { params(env: String).void }
+      # T::Sig::WithoutRuntime.sig { params(env: String).void }
       def rails_env(env)
         setup_phase.rails_env = env
       end
 
-      sig { params(version: String).void }
+      # T::Sig::WithoutRuntime.sig { params(version: String).void }
       def bundler_version(version)
         bundler_phase.version = version
       end
 
-      sig { params(path: String).void }
+      # T::Sig::WithoutRuntime.sig { params(path: String).void }
       def gemfile(path)
         bundler_phase.gemfile = path
       end
 
-      sig {
-        params(
-          package_name: Symbol,
-          version: T.nilable(String)
-        )
-        .void
-      }
+      # T::Sig::WithoutRuntime.sig { params(path: String).void }
+      def app_root(path)
+        @app_root_path = path
+      end
+
+      # T::Sig::WithoutRuntime.sig {
+      #   params(
+      #     package_name: Symbol,
+      #     version: T.nilable(String)
+      #   )
+      #   .void
+      # }
       def package(package_name, version = nil)
         package_phase.add(package_name, version)
       end
 
-      sig { params(distro_name: Symbol).void }
+      # T::Sig::WithoutRuntime.sig { params(distro_name: Symbol).void }
       def distro(distro_name)
         @distro_name = distro_name
         @distro_spec = nil
       end
 
-      sig { params(path: String).void }
+      # T::Sig::WithoutRuntime.sig { params(path: String).void }
       def files(path)
         copy_phase << path
       end
 
-      sig { params(port: Integer).void }
+      # T::Sig::WithoutRuntime.sig { params(port: Integer).void }
       def port(port)
         webserver_phase.port = port
       end
 
-      sig { params(url: String).void }
+      # T::Sig::WithoutRuntime.sig { params(url: String).void }
       def image_url(url)
         @image_url_str = url
       end
 
-      sig { params(url: String).void }
+      # T::Sig::WithoutRuntime.sig { params(url: String).void }
       def registry_index_url(url)
         @registry_index_url_str = url
       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)
         layer_stack.use(name, layer, &block)
       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: Dockerfile).void)
+      #   )
+      #   .void
+      # }
       def insert(name, layer = nil, options = {}, &block)
         layer_stack.insert(name, layer, options, &block)
       end
 
-      sig { params(name: Symbol).void }
+      # T::Sig::WithoutRuntime.sig { params(name: Symbol).void }
       def delete(name)
         layer_stack.delete(name)
       end
 
-      sig { params(name: Symbol).returns(T::Boolean) }
+      # T::Sig::WithoutRuntime.sig { params(name: Symbol).returns(T::Boolean) }
       def exists?(name)
         layer_stack.includes?(name)
       end
 
-      sig {
-        params(block: T.nilable(T.proc.void)).returns(Credentials)
-      }
+      # T::Sig::WithoutRuntime.sig {
+      #   params(block: T.nilable(T.proc.void)).returns(Kuby::Docker::Credentials)
+      # }
       def credentials(&block)
         @credentials ||= Credentials.new
         @credentials.instance_eval(&block) if block
         @credentials
       end
 
-      sig { returns(Docker::AppImage) }
-      def image
-        @image ||= begin
+      # T::Sig::WithoutRuntime.sig { void }
+      def after_configuration
+        @image = begin
           dockerfile = Dockerfile.new.tap do |df|
             layer_stack.each { |layer| layer.apply_to(df) }
           end
 
           Docker::AppImage.new(
-            dockerfile, T.must(image_url_str), credentials, registry_index_url_str
+            dockerfile, image_url_str, credentials, registry_index_url_str
           )
         end
       end
 
-      sig { returns(SetupPhase) }
+      # T::Sig::WithoutRuntime.sig { returns(Kuby::Docker::SetupPhase) }
       def setup_phase
         @setup_phase ||= SetupPhase.new(environment, self)
       end
 
-      sig { returns(PackagePhase) }
+      # T::Sig::WithoutRuntime.sig { returns(Kuby::Docker::PackagePhase) }
       def package_phase
         @package_phase ||= PackagePhase.new(environment)
       end
 
-      sig { returns(BundlerPhase) }
+      # T::Sig::WithoutRuntime.sig { returns(Kuby::Docker::BundlerPhase) }
       def bundler_phase
         @bundler_phase ||= BundlerPhase.new(environment)
       end
 
-      sig { returns(YarnPhase) }
+      # T::Sig::WithoutRuntime.sig { returns(Kuby::Docker::YarnPhase) }
       def yarn_phase
         @yarn_phase ||= YarnPhase.new(environment)
       end
 
-      sig { returns(CopyPhase) }
+      # T::Sig::WithoutRuntime.sig { returns(Kuby::Docker::CopyPhase) }
       def copy_phase
         @copy_phase ||= CopyPhase.new(environment)
       end
 
-      sig { returns(AssetsPhase) }
+      # T::Sig::WithoutRuntime.sig { returns(Kuby::Docker::AppPhase) }
+      def app_phase
+        @app_phase ||= AppPhase.new(environment)
+      end
+
+      # T::Sig::WithoutRuntime.sig { returns(Kuby::Docker::AssetsPhase) }
       def assets_phase
         @assets_phase ||= AssetsPhase.new(environment)
       end
 
-      sig { returns(WebserverPhase) }
+      # T::Sig::WithoutRuntime.sig { returns(Kuby::Docker::WebserverPhase) }
       def webserver_phase
         @webserver_phase ||= WebserverPhase.new(environment)
       end
 
-      sig { returns(Distro) }
+      # T::Sig::WithoutRuntime.sig { returns(Kuby::Docker::Distro) }
       def distro_spec
         @distro_spec ||= if distro_klass = Kuby.distros[distro_name]
           distro_klass.new(self)
@@ -208,7 +228,7 @@ module Kuby
 
       private
 
-      sig { returns(Kuby::Docker::LayerStack) }
+      # T::Sig::WithoutRuntime.sig { returns(Kuby::Docker::LayerStack) }
       def layer_stack
         @layer_stack ||= Kuby::Docker::LayerStack.new.tap do |stack|
           stack.use(:setup_phase, setup_phase)
@@ -216,6 +236,7 @@ module Kuby
           stack.use(:bundler_phase, bundler_phase)
           stack.use(:yarn_phase, yarn_phase)
           stack.use(:copy_phase, copy_phase)
+          stack.use(:app_phase, app_phase)
           stack.use(:assets_phase, assets_phase)
           stack.use(:webserver_phase, webserver_phase)
         end

data/lib/kuby/docker/timestamp_tag.rb

@@ -5,11 +5,11 @@ require 'time'
 module Kuby
   module Docker
     class TimestampTag
-      extend T::Sig
+      # extend T::Sig
 
-      FORMAT = T.let('%Y%m%d%H%M%S'.freeze, String)
+      FORMAT = '%Y%m%d%H%M%S'.freeze
 
-      sig { params(str: T.nilable(String)).returns(T.nilable(TimestampTag)) }
+      # T::Sig::WithoutRuntime.sig { params(str: T.nilable(String)).returns(T.nilable(Kuby::Docker::TimestampTag)) }
       def self.try_parse(str)
         return nil unless str
 
@@ -27,35 +27,40 @@ module Kuby
         new(time)
       end
 
-      sig { returns(Time) }
+      # T::Sig::WithoutRuntime.sig { returns(Kuby::Docker::TimestampTag) }
+      def self.now
+        new(Time.now.utc)
+      end
+
+      # T::Sig::WithoutRuntime.sig { returns(Time) }
       attr_reader :time
 
-      sig { params(time: Time).void }
+      # T::Sig::WithoutRuntime.sig { params(time: Time).void }
       def initialize(time)
-        @time = T.let(time, Time)
+        @time = time
       end
 
-      sig { returns(String) }
+      # T::Sig::WithoutRuntime.sig { returns(String) }
       def to_s
         time.strftime(FORMAT)
       end
 
-      sig { params(other: TimestampTag).returns(T.nilable(Integer)) }
+      # T::Sig::WithoutRuntime.sig { params(other: Kuby::Docker::TimestampTag).returns(T.nilable(Integer)) }
       def <=>(other)
         time <=> other.time
       end
 
-      sig { params(other: TimestampTag).returns(T::Boolean) }
+      # T::Sig::WithoutRuntime.sig { params(other: Kuby::Docker::TimestampTag).returns(T::Boolean) }
       def ==(other)
         time == other.time
       end
 
-      sig { returns(Integer) }
+      # T::Sig::WithoutRuntime.sig { returns(Integer) }
       def hash
         time.hash
       end
 
-      sig { params(other: TimestampTag).returns(T::Boolean) }
+      # T::Sig::WithoutRuntime.sig { params(other: Kuby::Docker::TimestampTag).returns(T::Boolean) }
       def eql?(other)
         time == other.time
       end