kuby-core 0.2.0 → 0.6.1

data/lib/kuby/docker/alpine.rb

@@ -8,7 +8,6 @@ module Kuby
         [:nodejs, '12.14.1'],
         [:yarn, '1.21.1'],
         [:c_toolchain],
-        [:sqlite_dev],
         [:tzdata]
       ].freeze
 

data/lib/kuby/docker/assets_phase.rb

@@ -1,6 +1,6 @@
 module Kuby
   module Docker
-    class AssetsPhase < Phase
+    class AssetsPhase < Layer
       def apply_to(dockerfile)
         dockerfile.run(
           'bundle', 'exec', 'rake', 'assets:precompile'

data/lib/kuby/docker/bundler_phase.rb

@@ -1,6 +1,8 @@
+require 'pathname'
+
 module Kuby
   module Docker
-    class BundlerPhase < Phase
+    class BundlerPhase < Layer
       DEFAULT_WITHOUT = ['development', 'test', 'deploy'].freeze
 
       attr_accessor :version, :gemfile, :without
@@ -48,7 +50,7 @@ module Kuby
           .definition
           .gemfiles
           .first
-          .relative_path_from(app.root)
+          .relative_path_from(Pathname(Dir.getwd))
           .to_s
       end
     end

data/lib/kuby/docker/copy_phase.rb

@@ -1,6 +1,6 @@
 module Kuby
   module Docker
-    class CopyPhase < Phase
+    class CopyPhase < Layer
       DEFAULT_PATHS = ['./'].freeze
 
       attr_reader :paths

data/lib/kuby/docker/inline_layer.rb

@@ -0,0 +1,15 @@
+module Kuby
+  module Docker
+    class InlineLayer < Layer
+      attr_reader :block
+
+      def initialize(block)
+        @block = block
+      end
+
+      def apply_to(dockerfile)
+        block.call(dockerfile)
+      end
+    end
+  end
+end

data/lib/kuby/docker/{phase.rb → layer.rb}

@@ -1,18 +1,19 @@
 module Kuby
   module Docker
-    class Phase
+    class Layer
       attr_reader :definition
 
       def initialize(definition)
         @definition = definition
       end
 
-      private
-
-      def app
-        definition.app
+      def apply_to(dockerfile)
+        raise NotImplementedError,
+          "#{__method__} must be defined in derived classes"
       end
 
+      private
+
       def metadata
         definition.docker.metadata
       end

data/lib/kuby/docker/layer_stack.rb

@@ -15,12 +15,31 @@ module Kuby
         @stack.each { |name| yield layers[name] }
       end
 
-      def use(name, layer)
+      def use(name, layer = nil, &block)
         stack << name
-        layers[name] = layer
+
+        if layer
+          layers[name] = layer
+        elsif block_given?
+          layers[name] = InlineLayer.new(block)
+        else
+          raise "Must either pass a layer object or a block to `#{__method__}'"
+        end
       end
 
-      def insert(name, layer, options = {})
+      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:
+        #
+        # insert :foo, FooLayer.new, before: :bundler_phase
+        # insert :foo, before: :bundler_phase do
+        #   ...
+        # end
+        if layer.is_a?(Hash)
+          insert(name, nil, options.merge(layer), &block)
+          return
+        end
+
         existing_name = options[:before] || options[:after]
         idx = stack.index(existing_name)
 
@@ -30,7 +49,14 @@ module Kuby
 
         idx += 1 if options[:after]
         stack.insert(idx, name)
-        layers[name] = layer
+
+        if layer
+          layers[name] = layer
+        elsif block_given?
+          layers[name] = InlineLayer.new(block)
+        else
+          raise "Must either pass a layer object or a block to `#{__method__}'"
+        end
       end
 
       def delete(name)

data/lib/kuby/docker/metadata.rb

@@ -8,7 +8,7 @@ module Kuby
       LATEST_TAG = 'latest'
 
       attr_accessor :image_url
-      attr_reader :definition, :distro
+      attr_reader :definition
 
       def initialize(definition)
         @definition = definition
@@ -40,6 +40,32 @@ module Kuby
         @tags.empty? ? default_tags : @tags
       end
 
+      def tag
+        t = ENV.fetch('KUBY_DOCKER_TAG') do
+          definition.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 = definition.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
+
       def distro=(distro_name)
         @distro = distro_name
       end

data/lib/kuby/docker/package_phase.rb

@@ -1,6 +1,6 @@
 module Kuby
   module Docker
-    class PackagePhase < Phase
+    class PackagePhase < Layer
       attr_reader :operations
 
       def initialize(*args)

data/lib/kuby/docker/packages.rb

@@ -1,10 +1,11 @@
 module Kuby
   module Docker
     module Packages
-      autoload :ManagedPackage, 'kuby/docker/packages/managed_package'
-      autoload :Nodejs,         'kuby/docker/packages/nodejs'
-      autoload :Package,        'kuby/docker/packages/package'
-      autoload :Yarn,           'kuby/docker/packages/yarn'
+      autoload :ManagedPackage,       'kuby/docker/packages/managed_package'
+      autoload :Nodejs,               'kuby/docker/packages/nodejs'
+      autoload :Package,              'kuby/docker/packages/package'
+      autoload :SimpleManagedPackage, 'kuby/docker/packages/simple_managed_package'
+      autoload :Yarn,                 'kuby/docker/packages/yarn'
     end
   end
 end

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

@@ -0,0 +1,25 @@
+module Kuby
+  module Docker
+    module Packages
+      class SimpleManagedPackage
+        attr_reader :name
+
+        def initialize(name)
+          @name = name
+        end
+
+        def package_name_for(distro)
+          name
+        end
+
+        def with_version(*)
+          self
+        end
+
+        def managed?
+          true
+        end
+      end
+    end
+  end
+end

data/lib/kuby/docker/setup_phase.rb

@@ -1,6 +1,6 @@
 module Kuby
   module Docker
-    class SetupPhase < Phase
+    class SetupPhase < Layer
       DEFAULT_WORKING_DIR = '/usr/src/app'.freeze
 
       attr_accessor :base_image, :working_dir

data/lib/kuby/docker/spec.rb

@@ -50,12 +50,12 @@ module Kuby
         metadata.image_url = url
       end
 
-      def use(*args)
-        layer_stack.use(*args)
+      def use(*args, &block)
+        layer_stack.use(*args, &block)
       end
 
-      def insert(*args)
-        layer_stack.insert(*args)
+      def insert(*args, &block)
+        layer_stack.insert(*args, &block)
       end
 
       def delete(*args)

data/lib/kuby/docker/tags.rb

@@ -19,10 +19,28 @@ module Kuby
         (local.latest_tags + remote.latest_tags).uniq
       end
 
+      def previous_timestamp_tag(current_tag)
+        current_tag = ::Kuby::Docker::TimestampTag.try_parse(current_tag)
+        all_tags = timestamp_tags.sort
+
+        idx = all_tags.index do |tag|
+          tag.time == current_tag.time
+        end
+
+        idx ||= 0
+        return nil unless idx > 0
+
+        all_tags[idx - 1]
+      end
+
       def timestamp_tags
         (local.timestamp_tags + remote.timestamp_tags).uniq
       end
 
+      def latest_timestamp_tag
+        @latest_timestamp_tag ||= timestamp_tags.sort.last
+      end
+
       def all
         self
       end

data/lib/kuby/docker/webserver_phase.rb

@@ -1,6 +1,6 @@
 module Kuby
   module Docker
-    class WebserverPhase < Phase
+    class WebserverPhase < Layer
       class Puma
         attr_reader :phase
 

data/lib/kuby/docker/yarn_phase.rb

@@ -1,6 +1,6 @@
 module Kuby
   module Docker
-    class YarnPhase < Phase
+    class YarnPhase < Layer
       def apply_to(dockerfile)
         dockerfile.copy('package.json', '.')
         dockerfile.copy('yarn.lock*', '.')

data/lib/kuby/environment.rb

@@ -0,0 +1,22 @@
+module Kuby
+  class Environment
+    attr_reader :name, :definition
+
+    def initialize(name, definition, &block)
+      @name = name
+      @definition = definition
+    end
+
+    def docker(&block)
+      @docker ||= Docker::Spec.new(definition)
+      @docker.instance_eval(&block) if block
+      @docker
+    end
+
+    def kubernetes(&block)
+      @kubernetes ||= Kubernetes::Spec.new(definition)
+      @kubernetes.instance_eval(&block) if block
+      @kubernetes
+    end
+  end
+end

data/lib/kuby/kubernetes.rb

@@ -4,6 +4,7 @@ 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 :Monitors,         'kuby/kubernetes/monitors'

data/lib/kuby/kubernetes/deploy_task.rb

@@ -0,0 +1,33 @@
+require 'krane'
+require 'ext/krane/kubernetes_resource'
+require 'kubectl-rb'
+
+module Kuby
+  module Kubernetes
+    class DeployTask
+      attr_reader :deploy_task
+
+      def initialize(**kwargs)
+        @deploy_task ||= ::Krane::DeployTask.new(**kwargs)
+      end
+
+      def run!(**kwargs)
+        new_path = "#{File.dirname(KubectlRb.executable)}:#{ENV['PATH']}"
+
+        with_env('PATH' => new_path) do
+          deploy_task.run!(**kwargs)
+        end
+      end
+
+      private
+
+      def with_env(new_env)
+        old_env = ENV.to_h
+        ENV.replace(old_env.merge(new_env))
+        yield
+      ensure
+        ENV.replace(old_env)
+      end
+    end
+  end
+end

data/lib/kuby/kubernetes/deployer.rb

@@ -1,5 +1,4 @@
 require 'fileutils'
-require 'krane'
 require 'securerandom'
 require 'yaml'
 
@@ -62,7 +61,7 @@ module Kuby
           File.write(resource_path, resource.to_resource.to_yaml)
         end
 
-        task = ::Krane::DeployTask.new(
+        task = ::Kuby::Kubernetes::DeployTask.new(
           namespace: namespace.metadata.name,
           context: cli.current_context,
           filenames: [tmpdir]

data/lib/kuby/kubernetes/minikube_provider.rb

@@ -26,11 +26,6 @@ module Kuby
           rails_app.resources.delete(rails_app.ingress)
           rails_app.service.spec { type 'LoadBalancer' }
         end
-
-        configure do
-          # default kubeconfig path
-          kubeconfig File.join(ENV['HOME'], '.kube', 'config')
-        end
       end
 
       def kubeconfig_path
@@ -45,6 +40,11 @@ module Kuby
 
       def after_initialize
         @config = Config.new
+
+        configure do
+          # default kubeconfig path
+          kubeconfig File.join(ENV['HOME'], '.kube', 'config')
+        end
       end
     end
   end

data/lib/kuby/kubernetes/plugins/nginx_ingress.rb

@@ -27,6 +27,11 @@ module Kuby
         def setup
           Kuby.logger.info('Deploying nginx ingress resources')
 
+          if already_deployed?
+            Kuby.logger.info('Nginx ingress already deployed, skipping')
+            return
+          end
+
           SETUP_RESOURCES.each do |uri|
             uri = uri % { provider: @config.provider || DEFAULT_PROVIDER }
             kubernetes_cli.apply_uri(uri)
@@ -48,6 +53,13 @@ module Kuby
 
         private
 
+        def already_deployed?
+          kubernetes_cli.get_object('Service', 'ingress-nginx', 'ingress-nginx')
+          true
+        rescue KubernetesCLI::GetResourceError
+          return false
+        end
+
         def after_initialize
           @config = Config.new
         end

data/lib/kuby/kubernetes/plugins/rails_app/database.rb

@@ -1,3 +1,6 @@
+require 'erb'
+require 'yaml'
+
 module Kuby
   module Kubernetes
     module Plugins
@@ -11,27 +14,29 @@ module Kuby
             'postgresql' => Postgres
           }.freeze
 
-          def self.get(definition)
-            new(definition).database
+          def self.get(rails_app)
+            if rails_app.manage_database?
+              new(rails_app).database
+            end
           end
 
           def self.get_adapter(adapter)
             ADAPTER_MAP.fetch(adapter) do
-              raise UnsupportedDatabaseError, "Kuby does not support the '#{adapter}'"\
+              raise UnsupportedDatabaseError, "Kuby does not support the '#{adapter}' "\
                 'database adapter'
             end
           end
 
-          attr_reader :definition
+          attr_reader :rails_app
 
-          def initialize(definition)
-            @definition = definition
+          def initialize(rails_app)
+            @rails_app = rails_app
           end
 
           def database
             @database ||= self.class
               .get_adapter(adapter)
-              .new(definition, environment, db_configs)
+              .new(rails_app, environment, db_configs)
           end
 
           private
@@ -45,11 +50,27 @@ module Kuby
           end
 
           def environment
-            @environment ||= definition.environment
+            @environment ||= rails_app.definition.environment.name
           end
 
           def db_configs
-            @db_configs ||= definition.app.config.database_configuration
+            @db_configs ||= YAML.load(ERB.new(File.read(db_config_path)).result)
+          end
+
+          def db_config_path
+            @db_config_path ||= begin
+              db_config_paths.first or
+                raise "Couldn't find database config at #{rails_app.root}"
+            end
+          end
+
+          def db_config_paths
+            @db_config_paths ||=
+              Dir.glob(
+                File.join(
+                  rails_app.root, 'config', 'database.{yml,erb,yml.erb,yaml,yaml.erb}'
+                )
+              )
           end
         end
       end