capistrano3-pushr 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 321427436b3d2e2bd3edbd7842db5889764a59a6
-  data.tar.gz: 696848033b90b43799f70a44c46aa9e82e7c6e72
+  metadata.gz: 3432dfb52d8f11cc07689bdb65e66b6decd49820
+  data.tar.gz: b2d66c54b3b98ca5793a92b4299c13bd56289584
 SHA512:
-  metadata.gz: bba2dbd43f3f260a9a61db9544d4f5fc70200bd05847b856179cf0b578a24eee59f16ac848c634748a8ff562628ad8b7d762610e5ac8d2dbfabddf55443da332
-  data.tar.gz: 395fb13d7f00767e122d73f5200a62b4c2548d14e14c361ca8eabfba55d790c3c017bdcb2184ad26a80aa4e9272d63147a455407d99bff40734037c61e52f7b2
+  metadata.gz: 1b7f06642c8c6fd179b2ba691d9722ac7a77e9051f3b4a694d991e5d0cf8bcd6a50e3259c12776be2beed59c4f3e4862040880bcd0deae3a80ec5006b153e717
+  data.tar.gz: 61af1c1a4deda8451cfefb6efd09c0a35f3d4f99d811b3481bc34d4c45a06d16a784e95e34fc24fc89c97a59561892618ebbb35341ff375627aba127a5830295

data/lib/capistrano/pushr/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Pushr
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

data/lib/capistrano/tasks/pushr.rake

@@ -3,6 +3,11 @@ namespace :load do
     set :pushr_default_hooks, -> { true }
 
     set :pushr_pid, -> { File.join shared_path, 'tmp', 'pids', 'pushr.pid' }
+    set :pushr_configuration, -> { File.join shared_path, 'config', 'pushr.yml' }
+    set :pushr_env, -> { fetch(:rack_env, fetch(:rails_env, fetch(:stage))) }
+    set :pushr_redis_host, -> { fetch(:redis_host, 'localhost') }
+    set :pushr_redis_port, -> { fetch(:redis_port, '6379') }
+    set :pushr_redis_namespace, -> { fetch(:redis_namespace, "pushr_#{fetch(:application)}_#{fetch(:stage)}") }
   end
 end
 
@@ -77,16 +82,16 @@ namespace :pushr do
     "cat #{fetch(:pushr_pid)}"
   end
 
-  def pid_file_exists?
+  def pushr_pid_file_exists?
     test(*("[ -f #{fetch(:pushr_pid)} ]").split(' '))
   end
 
-  def pid_process_exists?
-    pid_file_exists? && test(*("kill -0 `#{pid_command}`").split(' '))
+  def pushr_pid_process_exists?
+    pushr_pid_file_exists? && test(*("kill -0 `#{pid_command}`").split(' '))
   end
 
   def stop_pushr(signal)
-    return unless test("[ -d #{release_path} ]") && pid_process_exists?
+    return unless test("[ -d #{release_path} ]") && pushr_pid_process_exists?
 
     within release_path do
       puts 'Stopping Pushr...'
@@ -97,8 +102,17 @@ namespace :pushr do
 
   def start_pushr
     within release_path do
+      args = []
+      args.push "--pid-file #{fetch(:pushr_pid)}"
+      args.push "--configuration #{fetch(:pushr_configuration)}"
+      args.push "--redis-host #{fetch(:pushr_redis_host)}"
+      args.push "--redis-port #{fetch(:pushr_redis_port)}"
+      args.push "--redis-namespace #{fetch(:pushr_redis_namespace)}"
+
       puts 'Starting Pushr...'
-      execute 'bundle', 'exec', 'pushr', '--pid-file', fetch(:pushr_pid)
+      with rack_env: fetch(:pushr_env) do
+        execute 'bundle', 'exec', 'pushr', args.compact.join(' ')
+      end
       puts 'done!'
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-pushr
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Zsofia Balogh