capistrano-generals 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d136e725fcb93bd1cc091d07d57fd41e18827bbd
-  data.tar.gz: d42a6257cb5b87d3e04349f2374de5e5da498d03
+  metadata.gz: ce3252d284b37a5a53addd7588452febc7463f92
+  data.tar.gz: 6c2250f553972533c6bb7a7612a798587c941541
 SHA512:
-  metadata.gz: 4b018c2ee47f23b398c1a4ab91d484008efd12ab0faedc745ba73e705e5558eccac5fc1488665d734f13314dece33c53d599f7b744bd48d239991402c5687a4a
-  data.tar.gz: a7967de06065b57dc86d1f4c23a8ad8344611f5dac8a78bd4469a2b2b549ca3a5752498b3dc0d6895a43025bdf221e170d7cdccdea024d3581220b6fc95c6da8
+  metadata.gz: 3ccf20f6e534a1a3d381f9a13c0780efdb0462be7b2352bc944ea34e10f3b5cc21f3f9900dcf85cb508120b6344c2711a1ebebe9e8498e73005f847cdd95c514
+  data.tar.gz: 17d2272ae37d8116479f558fefa17e7116a56b1d4724dd2fd2b175f9602cacf0d80733aa68519e04400b5d0d9d5ee602f6b1d067a82a92cfb6f57552a86093ec

data/README.md

@@ -9,8 +9,8 @@ Add this to your application's `Gemfile`:
 
 ```ruby
 group :development do
-  gem 'capistrano', '~> 3.2.1'
-  gem 'capistrano-unicorn-nginx', '~> 3.1.0'
+  gem 'capistrano'
+  gem 'capistrano-generals'
 end
 ```
 
@@ -30,11 +30,32 @@ In your `config/deploy.rb` you can add the taks by adding them to the deploy nam
 
 ```ruby
 namespace :deploy do
-  before :deploy, 'git:push'
-  before :deploy, 'deploy:symlink:upload_linked_files'
+  before :deploy,   'git:push'
+  before :deploy,   'deploy:symlink:upload_linked_files'
+  after  :deploy,   'setup:symlink:unicorn'
+  after  :deploy,   'setup:symlink:nginx'
+  after  :deploy,   'setup:symlink:sidekiq'
+  after  :deploy,   'unicorn:restart'
+  after  :rollback, 'unicorn:restart'
+  after  :deploy,   'nginx:restart'
+  after  :rollback, 'nginx:restart'
+  after  :deploy,   'sidekiq:restart'
+  after  :rollback, 'sidekiq:restart'
 end
 ```
 
+### Setup linked files
+There are some tasks for linking configuration files to the system. It is
+possible to use stage specific files like `config/nginx.staging.conf`. It will
+then link this file to the system. If the stage specific file is not present,
+it will look for the `config/nginx.conf` file. If that is absent as well it will
+raise an error.
+```ruby
+cap <stage> setup:symlink:nginx    # Adds config/nginx.stage.conf to enabled nginx sites
+cap <stage> setup:symlink:unicorn  # Adds config/unicorn_init.stage.sh to /etc/init.d scripts and add run at startup
+cap <stage> setup:symlink:sidekiq  # Adds config/sidekiq_init.stag.sh to /etc/init.d scipts and add run at startup
+```
+
 ### Git push
 This first checks if there are no local changes that has not been committed.
 If all changes are committed, they are pushed.
@@ -50,6 +71,8 @@ example you want to upload `database.yml` to the `staging` environment,
 the system first searches for `database.staging.yml` and if it cannot find that
 it will fall back to the original.
 
+### Restart
+This will upgrade the unicorn workers and restart nginx.
 
 ## Contributing
 

data/lib/capistrano/generals/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Generals
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/lib/capistrano/tasks/nginx.rake

@@ -0,0 +1,25 @@
+namespace :nginx do
+
+  desc 'Start nginx'
+  task :start do
+    on roles(:app) do
+      execute 'sudo /etc/init.d/nginx start'
+    end
+  end
+
+  desc 'Stop nginx'
+  task :stop do
+    on roles(:app) do
+      execute 'sudo /etc/init.d/nginx stop'
+      sleep 3
+    end
+  end
+
+  desc 'Restart nginx'
+  task :restart do
+    on roles(:app) do
+      execute 'sudo /etc/init.d/nginx restart'
+    end
+  end
+
+end

data/lib/capistrano/tasks/setup.rake

@@ -1,20 +1,41 @@
 namespace :setup do
 
-  desc "Symlinks config files for Nginx and Unicorn"
-  task :symlink_nginx_and_unicorn do
-    on roles :app do
-      # Find stage specific config file
-      file_name = File.join current_path, 'config/nginx.conf'
-      file_name = get_config_file(file_name, fetch(:stage).to_s)
-      execute "ln -nfs #{file_name} /etc/nginx/sites-enabled/#{fetch(:application)}_#{fetch(:stage)}"
+  namespace :symlink do
 
