dockage 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 040dcb61ff6449c12748a15c4b33b37a0c71058f
-  data.tar.gz: 0bb254266945f5090087164aaaaf629a3ee78713
+  metadata.gz: 6dc0cb297821ddb14ff45a2aa8a4b6c4e5a5fd8e
+  data.tar.gz: 18bf46721239cafe327ac3a229c5d6bfe6a55727
 SHA512:
-  metadata.gz: 295e000c84cf10c1ea530a494ebf3de0960922acbf333b6d9edc6a9b846a0b0c49c02a14be578cf2ca93f9422396c2af2e97163dc17ad1755f13df33034ba642
-  data.tar.gz: f4d7b4edd1011caece5c0f2c8fb5c19239434207a68d18c8bc613a87cac0829f6be3bd062f5da027e08aa09a17c2219ed16232e76977e97702794c9e17fdba88
+  metadata.gz: 2959957dbefb1bb07c0d2b7e3807ead30bc43cf4d60accded74597400c0b78cb9397104f8922a5ce4faf812a4ff0e0725feebb9fb38cd8092349a41eea4049ee
+  data.tar.gz: efb59423192b688de2fbc130ae026c7da9a499e4e5d48a90f4da1c2f19f51fbd1a4dd72e6120e800af5a65a9c0e85b185a69d000275d86e716c4cb1f453e8abe

data/lib/dockage/cli.rb

@@ -31,7 +31,6 @@ module Dockage
     desc 'up [CONTAINER]', 'Create and run specified [CONTAINER] or all configured containers'
     def up(name = nil)
       find_containers(name).each do |container|
-        Dockage.logger("Bringing up #{container[:name].yellow.bold}")
         Dockage::Docker.shell.up(container)
       end
     end
@@ -59,6 +58,13 @@ module Dockage
       end
     end
 
+    desc 'stop [CONTAINER]', 'Stop specified [CONTAINER] or all configured containers'
+    def stop(name = nil)
+      find_containers(name).each do |container|
+        Dockage::Docker.shell.stop(container[:name])
+      end
+    end
+
     desc 'ssh CONTAINER', 'SSH login to CONTAINER'
     def ssh(name)
       container = find_container(name)

data/lib/dockage/docker/parse.rb

@@ -17,13 +17,12 @@ module Dockage
           end
 
           string.map do |container_string|
-            container           = Hash[keys.map { |k, v| [k, container_string[v[:start]..v[:stop]].strip] }]
-            container[:name]    = container[:names].to_s
-                                                   .split(',')
-                                                   .reject{ |v| v.include?('/') }
-                                                   .first
-            container[:running] = container[:status].downcase
-                                                    .include?('up') ? true : false
+            container               = Hash[keys.map { |k, v| [k, container_string[v[:start]..v[:stop]].strip] }]
+            container[:names]       = container[:names].to_s.split(',')
+            container[:name]        = container[:names].reject{ |v| v.include?('/') }.first
+            container[:linked_with] = container[:names].map{ |name| name.split('/')[0] }.compact
+            container[:running]     = container[:status].downcase
+                                                        .include?('up') ? true : false
             container
           end
         end

data/lib/dockage/docker/shell.rb

@@ -5,7 +5,7 @@ module Dockage
       DOCKER_DEFAULT_HOST = 'unix:///var/run/docker.sock'
 
       def initialize
-        @env = "DOCKER_HOST=#{Dockage.settings[:docker_host] || DOCKER_DEFAULT_HOST}"
+        @env = "export DOCKER_HOST=#{Dockage.settings[:docker_host] || DOCKER_DEFAULT_HOST}"
       end
 
       def pull(image)
@@ -22,9 +22,10 @@ module Dockage
 
       def stop(name)
         unless container_running?(name)
-          Dockage.logger("Container #{name.bold.yellow} is not running")
+          Dockage.logger("Container #{name.bold.yellow} is not running. Nothing to do")
           return
         end
+        Dockage.logger("Stopping container #{name.bold.yellow}")
         invoke("stop #{name}", catch_errors: true)
       end
 
@@ -59,6 +60,8 @@ module Dockage
       end
 
       def up(container)
+        Dockage.logger("Bringing up #{container[:name].yellow.bold}")
+        return reload(container) if should_be_reload?(container)
         if container_running?(container[:name])
           Dockage.logger("Container #{container[:name].bold} is already up. Nothing to do")
           return
@@ -69,6 +72,7 @@ module Dockage
       end
 
       def reload(container)
+        return unless dependences_satisfied?(container)
         stop(container[:name]) if container_running?(container[:name])
         destroy(container[:name]) if container_exists?(container[:name])
         up(container)
@@ -113,20 +117,51 @@ module Dockage
 
       def run(image, opts = {})
         command = "run" \
-          "#{opts[:detach] == false || ' -d'}" \
+          "#{opts[:detach]  == false || ' -d'}" \
           "#{opts[:links]   && opts[:links].map { |link| " --link #{link}" }.join}" \
           "#{opts[:volumes] && opts[:volumes].map { |volume| " -v #{volume}" }.join}" \
           "#{opts[:ports]   && opts[:ports].map { |port| " -p #{port}" }.join}" \
           "#{opts[:name]    && " --name #{opts[:name]}"}" \
           " #{image}" \
-          "#{opts[:cmd] && " /bin/sh -c '#{opts[:cmd]}'"}"
+          "#{opts[:cmd]     && " /bin/sh -c '#{opts[:cmd]}'"}"
         invoke(command)
       end
 
       private
 
+      def dependences_satisfied?(container)
+        return true unless container[:links] && container[:links].any?
+        active_containers = ps
+        container[:links].each do |link|
+          dependency_name = link.split(':').first
+          next if active_containers.select { |con| con[:name] == dependency_name }.any?
+          dependency_container = Dockage.settings.containers.select { |con| con[:name] == dependency_name }.first
+          unless dependency_container
+            Dockage.error("#{dependency_name.bold} is required for " \
+                         "#{container[:name]} but does not specified " \
+                         "in config file")
+          end
+          up(dependency_container)
+        end
+      end
+
+      def should_be_reload?(container)
+        return false unless container[:links]
+        containers = ps(nil, true)
+        return false unless containers.select { |con| con[:name] == container[:name] }.any?
+        links = container[:links].map { |link| link.split(':').first }
+        dependency_containers = containers.select { |con| links.include?(con[:name]) }
+        dependency_containers.each do |dep_con|
+          unless dep_con[:linked_with].include?(container[:name])
+            Dockage.logger("Container #{container[:name].bold} has missing links and should be reloaded")
+            return true
+          end
+        end
+        false
+      end
+
       def invoke(cmd, opts = {})
-        command = "#{@env} docker #{cmd}"
+        command = "#{@env} && docker #{cmd}"
         Dockage.verbose(command)
         if opts[:attach_std]
           output = sys_exec(command, opts[:catch_errors])

data/lib/dockage/version.rb

@@ -1,3 +1,3 @@
 module Dockage
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockage
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Sergey Besedin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor