indocker 0.1.11 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8625d37ada817f2f83c30f154bd2ed9a104a023e5b554f4c91f3708ed4aa2770
-  data.tar.gz: 24950eb94bd956f7f10ad81da4330bffa78495a4852733a1bec5d0713cce4896
+  metadata.gz: e93eba781605cba8bdb795ed40a03b16d3602508ca427639b42ead50c25b7ec6
+  data.tar.gz: 3e5dc1f5582c8ee45fa4e3583cfea13abf3121e52341eecdc98b8660db700d94
 SHA512:
-  metadata.gz: e50ef7ed88a688bb1119e55b1d1662d6827e5667cc66c61dc85933687e9d4834c785c03c7fb917a2709adf04d909f7e611f8c844741b1532211dddad340dc149
-  data.tar.gz: 1e52f25fff3bf09ddb7f1d097b46ad0e858555892d3b4721a628c8817a16e165694dbf3650e940eb83cb6ac05d8ded47c6359ada9d3cba39d3885ff95e9e88d0
+  metadata.gz: 4da7e1049911e4d0c12d89d977cfb568687f61568866ec82f737694c1023984ad97d205d25eaa35e19ebc46843d0743d1df07c833c48d293a5c10ca5de0fd792
+  data.tar.gz: 1a8205455ebf5da34c8039a87c45772807920e362e8814bee275ef578647a15edf9970a9c53196b5805aeba8d4b3b047e30e329b0637d393a390c9d32c68353f

data/.ruby-version

@@ -0,0 +1 @@
+2.5.0

data/Gemfile

@@ -6,6 +6,5 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 gemspec
 
 group :test do
-  gem 'rspec'
   gem 'pry'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    indocker (0.1.11)
+    indocker (0.1.16)
       net-ssh
 
 GEM
@@ -9,6 +9,7 @@ GEM
   specs:
     coderay (1.1.3)
     diff-lcs (1.3)
+    docile (1.3.2)
     method_source (1.0.0)
     net-ssh (6.1.0)
     pry (0.13.1)
@@ -28,6 +29,10 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
+    simplecov (0.18.5)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.2)
 
 PLATFORMS
   ruby
@@ -37,7 +42,8 @@ DEPENDENCIES
   indocker!
   pry
   rake (~> 12.3.3)
-  rspec
+  rspec (~> 3.0)
+  simplecov (~> 0.18.5)
 
 BUNDLED WITH
    1.17.3

data/example/indocker/bounded_contexts/shared/bad_container_build/container.rb

@@ -2,4 +2,5 @@ Indocker
   .define_container(:bad_container_build)
   .tags('bad_container_build', 'console=true')
   .image(:bad_container_build)
-  .networks(:app_net)
+  .networks(:app_net)
+  .daemonize(false)

data/example/indocker/bounded_contexts/shared/bad_container_start/container.rb

@@ -2,4 +2,5 @@ Indocker
   .define_container(:bad_container_start)
   .tags('bad_container_start', 'console=true')
   .image(:bad_container_start)
-  .networks(:app_net)
+  .networks(:app_net)
+  .daemonize(false)

data/example/indocker/bounded_contexts/shared/daemon_container/Dockerfile

@@ -0,0 +1,4 @@
+FROM ruby:2.5.0
+
+RUN mkdir /app
+WORKDIR /app

data/example/indocker/bounded_contexts/shared/daemon_container/container.rb

@@ -0,0 +1,6 @@
+Indocker
+  .define_container(:daemon_container)
+  .tags('daemon_container', 'console=true')
+  .image(:daemon_container)
+  .networks(:app_net)
+  .daemonize(true)

data/example/indocker/bounded_contexts/shared/daemon_container/image.rb

@@ -0,0 +1,3 @@
+Indocker
+  .define_image(:daemon_container)
+  .registry(:default)

data/example/indocker/bounded_contexts/shared/good_container/container.rb

@@ -2,4 +2,5 @@ Indocker
   .define_container(:good_container)
   .tags('good_container', 'console=true')
   .image(:good_container)
-  .networks(:app_net)
+  .networks(:app_net)
+  .daemonize(false)

data/example/indocker/bounded_contexts/shared/ruby/container.rb

@@ -2,4 +2,5 @@ Indocker
   .define_container(:ruby)
   .tags('ruby', 'console=true')
   .image(:ruby)
-  .networks(:app_net)
+  .networks(:app_net)
+  .daemonize(false)

data/example/indocker/configurations/external.rb

@@ -14,5 +14,10 @@ Indocker
     },
     bad_container_start: {
       servers: [:external],
+    },
+    daemon_container: {
+      servers: [:external],
     }
-  )
+  ).artifacts(
+    indocker_readme: [:external],
+  )

data/example/indocker/infrastructure/artifacts.rb

