docker_deploy 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63619a798b6a3fa44aec2d3228cb9750fb96ce8f
-  data.tar.gz: 8c61215138a2d56de1e3e8a0813aa59a12936343
+  metadata.gz: 2b3ca2a21e28ad1002f9acf80b7863334be7955e
+  data.tar.gz: 81d5bbfe43edc6485be780738aa0d1be2b2e1f6b
 SHA512:
-  metadata.gz: ff17a90efec549e9f1ea391a52a078b74b7c389348c9b993388c5eb3eb0cbaae5d05df8642b698fa8f015726e0cd4f5b0cb27a46c3ce95eaefe15e0bb0812a60
-  data.tar.gz: 4966d4578f640b5530f5c574ed2aabb709aa593ebe52483b86fedf1e2db96508946a430a8f9bde72cb41da1d90325aea99f252e2219b6ffbea356daaf696534a
+  metadata.gz: 746749ade72e06e8cb9b4df66b280586e0b0034f32135864798fdb3c1c62da53f54274576c626dc2bff4c2741208c13a836eb417e78cc11d33c1ef126a68fef5
+  data.tar.gz: f2354f4399a9e42f4f7b564950621a1f2ab218eac7c5aef32f4b480adbb90e110cef61608ca700cd01a8743c9d6c6a684e6da43136d096f079ee210c3ae0801a

data/lib/docker_deploy/service.rb

@@ -0,0 +1,29 @@
+module DockerDeploy
+  class Service
+    attr_reader :name, :command
+
+    def initialize(stage, name)
+      @stage = stage
+      @name = name
+      @ports = {}
+    end
+
+    def command(name = nil)
+      @command = name if name
+      @command
+    end
+
+    def port(ports = {})
+      @ports.merge!(ports)
+    end
+
+    def port_mappings
+      DockerDeploy.format_params("-p %s:%s", @ports)
+    end
+
+    def container(name = nil)
+      @container = name if name
+      @container or "#{@stage.container}_#{@name}"
+    end
+  end
+end

data/lib/docker_deploy/stage.rb

@@ -2,12 +2,13 @@ module DockerDeploy
   class Stage
     include Rake::FileUtilsExt
 
-    attr_reader :name, :servers, :variables, :links, :env_files, :deploy, :container
+    attr_reader :name, :servers, :variables, :links, :env_files, :deploy, :container, :services
 
     def initialize(context, name)
       @context = context
       @name = name
       @env_files = []
+      @services = []
       @variables = {}
       @ports = {}
       @links = {}
@@ -36,16 +37,16 @@ module DockerDeploy
     end
 
     def link_mappings
-      format_params("--link %s:%s", @context.links.merge(@links))
+      DockerDeploy.format_params("--link %s:%s", @context.links.merge(@links))
     end
 
     def port_mappings
-      format_params("-p %s:%s", @context.ports.merge(@ports))
+      DockerDeploy.format_params("-p %s:%s", @context.ports.merge(@ports))
     end
 
     def options
-      format_params("--env-file %s", @context.env_files + @env_files) + " " +
-      format_params("-e %s=%s", @context.variables.merge(@variables))
+      DockerDeploy.format_params("--env-file %s", @context.env_files + @env_files) + " " +
+      DockerDeploy.format_params("-e %s=%s", @context.variables.merge(@variables))
     end
 
     def container(name = nil)
@@ -53,13 +54,10 @@ module DockerDeploy
       @container or @context.container
     end
 
-  private
-
-    def format_params(pattern, enumerable)
-      enumerable.map do |args|
-        args = [args].flatten.map { |v| Shellwords.escape(v) }
-        pattern % args
-      end.join(" ")
+    def service(name, &block)
+      service = Service.new(self, name)
+      service.instance_eval(&block)
+      @services << service
     end
   end
 end

data/lib/docker_deploy/task.rb

@@ -33,7 +33,32 @@ module DockerDeploy
             task :start do
               stage.run "docker run -d #{stage.port_mappings} #{stage.link_mappings} #{stage.options} --name #{stage.container} #{context.image}:latest"
 
-              puts "\n\nStarted: #{stage.host}\n"
+              puts "\n\nstarted: #{stage.host}\n"
+            end
+
+            desc "Restart the running container."
+            task restart: [:stop, :start]
+
+            stage.services.each do |service|
+              namespace service.name do
+                desc "Stop the #{service.name} service and remove its container"
+                task :stop do
+                  stage.run "docker inspect #{service.container} 2>&1 > /dev/null && docker kill #{service.container} && docker rm #{service.container} || true"
+                end
+
+                desc "Start the #{service.name} service in a container using the latest image."
+                task :start do
+                  stage.run "docker run -d #{service.port_mappings} #{stage.link_mappings} #{stage.options} --name #{service.container} #{context.image}:latest #{service.command}"
+                end
+
+                desc "Restart the #{service.name} service."
+                task restart: [:stop, :start]
+
+                desc "Tail log of the #{service.name} service."
+                task :tail do
+                  stage.run "docker logs --tail 50 -f #{service.container}"
+                end
+              end
             end
 
             desc "Run migrations in the latest image."
@@ -67,9 +92,6 @@ module DockerDeploy
                 stage.shell
               end
             end
-
-            desc "Restart the running container."
-            task restart: [:stop, :start]
           end
         end
       end

data/lib/docker_deploy/version.rb

@@ -1,3 +1,3 @@
 module DockerDeploy
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/docker_deploy.rb

@@ -5,12 +5,22 @@ require "io/console"
 
 require "docker_deploy/version"
 require "docker_deploy/shell"
+require "docker_deploy/service"
 require "docker_deploy/context"
 require "docker_deploy/stage"
 require "docker_deploy/remote_stage"
 require "docker_deploy/local_stage"
 require "docker_deploy/task"
 
+module DockerDeploy
+  def self.format_params(pattern, enumerable)
+    enumerable.map do |args|
+      args = [args].flatten.map { |v| Shellwords.escape(v) }
+      pattern % args
+    end.join(" ")
+  end
+end
+
 # Improvement on the broken piece of crap text formatter in SSHKit.
 class PlainFormatter < SSHKit::Formatter::Abstract
   def initialize(io = $stdout)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker_deploy
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Jonas Nicklas
@@ -71,6 +71,7 @@ files:
 - lib/docker_deploy/context.rb
 - lib/docker_deploy/local_stage.rb
 - lib/docker_deploy/remote_stage.rb
+- lib/docker_deploy/service.rb
 - lib/docker_deploy/shell.rb
 - lib/docker_deploy/stage.rb
 - lib/docker_deploy/task.rb