capistrano-decompose 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ee987eae8bc6a437a8964b9d7a40d012ac764d9
-  data.tar.gz: 67c6f9504c421d0f760990647a5169a93e8bb9b8
+  metadata.gz: 93e0a9a34a416d8cd0047c7db1eada8fc5bd70a0
+  data.tar.gz: 2487583455283907d35fdcae1c82294987f15e3c
 SHA512:
-  metadata.gz: 2c1206bb0dbd43f6e80052994366aa258cfc9f03f94636134cf201f6475cba0ed339428aff33a9c748609de3c40c058bd6e601f836e21e310888e2acc01fae64
-  data.tar.gz: 09a6537feacf72d0558d432d9ed2ff82b1458e44ab6d7884b22f627a07346714c81ef9ace409032c8f8c11bc334bb24c4c441c636cd5183a5b5d02a4b173175e
+  metadata.gz: 00430b7a1db6a2dea295c9b9f295723273b33dc58682ea24e14d05cdfed29f53c6375ad4739ce17b5df8e847daa17495b5c136f00dd7b4d7a689a837d4653dba
+  data.tar.gz: b27a13f856c6be1ee8fb873d8bfbb291f101e1ac8f40a4a33998b03fe52f77aef89a72dcbe8e9224258e2f0eb7f6c684dd0e0b07808643b4c431815ef24ce51f

data/.gitignore

@@ -7,3 +7,4 @@ test/dummy/log/*.log
 test/dummy/tmp/
 test/dummy/.sass-cache
 .DS_Store
+*.gem

data/Gemfile.lock

@@ -1,27 +1,25 @@
 PATH
   remote: .
   specs:
-    capistrano-decompose (0.1)
+    capistrano-decompose (0.1.2)
       capistrano (~> 3.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    airbrussh (1.0.2)
+    airbrussh (1.3.0)
       sshkit (>= 1.6.1, != 1.7.0)
-    capistrano (3.5.0)
+    capistrano (3.9.0)
       airbrussh (>= 1.0.0)
-      capistrano-harrow
       i18n
       rake (>= 10.0.0)
       sshkit (>= 1.9.0)
-    capistrano-harrow (0.5.1)
-    i18n (0.7.0)
+    i18n (0.8.6)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (3.1.1)
-    rake (11.1.2)
-    sshkit (1.10.0)
+    net-ssh (4.1.0)
+    rake (12.0.0)
+    sshkit (1.14.0)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
 
@@ -32,4 +30,4 @@ DEPENDENCIES
   capistrano-decompose!
 
 BUNDLED WITH
-   1.11.2
+   1.15.1

data/README.md

@@ -57,6 +57,7 @@ For a typical rails application the previous options should be as follows, given
 set :decompose_restart, [:web]
 set :decompose_web_service, :web
 set :decompose_rake_tasks, ['db:migrate', 'assets:precompile']
+set :compose_file, "docker-compose file name"
 ```
 
 ## Defined Tasks

data/lib/capistrano/decompose/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Decompose
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

data/lib/capistrano/tasks/decompose.rake

@@ -71,10 +71,12 @@ namespace :decompose do
   end
 
   namespace :load do
+    desc 'set our variables if they are not yet'
     task :defaults do
       set :decompose_restart, fetch(:decompose_restart, nil)
-      set :decompose_web_service, fetch(:decompose_web_service, :web)
+      set :decompose_web_service, fetch(:decompose_web_service, 'web')
       set :decompose_rake_tasks, fetch(:decompose_rake_tasks, nil)
+      set :decompose_compose_file, fetch(:decompose_compose_file, 'docker-compose.yml')
     end
   end
 
@@ -83,16 +85,19 @@ namespace :decompose do
   end
 
   def docker_execute(*args)
-    execute('docker-compose', "--project-name #{fetch :application}", *args)
+    execute('docker-compose', "--project-name #{fetch :application} -f #{fetch :decompose_compose_file}", *args)
   end
 
   def docker_execute_interactively(host, command)
     user = host.user
     port = fetch(:port) || 22
-    docker_run = "docker-compose --project-name #{fetch :application} run --rm web #{command}"
+    docker_run = "docker-compose --project-name #{fetch :application}  -f #{fetch :decompose_compose_file} run --rm #{fetch :decompose_web_service} #{command}"
     exec "ssh -l #{user} #{host} -p #{port} -t 'cd #{deploy_to}/current && #{docker_run}'"
   end
 
+  before 'decompose:build', 'decompose:load:defaults'
+  before 'decompose:run', 'decompose:load:defaults'
+
   after 'deploy:updated', 'decompose:build'
   after 'deploy:published', 'decompose:rake_tasks'
   after 'deploy:published', 'decompose:restart'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-decompose
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Emad Elsaid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-20 00:00:00.000000000 Z
+date: 2017-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -63,10 +63,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Capistrano plugin to deploy your application inside docker containers using
   docker compose
 test_files: []
-has_rdoc: