indocker 0.1.12 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 288383229ce87e66ab3869aa6fcd5180e0a54d09ca4046ed32a4ec34550a564f
-  data.tar.gz: 77eed21c9ad07145d0141c8450495fd74b6336cea91fc76a5dc37909f3983ee6
+  metadata.gz: 87f0d247cd6a4aa8f3958d6b9d9aef1dfd879c15651c9e4c01c9e15e7bffe0a0
+  data.tar.gz: e0391bebb9cd04117a68e904caef9ccd72b586fd10a8e2ba02b3673b389de8de
 SHA512:
-  metadata.gz: 6e91c51c6898841882c3543a31710b84db43e2fc20498174119b269eaa47f9caf260a0720d99645a03dd292d470be4adadaaec6d4cadebce1290998782a3156a
-  data.tar.gz: cbf4395ff9f1f21c56785fa926dbaf3af80f33cad68041fa4ee9c2e8cee85faa353f0efe9c34aa23707b47764e5a0c6b4359dacf1a50b17f4e02db003455689d
+  metadata.gz: baad11d2671bb96f35cfed12ca80ac713d135ee19a4b8e7222ab91685a9f5efd65a84d539425cc68e7f786eca689e451b46ea2e503569037b080aee422f01fe2
+  data.tar.gz: 876a4b96e5a96f7a1f9ffff7138597e413739a84c4bc1dbe8b0adb18073e431ecef0da966b7c7bf861d3f6792de8ec21e43f5970aae6ccb3b5813b095700a787

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.12)
+    indocker (0.1.17)
       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/bin/deploy

@@ -94,12 +94,9 @@ if !configurations.include?(options[:configuration])
   exit 1
 end
 
-begin
-  require 'indocker'
-rescue LoadError
-  puts "InDocker has been moved into a separate gem. Please install using `gem install indocker`"
-  exit
-end
+require 'rubygems'
+require 'bundler/setup'
+require 'indocker'
 
 if options[:debug]
   Indocker.set_log_level(Logger::DEBUG)

data/example/indocker/bin/remote/compile

@@ -49,12 +49,8 @@ if !options.has_key?(:images)
   puts "At least one image should be provided"
 end
 
-begin
-  require 'indocker'
-rescue LoadError
-  puts "InDocker has been moved into a separate gem. Please install using `gem install indocker`"
-  exit 1
-end
+require 'rubygems'
+require 'indocker'
 
 if options[:debug]
   Indocker.set_log_level(Logger::DEBUG)

data/example/indocker/bin/remote/run

@@ -46,12 +46,8 @@ if !configurations.include?(options[:configuration])
   exit 1
 end
 
-begin
-  require 'indocker'
-rescue LoadError
-  puts "InDocker has been moved into a separate gem. Please install using `gem install indocker`"
-  exit 1
-end
+require 'rubygems'
+require 'indocker'
 
 if options[:debug]
   Indocker.set_log_level(Logger::DEBUG)

data/example/indocker/bounded_contexts/{shared → bad_containers}/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_containers}/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/good_containers/daemon_container/Dockerfile

@@ -0,0 +1 @@
+FROM <%= image_url(:parent_image) %>

data/example/indocker/bounded_contexts/good_containers/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/good_containers/daemon_container/image.rb

@@ -0,0 +1,4 @@
+Indocker
+  .define_image(:daemon_container)
+  .depends_on(:parent_image)
+  .registry(:default)

data/example/indocker/bounded_contexts/good_containers/dependency_container/Dockerfile

@@ -0,0 +1 @@
+FROM <%= image_url(:parent_image) %>

data/example/indocker/bounded_contexts/good_containers/dependency_container/container.rb

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

data/example/indocker/bounded_contexts/good_containers/dependency_container/image.rb

@@ -0,0 +1,4 @@
+Indocker
+  .define_image(:dependency_container)
+  .depends_on(:parent_image)
+  .registry(:default)

data/example/indocker/bounded_contexts/good_containers/good_container/Dockerfile

@@ -0,0 +1,3 @@
+FROM <%= image_url(:parent_image) %>
+
+COPY example_file.txt example_file.txt

data/example/indocker/bounded_contexts/good_containers/good_container/build_context/example_file.txt

@@ -0,0 +1,2 @@
+domain: <%= global_build_args.domain %>
+hostname: <%= containers.good_container.hostname %>

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

@@ -0,0 +1,10 @@
+Indocker
+  .define_container(:good_container)
+  .depends_on(:dependency_container)
+  .tags('good_container', 'console=true')
+  .image(:good_container)
+  .networks(:app_net)
+  .daemonize(false)
+  # .start({
+  #   env_files: [:default_env],
+  # })

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

@@ -0,0 +1,4 @@
+Indocker
+  .define_image(:good_container)
+  .depends_on(:parent_image)
+  .registry(:default)

data/example/indocker/bounded_contexts/shared/{good_container → parent_image}/Dockerfile

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

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

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

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

@@ -2,6 +2,10 @@ Indocker
   .build_configuration(:external)
   .use_registry(:dev, as: :default)
   .use_build_server(:external_bs)
