deploy_mate 0.17.6 → 0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a3e9f9595fe454da126261a0e622232970292b1
-  data.tar.gz: af8bb5fc8d015bf4cc08793f88d9cc34e15282cc
+  metadata.gz: c02225815d07b37452f67f963f13d5b36acf51eb
+  data.tar.gz: 84991452955ddc3b8163cfd1a62448db3a5e37e3
 SHA512:
-  metadata.gz: b98ffc4232697a7f691cdad14a04fb667f58fc074038d7c7e54bbbef94c8ceb204ed2c564a511036a76b6fe629e1d86ec13af1ff3c71e82bb406f3166e7252be
-  data.tar.gz: 71a3c6e809df459c750abe9e1f324a20e1cffdc3fcfdcebb622bdb3b0ca11d2d1b2efa39c9dab2ba9e77553a2d150aff6c3f84194066059b06214582f5a0e762
+  metadata.gz: da23d19df9d514d86f887454443897411a99ebd2d0b0725c40d819996caaa64940169db8014021fe25c2d8d19006c6293c113c63500e387ec53e04da34276032
+  data.tar.gz: d2d1b78e33ada5b83284002b6b00970e05423f8268616aa0485420b21b92e6a4707071632be214b6c0b777fbdb6ec0ef05faa2317dd6c05ab98567e52d126ba9

data/README.md