@@ -0,0 +1,10 @@
+Indocker.add_artifact(
+  Indocker::Artifacts::Git.new(
+    name:        :indocker_readme,
+    remote_name: 'origin',
+    remote_url:  'https://github.com/ArtStation/indocker.git',
+    branch:      :master,
+    source_path: './README.md',
+    target_path: File.join(Indocker.deploy_dir, 'README.md'),
+  )
+)

data/example/indocker/setup.rb

@@ -18,6 +18,7 @@ require_relative 'infrastructure/registries'
 require_relative 'infrastructure/servers'
 require_relative 'infrastructure/build_servers'
 require_relative 'infrastructure/networks'
+require_relative 'infrastructure/artifacts'
 
 Indocker.set_bounded_contexts_dir(File.join(__dir__, 'bounded_contexts'))
 

data/indocker.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "simplecov", "~> 0.18.5"
 end

data/lib/indocker.rb

@@ -50,6 +50,7 @@ module Indocker
     autoload :Local, 'volumes/local'
     autoload :External, 'volumes/external'
     autoload :Repository, 'volumes/repository'
+    autoload :VolumeHelper, 'volumes/volume_helper'
   end
 
   module EnvFiles
@@ -61,30 +62,42 @@ module Indocker
     autoload :Git, 'artifacts/git'
   end
 
+  module Networks
+    autoload :Network, 'networks/network'
+    autoload :NetworkHelper, 'networks/network_helper'
+  end
+
+  module Launchers
+    autoload :ConfigurationDeployer, 'launchers/configuration_deployer'
+    autoload :ImagesCompiler, 'launchers/images_compiler'
+    autoload :ContainerRunner, 'launchers/container_runner'
+  end
+
+  module ServerPools
+    autoload :ServerConnection, 'server_pools/server_connection'
+    autoload :DeployServerPool, 'server_pools/deploy_server_pool'
+    autoload :DeployServerConnection, 'server_pools/deploy_server_connection'
+    autoload :BuildServerPool, 'server_pools/build_server_pool'
+    autoload :BuildServerConnection, 'server_pools/build_server_connection'
+  end
+
   autoload :HashMerger, 'hash_merger'
   autoload :BuildServer, 'build_server'
   autoload :Server, 'server'
-  autoload :ConfigurationDeployer, 'configuration_deployer'
   autoload :SshSession, 'ssh_session'
-  autoload :BuildContextPool, 'build_context_pool'
   autoload :BuildContext, 'build_context'
   autoload :BuildContextHelper, 'build_context_helper'
   autoload :Shell, 'shell'
   autoload :Docker, 'docker'
   autoload :ContextArgs, 'context_args'
-  autoload :Network, 'network'
   autoload :ContainerDeployer, 'container_deployer'
-  autoload :ServerPool, 'server_pool'
   autoload :DeployContext, 'deploy_context'
   autoload :ContainerHelper, 'container_helper'
   autoload :DockerRunArgs, 'docker_run_args'
-  autoload :VolumeHelper, 'volume_helper'
-  autoload :NetworkHelper, 'network_helper'
   autoload :Rsync, 'rsync'
   autoload :EnvFileHelper, 'env_file_helper'
   autoload :IndockerHelper, 'indocker_helper'
-  autoload :ImagesCompiler, 'images_compiler'
-  autoload :ContainerRunner, 'container_runner'
+  autoload :SshResultLogger, 'ssh_result_logger'
   autoload :DeploymentProgress, 'deployment_progress'
   autoload :DeploymentChecker, 'deployment_checker'
   autoload :DeploymentPolicy, 'deployment_policy'
@@ -171,7 +184,7 @@ module Indocker
         raise ArgumentError.new("network :#{name} was already defined")
       end
 
-      networks.push(Indocker::Network.new(name))
+      networks.push(Indocker::Networks::Network.new(name))
     end
 
     def container_files
@@ -339,7 +352,7 @@ module Indocker
         require_confirmation: require_confirmation,
       )
 
-      Indocker::ConfigurationDeployer
+      Indocker::Launchers::ConfigurationDeployer
         .new(logger: Indocker.logger, global_logger: Indocker.global_logger)
         .run(
           configuration:     configuration,
@@ -356,7 +369,7 @@ module Indocker
         )
     end
 
-    def launched?(contaner_name, servers: [])
+    def launched?(contaner_name, servers: nil)
       silent_logger = Logger.new(File.open(File::NULL, "w"))
       Indocker::DeploymentChecker
         .new(silent_logger, silent_logger)
@@ -368,7 +381,7 @@ module Indocker
     end
 
     def compile(images:, skip_dependent:)
