h2ocube_rails_rainbows 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa4cae7dfaf54eb6d88462be6ee311da398999d1
-  data.tar.gz: b9e5fe6433c2bcd83157c1803399a0d6f7802bb8
+  metadata.gz: 4d29060644a2bd0d6b5cbb73f9441aa327e01b82
+  data.tar.gz: eec2f2b30206f7d0f97fb68b1f45e32e10269839
 SHA512:
-  metadata.gz: b64c45b2cfc2d1fa8f20c6e72b54c5ac427574276786d2f86988089f346321817de88ac815a892859cae7b5f523f8f3c37308f79f84f000f13db1d0970ffec96
-  data.tar.gz: 75fbb7ec44b76b3f370465af15dc3a329431fa7657407568aa4fcaa331d4cc1e5810ed816b02b6ae2888b201b80abd8903d010087255f2cadbe4fab25de83899
+  metadata.gz: 6b9d77f1920e4d285a42c44eb4f3633c8037173c12e726922f91dd9ec5a4d1ca8a67564ef64529d258cd062761b0dfb7343d9d4d7769310a4a58eb1ee64ebb16
+  data.tar.gz: 0188f2b9aadbe40bea67cac0657e6c2983b65bb1a9ccd32802ebb929bce93c0a7b2918db6ed201dfeebc872be393124b92c46521ade7627d597f8164e1e20c3d

data/README.md

@@ -23,7 +23,10 @@ Or install it yourself as:
     # Capfile
     require 'capistrano/rainbows'
 
-Puma specific tasks for Capistrano v3:
+    # config/deploy.rb
+    set :rainbows_bin, 'rainbows' # you can use `unicorn` replace `rainbows` 
+
+Rainbows specific tasks for Capistrano v3:
 
     cap rainbows:start
     cap rainbows:stop

data/h2ocube_rails_rainbows.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'h2ocube_rails_rainbows'
-  spec.version       = '0.0.5'
+  spec.version       = '0.0.6'
   spec.authors       = ['Ben']
   spec.email         = ['ben@zfben.com']
   spec.description   = %q{Rainbows! helper}

data/lib/capistrano/tasks/rainbows.cap

@@ -1,9 +1,16 @@
 namespace :rainbows do
+  set :rainbows_bin, fetch(:rainbows_bin, 'rainbows')
+
   desc 'Start rainbows'
   task :start do
     on roles :app do
-      within release_path do
-        execute :bundle, "exec rainbows -c config/rainbows.rb --listen 'unix://#{shared_path}/sockets/rainbows.sock' -E #{fetch(:stage)} --pid '#{shared_path}/pids/rainbows.pid' -D"
+      if !pid_exist?
+        within release_path do
+          execute :bundle, "exec #{fetch(:rainbows_bin)} -c config/#{fetch(:rainbows_bin)}.rb --listen 'unix://#{shared_path}/sockets/#{fetch(:rainbows_bin)}.sock' -E #{fetch(:stage)} -P '#{shared_path}/pids/#{fetch(:rainbows_bin)}.pid' -D"
+          info 'Rainbows started.'
+        end
+      else
+        info 'Rainbows is running, not need to start.'
       end
     end
   end
@@ -11,20 +18,20 @@ namespace :rainbows do
   desc 'Stop rainbows'
   task :stop do
     on roles :app do
-      pid_exist = 'true' ==  capture("if [ -e #{shared_path}/pids/rainbows.pid ]; then echo 'true'; fi").strip
+      pid_exist = pid_exist?
       times = 0
-      until pid_exist && times < 10 do
+      until !pid_exist && times < 10 do
         within release_path do
-          execute "kill -s QUIT `cat #{shared_path}/pids/rainbows.pid`;true"
+          execute "kill -s QUIT `cat #{shared_path}/pids/#{fetch(:rainbows_bin)}.pid`;true"
         end
-        sleep 1
-        pid_exist = 'true' ==  capture("if [ -e #{shared_path}/pids/rainbows.pid ]; then echo 'true'; fi").strip
+        sleep times + 1
+        pid_exist = pid_exist?
         times = times + 1
       end
 
-      if times > 9
+      if times >= 9
         within shared_path do
-          execute :rm, 'pids/rainbows.pid;true'
+          execute :rm, 'pids/#{fetch(:rainbows_bin)}.pid;true'
         end
       end
     end
@@ -34,10 +41,10 @@ namespace :rainbows do
   task :restart do
     pid_exist = true
     on roles :app do
-      pid_exist = 'true' ==  capture("if [ -e #{shared_path}/pids/rainbows.pid ]; then echo 'true'; fi").strip
+      pid_exist = pid_exist?
       if pid_exist
         within release_path do
-          execute "kill -s USR2 `cat #{shared_path}/pids/rainbows.pid`;true"
+          execute "kill -s USR2 `cat #{shared_path}/pids/#{fetch(:rainbows_bin)}.pid`;true"
         end
       end
     end
@@ -50,5 +57,9 @@ namespace :rainbows do
     invoke 'rainbows:start'
   end
 
+  def pid_exist?
+    'true' ==  capture("if [ -e #{shared_path}/pids/#{fetch(:rainbows_bin)}.pid ]; then echo 'true'; fi").strip
+  end
+
   before 'deploy:published', 'rainbows:restart'
 end

data/lib/generators/source/rainbows.rb.erb

@@ -27,5 +27,4 @@ end
  
 Rainbows! do
   use :ThreadPool
-  worker_connections 1024
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: h2ocube_rails_rainbows
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Ben
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbows