indocker 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8625d37ada817f2f83c30f154bd2ed9a104a023e5b554f4c91f3708ed4aa2770
-  data.tar.gz: 24950eb94bd956f7f10ad81da4330bffa78495a4852733a1bec5d0713cce4896
+  metadata.gz: 288383229ce87e66ab3869aa6fcd5180e0a54d09ca4046ed32a4ec34550a564f
+  data.tar.gz: 77eed21c9ad07145d0141c8450495fd74b6336cea91fc76a5dc37909f3983ee6
 SHA512:
-  metadata.gz: e50ef7ed88a688bb1119e55b1d1662d6827e5667cc66c61dc85933687e9d4834c785c03c7fb917a2709adf04d909f7e611f8c844741b1532211dddad340dc149
-  data.tar.gz: 1e52f25fff3bf09ddb7f1d097b46ad0e858555892d3b4721a628c8817a16e165694dbf3650e940eb83cb6ac05d8ded47c6359ada9d3cba39d3885ff95e9e88d0
+  metadata.gz: 6e91c51c6898841882c3543a31710b84db43e2fc20498174119b269eaa47f9caf260a0720d99645a03dd292d470be4adadaaec6d4cadebce1290998782a3156a
+  data.tar.gz: cbf4395ff9f1f21c56785fa926dbaf3af80f33cad68041fa4ee9c2e8cee85faa353f0efe9c34aa23707b47764e5a0c6b4359dacf1a50b17f4e02db003455689d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    indocker (0.1.11)
+    indocker (0.1.12)
       net-ssh
 
 GEM

data/lib/indocker.rb

@@ -85,6 +85,7 @@ module Indocker
   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'

data/lib/indocker/build_context.rb

@@ -3,11 +3,12 @@ require 'fileutils'
 class Indocker::BuildContext
   attr_reader :session, :server, :configuration, :helper, :logger
 
-  def initialize(configuration:, build_server:, logger:)
+  def initialize(configuration:, build_server:, logger:, global_logger:)
     @configuration = configuration
     @logger = logger
     @helper = Indocker::BuildContextHelper.new(@configuration, @build_server)
     @server = build_server
+    @global_logger = global_logger
     @compiled_images = Hash.new(false)
   end
 
@@ -72,8 +73,8 @@ 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
 

data/lib/indocker/build_context_pool.rb

@@ -1,13 +1,15 @@
 class Indocker::BuildContextPool
-  def initialize(configuration:, logger:)
+  def initialize(configuration:, logger:, global_logger:)
     @logger = logger
     @configuration = configuration
+    @global_logger = global_logger
 
     @contexts = configuration.build_servers.map do |build_server|
       Indocker::BuildContext.new(
         logger: @logger,
         configuration: configuration,
-        build_server: build_server
+        build_server: build_server,
+        global_logger: @global_logger,
       )
     end
   end

data/lib/indocker/configuration_deployer.rb

@@ -46,7 +46,7 @@ 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_context_pool = Indocker::BuildContextPool.new(configuration: configuration, logger: @logger, global_logger: @global_logger)
     deployer = Indocker::ContainerDeployer.new(configuration: configuration, logger: @logger)
     
     @global_logger.info("Establishing ssh sessions to all servers...")
@@ -290,21 +290,15 @@ class Indocker::ConfigurationDeployer
       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}")
-          }
+          "cd #{Indocker::IndockerHelper.indocker_dir} && ./bin/remote/compile -C #{Indocker.configuration_name} -i #{image.name} -s #{@logger.debug? ? '-d' : ''}"
         )
     end
 
-    if result.exit_code != 0
-      @global_logger.error("[compile] #{image.name.to_s.green} image compilation failed")
-      puts result.stdout_data
-      exit 1 
-    end
+    Indocker::SshResultLogger
+      .new(@logger)
+      .log(result, "#{image.name.to_s.green} image compilation failed")
+
+    exit 1 if result.exit_code != 0
 
     @logger.info("Image compilation completed #{image.name.to_s.green}. Time taken: #{time}")
 

data/lib/indocker/container_deployer.rb

@@ -50,21 +50,14 @@ class Indocker::ContainerDeployer
         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}")
-            }
+            "cd #{Indocker::IndockerHelper.indocker_dir} && ./bin/remote/run -C #{Indocker.configuration_name} -c #{container.name} #{debug_options} #{command_output} #{force_restart_options}"
           )
-        
-        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
 
+        Indocker::SshResultLogger
+          .new(@logger)
+          .log(result, "#{container.name.to_s.green} deployment for server #{server.name} failed")
+
+        exit 1 if result.exit_code != 0
         @logger.info("Container deployment to #{server.user}@#{server.host} finished: #{container.name.to_s.green}")
 
         deploy_context.close_session

data/lib/indocker/images_compiler.rb

@@ -9,7 +9,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/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.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: indocker
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Ruslan Gatiyatov
@@ -163,6 +163,7 @@ 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