-      # Find stage specific config file
-      file_name = File.join current_path, 'config/unicorn_init.sh'
-      file_name = get_config_file(file_name, fetch(:stage).to_s)
-      execute "ln -nfs #{file_name} /etc/init.d/unicorn_#{fetch(:application)}_#{fetch(:stage)}"
-      # Start unicorn at startup
-      execute "sudo update-rc.d unicorn_#{fetch(:application)}_#{fetch(:stage)} defaults"
+    desc 'Symlink config file for nginx'
+    task :nginx do
+      on roles :app do
+        # Find stage specific config file
+        file_name = File.join current_path, 'config/nginx.conf'
+        file_name = get_config_file(file_name, fetch(:stage).to_s)
+        execute "ln -nfs #{file_name} /etc/nginx/sites-enabled/#{fetch(:application)}_#{fetch(:stage)}"
+      end
     end
+
+    desc 'Symlink config file for unicorn'
+    task :unicorn do
+      on roles :app do
+        # Find stage specific config file
+        file_name = File.join current_path, 'config/unicorn_init.sh'
+        file_name = get_config_file(file_name, fetch(:stage).to_s)
+        execute "ln -nfs #{file_name} /etc/init.d/unicorn_#{fetch(:application)}_#{fetch(:stage)}"
+        # Start unicorn at startup
+        execute "sudo update-rc.d unicorn_#{fetch(:application)}_#{fetch(:stage)} defaults"
+      end
+    end
+
+    desc 'Symlink config file for sidekiq'
+    task :sidekiq do
+      on roles :app do
+        # Find stage specific config file
+        file_name = File.join current_path, 'config/sidekiq_init.sh'
+        file_name = get_config_file(file_name, fetch(:stage).to_s)
+        execute "ln -nfs #{file_name} /etc/init.d/sidekiq_#{fetch(:application)}_#{fetch(:stage)}"
+        # Start unicorn at startup
+        execute "sudo update-rc.d sidekiq_#{fetch(:application)}_#{fetch(:stage)} defaults"
+      end
+    end
+
   end
 
 end

data/lib/capistrano/tasks/sidekiq.rake

@@ -0,0 +1,24 @@
+namespace :sidekiq do
+
+  desc 'Start sidekiq'
+  task :start do
+    on roles(:app) do
+      execute "sudo /etc/init.d/sidekiq_#{fetch(:application)}_#{fetch(:stage)} start"
+    end
+  end
+
+  desc 'Stop sidekiq'
+  task :stop do
+    on roles(:app) do
+      execute "sudo /etc/init.d/sidekiq_#{fetch(:application)}_#{fetch(:stage)} stop"
+      sleep 8
+    end
+  end
+
+  desc 'Restart sidekiq'
+  task :restart do
+    invoke 'sidekiq:stop'
+    invoke 'sidekiq:start'
+  end
+
+end

data/lib/capistrano/tasks/unicorn.rake

@@ -0,0 +1,24 @@
+namespace :unicorn do
+
+  desc 'Start unicorn'
+  task :start do
+    on roles(:app) do
+      execute "sudo /etc/init.d/unicorn_#{fetch(:application)}_#{fetch(:stage)} start"
+    end
+  end
+
+  desc 'Stop unicorn'
+  task :stop do
+    on roles(:app) do
+      execute "sudo /etc/init.d/unicorn_#{fetch(:application)}_#{fetch(:stage)} stop"
+      sleep 3
+    end
+  end
+
+  desc 'Restart unicorn'
+  task :restart do
+    invoke 'unicorn:stop'
+    invoke 'unicorn:start'
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-generals
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Stef Schenkelaars
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-02 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -69,10 +69,12 @@ files:
 - lib/capistrano/generals.rb
 - lib/capistrano/generals/helpers.rb
 - lib/capistrano/generals/version.rb
-- lib/capistrano/tasks/deploy/restarts.rake
 - lib/capistrano/tasks/deploy/symlink.rake
 - lib/capistrano/tasks/git.rake
+- lib/capistrano/tasks/nginx.rake
 - lib/capistrano/tasks/setup.rake
+- lib/capistrano/tasks/sidekiq.rake
+- lib/capistrano/tasks/unicorn.rake
 homepage: ''
 licenses:
 - MIT
@@ -93,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Some general capistrano tasks which are commonly used

data/lib/capistrano/tasks/deploy/restarts.rake

@@ -1,11 +0,0 @@
-namespace :deploy do
-
-  desc 'Restart nginx and unicorn.'
-  task :restart do
-    on roles(:app) do
-      execute "sudo /etc/init.d/unicorn_#{fetch(:application)}_#{fetch(:stage)} upgrade"
-      execute "sudo /etc/init.d/nginx restart"
-    end
-  end
-
-end