-      Indocker::ImagesCompiler
+      Indocker::Launchers::ImagesCompiler
         .new(Indocker.logger)
         .compile(
           configuration: configuration,
@@ -378,7 +391,7 @@ module Indocker
     end
 
     def run(container_name, force_restart)
-      Indocker::ContainerRunner
+      Indocker::Launchers::ContainerRunner
         .new(Indocker.logger)
         .run(
           configuration: configuration,

data/lib/indocker/build_context.rb

@@ -1,54 +1,18 @@
 require 'fileutils'
 
 class Indocker::BuildContext
-  attr_reader :session, :server, :configuration, :helper, :logger
+  attr_reader :configuration, :logger, :global_logger, :helper
 
-  def initialize(configuration:, build_server:, logger:)
+  def initialize(configuration:, logger:, global_logger:)
     @configuration = configuration
     @logger = logger
     @helper = Indocker::BuildContextHelper.new(@configuration, @build_server)
-    @server = build_server
-    @compiled_images = Hash.new(false)
-  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)
-    @session.exec!(command)
-  end
-
-  def close_session
-    @session.close if @session
-  end
-
-  def image_compiled?(image)
-    @compiled_images[image]
-  end
-
-  def set_busy(flag)
-    @busy = !!flag
-  end
-
-  def busy?
-    !!@busy
-  end
-
-  def set_compiled(image)
-    @compiled_images[image] = true
+    @global_logger = global_logger
   end
 
   def build_image(image, build_dir, args: [])
     image_name = image.image_name
-    registry = image.registry
+    registry   = image.registry
     tag        = image.tag
 
     FileUtils.cd(build_dir) do
@@ -72,13 +36,15 @@ class Indocker::BuildContext
       res = Indocker::Docker.build(image.local_registry_url, build_args)
       
       if res.exit_status != 0
-        puts "image compilation :#{image.name} failed"
-        puts res.stdout
+        @global_logger.error("image compilation :#{image.name} failed")
+        @global_logger.error(res.stdout)
         exit 1
       end
 
       Indocker::Docker.tag(image.local_registry_url, image.registry_url)
-      Indocker::Docker.tag(image.local_registry_url, image.local_registry_url)
+      if image.registry_url != image.local_registry_url
+        Indocker::Docker.tag(image.local_registry_url, image.local_registry_url)
+      end
 
       if !image.registry.is_local?
         Indocker::Docker.push(image.registry_url)

data/lib/indocker/container_deployer.rb

@@ -5,7 +5,7 @@ class Indocker::ContainerDeployer
     @configuration = configuration
     @logger = logger
 
-    @server_pool = Indocker::ServerPool.new(
+    @server_pool = Indocker::ServerPools::DeployServerPool.new(
       configuration: @configuration,
       logger: logger
     )
@@ -14,10 +14,6 @@ class Indocker::ContainerDeployer
     @deployed_servers = {}
   end
 
-  def create_sessions!
-    @server_pool.create_sessions!
-  end
-
   def deploy(container, force_restart, skip_force_restart, progress)
     return if @deployed_containers[container]
 
@@ -37,37 +33,23 @@ class Indocker::ContainerDeployer
       end
 
       exec_proc.call do
-        deploy_context = @server_pool.get(server)
+        deploy_server = @server_pool.create_connection!(server)
         @logger.info("Deploying container: #{container.name.to_s.green} to #{server.user}@#{server.host}")
 
-        command_output  = @logger.debug? ? "" : " > /dev/null"
-        debug_options   = @logger.debug? ? "-d" : ""
-
-        if force_restart && !skip_force_restart.include?(container.name)
-          force_restart_options = force_restart ? "-f" : ""
-        end
-
-        result = deploy_context
-          .session
-          .exec!(
-            "cd #{Indocker::IndockerHelper.indocker_dir} && ./bin/remote/run -C #{Indocker.configuration_name} -c #{container.name} #{debug_options} #{command_output} #{force_restart_options}",
-            on_stdout: proc { |data|
-              @logger.info("[deploy] #{data}")
-            },
-            on_stderr: proc { |data|
-              @logger.error("[deploy] #{data}")
-            }
+        result = deploy_server
+          .run_container_remotely(
+            configuration_name: Indocker.configuration_name,
+            container_name:     container.name,
+            force_restart:      force_restart && !skip_force_restart.include?(container.name)
           )
-        
+
         if result.exit_code != 0
-          @global_logger.error("[deploy] #{container.name.to_s.green} deployment for server #{server.name} failed")
-          puts result.stdout_data
           exit 1 
         end
-
+        
         @logger.info("Container deployment to #{server.user}@#{server.host} finished: #{container.name.to_s.green}")
 
-        deploy_context.close_session
+        deploy_server.close_session
         progress.finish_deploying_container(container, server)
       end
     end

data/lib/indocker/crontab_redeploy_rules_builder.rb

@@ -8,7 +8,7 @@ PATH=/usr/local/bundle/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sb
   CRONTAB
 
   LOG_FILE      = "/var/log/indocker-redeploy-%{env}.log"
-  COMMAND       = "export TERM=xterm;#{Indocker.deploy_dir}/indocker/bin/deploy -C %{env} -f -B -y -c %{container_name}"
+  COMMAND       = "export TERM=xterm;%{deploy_dir}/indocker/bin/deploy -C %{env} -f -B -y -c %{container_name}"
   REDEPLOY_RULE = %Q{%{schedule} echo `date` "- %{command}..." >> %{log_file}; %{command} 1>/dev/null 2>>%{log_file}; echo `date` "- done, exitcode = $?" >> %{log_file}}
 
   def initialize(configuration:, logger:)
@@ -41,6 +41,7 @@ PATH=/usr/local/bundle/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sb
     COMMAND % {
       env:            env,
       container_name: container.name,
+      deploy_dir: Indocker.deploy_dir
     }
   end
 

data/lib/indocker/deploy_context.rb

@@ -2,42 +2,14 @@ require 'digest'
 require 'fileutils'
 
 class Indocker::DeployContext
-  attr_reader :server, :session
+  attr_reader :configuration, :logger
 
-  def initialize(logger:, configuration:, server:)
+  def initialize(logger:, configuration:)
     @logger = logger
     @configuration = configuration
-    @server = server
     @restart_policy = Indocker::Containers::RestartPolicy.new(configuration, 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)
-    @session.exec!(command)
-  end
-
-  def close_session
-    @session.close if @session
-  end
-
-  def set_busy(flag)
-    @busy = !!flag
-  end
-
-  def busy?
-    !!@busy
-  end
-
   def deploy(container, force_restart)
     @logger.info("Deploying container: #{container.name.to_s.green}")
     @logger.debug("Deploy dir: #{Indocker.deploy_dir}")
@@ -46,14 +18,14 @@ class Indocker::DeployContext
 
     container.networks.each do |network|
       Indocker::Docker.create_network(
-        Indocker::NetworkHelper.name(@configuration.name, network)
+        Indocker::Networks::NetworkHelper.name(@configuration.name, network)
       )
     end
 
     container.volumes.each do |volume|
       if volume.is_a?(Indocker::Volumes::External)
         Indocker::Docker.create_volume(
-          Indocker::VolumeHelper.name(@configuration.name, volume)
+          Indocker::Volumes::VolumeHelper.name(@configuration.name, volume)
         )
       end
     end

data/lib/indocker/deployment_checker.rb

@@ -109,13 +109,15 @@ class Indocker::DeploymentChecker
     { missing_containers: total_missing_containers, invalid_containers: total_invalid_containers }
   end
 
-  def launched?(container_name, configuration:, servers:)
+  def launched?(container_name, configuration:, servers: nil)
     container = Indocker.containers.detect { |c| c.name == container_name.to_sym }
     hostnames = (container.get_start_option(:scale) || 1).times.map do |number|
       Indocker::ContainerHelper.hostname(configuration.name, container, number)
     end
 
-    result = run(configuration: configuration, servers: servers, only_containers: [container.name])
+    servers ||= container.servers.map(&:name)
+
+    result = run(configuration: configuration, servers: container.servers.map(&:name), only_containers: [container.name])
     result[:missing_containers].empty?
   end
 end

data/lib/indocker/docker_run_args.rb

@@ -159,7 +159,7 @@ class Indocker::DockerRunArgs
         if volume.is_a?(Indocker::Volumes::Local)
           args.push("-v #{volume.local_path}:#{volume.path}")
         elsif volume.is_a?(Indocker::Volumes::External)
-          name = Indocker::VolumeHelper.name(configuration.name, volume)
+          name = Indocker::Volumes::VolumeHelper.name(configuration.name, volume)
           args.push("-v #{name}:#{volume.path}")
         elsif volume.is_a?(Indocker::Volumes::Repository)
           repository = configuration.repositories.fetch(volume.repository_name) do
@@ -173,7 +173,7 @@ class Indocker::DockerRunArgs
       end
 
       container.networks.each do |network|
-        name = Indocker::NetworkHelper.name(configuration.name, network)
+        name = Indocker::Networks::NetworkHelper.name(configuration.name, network)
         args.push("--network #{name}")
       end
 

data/lib/indocker/images/image_compiler.rb

@@ -61,7 +61,6 @@ class Indocker::Images::ImageCompiler
     end
 
     build_context.build_image(image, compile_dir)
-    build_context.set_compiled(image)
 
     @compiled_images[image] = true
   end

data/lib/indocker/{configuration_deployer.rb → launchers/configuration_deployer.rb}

@@ -2,7 +2,7 @@ require 'timeout'
 require 'benchmark'
 require 'tempfile'
 
-class Indocker::ConfigurationDeployer
+class Indocker::Launchers::ConfigurationDeployer
   REMOTE_OPERATION_TIMEOUT = 60
 
   def initialize(logger:, global_logger:)
@@ -14,13 +14,11 @@ class Indocker::ConfigurationDeployer
     @progress = Indocker::DeploymentProgress.new(
       Indocker.logger.level == Logger::DEBUG ? nil : Logger.new(STDOUT)
     )
+    @compiled_images = Hash.new(false)
   end
 
   # Launch deployment & measure the benchmark
   def run(configuration:, deployment_policy:)
-    build_context_pool = nil
-    deployer = nil
-
     time = Benchmark.realtime do
       if deployment_policy.force_restart
         @logger.warn("WARNING. All containers will be forced to restart.")
@@ -46,12 +44,11 @@ class Indocker::ConfigurationDeployer
     containers = find_containers_to_deploy(configuration, deployment_policy)
 
     clonner = Indocker::Repositories::Clonner.new(configuration, @logger)
-    build_context_pool = Indocker::BuildContextPool.new(configuration: configuration, logger: @logger)
+    build_server_pool = Indocker::ServerPools::BuildServerPool.new(configuration: configuration, logger: @logger)
     deployer = Indocker::ContainerDeployer.new(configuration: configuration, logger: @logger)
     
     @global_logger.info("Establishing ssh sessions to all servers...")
-    build_context_pool.create_sessions!
-    deployer.create_sessions!
+    build_server_pool.create_sessions!
 
     build_servers = configuration
       .build_servers
@@ -95,7 +92,7 @@ class Indocker::ConfigurationDeployer
       recursively_deploy_container(
         configuration, 
         deployer, 
-        build_context_pool, 
+        build_server_pool, 
         container, 
         containers, 
         deployment_policy.skip_build, 
@@ -109,7 +106,7 @@ class Indocker::ConfigurationDeployer
       .list
       .each { |t| t.join if t != Thread.current }
   ensure
-    build_context_pool.close_sessions if build_context_pool
+    build_server_pool.close_sessions if build_server_pool
     deployer.close_sessions if deployer
   end
 
@@ -261,23 +258,25 @@ class Indocker::ConfigurationDeployer
   def collect_soft_dependent_containers(containers, configuration)
     result = containers
 
-    result += containers.map do |container|
-      container.soft_dependent_containers.reject do |soft_dependent_container|
-        configuration.enabled_containers.include?(soft_dependent_container.name) &&
-        Indocker.launched?(soft_dependent_container.name)
-      end
-    end.flatten
+    soft_dependent_containers = containers
+      .map(&:soft_dependent_containers)
+      .flatten
+      .uniq(&:name)
 
+    result +=  soft_dependent_containers.select do |container|
+      configuration.enabled_containers.include?(container.name) &&
+        !Indocker.launched?(container.name)
+    end
 
-    result.uniq
+    result
   end
 
-  def compile_image(configuration, image, build_context)
-    return if build_context.image_compiled?(image)
+  def compile_image(configuration, image, build_server)
+    return if @compiled_images[image]
 
     image.dependent_images.each do |dependent_image|
-      next if build_context.image_compiled?(dependent_image)
-      compile_image(configuration, dependent_image, build_context)
+      next if @compiled_images[image]
+      compile_image(configuration, dependent_image, build_server)
     end
 
     compiler = Indocker::Images::ImageCompiler.new
@@ -287,38 +286,30 @@ class Indocker::ConfigurationDeployer
     result = nil
 
     time = Benchmark.realtime do
-      result = build_context
-        .session
-        .exec!(
-          "cd #{Indocker::IndockerHelper.indocker_dir} && ./bin/remote/compile -C #{Indocker.configuration_name} -i #{image.name} -s #{@logger.debug? ? '-d' : ''}",
-          on_stdout: proc { |data|
-            @logger.info("[compile] #{data}")
-          },
-          on_stderr: proc { |data|
-            @logger.error("[compile] #{data}")
-          }
+      result = build_server
+        .compile_image_remotely(
+          configuration_name: Indocker.configuration_name,
+          image_name:         image.name
         )
     end
 
     if result.exit_code != 0
-      @global_logger.error("[compile] #{image.name.to_s.green} image compilation failed")
-      puts result.stdout_data
-      exit 1 
+      exit 1
     end
 
     @logger.info("Image compilation completed #{image.name.to_s.green}. Time taken: #{time}")
 
-    build_context.set_compiled(image)
+    @compiled_images[image] = true
   end
 
-  def recursively_deploy_container(configuration, deployer, build_context_pool, container, 
+  def recursively_deploy_container(configuration, deployer, build_server_pool, container, 
     containers, skip_build, skip_deploy, force_restart, skip_force_restart)
 
     container.dependent_containers.each do |container|
       recursively_deploy_container(
         configuration, 
         deployer, 
-        build_context_pool, 
+        build_server_pool, 
         container, 
         containers, 
         skip_build, 
@@ -333,20 +324,24 @@ class Indocker::ConfigurationDeployer
     @progress.start_building_container(container)
 
     if !skip_build
-      build_context = build_context_pool.get
+      build_server = build_server_pool.get
 
-      build_context.set_busy(true)
-      compile_image(configuration, container.image, build_context)
-      build_context.set_busy(false)
+      build_server.set_busy(true)
+      compile_image(configuration, container.image, build_server)
+      build_server.set_busy(false)
     end
 
     @progress.finish_building_container(container)
 
     if !skip_deploy
-      deployer.deploy(container, force_restart, skip_force_restart, @progress)
+      deploy_container(deployer, container, force_restart, skip_force_restart)
     end
   end
 
+  def deploy_container(deployer, container, force_restart, skip_force_restart)
+    deployer.deploy(container, force_restart, skip_force_restart, @progress)
+  end
+
   class RemoteOperation
     attr_reader :thread, :server, :operation, :message
 

data/lib/indocker/{container_runner.rb → launchers/container_runner.rb}

@@ -1,4 +1,4 @@
-class Indocker::ContainerRunner
+class Indocker::Launchers::ContainerRunner
   def initialize(logger)
     @logger = logger
   end
@@ -13,8 +13,7 @@ class Indocker::ContainerRunner
 
     deploy_context = Indocker::DeployContext.new(
       logger: @logger,
-      configuration: configuration,
-      server: nil
+      configuration: configuration
     )
 
     container = configuration.containers.detect { |c| c.name == container_name }

data/lib/indocker/{images_compiler.rb → launchers/images_compiler.rb}

@@ -1,4 +1,4 @@
-class Indocker::ImagesCompiler
+class Indocker::Launchers::ImagesCompiler
   def initialize(logger)
     @logger = logger
   end
@@ -8,8 +8,8 @@ class Indocker::ImagesCompiler
 
     build_context = Indocker::BuildContext.new(
       configuration: configuration,
-      build_server:  nil,
-      logger: @logger
+      logger: @logger,
+      global_logger: Indocker.global_logger
     )
 
     image_compiler = Indocker::Images::ImageCompiler.new

data/lib/indocker/{network.rb → networks/network.rb}

@@ -1,4 +1,4 @@
-class Indocker::Network
+class Indocker::Networks::Network
   attr_reader :name, :containers
 
   def initialize(name)

data/lib/indocker/{network_helper.rb → networks/network_helper.rb}

@@ -1,4 +1,4 @@
-class Indocker::NetworkHelper
+class Indocker::Networks::NetworkHelper
   class << self
     def name(configuration_name, network)
       "#{configuration_name}_#{network.name}"

data/lib/indocker/server_pools/build_server_connection.rb

@@ -0,0 +1,15 @@
+require 'fileutils'
+
+class Indocker::ServerPools::BuildServerConnection < Indocker::ServerPools::ServerConnection
+  def compile_image_remotely(configuration_name:, image_name:)
+    result = exec!(
+      "cd #{Indocker::IndockerHelper.indocker_dir} && ./bin/remote/compile -C #{configuration_name} -i #{image_name} -s #{@logger.debug? ? '-d' : ''}"
+    )
+
+    Indocker::SshResultLogger
+      .new(@logger)
+      .log(result, "#{image_name.to_s.green} image compilation failed")
+    
+    result
+  end
+end

data/lib/indocker/{build_context_pool.rb → server_pools/build_server_pool.rb}

@@ -1,26 +1,26 @@
-class Indocker::BuildContextPool
+class Indocker::ServerPools::BuildServerPool
   def initialize(configuration:, logger:)
     @logger = logger
     @configuration = configuration
 
-    @contexts = configuration.build_servers.map do |build_server|
-      Indocker::BuildContext.new(
+    @connections = configuration.build_servers.map do |build_server|
+      Indocker::ServerPools::BuildServerConnection.new(
         logger: @logger,
         configuration: configuration,
-        build_server: build_server
+        server: build_server,
       )
     end
   end
 
   def create_sessions!
-    @contexts.each(&:create_session!)
+    @connections.each(&:create_session!)
   end
 
   def get
     context = nil
 
     loop do
-      context = @contexts.detect {|c| !c.busy?}
+      context = @connections.detect {|c| !c.busy?}
       sleep(0.1)
       break if context
     end
@@ -29,11 +29,11 @@ class Indocker::BuildContextPool
   end
 
   def each(&proc)
-    @contexts.each(&proc)
+    @connections.each(&proc)
   end
 
   def close_sessions
-    @contexts.each(&:close_session)
+    @connections.each(&:close_session)
   rescue => e
     @logger.error("error during session close: #{e.inspect}")
   end

data/lib/indocker/server_pools/deploy_server_connection.rb

@@ -0,0 +1,17 @@
+class Indocker::ServerPools::DeployServerConnection < Indocker::ServerPools::ServerConnection
+  def run_container_remotely(configuration_name:, container_name:, force_restart:)
+    command_output  = @logger.debug? ? "" : " > /dev/null"
+    debug_options   = @logger.debug? ? "-d" : ""
+    force_restart_options = force_restart ? "-f" : ""
+
+    result = exec!(
+      "cd #{Indocker::IndockerHelper.indocker_dir} && ./bin/remote/run -C #{configuration_name} -c #{container_name} #{debug_options} #{command_output} #{force_restart_options}"
+    )
+
+    Indocker::SshResultLogger
+      .new(@logger)
+      .log(result, "#{container_name.to_s.green} deployment for server #{server.name} failed")
+    
+    result
+  end
+end

data/lib/indocker/server_pools/deploy_server_pool.rb

@@ -0,0 +1,41 @@
+class Indocker::ServerPools::DeployServerPool
+  def initialize(configuration:, logger:)
+    @logger = logger
+    @configuration = configuration
+    @connections = []
+    @semaphore = Mutex.new
+  end
+
+  def create_connection!(server)
+    connection = Indocker::ServerPools::DeployServerConnection.new(
+      logger: @logger,
+      configuration: @configuration,
+      server: server,
+    )
+    connection.create_session!
+    connection
+  end
+
+  def find_or_create_connection!(server)
+    @semaphore.synchronize do
+      connection = @connections.detect do |connection|
+        connection.server.host == server.host &&
+        connection.server.port == server.port &&
+        connection.server.user == server.user
+      end
+      if connection.nil?
+        connection = create_connection!(server)
+        @connections.push(connection)
+      end
+      connection
+    end
+  end
+
+  def each(&proc)
+    @connections.each(&proc)
+  end
+
+  def close_sessions
+    @connections.each(&:close_session)
+  end
+end

data/lib/indocker/server_pools/server_connection.rb

@@ -0,0 +1,37 @@
+class Indocker::ServerPools::ServerConnection
+  attr_reader :server, :session
+
+  def initialize(logger:, configuration:, server:)
+    @logger = logger
+    @configuration = configuration
+    @server = server
+  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)
+    @session.exec!(command)
+  end
+
+  def close_session
+    @session.close if @session
+    @session = nil
+  end
+
+  def set_busy(flag)
+    @busy = !!flag
+  end
+
+  def busy?
+    !!@busy
+  end
+end

data/lib/indocker/ssh_result_logger.rb

@@ -0,0 +1,18 @@
+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

data/lib/indocker/ssh_session.rb

@@ -37,11 +37,11 @@ class Indocker::SshSession
     !@ssh
   end
 
-  def exec!(command, on_stdout: nil, on_stderr: nil)
+  def exec!(command)
     if local?
       exec_locally!(command)
     else
-      exec_remotely!(command, on_stdout: on_stdout, on_stderr: on_stderr)
+      exec_remotely!(command)
     end
   end
 
@@ -57,7 +57,7 @@ class Indocker::SshSession
       ExecResult.new(res.stdout, '', res.exit_status, nil)
     end
 
-    def exec_remotely!(command, on_stdout:, on_stderr:)
+    def exec_remotely!(command)
       if Indocker.export_command
         command = "#{Indocker.export_command} && #{command}"
       end
@@ -78,12 +78,10 @@ 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|

data/lib/indocker/version.rb

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

data/lib/indocker/{volume_helper.rb → volumes/volume_helper.rb}

@@ -1,4 +1,4 @@
-class Indocker::VolumeHelper
+class Indocker::Volumes::VolumeHelper
   class << self
     def name(configuration_name, volume)
       "#{configuration_name}_#{volume.name}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: indocker
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.16
 platform: ruby
 authors:
 - Ruslan Gatiyatov
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-13 00:00:00.000000000 Z
+date: 2020-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -67,6 +67,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.5
 description: Docker Containers Deployment
 email:
 - gvalmon@gmail.com
@@ -76,6 +90,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
@@ -95,6 +110,9 @@ files:
 - 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/daemon_container/Dockerfile
+- example/indocker/bounded_contexts/shared/daemon_container/container.rb
+- example/indocker/bounded_contexts/shared/daemon_container/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
@@ -103,29 +121,25 @@ files:
 - example/indocker/bounded_contexts/shared/ruby/image.rb
 - example/indocker/configurations/dev.rb
 - example/indocker/configurations/external.rb
+- example/indocker/infrastructure/artifacts.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
 - lib/indocker/build_context.rb
 - lib/indocker/build_context_helper.rb
-- lib/indocker/build_context_pool.rb
 - lib/indocker/build_server.rb
 - lib/indocker/colored_string.rb
 - lib/indocker/concerns/inspectable.rb
-- lib/indocker/configuration_deployer.rb
 - lib/indocker/configurations/configuration.rb
 - lib/indocker/configurations/configuration_builder.rb
 - lib/indocker/configurations/formatters/stdout.rb
 - lib/indocker/container_deployer.rb
 - lib/indocker/container_helper.rb
-- lib/indocker/container_runner.rb
 - lib/indocker/containers/container.rb
 - lib/indocker/containers/container_builder.rb
 - lib/indocker/containers/restart_policy.rb
@@ -146,11 +160,13 @@ files:
 - lib/indocker/images/image_compiler.rb
 - lib/indocker/images/template_compiler.rb
 - lib/indocker/images/templates_compiler.rb
-- lib/indocker/images_compiler.rb
 - lib/indocker/indocker_helper.rb
+- lib/indocker/launchers/configuration_deployer.rb
+- lib/indocker/launchers/container_runner.rb
+- lib/indocker/launchers/images_compiler.rb
 - lib/indocker/logger_factory.rb
-- lib/indocker/network.rb
-- lib/indocker/network_helper.rb
+- lib/indocker/networks/network.rb
+- lib/indocker/networks/network_helper.rb
 - lib/indocker/registries/abstract.rb
 - lib/indocker/registries/local.rb
 - lib/indocker/registries/remote.rb
@@ -161,14 +177,19 @@ files:
 - lib/indocker/repositories/no_sync.rb
 - lib/indocker/rsync.rb
 - lib/indocker/server.rb
-- lib/indocker/server_pool.rb
+- lib/indocker/server_pools/build_server_connection.rb
+- lib/indocker/server_pools/build_server_pool.rb
+- lib/indocker/server_pools/deploy_server_connection.rb
+- lib/indocker/server_pools/deploy_server_pool.rb
+- lib/indocker/server_pools/server_connection.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
 - lib/indocker/volumes/external.rb
 - lib/indocker/volumes/local.rb
 - lib/indocker/volumes/repository.rb
+- lib/indocker/volumes/volume_helper.rb
 homepage: https://github.com/ArtStation/indocker
 licenses:
 - MIT

data/example/spec/indocker_spec.rb

@@ -1,39 +0,0 @@
-require 'spec_helper'
-
-RSpec.describe Indocker do
-  it "has a version number" do
-    expect(Indocker::VERSION).not_to be nil
-  end
-
-  describe "successful deployment" do
-    it "doesn't raise any error" do
-      expect{
-        launch_deployment(containers: [:good_container])
-      }.to_not raise_error
-    end
-
-    it "shows a message about successful deploy" do
-      allow(Indocker.global_logger).to receive(:info).at_least(:once)
-      
-      launch_deployment(containers: [:good_container])
-
-      expect(Indocker.global_logger).to have_received(:info).at_least(:once).with(/Deployment finished/)
-    end
-  end
-
-  describe "failed build" do
-    it "exits with an error" do
-      expect{
-        launch_deployment(containers: [:bad_container_build])
-      }.to raise_error(SystemExit)
-    end
-  end
-
-  describe "failed start" do
-    it "exits without error" do
-      expect{
-        launch_deployment(containers: [:bad_container_start])
-      }.to_not raise_error(SystemExit)
-    end
-  end
-end

data/example/spec/spec_helper.rb

@@ -1,39 +0,0 @@
-require "bundler/setup"
-require "indocker"
-require "pry"
-
-RSpec.configure do |config|
-  # Enable flags like --only-failures and --next-failure
-  config.example_status_persistence_file_path = ".rspec_status"
-
-  # Disable RSpec exposing methods globally on `Module` and `main`
-  config.disable_monkey_patching!
-
-  config.expect_with :rspec do |c|
-    c.syntax = :expect
-  end
-end
-
-def launch_deployment(options = {})
-  require_relative '../indocker/bin/utils/configurations'
-
-  Indocker.set_configuration_name(options[:configuration] || "external")
-  require_relative '../indocker/setup'
-
-  Indocker.set_log_level(options[:debug] ? Logger::DEBUG : Logger::INFO)
-
-  Indocker.deploy(
-    containers:           options[:containers] || [],
-    tags:                 options[:tags] || [],
-    skip_containers:      options[:skip_containers] || [],
-    skip_dependent:       !!options[:skip_dependent],
-    servers:              options[:servers] || [],
-    skip_build:           options[:skip_build],
-    skip_deploy:          options[:skip_deploy],
-    force_restart:        options[:force_restart],
-    skip_tags:            options[:skip_tags] || [],
-    skip_force_restart:   options[:skip_force_restart] || [],
-    auto_confirm:         !!options[:auto_confirm],
-    require_confirmation: !!options[:require_confirmation],
-  )
-end

data/lib/indocker/server_pool.rb

@@ -1,38 +0,0 @@
-class Indocker::ServerPool
-  def initialize(configuration:, logger:)
-    @logger = logger
-    @configuration = configuration
-
-    @contexts = configuration.servers.map do |server|
-      Indocker::DeployContext.new(
-        logger: @logger,
-        configuration: configuration,
-        server: server,
-      )
-    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)
-    context = Indocker::DeployContext.new(
-      logger: @logger,
-      configuration: @configuration,
-      server: server,
-    )
-    context.create_session!
-    context
-  end
-
-  def each(&proc)
-    @contexts.each(&proc)
-  end
-
-  def close_sessions
-    @contexts.each(&:close_session)
-  end
-end