capistrano-sidekiq-docker 0.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f30cfeed1c2193cf02409e93fc49537145e4136
-  data.tar.gz: 197a0a2345f5ac95919678837608b98789898afd
+  metadata.gz: 14d41699739ce8fe9b9d79fd0f8a77574a523490
+  data.tar.gz: 8da2c6c4e0e3b3214b8c3ba7704841e8f83234aa
 SHA512:
-  metadata.gz: d3047764c605329fb4679d8cc59917de25890888135f8b179a986b5c5462e497826d4aae8f24113a6234eeed1ff2d1f91da0014fc9875e50142ed8df95f15592
-  data.tar.gz: dc20513f3590613f8c9f93d7ca5e5a230fca0ddf27cb0d30ac9e6b6c0fb54c6e2376f79d2f71c9be1de7ebf92627f32f16ba93c25629a32d42fcc370013dbe0f
+  metadata.gz: fd894326cd9f459d5543fbb576b56ae462c50dfebd1a0157b187450d785834f8fe89eef2fcf46c5ccf1c9a5c8c470a7855c332b668b1a7eaad94d552ef92c82b
+  data.tar.gz: 718dadce0653a8631240f3bc10fe28f342e0b92142f1ff6fe9a28b80b5c34297a3bf7f043f67cf513e6e32a6249347dfaed76db74bc9b66dabeb80fc926ca3f0

data/README.md

@@ -45,3 +45,8 @@ set :sidekiq_docker_image_name, -> { 'sidekiq' }
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## Changelog
+
+* 0.2.1: Fixing bundle install options, Checking if process is running before stopping sidekiq
+* 0.2: Added bundle install support for docker

data/lib/capistrano/sidekiq/docker/version.rb

@@ -1,7 +1,7 @@
 module Capistrano
   module Sidekiq
     module Docker
-      VERSION = '0.2'
+      VERSION = '0.2.1'
     end
   end
 end

data/lib/capistrano/tasks/sidekiq.rake

@@ -12,6 +12,10 @@ namespace :load do
     set :sidekiq_docker_env_options, -> { nil }
     set :sidekiq_docker_container_name, -> { nil }
     set :sidekiq_docker_image_name, -> { :sidekiq }
+    # Bundler options
+    set :sidekiq_bundle_gemfile, -> { release_path.join('Gemfile') }
+    set :sidekiq_bundle_without, %w{development test}.join(' ')
+    set :sidekiq_bundle_flags, '--deployment --quiet'
   end
 end
 
@@ -49,6 +53,10 @@ namespace :sidekiq do
     pids
   end
 
+  def pid_process_exists?(pid_file)
+    pid_file_exists?(pid_file) and test(*("docker exec -i #{fetch(:sidekiq_docker_container_name)} kill -0 $( cat #{pid_file} )").split(' '))
+  end
+
   def pid_file_exists?(pid_file)
     test(*("[ -f #{pid_file} ]").split(' '))
   end
@@ -83,7 +91,7 @@ namespace :sidekiq do
       switch_user(role) do
         if test("[ -d #{fetch(:sidekiq_release_path)} ]") # fixes #11
           for_each_process(true) do |pid_file, idx|
-            if pid_file_exists?(pid_file)
+            if pid_process_exists?(pid_file)
               quiet_sidekiq(pid_file)
             end
           end
@@ -97,7 +105,7 @@ namespace :sidekiq do
     on roles fetch(:sidekiq_role) do |role|
       switch_user(role) do
         if test("[ -d #{fetch(:sidekiq_release_path)} ]")
-          execute "#{fetch(:sidekiq_docker_env_options)} docker-compose -f #{fetch(:sidekiq_docker_compose_file_path)} run #{fetch(:sidekiq_docker_image_name)} bundle install --without development test --deployment --quiet"
+          execute "#{fetch(:sidekiq_docker_env_options)} docker-compose -f #{fetch(:sidekiq_docker_compose_file_path)} run #{fetch(:sidekiq_docker_image_name)} bundle install --gemfile #{fetch(:sidekiq_bundle_gemfile)} --without #{fetch(:sidekiq_bundle_without)} #{fetch(:sidekiq_bundle_flags)}"
         end
       end
     end
@@ -109,7 +117,7 @@ namespace :sidekiq do
       switch_user(role) do
         if test("[ -d #{fetch(:sidekiq_release_path)} ]")
           for_each_process(true) do |pid_file, idx|
-            if pid_file_exists?(pid_file)
+            if pid_process_exists?(pid_file)
               stop_sidekiq(pid_file)
             end
           end
@@ -150,8 +158,8 @@ namespace :sidekiq do
     on roles fetch(:sidekiq_role) do |role|
       switch_user(role) do
         for_each_process do |pid_file, idx|
-          if pid_file_exists?(pid_file)
-            execute "rm #{pid_file}" unless pid_file_exists?(pid_file)
+          if pid_process_exists?(pid_file)
+            execute "rm #{pid_file}" unless pid_process_exists?(pid_file)
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-sidekiq-docker
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
 platform: ruby
 authors:
 - Vasu Adari