indocker 0.1.12 → 0.1.17

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/launchers/dto/remote_operation_dto.rb

@@ -0,0 +1,10 @@
+class Indocker::Launchers::DTO::RemoteOperationDTO
+  attr_reader :thread, :server, :operation, :message
+
+  def initialize(thread, server, operation, message = nil)
+    @thread = thread
+    @server = server
+    @operation = operation
+    @message = message
+  end
+end

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,7 +8,6 @@ class Indocker::ImagesCompiler
 
     build_context = Indocker::BuildContext.new(
       configuration: configuration,
-      build_server:  nil,
       logger: @logger,
       global_logger: Indocker.global_logger
     )

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/repositories/cloner.rb

@@ -0,0 +1,73 @@
+require 'net/ssh'
+
+class Indocker::Repositories::Cloner
+  def initialize(configuration, logger)
+    @configuration = configuration
+    @logger = logger
+  end
+
+  def clone(session, repository)
+    raise ArgumenError.new("only git repositories should be cloned") if !repository.is_git?
+
+    already_cloned = repository_already_cloned?(
+      session:     session,
+      target_path: repository.clone_path,
+      remote_url:  repository.remote_url,
+    )
+
+    git_command = if already_cloned
+      build_force_pull_command(
+        target_path: repository.clone_path,
+        branch_name: repository.branch,
+      )
+    else
+      build_clone_command(
+        target_path: repository.clone_path,
+        branch_name: repository.branch,
+        remote_url:  repository.remote_url,
+      )
+    end
+
+    session.exec!("ssh-agent bash -c 'ssh-add ~/.ssh/#{repository.ssh_key}; #{git_command}'")
+  end
+
+  private
+
+    def repository_already_cloned?(session:, target_path:, remote_url:)
+      target_remote_url = session.exec!(
+        build_git_remote_url_command(
+          path: target_path
+        )
+      ).stdout_data.chomp
+
+      @logger.debug("target remote_url:  #{target_remote_url.inspect}, checked remote_url: #{remote_url.inspect}")
+
+      target_remote_url == remote_url
+    end
+
+    def build_git_remote_url_command(path:)
+      [
+        "mkdir -p #{path}",
+        "cd #{path}",
+        "git config --get remote.origin.url",
+      ].join(" && ")
+    end
+
+    def build_clone_command(target_path:, branch_name:, remote_url:)
+      [
+        "rm -rf #{target_path}",
+        "mkdir -p #{target_path}",
+        "git clone -b #{branch_name} --depth 1 #{remote_url} #{target_path}",
+      ].join(" && ")
+    end
+
+    def build_force_pull_command(target_path:, branch_name:)
+      [
+        "cd #{target_path}",
+        "git add .",
+        "git reset HEAD --hard",
+        "git checkout #{branch_name}",
+        "git pull --force",
+      ].join(" && ")
+    end
+end

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/server_pools/build_server_pool.rb

@@ -0,0 +1,40 @@
+class Indocker::ServerPools::BuildServerPool
+  def initialize(configuration:, logger:)
+    @logger = logger
+    @configuration = configuration
+
+    @connections = configuration.build_servers.map do |build_server|
+      Indocker::ServerPools::BuildServerConnection.new(
+        logger: @logger,
+        configuration: configuration,
+        server: build_server,
+      )
+    end
+  end
+
+  def create_sessions!
+    @connections.each(&:create_session!)
+  end
+
+  def get
+    context = nil
+
+    loop do
+      context = @connections.detect {|c| !c.busy?}
+      sleep(0.1)
+      break if context
+    end
+
+    context
+  end
+
+  def each(&proc)
+    @connections.each(&proc)
+  end
+
+  def close_sessions
+    @connections.each(&:close_session)
+  rescue => e
+    @logger.error("error during session close: #{e.inspect}")
+  end
+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/version.rb

@@ -1,3 +1,3 @@
 module Indocker
-  VERSION = "0.1.12"
+  VERSION = "0.1.17"
 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.12
+  version: 0.1.17
 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-09-08 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
@@ -88,44 +103,54 @@ 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/bad_containers/bad_container_build/Dockerfile
+- example/indocker/bounded_contexts/bad_containers/bad_container_build/container.rb
+- example/indocker/bounded_contexts/bad_containers/bad_container_build/image.rb
+- example/indocker/bounded_contexts/bad_containers/bad_container_start/Dockerfile
+- example/indocker/bounded_contexts/bad_containers/bad_container_start/build_context/bin/run
+- example/indocker/bounded_contexts/bad_containers/bad_container_start/container.rb
+- example/indocker/bounded_contexts/bad_containers/bad_container_start/image.rb
+- example/indocker/bounded_contexts/good_containers/daemon_container/Dockerfile
+- example/indocker/bounded_contexts/good_containers/daemon_container/container.rb
+- example/indocker/bounded_contexts/good_containers/daemon_container/image.rb
+- example/indocker/bounded_contexts/good_containers/dependency_container/Dockerfile
+- example/indocker/bounded_contexts/good_containers/dependency_container/container.rb
+- example/indocker/bounded_contexts/good_containers/dependency_container/image.rb
+- example/indocker/bounded_contexts/good_containers/good_container/Dockerfile
+- example/indocker/bounded_contexts/good_containers/good_container/build_context/example_file.txt
+- example/indocker/bounded_contexts/good_containers/good_container/container.rb
+- example/indocker/bounded_contexts/good_containers/good_container/image.rb
+- example/indocker/bounded_contexts/shared/parent_image/Dockerfile
+- example/indocker/bounded_contexts/shared/parent_image/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/env_files/development_env.env
+- example/indocker/infrastructure/artifacts.rb
 - example/indocker/infrastructure/build_servers.rb
+- example/indocker/infrastructure/env_files.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/base.rb
+- lib/indocker/artifacts/dto/file_dto.rb
 - lib/indocker/artifacts/git.rb
+- lib/indocker/artifacts/remote.rb
+- lib/indocker/artifacts/services/synchronizer.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,30 +171,37 @@ 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/dto/remote_operation_dto.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
 - lib/indocker/repositories/abstract.rb
-- lib/indocker/repositories/clonner.rb
+- lib/indocker/repositories/cloner.rb
 - lib/indocker/repositories/git.rb
 - lib/indocker/repositories/local.rb
 - 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