docktor 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 749c40ad9a74da59aaa3a52c9ab9848bf52a10bd
-  data.tar.gz: 14bb492a1232e1ffd85c0eae9c99ae9e3f0e6b81
+  metadata.gz: 668089227b7edce1c61b2969309282930668aca8
+  data.tar.gz: 4cc904b8dddf40bd913e603fb870d0a677a2c139
 SHA512:
-  metadata.gz: c03b957271b5b1388354a52fb786a40a5bc5396fd94fbaf9bf3ee14434e42bbe367521f42d5e6defb8fa56dc38cafba259fd8da0ece623e9b88bf6f47c6a83ba
-  data.tar.gz: 429aa3be22d6ab039be4132fac9d8c9ab9038ef82248ee194ce940d59a9669c16bc90646041c8d90f47a6579148e21313316578a2516bd6ac5cda4f04479c481
+  metadata.gz: 3b0755e53477032149692af0a46b1d6c37f9c3638af0a72263e85c49fd85bffd075ce176b9414f7c978a7638d02ccaff40f37ec71e1c137f0ac8b03abf0d0393
+  data.tar.gz: c1d39ce8a1361f9e0070580ccff5c6b84f846cb2452005a3022fbe1510a45dd20dda4ec7431607827da18224cad8d1d33b825df4ec37fb564e40da6f505e40be

data/Gemfile

@@ -3,4 +3,5 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in docktor.gemspec
 gemspec
 
+gem 'activesupport'
 gem 'virtus'

data/bin/doc

@@ -6,4 +6,8 @@ require "docktor"
 
 include Docktor
 
-Docktor::Runner.new.invoke
+begin
+  Docktor::Runner.new.invoke container_name: ARGV[0]
+rescue Docktor::Runner::ContainerNotFound => e
+  puts e.message
+end

data/lib/docktor.rb

@@ -1,3 +1,6 @@
+require "active_support"
+require "active_support/core_ext"
+
 require "docktor/version"
 require "docktor/runner"
 

data/lib/docktor/container.rb

@@ -2,9 +2,9 @@ require "virtus"
 
 module Docktor
   class Container
-    include Virtus.value_object
+    include Virtus.model
 
-    OPTION_ATTRIBUTES = %i(volumes ports links environment)
+    OPTION_ATTRIBUTES = %i(volumes ports links environment detach)
 
     values do
       attribute :name, String
@@ -14,10 +14,11 @@ module Docktor
       attribute :ports, Array[String]
       attribute :links, Array[String]
       attribute :environment, Hash[String, String]
+      attribute :detach, Boolean, default: false
     end
 
     def options
-      attributes.select { |key, value| (key != :name || key != :image) && !value.nil? && !value.empty? }
+      attributes = self.attributes.select { |key, value| OPTION_ATTRIBUTES.include?(key) && !value.try(:empty?) }
     end
   end
 end

data/lib/docktor/docker_client.rb

@@ -3,27 +3,29 @@ module Docktor
     CONTAINER_NAME_PREFIX = "docktor_"
 
     def container_exists?(container)
-      `docker ps -aqf name=#{container_name(container.name)}` != ""
+      `docker ps --all --quiet --filter name=#{container_name(container.name)}`.present?
     end
 
     def run(container)
-      puts "docker run -d --name #{container_name(container.name)} #{parse_options(container.options)} #{container.image} #{container.command}"
-      `docker run -d --name #{container_name(container.name)} #{parse_options(container.options)} #{container.image} #{container.command}`
+      `docker run --name #{container_name(container.name)} #{parse_options(container.options)} #{container.image} #{container.command}`
     end
 
     def start(container)
       `docker start #{container_name(container.name)}`
     end
 
+    private
+
     def parse_options(options)
       options.map do |name, value|
         case name
-        when :volumes then "-v #{value.join(" ")}"
-        when :ports then "-p #{value.join(" ")}"
-        when :links then "--link #{value.join(" ")}"
+        when :detach then "--detach=#{value}"
+        when :volumes then "--volume #{value.join(" ")}"
+        when :ports then "--publish #{value.join(" ")}"
+        when :links
           value.map { |v| "--link #{container_name(v)}" }.join(" ")
         when :environment
-          "-e #{value.map { |k, v| %(#{k}="#{v}") }.join(" ")}"
+          "--env #{value.map { |k, v| %(#{k}="#{v}") }.join(" ")}"
         end
       end.join(" ").strip
     end

data/lib/docktor/manifest.rb

@@ -0,0 +1,54 @@
+require "virtus"
+require "docktor/container"
+
+module Docktor
+  class Manifest
+    include Virtus.model
+
+    class ContainerNotFound < StandardError; end
+
+    values do
+      attribute :containers_for_execution, Array[String]
+      attribute :containers, Array[Docktor::Container]
+    end
+
+    def select_container_for_execution(container_name)
+      select_containers_for_execution([container_name])
+    end
+
+    def select_containers_for_execution(container_names)
+      self.containers_for_execution = []
+
+      container_names.each do |name|
+        container = find_container_by_name(name)
+
+        fail ContainerNotFound, %(There is no container "#{name}") if container.nil?
+
+        containers_for_execution << container
+        self.containers_for_execution += find_container_links(container)
+      end
+
+      containers_for_execution.uniq!
+      sort_containers_for_execution!
+    end
+
+    def find_container_by_name(name)
+      containers.find { |container| container.name == name }
+    end
+
+    def find_container_links(container)
+      container.links.map { |link| find_container_by_name link }
+    end
+
+    def sort_containers_for_execution!
+      sorted_containers = []
+
+      containers_for_execution.each do |container|
+        links_indexes = container.links.map { |link| sorted_containers.index link }
+        sorted_containers.insert((links_indexes.max || -1) + 1, container)
+      end
+
+      self.containers_for_execution = sorted_containers
+    end
+  end
+end

data/lib/docktor/manifest_parser.rb

@@ -0,0 +1,24 @@
+require "yaml"
+require "docktor/manifest"
+require "docktor/container"
+
+module Docktor
+  class ManifestParser
+    def parse(yaml_path)
+      manifest_data = YAML.load_file(yaml_path)
+      manifest = Docktor::Manifest.new
+      default_containers = manifest_data.delete("doc_defaults")
+
+      manifest.containers = manifest_data.map do |container_name, options|
+        Container.new(
+          name: container_name,
+          **options.symbolize_keys
+        )
+      end
+
+      manifest.select_containers_for_execution default_containers
+
+      manifest
+    end
+  end
+end

data/lib/docktor/runner.rb

@@ -1,20 +1,31 @@
-require "docktor/yaml_parser"
+require "docktor/manifest_parser"
 require "docktor/docker_client"
 
 module Docktor
   class Runner
+    class ContainerNotFound < StandardError; end
+
     DEFAULT_YAML_PATH = "./docktor.yml"
 
-    def invoke(yaml_path: DEFAULT_YAML_PATH, parser: Docktor::YAMLParser.new, client: Docktor::DockerClient.new)
-      containers = parser.parse(yaml_path)
+    def invoke(
+      container_name: nil,
+      yaml_path: DEFAULT_YAML_PATH,
+      parser: Docktor::ManifestParser.new,
+      client: Docktor::DockerClient.new
+    )
+      manifest = parser.parse(yaml_path)
+
+      manifest.select_container_for_execution(container_name) if container_name.present?
 
-      containers.each do |container|
+      manifest.containers_for_execution.each do |container|
         if client.container_exists?(container)
           client.start container
         else
           client.run container
         end
       end
+    rescue Docktor::Manifest::ContainerNotFound => e
+      raise ContainerNotFound, e.message
     end
   end
 end

data/lib/docktor/version.rb

@@ -1,3 +1,3 @@
 module Docktor
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docktor
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Marcelo Munhoz Pélos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,9 +75,10 @@ files:
 - lib/docktor.rb
 - lib/docktor/container.rb
 - lib/docktor/docker_client.rb
+- lib/docktor/manifest.rb
+- lib/docktor/manifest_parser.rb
 - lib/docktor/runner.rb
 - lib/docktor/version.rb
-- lib/docktor/yaml_parser.rb
 homepage: https://github.com/mpelos/docktor
 licenses:
 - MIT

data/lib/docktor/yaml_parser.rb

@@ -1,20 +0,0 @@
-require "yaml"
-require "docktor/container"
-
-module Docktor
-  class YAMLParser
-    def parse(yaml_path)
-      YAML.load_file(yaml_path).map do |container_name, options|
-        Container.new(
-          name: container_name,
-          image: options["image"],
-          volumes: options["volumes"],
-          ports: options["ports"],
-          links: options["links"],
-          command: options["command"],
-          environment: options["environment"]
-        )
-      end
-    end
-  end
-end