indocker 0.0.2 → 0.0.5

data/lib/indocker/image/image_dsl.rb

@@ -19,44 +19,64 @@ class Indocker::ImageDSL
   def partial(name, opts = {})
     @directives << Indocker::Directives::Partial.new(name, @context, opts)
   end
+
+  def expose(port)
+    @directives << Indocker::ImageDirectives::Expose.new(port)
+  end
   
   def from(*args)
-    @directives << Indocker::DockerDirectives::From.new(*args)
+    first_from_directive = @directives.detect {|c| c.instance_of?(Indocker::ImageDirectives::From)}
+    raise Indocker::Errors::DirectiveAlreadyInUse, first_from_directive if first_from_directive
+
+    @directives << Indocker::ImageDirectives::From.new(*args)
+  end
+
+  def use(item)
+    case item
+    when Indocker::Registry::RegistryHelper
+      first_from_directive = @directives.detect {|c| c.instance_of?(Indocker::ImageDirectives::Registry)}
+      raise Indocker::Errors::DirectiveAlreadyInUse, first_from_directive if first_from_directive
+
+      @directives << Indocker::ImageDirectives::Registry.new(
+        repo:     repo,
+        tag:      tag,
+        registry: item.registry, 
+        push:     item.push
+      )
+    end
   end
   
   def workdir(*args)
-    @directives << Indocker::DockerDirectives::Workdir.new(*args)
+    @directives << Indocker::ImageDirectives::Workdir.new(*args)
   end
 
   def run(*args)
-    @directives << Indocker::DockerDirectives::Run.new(*args)
+    @directives << Indocker::ImageDirectives::Run.new(*args)
   end
 
   def cmd(*args)
-    @directives << Indocker::DockerDirectives::Cmd.new(*args)
+    @directives << Indocker::ImageDirectives::Cmd.new(*args)
   end
 
