capistrano-docker 0.0.01 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a592fc849c9d22346829a7c36469511f958f6ed4
-  data.tar.gz: c54393b6fa06d26e7af161d460b5c597ab55fadc
+  metadata.gz: 738b52f5ebbc979cfa353956cb91aa1004adf2fb
+  data.tar.gz: 1fd51047f862f0c80c49df490f7311b88f3d003f
 SHA512:
-  metadata.gz: 3da59a8592defba7141b6c595ff6251f635bf1abe3b958277112510b5ed04dd314d385e09972ef1e8ff8a9bde71793f1fbe8919015be045e537baf33da7b859b
-  data.tar.gz: cbfa3ff8723cf116ffd84c65048b2854ce4a5bcb2f911aca40917fd0fb58ef0c58a01d2ed6b841bce92b4285dd3a6d819a5cb56d48507bc8f0ebee5fe9d5ee2f
+  metadata.gz: 7d56ae10e506c9601767d271c624cdea641a56b88c2d441419c1bf0360743a8976acf629f716446d58960fe0f65e5e70de1724636874779cb1ccab3f9eaec9e6
+  data.tar.gz: 5f6796ef8a74ab9cf2122d09240fc24891a4f2e339ef8f0d14f433a3c0676bab30e9f6af5df407540e65c5efbe0d2f865edcf26a92eb46c085e719117ad1015e

data/capistrano-docker.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'capistrano-docker'
-  spec.version       = '0.0.01'
+  spec.version       = '0.0.2'
   spec.authors       = ["Ross Riley"]
   spec.email         = ["riley.ross@gmail.com"]
   spec.description   = %q{Docker support for Capistrano 3.x}

data/lib/capistrano/tasks/deploy.rake

@@ -66,7 +66,7 @@ namespace :deploy do
         on roles :host do |host|
             info " Running Rsync to: #{host.user}@#{host.hostname}"
             run_locally do
-                execute "rsync -rup --exclude '.git' tmp/build/* #{host.user}@#{host.hostname}:#{fetch(:docker_buildpath)}/"
+                execute "rsync -rupl --exclude '.git' tmp/build/* #{host.user}@#{host.hostname}:#{fetch(:docker_buildpath)}/"
             end
         end
     end

data/lib/capistrano/tasks/docker.rake

@@ -12,7 +12,7 @@ namespace :docker do
     desc "build an updated box, restart container"
     task :build do
         on roles :host do
-            execute "docker build --no-cache=true -t #{fetch(:docker_appname)}_img #{fetch(:docker_buildpath)}/"
+            execute "docker build -t #{fetch(:docker_image)} #{fetch(:docker_buildpath)}/"
             execute "docker kill #{fetch(:docker_appname)}" rescue ""
             execute "docker rm #{fetch(:docker_appname)}" rescue ""
             execute build_run_command
@@ -29,10 +29,10 @@ namespace :docker do
             cmd << "-v `pwd`/#{fetch(:docker_mountpath)}/#{name}:#{vol}:rw "
         end
         cmd << "-name #{fetch(:docker_appname)} "
-        cmd << "-e APP_USER='#{fetch(:docker_appname)}' "
-        cmd << "-e APP_PASS='#{fetch(:password)}' "
-        cmd << "-e APP_DB='#{fetch(:docker_appname)}' "
-        cmd << "-d -t #{fetch(:docker_appname)}_img:latest "
+        cmd << "-e APP_USER='#{fetch(:app_username)}' "
+        cmd << "-e APP_PASS='#{fetch(:app_password)}' "
+        cmd << "-e APP_DB='#{fetch(:app_db)}' "
+        cmd << "-d -t #{fetch(:docker_image)}:latest "
         cmd
     end
 end
@@ -45,6 +45,10 @@ namespace :load do
         set  :docker_buildpath, ->   { "#{fetch(:docker_workpath)}/config" }
         set  :docker_mountpath, ->   { "#{fetch(:docker_workpath)}/mounts" }
         set  :docker_appname,   ->   { "#{fetch(:namespace)}_#{fetch(:application)}" }
+        set  :docker_image,   ->     { "#{fetch(:namespace)}_#{fetch(:image, fetch(:application))}" }
+        set  :app_username,   ->     { "#{fetch(:docker_appname)}" }
+        set  :app_password,   ->     { "#{fetch(:password)}" }
+        set  :app_db,   ->           { "#{fetch(:app_username)}" }
         
         
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-docker
 version: !ruby/object:Gem::Version
-  version: 0.0.01
+  version: 0.0.2
 platform: ruby
 authors:
 - Ross Riley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-06 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano