indocker 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cc8ce4873ccea152495206a220d2bd9cd382c4046fea21490787ebd10b87f84
-  data.tar.gz: 83453296afe65dae6146b35b50317f5b720eadc0a19d941d9dad2c8617087dfb
+  metadata.gz: 8625d37ada817f2f83c30f154bd2ed9a104a023e5b554f4c91f3708ed4aa2770
+  data.tar.gz: 24950eb94bd956f7f10ad81da4330bffa78495a4852733a1bec5d0713cce4896
 SHA512:
-  metadata.gz: 2322d367c0d236ccc4e6abab8b5d4c73a2a0ea40a9c29936d986ccd2c0d1249676c11100071ab385f676abf56310c934b0dca99cfa0c8f90619e46c9a29a6726
-  data.tar.gz: 6183205fcf0cf0dbfc05194e9d81a4e4f768a9a8b7ae631c0ced837190de55c7eac93844b5830fa6c1009966991a1dde9af4c5df92a1027d3f21de0440ce6672
+  metadata.gz: e50ef7ed88a688bb1119e55b1d1662d6827e5667cc66c61dc85933687e9d4834c785c03c7fb917a2709adf04d909f7e611f8c844741b1532211dddad340dc149
+  data.tar.gz: 1e52f25fff3bf09ddb7f1d097b46ad0e858555892d3b4721a628c8817a16e165694dbf3650e940eb83cb6ac05d8ded47c6359ada9d3cba39d3885ff95e9e88d0

data/Gemfile.lock

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

data/example/indocker/bounded_contexts/shared/{container_failing_build → bad_container_build}/Dockerfile

@@ -1,4 +1,3 @@
 FROM ruby:2.5.0
 
 RUN some-unexisting-command
-WORKDIR /app

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

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

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

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

data/example/indocker/bounded_contexts/shared/bad_container_start/Dockerfile

@@ -0,0 +1,8 @@
+FROM ruby:2.5.0
+
+RUN mkdir /app
+WORKDIR /app
+
+COPY bin bin
+
+CMD ["bin/run"]

data/example/indocker/bounded_contexts/shared/bad_container_start/build_context/bin/run

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+
+raise "Some error"

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

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

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

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

data/example/indocker/bounded_contexts/shared/good_container/Dockerfile

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

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

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

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

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

data/example/indocker/configurations/external.rb

@@ -6,7 +6,13 @@ Indocker
     ruby: {
       servers: [:external],
     },
-    container_failing_build: {
+    good_container: {
+      servers: [:external],
+    },
+    bad_container_build: {
+      servers: [:external],
+    },
+    bad_container_start: {
       servers: [:external],
     }
   )

data/example/spec/indocker_spec.rb

@@ -8,14 +8,14 @@ RSpec.describe Indocker do
   describe "successful deployment" do
     it "doesn't raise any error" do
       expect{
-        launch_deployment(containers: [:ruby])
+        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: [:ruby])
+      launch_deployment(containers: [:good_container])
 
       expect(Indocker.global_logger).to have_received(:info).at_least(:once).with(/Deployment finished/)
     end
@@ -24,8 +24,16 @@ RSpec.describe Indocker do
   describe "failed build" do
     it "exits with an error" do
       expect{
-        launch_deployment(containers: [:container_failing_build])
+        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/lib/indocker.rb

@@ -85,7 +85,6 @@ 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,12 +3,11 @@ require 'fileutils'
 class Indocker::BuildContext
   attr_reader :session, :server, :configuration, :helper, :logger
 
-  def initialize(configuration:, build_server:, logger:, global_logger:)
+  def initialize(configuration:, build_server:, 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
 
@@ -73,8 +72,8 @@ class Indocker::BuildContext
       res = Indocker::Docker.build(image.local_registry_url, build_args)
       
       if res.exit_status != 0
-        @global_logger.error("image compilation :#{image.name} failed")
-        @global_logger.error(res.stdout)
+        puts "image compilation :#{image.name} failed"
+        puts res.stdout
         exit 1
       end
 

data/lib/indocker/build_context_pool.rb

@@ -1,15 +1,13 @@
 class Indocker::BuildContextPool
-  def initialize(configuration:, logger:, global_logger:)
+  def initialize(configuration:, 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,
-        global_logger: @global_logger,
+        build_server: build_server
       )
     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, global_logger: @global_logger)
+    build_context_pool = Indocker::BuildContextPool.new(configuration: configuration, logger: @logger)
     deployer = Indocker::ContainerDeployer.new(configuration: configuration, logger: @logger)
     
     @global_logger.info("Establishing ssh sessions to all servers...")
@@ -290,15 +290,21 @@ 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' : ''}"
+          "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}")
+          }
         )
     end
 
-    Indocker::SshResultLogger
-      .new(@logger)
-      .log(result, "#{image.name.to_s.green} image compilation failed")
-
-    exit 1 if result.exit_code != 0
+    if result.exit_code != 0
+      @global_logger.error("[compile] #{image.name.to_s.green} image compilation failed")
+      puts result.stdout_data
+      exit 1 
+    end
 
     @logger.info("Image compilation completed #{image.name.to_s.green}. Time taken: #{time}")
 

data/lib/indocker/container_deployer.rb

@@ -50,14 +50,21 @@ 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}"
+            "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}")
+            }
           )
+        
+        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,8 +9,7 @@ class Indocker::ImagesCompiler
     build_context = Indocker::BuildContext.new(
       configuration: configuration,
       build_server:  nil,
-      logger: @logger,
-      global_logger: Indocker.global_logger
+      logger: @logger
     )
 
     image_compiler = Indocker::Images::ImageCompiler.new

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.10"
+  VERSION = "0.1.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: indocker
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Ruslan Gatiyatov
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-07 00:00:00.000000000 Z
+date: 2020-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -88,9 +88,16 @@ files:
 - example/indocker/bin/remote/compile
 - example/indocker/bin/remote/run
 - example/indocker/bin/utils/configurations.rb
-- example/indocker/bounded_contexts/shared/container_failing_build/Dockerfile
-- example/indocker/bounded_contexts/shared/container_failing_build/container.rb
-- example/indocker/bounded_contexts/shared/container_failing_build/image.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
@@ -156,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/example/indocker/bounded_contexts/shared/container_failing_build/container.rb

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

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

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

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