-  def copy(copy_actions)
-    @directives << Indocker::DockerDirectives::Copy.new(
-      context:      @context, 
-      copy_actions: copy_actions
-    )
-  end
-
-  def copy_compile(copy_actions)
-    @directives << Indocker::DockerDirectives::Copy.new(
-      context:      @context, 
+  def copy(copy_actions = {}, compile = false)
+    @directives << Indocker::ImageDirectives::Copy.new(
+      compile:      compile,
       copy_actions: copy_actions,
-      compile:      true
+      locals:       @context.storage,
+      build_dir:    @context.build_dir
     )
   end
 
   def entrypoint(*args)
-    @directives << Indocker::DockerDirectives::Entrypoint.new(*args)
+    @directives << Indocker::ImageDirectives::Entrypoint.new(*args)
   end
 
   def env(*args)
-    @directives << Indocker::DockerDirectives::Env.new(args)
+    @directives << Indocker::ImageDirectives::Env.new(args)
+  end
+
+  def env_file(*paths)
+    @directives.concat paths.map {|p| Indocker::ImageDirectives::EnvFile.new(p)}
   end
 
   def before_build(&block)
@@ -64,6 +84,6 @@ class Indocker::ImageDSL
   end
 
   def docker_cp(container_name, &block)
-    @directives << Indocker::PrepareDirectives::DockerCp.new(container_name, @context.build_dir, &block)
+    @directives << Indocker::ImageDirectives::DockerCp.new(container_name, @context.build_dir, &block)
   end
 end

data/lib/indocker/image/image_evaluator.rb

@@ -11,7 +11,7 @@ class Indocker::ImageEvaluator
     
     image_dsl.directives
       .map do |directive|
-        next directive if !directive.partial?
+        next directive if !directive.partial_directive?
 
         partial = partial_metadata_repository.find_by_name(directive.name)
         evaluate(directive.context, &partial.definition)

data/lib/indocker/image/image_helper.rb

@@ -0,0 +1,9 @@
+module Indocker::ImageHelper
+  DEFAULT_TAG = 'latest'
+
+  def full_name(repo, tag = nil)
+    tag ||= DEFAULT_TAG
+
+    "#{repo}:#{tag}"
+  end
+end

data/lib/indocker/image/image_metadata.rb

@@ -1,7 +1,7 @@
 class Indocker::ImageMetadata
-  DEFAULT_TAG = 'latest'
+  include Indocker::ImageHelper
 
-  attr_reader   :repo, :tag, :directives, :build_dir
+  attr_reader :repo, :tag, :directives, :build_dir
 
   def initialize(repo:, tag:, directives:, build_dir:)
     @repo       = repo
@@ -11,23 +11,23 @@ class Indocker::ImageMetadata
   end
 
   def full_name
-    "#{repo}:#{tag}"
-  end
-
-  def full_name_with_registry
-    "#{Indocker.config.registry}/#{local_full_name}"
+    super(@repo, @tag)
   end
 
   def prepare_directives
     directives.select {|d| d.prepare_directive?}
   end
 
+  def after_build_directives
+    directives.select {|d| d.after_build_directive?}
+  end
+
   def build_directives
     directives.select {|d| d.build_directive?}
   end
 
   def docker_cp_directives
-    directives.select {|d| d.is_a?(Indocker::PrepareDirectives::DockerCp)}
+    directives.select {|d| d.is_a?(Indocker::ImageDirectives::DockerCp)}
   end
 
   def from_repo
@@ -45,6 +45,6 @@ class Indocker::ImageMetadata
   private
 
   def from_directive
-    @directives.detect {|c| c.instance_of?(Indocker::DockerDirectives::From)}
+    @directives.detect {|c| c.instance_of?(Indocker::ImageDirectives::From)}
   end
 end

data/lib/indocker/image/image_metadata_factory.rb

@@ -1,4 +1,5 @@
 class Indocker::ImageMetadataFactory
+  include Indocker::ImageHelper
   include SmartIoC::Iocify
 
   bean   :image_metadata_factory
@@ -6,25 +7,25 @@ class Indocker::ImageMetadataFactory
   inject :image_evaluator
   inject :docker_api
   inject :config
+  inject :git_helper
+  inject :registry_service
 
-  def create(repo, tag: Indocker::ImageMetadata::DEFAULT_TAG, &definition)
+  def create(repo, tag: Indocker::ImageHelper::DEFAULT_TAG, &definition)
     context = Indocker::DSLContext.new(
-      build_dir: build_dir(repo),
-      root_dir:  config.root
+      build_dir:  config.build_dir.join(repo.to_s),
+      git:        git_helper,
+      repo:       repo,
+      tag:        tag,
+      registry:   registry_service
     )
+    
     directives = image_evaluator.evaluate(context, &definition)
 
     Indocker::ImageMetadata.new(
       repo:       repo.intern,
       tag:        tag.intern,
       directives: directives,
-      build_dir:  build_dir(repo)
+      build_dir:  config.build_dir.join(repo.to_s)
     )
   end
-
-  private
-
-  def build_dir(name)
-    Pathname.new File.join(config.root, Indocker::BUILD_DIR, name.to_s)
-  end
 end

data/lib/indocker/image/image_metadata_repository.rb

@@ -1,5 +1,6 @@
 class Indocker::ImageMetadataRepository
   include SmartIoC::Iocify
+  include Indocker::ImageHelper
   
   bean :image_metadata_repository
 
@@ -7,13 +8,17 @@ class Indocker::ImageMetadataRepository
     all.push(image_metadata)
   end
 
-  def find_by_repo(repo, tag: Indocker::ImageMetadata::DEFAULT_TAG)
-    image_metadata = all.detect { |im| im.repo == repo.intern and im.tag == tag.intern }
-    raise Indocker::Errors::ImageIsNotDefined, "#{repo}:#{tag}" if image_metadata.nil?
+  def find_by_full_name(image_metadata_full_name)
+    image_metadata = all.detect { |image_metadata| image_metadata.full_name == image_metadata_full_name }
+    raise Indocker::Errors::ImageIsNotDefined, image_metadata_full_name if image_metadata.nil?
 
     image_metadata
   end
 
+  def find_by_repo(repo, tag: nil)
+    find_by_full_name(full_name(repo, tag))
+  end
+
   def clear
     @all = []
   end
@@ -21,10 +26,4 @@ class Indocker::ImageMetadataRepository
   def all
     @all ||= []
   end
-
-  def method_missing(method, **args)
-    tag = args[:tag] || Indocker::ImageMetadata::DEFAULT_TAG
-
-    find_by_repo(method, tag: tag)
-  end
 end

data/lib/indocker/registry/registry_api.rb

@@ -0,0 +1,46 @@
+require 'docker_registry2'
+
+class Indocker::Registry::RegistryAPIBuilder
+  include SmartIoC::Iocify
+
+  bean :registry_api
+
+  inject :config
+
+  def get(registry_name)
+    registry = config.docker.send(registry_name)
+
+    Indocker::Registry::RegistryAPI.new(
+      serveraddress: registry.serveraddress,
+      username:      registry.username,
+      password:      registry.password
+    )
+  end
+end
+
+class Indocker::Registry::RegistryAPI
+  def initialize(serveraddress:, username:, password:)
+    @serveraddress = serveraddress
+    @username      = username
+    @password      = password
+  end
+
+  def rmtag(repo, tag: nil)
+    tag ||= 'latest'
+
+    registry.rmtag(repo, tag)
+  end
+
+  private
+
+  def registry
+    @registry ||= DockerRegistry2.connect(@serveraddress, connection_options)
+  end
+
+  def connection_options
+    {
+      username: @username,
+      password: @password
+    }.delete_if {|_, value| value.to_s.empty?}
+  end
+end

data/lib/indocker/registry/registry_helper.rb

@@ -0,0 +1,20 @@
+module Indocker::Registry
+  class RegistryHelper
+    include Indocker::ImageHelper
+
+    attr_reader :push, :registry
+
+    def initialize(registry:, push: false)
+      @registry = registry
+      @push     = push
+    end
+
+    def to_s
+      registry
+    end
+
+    def get(repository, tag: nil)
+      "#{registry}/#{full_name(repository, tag)}"
+    end
+  end
+end

data/lib/indocker/registry/registry_service.rb

@@ -0,0 +1,28 @@
+class Indocker::Registry::RegistryService
+  include SmartIoC::Iocify
+
+  bean :registry_service
+
+  inject :config
+
+  def method_missing(method, *args)
+    if !config.docker.respond_to?(method)
+      raise ArgumentError, "Registry #{method} is not defined. Add it to config.docker section"
+    end
+
+    registry_config = config.docker.send(method)
+
+    Indocker::Registry::RegistryHelper.new(
+      registry: registry_config.serveraddress,
+      push:     args.first[:push]
+    )
+  end
+
+  def get(registry)
+    if !config.docker.respond_to?(method)
+      raise ArgumentError, "Registry #{method} is not defined. Add it to config.docker section"
+    end
+    
+    config.docker.send(method).serveraddress
+  end
+end

data/lib/indocker/utils/logger_factory.rb

@@ -4,6 +4,7 @@ class Indocker::LoggerFactory
   bean :logger, factory_method: :build
 
   def build
+    STDOUT.sync = true
     Indocker::Logger.new(STDOUT)
   end
 end

data/lib/indocker/utils/registry_authenticator.rb

@@ -6,12 +6,12 @@ class Indocker::RegistryAvaliabilityChecker
   inject :config
   inject :docker_api
 
-  def authenticate!
+  def authenticate!(serveraddress:, username:, email:, password:)
     docker_api.authenticate!(
-      serveraddress: config.docker.registry,
-      username:      config.docker.username,
-      email:         config.docker.email,
-      password:      config.docker.password
+      serveraddress: serveraddress,
+      username:      username,
+      email:         email,
+      password:      password
     )
   rescue Docker::Error::AuthenticationError
     raise Indocker::Errors::DockerRegistryAuthenticationError

data/lib/indocker/utils/tar_helper.rb

@@ -19,18 +19,18 @@ class Indocker::TarHelper
           tarfile_full_name = tarfile.full_name
         end
 
-        destination_file = File.join destination, tarfile_full_name
+        destination_file = File.join(destination, tarfile_full_name)
         
         if tarfile.directory?
           FileUtils.mkdir_p destination_file
         else
           files_list.push(tarfile_full_name)
 
-          destination_directory = File.dirname(destination_file)
-          FileUtils.mkdir_p destination_directory unless File.directory?(destination_directory)
-          File.open destination_file, "wb" do |f|
-            f.print tarfile.read
+          if !File.directory?(destination)
+            FileUtils.mkdir_p destination 
           end
+
+          File.open(destination_file, "wb") {|f| f.print tarfile.read}
         end
       end
     end

data/lib/indocker/version.rb

@@ -1,3 +1,3 @@
 module Indocker
-  VERSION = '0.0.2'.freeze
+  VERSION = '0.0.5'.freeze
 end

data/lib/indocker/volumes/volume_metadata.rb

@@ -0,0 +1,9 @@
+module Indocker::Volumes
+  class VolumeMetadata
+    attr_reader :name
+
+    def initialize(name)
+      @name = name
+    end
+  end
+end

data/lib/indocker/volumes/volume_metadata_factory.rb

@@ -0,0 +1,9 @@
+class Indocker::Volumes::VolumeMetadataFactory
+  include SmartIoC::Iocify
+
+  bean :volume_metadata_factory
+
+  def create(name)
+    Indocker::Volumes::VolumeMetadata.new(name.to_s)
+  end
+end

data/lib/indocker/volumes/volume_metadata_repository.rb

@@ -0,0 +1,34 @@
+class Indocker::Volumes::VolumeMetadataRepository
+  include SmartIoC::Iocify
+
+  bean :volume_metadata_repository
+
+  def put(volume_metadata)
+    if all.any? {|n| n.name == volume_metadata.name}
+      raise Indocker::Errors::VolumeAlreadyDefined, volume_metadata.name 
+    end
+
+    all.push(volume_metadata)
+  end
+
+  def find_by_name(name)
+    volume_metadata = all.detect {|volume| volume.name == name.to_s}
+    raise Indocker::Errors::VolumeIsNotDefined unless volume_metadata
+
+    volume_metadata
+  end
+
+  def clear
+    @all = []
+  end
+
+  def all
+    @all ||= []
+  end
+
+  def method_missing(method)
+    find_by_name(method)
+  rescue 
+    super
+  end
+end

data/lib/indocker.rb

@@ -1,24 +1,27 @@
 require 'smart_ioc'
-require 'docker-api'
-require 'logger'
+
+require 'byebug' # TODO: remove after release
 
 SmartIoC.find_package_beans(:indocker, __dir__)
 SmartIoC.set_load_proc do |location|
   require(location)
 end
 
-Docker.options = { read_timeout: 600, write_timeout: 600 }
-
 require 'indocker/version'
 
+require 'indocker/image/image_helper'
+
 require 'indocker/errors'
 require 'indocker/cli'
-require 'indocker/docker_api'
 require 'indocker/dsl_context'
 
+require 'indocker/docker_api/docker_api'
+require 'indocker/docker_api/container_config'
+
 require 'indocker/configs/config'
 require 'indocker/configs/config_factory'
 require 'indocker/configs/locator'
+require 'indocker/configs/config_initializer'
 
 require 'indocker/utils/logger'
 require 'indocker/utils/logger_factory'
@@ -29,15 +32,19 @@ require 'indocker/utils/registry_authenticator'
 require 'indocker/utils/render_util'
 require 'indocker/utils/render_namespace'
 
-require 'indocker/handlers/base'
-require 'indocker/handlers/run_container'
+require 'indocker/handlers/performable'
+require 'indocker/handlers/container_run'
+require 'indocker/handlers/container_stop'
 
 require 'indocker/utils/ioc_container'
 
 require 'indocker/envs/env_metadata'
-require 'indocker/envs/manager'
 require 'indocker/envs/loader'
 
+require 'indocker/registry/registry_helper'
+require 'indocker/registry/registry_service'
+require 'indocker/registry/registry_api'
+
 require 'indocker/image/image_metadata'
 require 'indocker/image/image_metadata_factory'
 require 'indocker/image/image_dsl'
@@ -45,6 +52,8 @@ require 'indocker/image/image_metadata_repository'
 require 'indocker/image/image_builder'
 require 'indocker/image/image_dependencies_manager'
 require 'indocker/image/image_evaluator'
+require 'indocker/image/image_dockerfile_builder'
+require 'indocker/image/image_directives_runner'
 
 require 'indocker/container/container_metadata'
 require 'indocker/container/container_metadata_repository'
@@ -52,12 +61,12 @@ require 'indocker/container/container_metadata_factory'
 require 'indocker/container/container_manager'
 require 'indocker/container/container_evaluator'
 require 'indocker/container/container_dsl'
+require 'indocker/container/container_builder'
+require 'indocker/container/container_directives_runner'
 
 require 'indocker/partial/partial_metadata'
 require 'indocker/partial/partial_metadata_repository'
 
-require 'indocker/directives/image_directives_runner'
-require 'indocker/directives/container_directives_runner'
 require 'indocker/directives/base'
 require 'indocker/directives/partial'
 
@@ -65,30 +74,40 @@ require 'indocker/networks/network_metadata'
 require 'indocker/networks/network_metadata_factory'
 require 'indocker/networks/network_metadata_repository'
 
-require 'indocker/directives/docker_directives/base'
-require 'indocker/directives/docker_directives/cmd'
-require 'indocker/directives/docker_directives/entrypoint'
-require 'indocker/directives/docker_directives/env'
-require 'indocker/directives/docker_directives/copy'
-require 'indocker/directives/docker_directives/from'
-require 'indocker/directives/docker_directives/run'
-require 'indocker/directives/docker_directives/workdir'
-
-require 'indocker/directives/prepare_directives/base'
-require 'indocker/directives/prepare_directives/docker_cp'
+require 'indocker/volumes/volume_metadata'
+require 'indocker/volumes/volume_metadata_factory'
+require 'indocker/volumes/volume_metadata_repository'
+
+require 'indocker/directives/image_directives/base'
+require 'indocker/directives/image_directives/cmd'
+require 'indocker/directives/image_directives/entrypoint'
+require 'indocker/directives/image_directives/env'
+require 'indocker/directives/image_directives/copy'
+require 'indocker/directives/image_directives/from'
+require 'indocker/directives/image_directives/run'
+require 'indocker/directives/image_directives/workdir'
+require 'indocker/directives/image_directives/expose'
+require 'indocker/directives/image_directives/env_file'
+require 'indocker/directives/image_directives/docker_cp'
+require 'indocker/directives/image_directives/registry'
 
 require 'indocker/directives/container_directives/base'
 require 'indocker/directives/container_directives/from'
 require 'indocker/directives/container_directives/network'
-require 'indocker/directives/container_directives/env_file'
 require 'indocker/directives/container_directives/ports'
 require 'indocker/directives/container_directives/expose'
 require 'indocker/directives/container_directives/depends_on'
 require 'indocker/directives/container_directives/ready'
+require 'indocker/directives/container_directives/cmd'
+require 'indocker/directives/container_directives/volume'
+require 'indocker/directives/container_directives/env_file'
+require 'indocker/directives/container_directives/env'
+
+
+require 'indocker/git/git_helper'
 
 module Indocker
   DOCKERFILE_NAME = 'Dockerfile'
-  BUILD_DIR       = 'tmp/build'
 
   class << self
     def define_image(name, &definition)
@@ -97,9 +116,9 @@ module Indocker
       )
     end
 
