dapp 0.11.0 → 0.12.0

data/lib/dapp/dapp.rb

@@ -19,15 +19,11 @@ module Dapp
 
     include Shellout::Base
 
-    attr_reader :cli_options
-    attr_reader :dimgs_patterns
+    attr_reader :options
 
-    def initialize(cli_options: {}, dimgs_patterns: nil)
-      @cli_options = cli_options
-      @dimgs_patterns = dimgs_patterns || []
-      @dimgs_patterns << '*' unless @dimgs_patterns.any?
-
-      Logging::Paint.initialize(cli_options[:log_color])
+    def initialize(options: {})
+      @options = options
+      Logging::Paint.initialize(options[:log_color])
       Logging::I18n.initialize
     end
 
@@ -68,8 +64,8 @@ module Dapp
 
     def build_path
       @build_path ||= begin
-        if cli_options[:build_dir]
-          Pathname.new(cli_options[:build_dir])
+        if options[:build_dir]
+          Pathname.new(options[:build_dir])
         else
           Pathname.new(path).join('.dapp_build')
         end.expand_path.tap(&:mkpath)
@@ -92,9 +88,5 @@ module Dapp
     def stage_dapp_label
       name
     end
-
-    def dev_mode?
-      !!cli_options[:dev]
-    end
   end # Dapp
 end # Dapp

data/lib/dapp/dapp/dappfile.rb

@@ -9,21 +9,13 @@ module Dapp
         end
       end
 
-      def build_configs
-        @configs ||= begin
-          dimgs(dappfile_path).flatten.tap do |dimgs|
-            raise Error::Dapp, code: :no_such_dimg, data: { dimgs_patterns: dimgs_patterns.join(', ') } if dimgs.empty?
-          end
-        end
-      end
-
       def dappfile_path
         raise Error::Dapp, code: :dappfile_not_found unless (dappfile_path = search_file_upward('Dappfile'))
         dappfile_path
       end
 
       def work_dir
-        File.expand_path(cli_options[:dir] || Dir.pwd)
+        File.expand_path(options[:dir] || Dir.pwd)
       end
 
       def expand_path(path, number = 1)
@@ -32,27 +24,28 @@ module Dapp
         path
       end
 
-      def dimgs(dappfile_path)
-        Dimg::Config::DimgGroupMain.new(dapp: self) do |conf|
-          begin
-            conf.instance_eval File.read(dappfile_path), dappfile_path
-          rescue SyntaxError, StandardError => e
-            backtrace = e.backtrace.find { |line| line.start_with?(dappfile_path) }
-            message = begin
-              case e
-              when NoMethodError
-                e.message =~ /`.*'/
-                "undefined method #{Regexp.last_match}"
-              when NameError then e.message[/.*(?= for)/]
-              else
-                e.message
+      def config
+        @config ||= begin
+          ::Dapp::Config::Config.new(dapp: self).tap do |config|
+            begin
+              config.instance_eval File.read(dappfile_path), dappfile_path
+              config.validate!
+            rescue SyntaxError, StandardError => e
+              backtrace = e.backtrace.find { |line| line.start_with?(dappfile_path) }
+              message = begin
+                case e
+                when NoMethodError
+                  e.message =~ /`.*'/
+                  "undefined method #{Regexp.last_match}"
+                when NameError then e.message[/.*(?= for)/]
+                else
+                  e.message
+                end
               end
+              message = "#{backtrace[/.*(?=:in)/]}: #{message}" if backtrace
+              raise Error::Dappfile, code: :incorrect, data: { error: e.class.name, message: message }
             end
-            message = "#{backtrace[/.*(?=:in)/]}: #{message}" if backtrace
-            raise Error::Dappfile, code: :incorrect, data: { error: e.class.name, message: message }
           end
-        end._dimg.select { |dimg| dimgs_patterns.any? { |pattern| dimg._name.nil? || File.fnmatch(pattern, dimg._name) } }.tap do |dimgs|
-          dimgs.each { |dimg| dimg.send(:validate!) }
         end
       end
     end # Dappfile

data/lib/dapp/dapp/deps/base.rb

@@ -24,8 +24,8 @@ module Dapp
         end
 
         %w(rm rsync diff date cat
-           stat test sleep mkdir find
-           install sed cp true
+           stat readlink test sleep mkdir
+           install sed cp true find
            bash tar sudo).each do |cmd|
           define_method("#{cmd}_bin") { "/.dapp/deps/base/#{BASE_VERSION}/bin/#{cmd}" }
         end

data/lib/dapp/dapp/lock.rb

@@ -14,7 +14,7 @@ module Dapp
         if dry_run?
           yield if block_given?
         else
