kuby-core 0.8.0 → 0.10.1

data/lib/kuby/docker/dockerfile.rb

@@ -1,3 +1,5 @@
+require 'digest'
+
 module Kuby
   module Docker
     class Dockerfile
@@ -65,6 +67,10 @@ module Kuby
         def to_s; "CMD #{super}"; end
       end
 
+      class Arg < Command
+        def to_s; "ARG #{super}"; end
+      end
+
       attr_reader :commands, :cursor
 
       def initialize
@@ -84,6 +90,10 @@ module Kuby
         add Env.new(*args)
       end
 
+      def arg(*args)
+        add Arg.new(*args)
+      end
+
       def run(*args)
         add Run.new(*args)
       end
@@ -101,7 +111,12 @@ module Kuby
       end
 
       def to_s
-        commands.map(&:to_s).join("\n")
+        # ensure trailing newline
+        "#{commands.map(&:to_s).join("\n")}\n"
+      end
+
+      def checksum
+        Digest::SHA256.hexdigest(to_s)
       end
 
       def exposed_ports

data/lib/kuby/docker/errors.rb

@@ -2,6 +2,7 @@ module Kuby
   module Docker
     class BuildError < StandardError; end
     class PushError < StandardError; end
+    class PullError < StandardError; end
     class LoginError < StandardError; end
 
     class MissingTagError < StandardError

data/lib/kuby/docker/layer_stack.rb

@@ -63,6 +63,10 @@ module Kuby
         stack.delete(name)
         layers.delete(name)
       end
+
+      def includes?(name)
+        layers.include?(name)
+      end
     end
   end
 end

data/lib/kuby/docker/local_tags.rb

@@ -33,6 +33,10 @@ module Kuby
       def timestamp_tags
         tags.map { |t| TimestampTag.try_parse(t) }.compact
       end
+
+      def latest_timestamp_tag
+        @latest_timestamp_tag ||= timestamp_tags.sort.last
+      end
     end
   end
 end

data/lib/kuby/docker/metadata.rb

@@ -5,6 +5,7 @@ module Kuby
     class Metadata
       DEFAULT_DISTRO = :debian
       DEFAULT_REGISTRY_HOST = 'https://www.docker.com'.freeze
+      DEFAULT_REGISTRY_SCHEME = 'https'
       LATEST_TAG = 'latest'
 
       attr_accessor :image_url
@@ -20,12 +21,7 @@ module Kuby
       end
 
       def image_host
-        @image_host ||= if image_url.include?('/')
-          uri = parse_url(image_url)
-          "#{uri.scheme}://#{uri.host}"
-        else
-          DEFAULT_REGISTRY_HOST
-        end
+        @image_host ||= "#{full_image_uri.scheme}://#{full_image_uri.host}"
       end
 
       def image_hostname
@@ -33,39 +29,13 @@ module Kuby
       end
 
       def image_repo