-    def define_container(name, &definition)
+    def define_container(name, attach: false, &definition)
       ioc.container_metadata_repository.put(
-        ioc.container_metadata_factory.create(name, &definition)
+        ioc.container_metadata_factory.create(name, attach: attach, &definition)
       )
     end
 
@@ -115,12 +134,22 @@ module Indocker
       )
     end
 
+    def define_volume(name)
+      ioc.volume_metadata_repository.put(
+        ioc.volume_metadata_factory.create(name)
+      )
+    end
+
     def setup(&block)
       ioc.config.set(&block)
     end
 
-    def root(dir = nil)
-      ioc.config.root(dir)
+    def cache_dir(dir = nil)
+      ioc.config.git.cache_dir(Pathname.new(dir))
+    end
+
+    def build_dir(dir = nil)
+      ioc.config.build_dir(Pathname.new(dir))
     end
   end
 end

data/spec/example/.indocker/config.rb

@@ -1,21 +1,28 @@
 Idocker.setup do
-  namespace     'indocker_example'
-  root          File.dirname(__dir__)
+  namespace 'indocker_example'
 
   load_env_file '.indocker/env_files'
   load_docker_items [
     '.indocker/images_and_containers.rb'
   ]
 
+  docker do
+    registry :indocker do
+      serveraddress: 'localhost:1000'
+    end
+  end
+
   git do
-    repository 'https://github.com/droidlabs/indocker'
-    tag        'latest'
-    branch     'master'
-    workdir    'some/path'
+    cache_dir '/tmp/indocker'
+
+    repo :indocker do
+      repository 'https://github.com/droidlabs/indocker'
+      branch     'master'
+    end
   end
   
   docker do
-    registry   'localhost:5000'
+    registry   'localhost:1000'
     skip_push  true
   end
 

data/spec/fixtures/spec.env

@@ -0,0 +1,2 @@
+RUBY_ENV=development
+RAILS_ENV=development