@@ -6,7 +6,7 @@ This little gem can be added to your ruby-projects in order to **set up a workin
 
 The resulting server will work with this setup:
 - NGINX Webserver (http://nginx.org/)
-- Unicorn Rack App Server (http://unicorn.bogomips.org/)
+- Unicorn Rack App Server (http://unicorn.bogomips.org/) / Puma Rack App Server (http://puma.io/)
 - Bluepill Process Monitoring (https://github.com/bluepill-rb/bluepill)
 - RVM as user-install (http://rvm.io)
 - [Optional] ImageMagick (http://www.imagemagick.org)
@@ -29,6 +29,7 @@ It uses the following Capistrano-roles to divide the installed components:
 - **cronjobs**: [OPTIONAL] For environments where `whenever` should manage/run cronjobs
 
 ## Changelog
+* **0.18 (2016-02-25)**: Added support for capistrano 3.4, Ask before overwriting existing config-files
 * **2016-02-19**: Made selection of a deployed branch possible
 * **2016-02-17**: Added support for puma as application server
 * **2015-10-12**: Support additional linked-directories

data/deploy-mate.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name                      = "deploy_mate"
-  s.version                   = "0.17.6"
+  s.version                   = "0.18"
 
   s.authors                   = ["Tim Adler", "Marcus Geißler", "Johannes Strampe"]
   s.date                      = %q{2016-02-17}

data/lib/capistrano/deploy_mate_capfile.rb

@@ -23,7 +23,7 @@ require 'capistrano/bundler'
 require "capistrano/helpers.rb"
 
 # Load custom modules with helper functions
-%w(aptitude bluepill upstart user_management).each do |m|
+%w(aptitude bluepill upstart user_management shell).each do |m|
   load File.expand_path("../modules/#{m}.rb", __FILE__)
 end
 

data/lib/capistrano/deploy_mate_defaults.rb

@@ -25,9 +25,7 @@ set :app_server, "unicorn" # default to unicorn if nothing set
 namespace :deploy do
   desc 'Restart application'
   task :restart do
-    on roles(:app), in: :sequence, wait: 5 do
-      invoke "bluepill:restart"
-    end
+    invoke "bluepill:restart"
   end
 
   desc 'Ensure that the app folder is present'

data/lib/capistrano/modules/shell.rb

@@ -0,0 +1,20 @@
+module Shell
+
+  def file_exists?(file)
+    test("[ -f #{file} ]")
+  end
+
+  def overwrite_file?(file)
+    ask(:answer, "File #{file} already exists. Overwrite it? (y/N)")
+    fetch(:answer).downcase == "y"
+  end
+
+  def file_exists_and_overwrite?(file)
+    file_exists?(file) && overwrite_file?(file)
+  end
+
+  def file_new_or_overwrite?(file)
+    !file_exists?(file) || overwrite_file?(file)
+  end
+
+end

data/lib/capistrano/tasks/bluepill.rake

@@ -1,29 +1,42 @@
 namespace :bluepill do
+  include Shell
 
   desc "Installs the application pill"
   task :setup do
     on roles(:app) do
       execute "mkdir -p #{shared_path}/config"
-      template "application.pill.erb", "#{shared_path}/config/#{fetch(:application)}.pill"
+      if file_new_or_overwrite?("#{shared_path}/config/#{fetch(:application)}.pill")
+        template "application.pill.erb", "#{shared_path}/config/#{fetch(:application)}.pill"
+      end
     end
   end
 
   desc "Starts bluepill"
   task :start do
     on roles(:app) do
-      sudo "start bluepill"
+      if !bluepill_running?
+        sudo "start bluepill"
+      else
+        info "No need to start bluepill, it is running!"
+      end
     end
   end
 
   desc "Stops app server"
   task :stop do
     on roles(:app) do
-      sudo "stop bluepill"
+      if bluepill_running?
+        sudo "stop bluepill"
+      else
+        "Can't stop bluepill because it's not running!"
+      end
     end
   end
 
   desc "Restarts/Reloads app gracefully"
   task :restart do
+    invoke "bluepill:start"
+
     on roles(:app) do
       if bluepill_running?
         if pill_running?(fetch(:app_server))
@@ -31,11 +44,10 @@ namespace :bluepill do
         else
           execute :rvmsudo, :bluepill, fetch(:application), :start
         end
-      else
-        invoke "bluepill:start"
-        invoke "nginx:reload"
       end
     end
+
+    invoke "nginx:reload"
   end
   before :restart, 'rvm:hook'
 end

data/lib/capistrano/tasks/logrotate.rake

@@ -1,10 +1,13 @@
 namespace :logrotate do
+  include Shell
 
   desc "Install the logrotate config"
   task :setup do
     on roles(:app) do
-      template "logrotate.erb", "/tmp/logrotate-#{fetch(:application)}"
-      sudo "mv /tmp/logrotate-#{fetch(:application)} /etc/logrotate.d/#{fetch(:application)}"
+      if file_new_or_overwrite?("/etc/logrotate.d/#{fetch(:application)}")
+        template "logrotate.erb", "/tmp/logrotate-#{fetch(:application)}"
+        sudo "mv /tmp/logrotate-#{fetch(:application)} /etc/logrotate.d/#{fetch(:application)}"
+      end
       sudo "chown root:root /etc/logrotate.d/#{fetch(:application)}"
     end
   end

data/lib/capistrano/tasks/machine.rake

@@ -6,24 +6,24 @@ namespace :machine do
   task :init do
     on roles(:app) do
       apt_get_update
-      invoke "machine:install:htop"
-      invoke "machine:install:language_pack_de"
-      invoke "machine:install:unattended_upgrades"
-      invoke "machine:install:ntp"
-      invoke "machine:install:git"
-      invoke "machine:install:nginx"
-      invoke "machine:install:fail2ban"
-      invoke "machine:install:rvm"
-      invoke "machine:install:ruby"
-      invoke "machine:install:set_defaults"
-      invoke "machine:install:bluepill"
-      invoke "machine:install:bundler"
-      invoke "machine:install:nodejs"
-      invoke "machine:install:elasticsearch"
-      invoke "machine:install:imagemagick" if fetch(:imagemagick)
-      invoke "machine:install:mysql_dev" if fetch(:db_engine) == "mysql"
-      invoke "machine:install:postgres_dev" if fetch(:db_engine) == "postgresql"
     end
+    invoke "machine:install:htop"
+    invoke "machine:install:language_pack_de"
+    invoke "machine:install:unattended_upgrades"
+    invoke "machine:install:ntp"
+    invoke "machine:install:git"
+    invoke "machine:install:nginx"
+    invoke "machine:install:fail2ban"
+    invoke "machine:install:rvm"
+    invoke "machine:install:ruby"
+    invoke "machine:install:set_defaults"
+    invoke "machine:install:bluepill"
+    invoke "machine:install:bundler"
+    invoke "machine:install:nodejs"
+    invoke "machine:install:elasticsearch"
+    invoke "machine:install:imagemagick" if fetch(:imagemagick)
+    invoke "machine:install:mysql_dev" if fetch(:db_engine) == "mysql"
+    invoke "machine:install:postgres_dev" if fetch(:db_engine) == "postgresql"
   end
   before "machine:init", "machine:check_ubuntu_user"
   before "deploy", "machine:check_ubuntu_user"

data/lib/capistrano/tasks/nginx.rake

@@ -1,30 +1,35 @@
 set_default(:nginx_server_name, "*.*")
 
 namespace :nginx do
+  include Shell
 
   desc "Installs the nginx configs"
   task :setup do
     on roles(:web) do
-      template "nginx_base.conf.erb", "/tmp/nginx_conf"
-      sudo "mv /tmp/nginx_conf /etc/nginx/nginx.conf"
-      template "nginx_app.conf.erb", "/tmp/#{fetch(:application)}_conf"
-      sudo "mv /tmp/#{fetch(:application)}_conf /etc/nginx/sites-available/#{fetch(:application)}.conf"
+      if file_new_or_overwrite?("/etc/nginx/nginx.conf")
+        template "nginx_base.conf.erb", "/tmp/nginx_conf"
+        sudo "mv /tmp/nginx_conf /etc/nginx/nginx.conf"
+      end
+
+      if file_new_or_overwrite?("/etc/nginx/sites-available/#{fetch(:application)}.conf")
+        template "nginx_app.conf.erb", "/tmp/#{fetch(:application)}_conf"
+        sudo "mv /tmp/#{fetch(:application)}_conf /etc/nginx/sites-available/#{fetch(:application)}.conf"
+      end
 
-      if test("[ -f /etc/nginx/sites-enabled/default ]")
+      if file_exists? "/etc/nginx/sites-enabled/default"
         sudo "rm /etc/nginx/sites-enabled/default"
       end
 
       execute "mkdir -p #{shared_path}/log"
-
-      invoke "nginx:enable_site"
-      invoke "nginx:reload"
     end
+    invoke "nginx:enable_site"
+    invoke "nginx:reload"
   end
 
   desc "Enable the app page for nginx"
   task :enable_site do
     on roles(:web) do
-      unless test("[ -f /etc/nginx/sites-enabled/#{fetch(:application)}.conf ]")
+      unless file_exists? "/etc/nginx/sites-enabled/#{fetch(:application)}.conf"
         sudo "ln -sf /etc/nginx/sites-available/#{fetch(:application)}.conf /etc/nginx/sites-enabled/#{fetch(:application)}.conf"
       end
     end

data/lib/capistrano/tasks/puma.rake

@@ -5,12 +5,15 @@ set_default(:puma_worker_grace_time, "60")
 
 namespace :puma do
   include Bluepill
+  include Shell
 
   desc "Installs the puma config"
   task :setup do
     on roles(:app) do
       execute "mkdir -p #{shared_path}/config"
-      template "puma.rb.erb", "#{shared_path}/config/puma.rb"
+      if file_new_or_overwrite?("#{shared_path}/config/puma.rb")
+        template "puma.rb.erb", "#{shared_path}/config/puma.rb"
+      end
     end
   end
 

data/lib/capistrano/tasks/unicorn.rake

@@ -4,12 +4,15 @@ set_default(:unicorn_worker_grace_time, "60")
 
 namespace :unicorn do
   include Bluepill
+  include Shell
 
   desc "Installs the unicorn config"
   task :setup do
     on roles(:app) do
       execute "mkdir -p #{shared_path}/config"
-      template "unicorn.rb.erb", "#{shared_path}/config/unicorn.rb"
+      if file_new_or_overwrite?("#{shared_path}/config/unicorn.rb")
+        template "unicorn.rb.erb", "#{shared_path}/config/unicorn.rb"
+      end
     end
   end
 

data/lib/capistrano/tasks/upstart.rake

@@ -1,19 +1,25 @@
 namespace :upstart do
   include Upstart
+  include Shell
 
+  # TODO: remove one of these - they do the same
   desc "Install the upstart config"
   task :setup do
     on roles(:app) do
-      template "upstart.conf.erb", "/tmp/bluepill.conf"
-      sudo "mv /tmp/bluepill.conf /etc/init/"
+      if file_new_or_overwrite?("/etc/init/bluepill.conf")
+        template "upstart.conf.erb", "/tmp/bluepill.conf"
+        sudo "mv /tmp/bluepill.conf /etc/init/"
+      end
       sudo "chown root:root /etc/init/bluepill.conf"
     end
   end
 
   task :start do
     on roles(:app) do
-      template "upstart.conf.erb", "/tmp/bluepill.conf"
-      sudo "mv /tmp/bluepill.conf /etc/init/"
+      if file_new_or_overwrite?("/etc/init/bluepill.conf")
+        template "upstart.conf.erb", "/tmp/bluepill.conf"
+        sudo "mv /tmp/bluepill.conf /etc/init/"
+      end
       sudo "chown root:root /etc/init/bluepill.conf"
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deploy_mate
 version: !ruby/object:Gem::Version
-  version: 0.17.6
+  version: '0.18'
 platform: ruby
 authors:
 - Tim Adler
@@ -96,6 +96,7 @@ files:
 - lib/capistrano/helpers.rb
 - lib/capistrano/modules/aptitude.rb
 - lib/capistrano/modules/bluepill.rb
+- lib/capistrano/modules/shell.rb
 - lib/capistrano/modules/upstart.rb
 - lib/capistrano/modules/user_management.rb
 - lib/capistrano/scripts/create_ubuntu_user.sh