-        @image_repo ||= if image_url.include?('/')
-          parse_url(image_url).path.sub(/\A\//, '')
-        else
-          image_url
-        end
+        @image_repo ||= full_image_uri.path.sub(/\A[\/]+/, '')
       end
 
       def tags
         @tags.empty? ? default_tags : @tags
       end
 
-      def tag
-        t = ENV.fetch('KUBY_DOCKER_TAG') do
-          environment.docker.tags.latest_timestamp_tag
-        end
-
-        unless t
-          raise MissingTagError, 'could not find latest timestamped tag'
-        end
-
-        t.to_s
-      end
-
-      def previous_tag(current_tag)
-        t = environment.docker.tags.previous_timestamp_tag(current_tag)
-
-        unless t
-          raise MissingTagError, 'could not find previous timestamped tag'
-        end
-
-        t.to_s
-      end
-
       def distro
         @distro || DEFAULT_DISTRO
       end
@@ -76,6 +46,16 @@ module Kuby
 
       private
 
+      def full_image_uri
+        @full_image_uri ||= if image_url.include?('://')
+          URI.parse(image_url)
+        elsif image_url =~ /\A[^.]+\.[^\/]+\//
+          URI.parse("#{DEFAULT_REGISTRY_SCHEME}://#{image_url}")
+        else
+          URI.parse("#{DEFAULT_REGISTRY_HOST}/#{image_url.sub(/\A[\/]+/, '')}")
+        end
+      end
+
       def default_image_url
         # assuming dockerhub by not specifying full url
         @default_image_url ||= environment.app_name.downcase
@@ -92,7 +72,7 @@ module Kuby
         return uri if uri.scheme
 
         # force a scheme because URI.parse won't work properly without one
-        URI.parse("https://#{url}")
+        URI.parse("#{DEFAULT_REGISTRY_SCHEME}://#{url}")
       end
     end
   end

data/lib/kuby/docker/setup_phase.rb

@@ -3,13 +3,14 @@ module Kuby
     class SetupPhase < Layer
       DEFAULT_WORKING_DIR = '/usr/src/app'.freeze
 
-      attr_accessor :base_image, :working_dir
+      attr_accessor :base_image, :working_dir, :rails_env
 
       def apply_to(dockerfile)
         dockerfile.from(base_image || default_base_image)
         dockerfile.workdir(working_dir || DEFAULT_WORKING_DIR)
-        dockerfile.env("RAILS_ENV=#{Kuby.env}")
+        dockerfile.env("RAILS_ENV=#{rails_env || Kuby.env}")
         dockerfile.env("KUBY_ENV=#{Kuby.env}")
+        dockerfile.arg('RAILS_MASTER_KEY')
       end
 
       private

data/lib/kuby/docker/spec.rb

@@ -22,15 +22,15 @@ module Kuby
       end
 
       def bundler_version(version)
-        bundler_phase.bundler_version = version
+        bundler_phase.version = version
       end
 
       def gemfile(path)
         bundler_phase.gemfile = path
       end
 
-      def package(pkg)
-        package_phase << pkg
+      def package(*args)
+        package_phase.add(*args)
       end
 
       def distro(distro_name)
@@ -62,6 +62,10 @@ module Kuby
         layer_stack.delete(*args)
       end
 
+      def exists?(*args)
+        layer_stack.includes?(*args)
+      end
+
       def credentials(&block)
         @credentials ||= Credentials.new
         @credentials.instance_eval(&block) if block
@@ -106,8 +110,26 @@ module Kuby
         @metadata ||= Metadata.new(environment)
       end
 
-      def tags
-        @tags ||= Tags.new(cli, remote_client, metadata)
+      def tag
+        t = ENV.fetch('KUBY_DOCKER_TAG') do
+          tags.latest_timestamp_tag
+        end
+
+        unless t
+          raise MissingTagError, 'could not find latest timestamped tag'
+        end
+
+        t.to_s
+      end
+
+      def previous_tag(current_tag)
+        t = tags.previous_timestamp_tag(current_tag)
+
+        unless t
+          raise MissingTagError, 'could not find previous timestamped tag'
+        end
+
+        t.to_s
       end
 
       def cli
@@ -129,6 +151,10 @@ module Kuby
         end
       end
 
+      def tags
+        @tags ||= Tags.new(cli, remote_client, metadata)
+      end
+
       private
 
       def layer_stack

data/lib/kuby/docker/timestamp_tag.rb

@@ -1,3 +1,5 @@
+require 'time'
+
 module Kuby
   module Docker
     class TimestampTag
@@ -27,6 +29,10 @@ module Kuby
         time <=> other.time
       end
 
+      def ==(other)
+        time == other.time
+      end
+
       def hash
         time.hash
       end

data/lib/kuby/environment.rb

@@ -8,7 +8,12 @@ module Kuby
     end
 
     def docker(&block)
-      @docker ||= Docker::Spec.new(self)
+      @docker ||= if development?
+        Docker::DevSpec.new(self)
+      else
+        Docker::Spec.new(self)
+      end
+
       @docker.instance_eval(&block) if block
       @docker
     end
@@ -22,5 +27,9 @@ module Kuby
     def app_name
       definition.app_name
     end
+
+    def development?
+      name == 'development'
+    end
   end
 end

data/lib/kuby/kubernetes.rb

@@ -2,14 +2,14 @@ require 'kuby/kubernetes/errors'
 
 module Kuby
   module Kubernetes
-    autoload :MinikubeProvider, 'kuby/kubernetes/minikube_provider'
-    autoload :Deployer,         'kuby/kubernetes/deployer'
-    autoload :DeployTask,       'kuby/kubernetes/deploy_task'
-    autoload :DockerConfig,     'kuby/kubernetes/docker_config'
-    autoload :Manifest,         'kuby/kubernetes/manifest'
-    autoload :Plugins,          'kuby/kubernetes/plugins'
-    autoload :Provider,         'kuby/kubernetes/provider'
-    autoload :RegistrySecret,   'kuby/kubernetes/registry_secret'
-    autoload :Spec,             'kuby/kubernetes/spec'
+    autoload :Deployer,              'kuby/kubernetes/deployer'
+    autoload :DeployTask,            'kuby/kubernetes/deploy_task'
+    autoload :DockerConfig,          'kuby/kubernetes/docker_config'
+    autoload :DockerDesktopProvider, 'kuby/kubernetes/docker_desktop_provider'
+    autoload :Manifest,              'kuby/kubernetes/manifest'
+    autoload :Plugins,               'kuby/kubernetes/plugins'
+    autoload :Provider,              'kuby/kubernetes/provider'
+    autoload :RegistrySecret,        'kuby/kubernetes/registry_secret'
+    autoload :Spec,                  'kuby/kubernetes/spec'
   end
 end

data/lib/kuby/kubernetes/deploy_task.rb

@@ -18,6 +18,10 @@ module Kuby
         end
       end
 
+      def logger
+        deploy_task.instance_variable_get(:@logger)
+      end
+
       private
 
       def with_env(new_env)

data/lib/kuby/kubernetes/deployer.rb

@@ -6,22 +6,42 @@ module Kuby
   module Kubernetes
     class Deployer
       attr_reader :environment
+      attr_accessor :logdev
 
       def initialize(environment)
         @environment = environment
       end
 
       def deploy
-        namespaced, global = all_resources.partition do |resource|
-          # Unfortunately we can't use respond_to here because all KubeDSL
-          # objects use ObjectMeta, which has a namespace field. Not sure
-          # why, since it makes no sense for a namespace to have a namespace.
-          # Instead we just check for nil here.
-          resource.metadata.namespace
+        restart_rails_deployment_if_necessary do
+          namespaced, global = all_resources.partition do |resource|
+            # Unfortunately we can't use respond_to here because all KubeDSL
+            # objects use ObjectMeta, which has a namespace field. Not sure
+            # why, since it makes no sense for a namespace to have a namespace.
+            # Instead we just check for nil here.
+            resource.metadata.namespace
+          end
+
+          deploy_global_resources(global)
+          deploy_namespaced_resources(namespaced)
         end
+      end
+
+      # adhere to the "CLI" interface
+      def with_pipes(out = STDOUT, err = STDERR)
+        previous_logdev = logdev
+        @logdev = err
+        yield
+      ensure
+        @logdev = previous_logdev
+      end
+
+      def logdev
+        @logdev || STDERR
+      end
 
-        deploy_global_resources(global)
-        deploy_namespaced_resources(namespaced)
+      def last_status
+        nil
       end
 
       private
@@ -67,22 +87,57 @@ module Kuby
           filenames: [tmpdir]
         )
 
+        task.logger.reopen(logdev)
+
         task.run!(verify_result: true, prune: false)
       ensure
         ENV['KUBECONFIG'] = old_kubeconfig
         FileUtils.rm_rf(tmpdir)
       end
 
+      def restart_rails_deployment_if_necessary
+        deployed_image = nil
+        current_image = "#{docker.metadata.image_url}:#{docker.tag}"
+
+        if rails_app = kubernetes.plugin(:rails_app)
+          deployment_name = rails_app.deployment.metadata.name
+
+          begin
+            deployment = cli.get_object(
+              'deployment', namespace.metadata.name, deployment_name
+            )
+
+            deployed_image = deployment.dig(*%w(spec template spec containers), 0, 'image')
+          rescue ::KubernetesCLI::GetResourceError
+          end
+        end
+
+        yield
+
+        if deployed_image == current_image
+          Kuby.logger.info('Docker image URL did not change, restarting Rails deployment manually')
+          cli.restart_deployment(namespace.metadata.name, deployment_name)
+        end
+      end
+
       def provider
-        environment.kubernetes.provider
+        kubernetes.provider
       end
 
       def namespace
-        environment.kubernetes.namespace
+        kubernetes.namespace
       end
 
       def all_resources
-        environment.kubernetes.resources
+        kubernetes.resources
+      end
+
+      def docker
+        environment.docker
+      end
+
+      def kubernetes
+        environment.kubernetes
       end
 
       def cli

data/lib/kuby/kubernetes/{minikube_provider.rb → docker_desktop_provider.rb}

@@ -2,7 +2,7 @@ require 'kube-dsl'
 
 module Kuby
   module Kubernetes
-    class MinikubeProvider < Provider
+    class DockerDesktopProvider < Provider
       STORAGE_CLASS_NAME = 'hostpath'.freeze
 
       class Config
@@ -20,9 +20,9 @@ module Kuby
       def after_configuration
         if rails_app = spec.plugin(:rails_app)
           # Remove ingress and change service type from ClusterIP to
-          # LoadBalancer. No need to set up ingress for minikube since
-          # it handles all the localhost mapping, etc if you set up a
-          # service LB.
+          # LoadBalancer. No need to set up ingress for Docker Desktop
+          # since it handles all the localhost mapping, etc if you set
+          # up a service LB.
           rails_app.resources.delete(rails_app.ingress)
           rails_app.service.spec { type 'LoadBalancer' }
         end