indocker 0.1.6 → 0.1.11

data/lib/indocker/context_args.rb

@@ -16,6 +16,8 @@ class Indocker::ContextArgs
     value = @context_args.fetch(name) do
       Indocker.logger.warn("build arg '#{format_arg(name)}' is not defined#{@container ? " for container :#{@container.name}" : ""}")
       Indocker.logger.warn("available args: #{@context_args.inspect}")
+
+      nil
     end
 
     if value.is_a?(Hash)

data/lib/indocker/deploy_context.rb

@@ -9,15 +9,17 @@ class Indocker::DeployContext
     @configuration = configuration
     @server = server
     @restart_policy = Indocker::Containers::RestartPolicy.new(configuration, logger)
+  end
 
-    if server
-      @session = Indocker::SshSession.new(
-        host: server.host,
-        user: server.user,
-        port: server.port,
-        logger: @logger
-      )
-    end
+  def create_session!
+    return unless @server
+    
+    @session = Indocker::SshSession.new(
+      host: @server.host,
+      user: @server.user,
+      port: @server.port,
+      logger: @logger
+    )
   end
 
   def exec!(command)

data/lib/indocker/deployment_policy.rb

@@ -0,0 +1,22 @@
+class Indocker::DeploymentPolicy
+  attr_reader  :deploy_containers, :deploy_tags, :servers, 
+               :skip_dependent, :skip_tags, :skip_containers, :skip_build, :skip_deploy, 
+               :force_restart, :skip_force_restart, :auto_confirm, :require_confirmation
+
+  def initialize(deploy_containers:, deploy_tags:, servers:, 
+                skip_dependent:, skip_tags:, skip_containers:, skip_build:, skip_deploy:, 
+                force_restart:, skip_force_restart:, auto_confirm:, require_confirmation:)
+    @deploy_containers = deploy_containers
+    @deploy_tags = deploy_tags
+    @servers = servers
+    @skip_dependent = skip_dependent
+    @skip_tags = skip_tags
+    @skip_containers = skip_containers
+    @skip_build = skip_build
+    @skip_deploy = skip_deploy
+    @force_restart = force_restart
+    @skip_force_restart = skip_force_restart
+    @auto_confirm = auto_confirm
+    @require_confirmation = require_confirmation
+  end
+end

data/lib/indocker/deployment_progress.rb

@@ -70,9 +70,10 @@ class Indocker::DeploymentProgress
   end
 
   def setup(binaries_servers:, build_servers:, deploy_servers:, env_files:, artifact_servers:,
-            repositories:, force_restart:, skip_build:, containers:)
+            repositories:, force_restart:, skip_build:, skip_deploy:, containers:)
     @force_restart = force_restart