+  .global_build_args({
+    domain: 'indocker.me',
+  })
+  .use_env_file(:development_env, as: :default_env)
   .enabled_containers(
     ruby: {
       servers: [:external],
@@ -14,5 +18,11 @@ Indocker
     },
     bad_container_start: {
       servers: [:external],
+    },
+    daemon_container: {
+      servers: [:external],
     }
-  )
+  ).artifacts(
+    indocker_readme: [:external],
+    hosts_file: [:external],
+  )

data/example/indocker/env_files/development_env.env

@@ -0,0 +1 @@
+PROJECT_NAME=indocker

data/example/indocker/infrastructure/artifacts.rb

@@ -0,0 +1,26 @@
+Indocker.add_artifact(
+  Indocker::Artifacts::Git.new(
+    name:        :indocker_readme,
+    remote_name: 'origin',
+    remote_url:  'https://github.com/ArtStation/indocker.git',
+    branch:      :master,
+    files: [
+      Indocker::Artifacts::DTO::FileDTO.new(
+        source_path: './README.md',
+        target_path: Indocker.deploy_dir,
+      )
+    ]
+  )
+)
+
+Indocker.add_artifact(
+  Indocker::Artifacts::Remote.new(
+    name: :hosts_file,
+    files: [
+      Indocker::Artifacts::DTO::FileDTO.new(
+        source_path: '/etc/hosts',
+        target_path: Indocker.deploy_dir,
+      )
+    ]
+  )
+)

data/example/indocker/infrastructure/env_files.rb

@@ -0,0 +1,6 @@
+Indocker.define_env_file(
+  Indocker::EnvFiles::Local.new(
+    :development_env,
+    File.expand_path(File.join(__dir__, '../env_files/development_env.env'))
+  )
+)

data/example/indocker/setup.rb

@@ -3,7 +3,7 @@ require 'indocker'
 root_dir = File.join(__dir__, '..', '..')
 
 Indocker.set_root_dir(__dir__)
-Indocker.set_deploy_dir('~/deployment')
+Indocker.set_deploy_dir('~/.indocker-deployment')
 
 Indocker.set_dockerignore [
   'Dockerfile',
@@ -18,6 +18,8 @@ require_relative 'infrastructure/registries'
 require_relative 'infrastructure/servers'
 require_relative 'infrastructure/build_servers'
 require_relative 'infrastructure/networks'
+require_relative 'infrastructure/artifacts'
+require_relative 'infrastructure/env_files'
 
 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

@@ -10,16 +10,12 @@ module Indocker
     autoload :Git, 'repositories/git'
     autoload :Local, 'repositories/local'
     autoload :NoSync, 'repositories/no_sync'
-    autoload :Clonner, 'repositories/clonner'
+    autoload :Cloner, 'repositories/cloner'
   end
 
   module Configurations
     autoload :Configuration, 'configurations/configuration'
     autoload :ConfigurationBuilder, 'configurations/configuration_builder'
-
-    module Formatters
-      autoload :Stdout, 'configurations/formatters/stdout'
-    end
   end
 
   module Registries
@@ -50,6 +46,7 @@ module Indocker
     autoload :Local, 'volumes/local'
     autoload :External, 'volumes/external'
     autoload :Repository, 'volumes/repository'
+    autoload :VolumeHelper, 'volumes/volume_helper'
   end
 
   module EnvFiles
@@ -58,33 +55,58 @@ module Indocker
   end
 
   module Artifacts
+    autoload :Base, 'artifacts/base'
     autoload :Git, 'artifacts/git'
+    autoload :Remote, 'artifacts/remote'
+
+    module DTO
+      autoload :FileDTO, 'artifacts/dto/file_dto'
+    end
+
+    module Services
+      autoload :Synchronizer, 'artifacts/services/synchronizer'
+    end
+  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'
+
+    module DTO
+      autoload :RemoteOperationDTO, 'launchers/dto/remote_operation_dto'
+    end
+  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'
@@ -172,7 +194,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
@@ -320,9 +342,9 @@ module Indocker
       builder
     end
 
-    def deploy(containers: [], skip_tags: [], tags: [], skip_dependent: false, 
+    def deploy(containers: [], skip_tags: [], tags: [], skip_dependent: false,
       skip_containers: [], servers: [], skip_build: false, skip_deploy: false,
-      force_restart: false, skip_force_restart: [], auto_confirm: false, 
+      force_restart: false, skip_force_restart: [], auto_confirm: false,
       require_confirmation: false)
 
       deployment_policy = Indocker::DeploymentPolicy.new(
@@ -340,7 +362,7 @@ module Indocker
         require_confirmation: require_confirmation,
       )
 
-      Indocker::ConfigurationDeployer
+      Indocker::Launchers::ConfigurationDeployer
         .new(logger: Indocker.logger, global_logger: Indocker.global_logger)
         .run(
           configuration:     configuration,
@@ -357,7 +379,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)
@@ -369,7 +391,7 @@ module Indocker
     end
 
     def compile(images:, skip_dependent:)
-      Indocker::ImagesCompiler
+      Indocker::Launchers::ImagesCompiler
         .new(Indocker.logger)
         .compile(
           configuration: configuration,
@@ -379,7 +401,7 @@ module Indocker
     end
 
     def run(container_name, force_restart)
-      Indocker::ContainerRunner
+      Indocker::Launchers::ContainerRunner
         .new(Indocker.logger)
         .run(
           configuration: configuration,