-          timeout = cli_options[:lock_timeout] || default_timeout
+          timeout = options[:lock_timeout] || default_timeout
           _lock(name).synchronize(
             timeout: timeout,
             on_wait: proc do |&do_wait|

data/lib/dapp/dapp/logging/base.rb

@@ -3,31 +3,35 @@ module Dapp
     module Logging
       module Base
         def log_quiet?
-          cli_options[:log_quiet]
+          options[:log_quiet]
         end
 
         def log_time?
-          cli_options[:log_time]
+          options[:log_time]
         end
 
         def log_verbose?
-          cli_options[:log_verbose]
+          options[:log_verbose]
         end
 
         def ignore_config_warning?
-          cli_options[:ignore_config_warning]
+          options[:ignore_config_warning]
         end
 
         def introspect_error?
-          cli_options[:introspect_error]
+          options[:introspect_error]
         end
 
         def introspect_before_error?
-          cli_options[:introspect_before_error]
+          options[:introspect_before_error]
         end
 
         def dry_run?
-          cli_options[:dry_run]
+          options[:dry_run]
+        end
+
+        def dev_mode?
+          options[:dev].nil? ? config._dev_mode : options[:dev]
         end
 
         def log_info(*args, **kwargs)

data/lib/dapp/dapp/logging/process.rb

@@ -25,7 +25,7 @@ module Dapp
         end
 
         # rubocop:disable Metrics/ParameterLists
-        def log_process(message, process: nil, short: false, quiet: false, style: {}, status: {}, &blk)
+        def log_process(message, process: nil, short: false, quiet: false, verbose: nil, style: {}, status: {}, &blk)
           style[:message] ||= DEFAULT_STYLE[:message]
           style[:process] ||= DEFAULT_STYLE[:process]
           style[:failed] ||= DEFAULT_STYLE[:failed]
@@ -34,9 +34,11 @@ module Dapp
           status[:success] ||= t(code: 'status.success.default')
           status[:failed] ||= t(code: 'status.failed.default')
 
+          is_verbose = (verbose.nil? ? log_verbose? : verbose) && !short
+
           if quiet
             log_process_quiet(message.to_s, style: style, status: status, &blk)
-          elsif log_verbose? && !short
+          elsif is_verbose
             process ||= t(code: 'status.process.default')
             log_process_verbose(message.to_s, process: process, style: style, status: status, &blk)
           else

data/lib/dapp/dapp/shellout/base.rb

@@ -49,12 +49,12 @@ module Dapp
 
         protected
 
-        def shellout_with_logging(log_verbose: false, **kwargs)
+        def shellout_with_logging(log_verbose: false, force_log: false, **kwargs)
           return yield(**kwargs) unless instance_of? Dapp
 
           begin
             stream = Stream.new
-            if log_verbose && log_verbose?
+            if force_log || (log_verbose && log_verbose?)
               kwargs[:live_stream] = Proxy::Base.new(stream, STDOUT, with_time: log_time?)
             else
               kwargs[:live_stdout] = Proxy::Base.new(stream, with_time: log_time?)

data/lib/dapp/dapp/ssh_agent.rb

@@ -60,9 +60,9 @@ module Dapp
       end
 
       def setup_ssh_agent
-        return unless cli_options[:ssh_key]
+        return unless options[:ssh_key]
 
-        cli_options[:ssh_key].each do |ssh_key|
+        options[:ssh_key].each do |ssh_key|
           raise Error::Dapp, code: :ssh_key_not_found, data: { path: ssh_key } unless File.exist? ssh_key
 
           File.chmod 0o600, ssh_key

data/lib/dapp/deployment.rb

@@ -0,0 +1 @@
+module Dapp::Deployment; end

data/lib/dapp/deployment/app.rb

@@ -0,0 +1,120 @@
+module Dapp
+  module Deployment
+    class App
+      include Mod::Namespace
+      include Mod::SystemEnvironments
+      include Mod::Jobs
+
+      attr_reader :deployment
+      attr_reader :app_config
+      alias config app_config
+
+      def initialize(app_config:, deployment:)
+        @app_config = app_config
+        @deployment = deployment
+      end
+
+      def name(*args)
+        deployment.name(app_config._name, *args)
+      end
+
+      def kube
+        @kube ||= KubeApp.new(self)
+      end
+
+      [:dimg, :expose, :bootstrap, :migrate].each do |directive|
+        define_method directive do
+          app_config.public_send("_#{directive}")
+        end
+      end
+
+      def to_kube_deployments(repo, image_version)
+        {}.tap do |hash|
+          hash[name] = {}.tap do |deployment|
+            deployment['metadata'] = {}.tap do |metadata|
+              metadata['name']   = name
+              metadata['labels'] = kube.labels
+            end
+            deployment['spec'] = {}.tap do |spec|
+              spec['replicas'] = scale
+              spec['template'] = {}
+              spec['template']['metadata'] = deployment['metadata']
+              spec['template']['spec'] = {}.tap do |template_spec|
+                template_spec['containers'] = [].tap do |containers|
+                  containers << {}.tap do |container|
+                    ports = expose._port.map do |port|
+                      {
+                        'containerPort' => port._number,
+                        'name' => ['app', port._number].join('-'),
+                        'protocol' => port._protocol
+                      }
+                    end
+                    volume_mounts = [{'mountPath' => '/.data', 'name' => "volume-#{self.name}"}]
+
+                    container['imagePullPolicy'] = 'Always'
+                    container['image']           = [repo, [dimg, image_version].compact.join('-')].join(':')
+                    container['name']            = dimg_name
+                    container['env']             = environments unless environments.empty?
+                    container['ports']           = ports unless expose._port.empty?
+                    container['volumeMounts']    = volume_mounts
+                  end
+                end
+
+                template_spec['volumes'] = [
+                  {
+                    'name' => "volume-#{name}",
+                    'hostPath' => {'path' => "/var/lib/dapp/deployment/volumes/#{self.deployment.name}/#{self.name}"}
+                  }
+                ]
+              end
+            end
+          end
+        end
+      end
+
+      def to_kube_services
+        return {} if expose._port.empty?
+
+        {}.tap do |hash|
+          hash[service_name] = {}.tap do |service|
+            service['metadata'] = {}.tap do |metadata|
+              metadata['name']   = service_name
+              metadata['labels'] = kube.labels
+            end
+            service['spec'] = {}.tap do |spec|
+              spec['selector'] = kube.labels
+              spec['ports']    = expose._port.map do |port|
+                {
+                  'port' => port._number,
+                  'name' => ['service', port._number].join('-'),
+                  'protocol' => port._protocol
+                }.tap do |h|
+                  h['targetPort'] = port._target unless port._target.nil?
+                end
+              end
+              spec['type'] = expose._type
+            end
+          end
+        end
+      end
+
+      protected
+
+      def dimg_name
+        name(dimg)
+      end
+
+      def service_name
+        name('service')
+      end
+
+      def namespace
+        deployment.namespace
+      end
+
+      def secret
+        deployment.dapp.secret
+      end
+    end
+  end
+end

data/lib/dapp/deployment/cli/cli.rb

@@ -0,0 +1 @@
+::Dapp::CLI.send(:include, ::Dapp::Deployment::CLI::Command)

data/lib/dapp/deployment/cli/command/base.rb

@@ -0,0 +1,14 @@
+module Dapp::Deployment::CLI
+  module Command
+    class Base < ::Dapp::CLI::Command::Base
+      def run(argv = ARGV)
+        self.class.parse_options(self, argv)
+        ::Dapp::Dapp.new(options: cli_options).public_send(run_method)
+      end
+
+      def run_method
+        :"deployment_#{class_to_lowercase}"
+      end
+    end
+  end
+end

data/lib/dapp/deployment/cli/command/deployment.rb

@@ -0,0 +1,21 @@
+module Dapp::Deployment::CLI
+  module Command
+    class Deployment < ::Dapp::CLI
+      SUBCOMMANDS = ['apply', 'mrproper', 'secret generate', 'secret key generate', 'minikube setup'].freeze
+
+      banner <<BANNER.freeze
+Usage: dapp deployment sub-command [sub-command options]
+
+Available subcommands: (for details, dapp deployment SUB-COMMAND --help)
+
+  dapp deployment apply [options] [APP ...] REPO
+  dapp deployment secret key generate
+  dapp deployment secret generate
+  dapp deployment minikube setup
+  dapp deployment mrproper [options]
+
+Options:
+BANNER
+    end
+  end
+end

data/lib/dapp/deployment/cli/command/deployment/apply.rb

@@ -0,0 +1,26 @@
+module Dapp::Deployment::CLI::Command
+  class Deployment < ::Dapp::CLI
+    class Apply < Base
+      banner <<BANNER.freeze
+Usage:
+
+  dapp deploy apply [options] [APP ...] REPO
+
+Options:
+BANNER
+
+      option :namespace,
+             long: '--namespace NAME'
+
+      option :image_version,
+             long: '--image-version IMAGE_VERSION',
+             default: 'latest'
+
+      def run(argv = ARGV)
+        self.class.parse_options(self, argv)
+        repo = self.class.required_argument(self, 'repo')
+        ::Dapp::Dapp.new(options: cli_options(apps_patterns: cli_arguments, repo: repo)).deployment_apply
+      end
+    end
+  end
+end

data/lib/dapp/deployment/cli/command/deployment/minikube_setup.rb

@@ -0,0 +1,13 @@
+module Dapp::Deployment::CLI::Command
+  class Deployment < ::Dapp::CLI
+    class MinikubeSetup < Base
+      banner <<BANNER.freeze
+Usage:
+
+  dapp deployment minikube setup
+
+Options:
+BANNER
+    end
+  end
+end

data/lib/dapp/deployment/cli/command/deployment/mrproper.rb

@@ -0,0 +1,13 @@
+module Dapp::Deployment::CLI::Command
+  class Deployment < ::Dapp::CLI
+    class Mrproper < Base
+      banner <<BANNER.freeze
+Usage:
+
+  dapp deployment mrproper [options]
+
+Options:
+BANNER
+    end
+  end
+end