-    @skip_build = skip_build
+    @skip_build    = skip_build
+    @skip_deploy   = skip_deploy
 
     binaries_servers.each do |server|
       @synced_binaries[server] = {
@@ -250,6 +251,10 @@ class Indocker::DeploymentProgress
       @logger.info("Warning: Image build is skipped for all containers".purple)
     end
 
+    if @skip_deploy
+      @logger.info("Warning: All container deployment is skipped".purple)
+    end
+
     if @force_restart
       @logger.info("Warning: All containers will be force restarted".purple)
     end

data/lib/indocker/images_compiler.rb

@@ -9,7 +9,7 @@ class Indocker::ImagesCompiler
     build_context = Indocker::BuildContext.new(
       configuration: configuration,
       build_server:  nil,
-      logger: Indocker.logger
+      logger: @logger
     )
 
     image_compiler = Indocker::Images::ImageCompiler.new

data/lib/indocker/logger_factory.rb

@@ -0,0 +1,37 @@
+class Indocker::LoggerFactory
+  class << self
+    def create(stdout, level = nil)
+      logger = Logger.new(stdout)
+
+      logger.level = level || Logger::INFO
+
+      logger.formatter = proc do |severity, datetime, progname, msg|
+        level = Logger::SEV_LABEL.index(severity)
+
+        severity = case level
+        when Logger::INFO
+          severity.green
+        when Logger::WARN
+          severity.purple
+        when Logger::DEBUG
+          severity.yellow
+        when Logger::ERROR
+          severity.red
+        when Logger::FATAL
+          severity.red
+        else
+          severity
+        end
+
+        severity = severity.downcase
+        if logger.debug?
+          "#{datetime.strftime("%Y/%m/%d %H:%M:%S")} #{severity}: #{msg}\n"
+        else
+          "  #{severity}: #{msg}\n"
+        end
+      end
+
+      logger
+    end
+  end
+end

data/lib/indocker/server_pool.rb

@@ -12,12 +12,20 @@ class Indocker::ServerPool
     end
   end
 
+  def create_sessions!
+    @contexts.each(&:create_session!)
+  end
+
+  # NOTE: get is a bad name here, because we create a new connection.
+  # TODO: why we create a new connection here?
   def get(server)
-    Indocker::DeployContext.new(
+    context = Indocker::DeployContext.new(
       logger: @logger,
       configuration: @configuration,
       server: server,
     )
+    context.create_session!
+    context
   end
 
   def each(&proc)

data/lib/indocker/ssh_session.rb

@@ -37,11 +37,27 @@ class Indocker::SshSession
     !@ssh
   end
 
-  def exec!(command)
-    if !@ssh
+  def exec!(command, on_stdout: nil, on_stderr: nil)
+    if local?
+      exec_locally!(command)
+    else
+      exec_remotely!(command, on_stdout: on_stdout, on_stderr: on_stderr)
+    end
+  end
+
+  def close
+    if @ssh
+      @ssh.close
+    end
+  end
+
+  private
+    def exec_locally!(command)
       res = Indocker::Shell.command_with_result(command, @logger, skip_logging: false)
       ExecResult.new(res.stdout, '', res.exit_status, nil)
-    else
+    end
+
+    def exec_remotely!(command, on_stdout:, on_stderr:)
       if Indocker.export_command
         command = "#{Indocker.export_command} && #{command}"
       end
@@ -62,10 +78,12 @@ class Indocker::SshSession
 
           channel.on_data do |ch,data|
             stdout_data += data
+            on_stdout.call(data) if on_stdout
           end
 
           channel.on_extended_data do |ch,type,data|
             stderr_data += data
+            on_stderr.call(data) if on_stderr
           end
 
           channel.on_request('exit-status') do |ch,data|
@@ -82,11 +100,4 @@ class Indocker::SshSession
 
       ExecResult.new(stdout_data, stderr_data, exit_code, exit_signal)
     end
-  end
-
-  def close
-    if @ssh
-      @ssh.close
-    end
-  end
 end

data/lib/indocker/version.rb

@@ -1,3 +1,3 @@
 module Indocker
-  VERSION = "0.1.6"
+  VERSION = "0.1.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: indocker
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.11
 platform: ruby
 authors:
 - Ruslan Gatiyatov
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-01 00:00:00.000000000 Z
+date: 2020-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -88,15 +88,28 @@ files:
 - example/indocker/bin/remote/compile
 - example/indocker/bin/remote/run
 - example/indocker/bin/utils/configurations.rb
+- example/indocker/bounded_contexts/shared/bad_container_build/Dockerfile
+- example/indocker/bounded_contexts/shared/bad_container_build/container.rb
+- example/indocker/bounded_contexts/shared/bad_container_build/image.rb
+- example/indocker/bounded_contexts/shared/bad_container_start/Dockerfile
+- example/indocker/bounded_contexts/shared/bad_container_start/build_context/bin/run
+- example/indocker/bounded_contexts/shared/bad_container_start/container.rb
+- example/indocker/bounded_contexts/shared/bad_container_start/image.rb
+- example/indocker/bounded_contexts/shared/good_container/Dockerfile
+- example/indocker/bounded_contexts/shared/good_container/container.rb
+- example/indocker/bounded_contexts/shared/good_container/image.rb
 - example/indocker/bounded_contexts/shared/ruby/Dockerfile
 - example/indocker/bounded_contexts/shared/ruby/container.rb
 - example/indocker/bounded_contexts/shared/ruby/image.rb
 - example/indocker/configurations/dev.rb
+- example/indocker/configurations/external.rb
 - example/indocker/infrastructure/build_servers.rb
 - example/indocker/infrastructure/networks.rb
 - example/indocker/infrastructure/registries.rb
 - example/indocker/infrastructure/servers.rb
 - example/indocker/setup.rb
+- example/spec/indocker_spec.rb
+- example/spec/spec_helper.rb
 - indocker.gemspec
 - lib/indocker.rb
 - lib/indocker/artifacts/git.rb
@@ -120,6 +133,7 @@ files:
 - lib/indocker/crontab_redeploy_rules_builder.rb
 - lib/indocker/deploy_context.rb
 - lib/indocker/deployment_checker.rb
+- lib/indocker/deployment_policy.rb
 - lib/indocker/deployment_progress.rb
 - lib/indocker/docker.rb
 - lib/indocker/docker_run_args.rb
@@ -134,6 +148,7 @@ files:
 - lib/indocker/images/templates_compiler.rb
 - lib/indocker/images_compiler.rb
 - lib/indocker/indocker_helper.rb
+- lib/indocker/logger_factory.rb
 - lib/indocker/network.rb
 - lib/indocker/network_helper.rb
 - lib/indocker/registries/abstract.rb
@@ -148,7 +163,6 @@ files:
 - lib/indocker/server.rb
 - lib/indocker/server_pool.rb
 - lib/indocker/shell.rb
-- lib/indocker/ssh_result_logger.rb
 - lib/indocker/ssh_session.rb
 - lib/indocker/version.rb
 - lib/indocker/volume_helper.rb

data/lib/indocker/ssh_result_logger.rb

@@ -1,18 +0,0 @@
-class Indocker::SshResultLogger
-  def initialize(logger)
-    @logger = logger
-  end
-
-  def log(result, error_message)
-    if result.exit_code == 0
-      puts result.stdout_data
-    else
-      @logger.error(error_message)
-      puts result.stdout_data
-
-      result.stderr_data.to_s.split("\n").each do |line|
-        @logger.error(line)
-      end
-    end
-  end
-end