docker_deploy 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6ecb0e145a8a035e682723c67deb36e908de5ad
-  data.tar.gz: 7a4a43a110e5fa7d3b338e710cbbd89e8a1d11c4
+  metadata.gz: 3f377e6e5c4f35c71eb78e3e3f1a43600ba7ace9
+  data.tar.gz: bd168fbc6d365ac6bb2d036f364cc2c6272e6aa8
 SHA512:
-  metadata.gz: 685ffec9fcb8743c058c09aa2fd0f108bdd1a7d2a578e9ad77a0ccad79bfb0708005ff5357c18838495a7398ecf36e85377f16ad4b91ab6e60ab9d66dbf1c4b5
-  data.tar.gz: e8db5e0fdc5cc792836487f8ff3a044e3eeda3e211d5908424ee7abfae81b61e22f7673e63b59fe21b8bdea8c2dd352ad27df4ab1bffd1cc205b152f848c8572
+  metadata.gz: 32c259e9d57c6d73f3d6774840a5265a00beeb5c2d6fdcc81a38b489a3d91419e39a9dac3318ef2caa672e797f72ff00e4c7d6896193e905b46694a0d5089d77
+  data.tar.gz: 529a1cd86771318527138c5928c58348aea4c65e354182b1ec0fcab1212cef09cf8575adb5f3573e2a92823de6e7f34e0618469e1c483f299ac4ad2899fe8f05

data/README.md

@@ -8,7 +8,7 @@ Ruby applications.
 Add this line to your application's Gemfile:
 
 ``` ruby
-gem 'docker_deploy'
+gem "docker_deploy", require: false
 ```
 
 ## Usage
@@ -16,6 +16,8 @@ gem 'docker_deploy'
 In your Rakefile define your deployment setup like this:
 
 ``` ruby
+require "docker_deploy"
+
 DockerDeploy.task do
   image "elabs/projectpuzzle"
 

data/lib/docker_deploy/context.rb

@@ -31,8 +31,9 @@ module DockerDeploy
       @image
     end
 
-    def container
-      @image.split("/").last
+    def container(name = nil)
+      @container = name if name
+      @container or @image.split("/").last
     end
 
     def revision

data/lib/docker_deploy/stage.rb

@@ -2,7 +2,7 @@ module DockerDeploy
   class Stage
     include Rake::FileUtilsExt
 
-    attr_reader :name, :servers, :variables, :links, :env_files, :deploy
+    attr_reader :name, :servers, :variables, :links, :env_files, :deploy, :container
 
     def initialize(context, name)
       @context = context
@@ -48,6 +48,11 @@ module DockerDeploy
       format_params("-e %s=%s", @context.variables.merge(@variables))
     end
 
+    def container(name = nil)
+      @container = name if name
+      @container or @context.container
+    end
+
   private
 
     def format_params(pattern, enumerable)

data/lib/docker_deploy/task.rb

@@ -31,12 +31,12 @@ module DockerDeploy
 
             desc "Stop the application and remove its container"
             task :stop do
-              stage.run "docker inspect #{context.container} 2>&1 > /dev/null && docker stop #{context.container} && docker rm #{context.container} || true"
+              stage.run "docker inspect #{stage.container} 2>&1 > /dev/null && docker stop #{stage.container} && docker rm #{stage.container} || true"
             end
 
             desc "Start the application in a container using the latest image."
             task :start do
-              stage.run "docker run -d #{stage.port_mappings} #{stage.link_mappings} #{stage.options} --name #{context.container} #{context.image}:latest"
+              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"
             end

data/lib/docker_deploy/version.rb

@@ -1,3 +1,3 @@
 module DockerDeploy
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker_deploy
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Jonas Nicklas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-10 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sshkit