capistrano-websocket-rails 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 037c3b1c882247f15e79af1fb22a343f87bcf98a
-  data.tar.gz: 21911c31285a74df594606f8034199ec1aad0e2d
+  metadata.gz: 4e3f495aa46f5dff46657f24a4325649de7bf0fd
+  data.tar.gz: 21b1e952f2dbbc50fafed529be4e9dc8d3748ed8
 SHA512:
-  metadata.gz: 7300b0f4352c96f3f9c2052ddf58cd8c824706d0e4c8d994d9dd545a04874ec00f3a9e365079b3df2cb4fb49e6350c3566efa35c51d996b8e223c8fd524f901c
-  data.tar.gz: e15c301121c1b4b106500991c7106e22a85c3b49c4fcbf69015235a87b0b4fe26c14cd38da1400c83f52dd78377e6dd0cac313743d219c76e4ced8b6063e4599
+  metadata.gz: 0e931a7b094b05e578469c2f6237de0ab045ce36a49e417877c6b6946de1c6494101fa6043f05fcfef80279ba1c573eece7949a74ef04e20fca38c13ac527155
+  data.tar.gz: b8664d10e5c81b000053dc84142cd4909a33ab08bb8071af4b796075575ad2c0190b1428fb8834d71c8230d41d6ea3219781f2b36a32bbfe235c3765d803db05

data/README.md

@@ -19,15 +19,16 @@ And then execute:
 Add the following to your Capfile.
 
 ```ruby
-    require 'capistrano/websocket-rails'
+require 'capistrano/websocket-rails'
 ```
 
 Configurable options, shown here with defaults:
 
 ```ruby
-    :websocket_rails_pid => current_path.join('tmp', 'pids', 'websocket_rails.pid')
-    :websocket_rails_env => fetch(:rack_env, fetch(:rails_env, fetch(:stage)))
-    :websocket_rails_role => :app
+  :websocket_rails_default_hooks => true
+  :websocket_rails_pid => shared_path.join('tmp', 'pids', 'websocket_rails.pid')
+  :websocket_rails_env => fetch(:rack_env, fetch(:rails_env, fetch(:stage)))
+  :websocket_rails_role => :app
 ```
 
 ## Contributing

data/lib/capistrano/tasks/websocket-rails.rake

@@ -1,15 +1,16 @@
 namespace :load do
+  set :websocket_rails_default_hooks, -> { true }
   set :websocket_rails_pid, -> { shared_path.join 'tmp', 'pids', 'websocket_rails.pid' }
   set :websocket_rails_env, -> { fetch :rack_env, fetch(:rails_env, fetch(:stage)) }
   set :websocket_rails_role, -> { :app }
 end
 
 namespace :deploy do
-  # before :starting, :stop_websocket_server do
-  #   invoke 'websocket_rails:stop_server'
+  # before :starting, :check_websocket_rails_hooks do
+  #   invoke 'websocket_rails:add_default_hooks' if fetch(:websocket_rails_default_hooks)
   # end
-  after :publishing, :start_websocket_server do
-    invoke 'websocket_rails:restart_server'
+  after :publishing, :restart_websocket_rails_server do
+    invoke 'websocket_rails:restart_server' if fetch(:websocket_rails_default_hooks)
   end
 end
 
@@ -17,44 +18,51 @@ namespace :websocket_rails do
 
   desc 'Start websocket-rails server'
   task :start_server do
-    on roles(fetch(:websocket_rails_role)), in: :sequence, wait: 5 do
-      within(release_path) { start_server }
+    on roles(fetch(:websocket_rails_role)) do
+      within(release_path) { start_server fetch(:websocket_rails_pid) }
     end
   end
 
   desc 'Stop websocket-rails server'
   task :stop_server do
-    on roles(fetch(:websocket_rails_role)), in: :sequence, wait: 5 do
-      within(current_path) { stop_server }
+    on roles(fetch(:websocket_rails_role)) do
+      within(release_path) { stop_server fetch(:websocket_rails_pid) }
     end
   end
 
   desc 'Restart websocket-rails server'
   task :restart_server do
-    on roles(fetch(:websocket_rails_role)), in: :sequence, wait: 5 do
-      within(release_path) { restart_server }
+    on roles(fetch(:websocket_rails_role)) do
+      within(release_path) { restart_server fetch(:websocket_rails_pid) }
     end
   end
 
-  def start_server
+  task :add_default_hooks do
+    after 'deploy:updated', 'websocket_rails:stop_server'
+    after 'deploy:reverted', 'websocket_rails:stop_server'
+    after 'deploy:published', 'websocket_rails:start_server'
+  end
+
+  def start_server(pid_file)
     info 'Starting websocket-rails server...'
-    run_rake_command! 'start_server'
+    run_rake_command 'start_server'
     info 'Websocket-rails server started.'
   end
-  def stop_server
-    if pid_file_exists?
+  def stop_server(pid_file)
+    if pid_file_exists? pid_file
       info 'Stopping websocket-rails server...'
-      run_rake_command! 'stop_server'
+      run_rake_command 'stop_server'
       info 'Websocket-rails server stopped.'
     else
       info 'Websocket-rails server not running.'
     end
   end
-  def restart_server; stop_server; start_server end
-  def pid_file_exists?
-    test "[ -f #{fetch(:websocket_rails_pid)} ]"
+  def restart_server(pid_file)
+    stop_server(pid_file)
+    start_server(pid_file)
   end
-  def run_rake_command!(cmd)
+  def pid_file_exists?(pid_file); test "[ -f #{pid_file} ]" end
+  def run_rake_command(cmd)
     with rails_env: fetch(:websocket_rails_env) do
       rake "websocket_rails:#{cmd}"
     end

data/lib/capistrano/websocket-rails/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module WebsocketRails
-    VERSION = '0.1.5'
+    VERSION = '0.1.6'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-websocket-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - MacKinley Smith