deploy_mate 0.15 → 0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 010748fec2c76a90ba7f99433ee1f5045980f40f
-  data.tar.gz: 4b5007ee4f0fcd32c37d0053a95e28d9935fb3bd
+  metadata.gz: 14882d055c45f84057957cb143d5126ee0c12006
+  data.tar.gz: b78d5446177e2e0e24ad63714a42185c6cf3c786
 SHA512:
-  metadata.gz: cafffbfdaec1aad29f7cedbeff29878d94e1fc67864eda988a75d03f5741bdc08437fef20a28d8857968b21223af752a9bd43974c0c15e1e07dc381a1d6cc854
-  data.tar.gz: 1b5a3e7443df511271b70be63c40b49e0617131ffc5261940c012383420e5264e2912818249b5e0c52b1f7b3a19a79d55295355a7a0d148b42b8db18b9018644
+  metadata.gz: be7b2f88daea3077d8db2f78e45a88108e3e894802ae5aeab5e23b778df467d32cbeb0765184a630a2fa99dc2c25119717e511e345c6e88fc5c62af1dde856ba
+  data.tar.gz: 90a21e17e5d3ffce0571495c7b4abb48a98ca3429c9dd7db18f2920233c7cfa71234331bb2b4cc26a6f030c1d1d72853df4a8e6951091c4a6967a3fcdad42e4d

data/deploy-mate.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name                      = "deploy_mate"
-  s.version                   = "0.15"
+  s.version                   = "0.16"
 
   s.authors                   = ["Tim Adler"]
   s.date                      = %q{2015-06-23}

data/lib/capistrano/configs/{unicorn.pill.erb → application.pill.erb}

@@ -6,6 +6,7 @@ Bluepill.application("<%= fetch(:application) %>", :log_file => "#{shared_path}/
   app.working_dir = current_path
   app.uid = 'ubuntu'
   app.gid = 'www-data'
+
   app.process("unicorn") do |process|
     process.pid_file = "#{shared_path}/system/pids/unicorn.pid"
     process.environment = { 'BUNDLE_GEMFILE' => "#{current_path}/Gemfile" }
@@ -20,9 +21,20 @@ Bluepill.application("<%= fetch(:application) %>", :log_file => "#{shared_path}/
 
     process.monitor_children do |child_process|
       child_process.stop_command = "kill -9 {{PID}}"
-
       child_process.checks :mem_usage, :every => 30.seconds, :below => 500.megabytes, :times => [3,4], :fires => :stop
     end
   end
 
+  <% if fetch(:sidekiq) %>
+  app.process("sidekiq") do |process|
+    process.pid_file = "#{shared_path}/system/pids/sidekiq.pid"
+
+    process.start_command = "/home/ubuntu/.rvm/wrappers/default/bundle exec sidekiq -e <%= fetch(:environment) %> -C #{current_path}/config/sidekiq.yml -i 0 -P #{shared_path}/pids/sidekiq.pid"
+    process.stop_command = "kill -QUIT {{PID}}"
+
+    process.start_grace_time = 10.seconds
+    process.stop_grace_time = 10.seconds
+  end
+  <% end %>
+
 end

data/lib/capistrano/configs/upstart.conf.erb

@@ -4,6 +4,6 @@ start on runlevel [2]
 stop on runlevel [016]
 
 expect daemon
-exec /home/ubuntu/.rvm/wrappers/default/bluepill load <%= shared_path %>/config/unicorn.pill
+exec /home/ubuntu/.rvm/wrappers/default/bluepill load <%= shared_path %>/config/<%= fetch(:application)%>.pill
 
 respawn

data/lib/capistrano/tasks/bluepill.rake

@@ -4,7 +4,7 @@ namespace :bluepill do
   task :setup do
     on roles(:app) do
       execute "mkdir -p #{shared_path}/config"
-      template "unicorn.pill.erb", "#{shared_path}/config/unicorn.pill"
+      template "application.pill.erb", "#{shared_path}/config/#{fetch(:application)}.pill"
     end
   end
 

data/lib/capistrano/tasks/machine.rake

@@ -166,6 +166,7 @@ namespace :machine do
         unless is_package_installed?("imagemagick")
           apt_get_install("imagemagick")
           apt_get_install("libmagickcore-dev")
+          apt_get_install("libmagickwand-dev")
         end
       end
     end

data/lib/capistrano/tasks/nginx.rake

@@ -14,6 +14,8 @@ namespace :nginx do
         sudo "rm /etc/nginx/sites-enabled/default"
       end
 
+      execute "mkdir -p #{shared_path}/log"
+
       invoke "nginx:enable_site"
       invoke "nginx:reload"
     end

data/lib/deploy_mate/tasks.rake

@@ -7,18 +7,19 @@ namespace :deploy_mate do
     puts "I'm your DEPLOY_MATE."
     puts "We will setting up your deployment now."
 
-    @ssh_name = ask("[01/12] SSH-Hostname for the server", "#{@app_name}-#{@stage_name}")
-    @ruby_version = ask("[02/12] Ruby-Version (the RVM-way, e.g. ruby-2.2.0)", guess_ruby_version)
-    @app_name = ask("[03/12] App-Name (for nginx, servers, etc.)", guess_app_name)
-    @repo_url = ask("[04/12] Url-Location of git-repo", "git@github.com:hanseventures/#{@app_name}.git")
-    @is_rails = yes_or_no?("[05/12] Is this a RAILS project ?", (rails_present? ? "yes" : "no"))
-    @needs_imagemagick = yes_or_no?("[06/12] Does this project need ImageMagick ?", (needs_imagemagick? ? "yes" : "no"))
-    @stage_name = ask("[07/12] Give the first stage a name", "prestage")
-    @branch_name = ask("[08/12] Branch to deploy '#{@stage_name}' from", "dev")
-    @host_name = ask("[09/12] Web-URL for '#{@stage_name}'", "#{@stage_name}.#{@app_name}")
-    @environment = ask("[10/12] #{@stage_name}'s environment (RACK_ENV/RAILS_ENV)", "#{@stage_name}")
-    @db_engine = ask_until("[11/12] What db are you using?", %w( postgresql mysql ), "mysql")
-    @needs_elasticsearch = yes_or_no?("[12/12] Do you need ElasticSearch on this machine ?", "no")
+    @app_name = ask("[01/13] App-Name (for nginx, servers, etc.)", guess_app_name)
+    @stage_name = ask("[02/13] Give the first stage a name", "prestage")
+    @ssh_name = ask("[03/13] SSH-Hostname for the server", "#{@app_name}-#{@stage_name}")
+    @ruby_version = ask("[04/13] Ruby-Version (the RVM-way, e.g. ruby-2.2.0)", guess_ruby_version)
+    @db_engine = ask_until("[05/13] What db are you using?", %w( postgresql mysql ), "mysql")
+    @repo_url = ask("[06/13] Url-Location of git-repo", "git@github.com:hanseventures/#{@app_name}.git")
+    @is_rails = yes_or_no?("[07/13] Is this a RAILS project ?", (rails_present? ? "yes" : "no"))
+    @needs_imagemagick = yes_or_no?("[08/13] Does this project need ImageMagick ?", (needs_imagemagick? ? "yes" : "no"))
+    @uses_sidekiq = yes_or_no?("[09/13] Does this project use Sidekiq ?", (uses_sidekiq? ? "yes" : "no"))
+    @branch_name = ask("[10/13] Branch to deploy '#{@stage_name}' from", "dev")
+    @host_name = ask("[11/13] Web-URL for '#{@stage_name}'", "#{@stage_name}.#{@app_name}")
+    @environment = ask("[12/13] #{@stage_name}'s environment (RACK_ENV/RAILS_ENV)", "#{@stage_name}")
+    @needs_elasticsearch = yes_or_no?("[13/13] Do you need ElasticSearch on this machine ?", "no")
 
     puts "Aye!"
     puts "Worrrrking..."
@@ -45,6 +46,10 @@ def config_template(from, to)
   puts "'#{to}'"
 end
 
+def uses_sidekiq?
+  defined? Sidekiq
+end
+
 def needs_imagemagick?
   defined? RMagick || defined? MiniMagick
 end

data/lib/deploy_mate/templates/Capfile.erb

@@ -8,4 +8,5 @@ Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
 # Optionals
 # Uncomment, if needed
 
-# require "whenever/capistrano"
+# require "whenever/capistrano"
+# before 'deploy:restart', 'deploy:migrate', 'whenever:update_crontab'

data/lib/deploy_mate/templates/deploy.rb.erb

@@ -11,7 +11,8 @@ set :default_stage, '<%= @stage_name %>'
 set :repo_url, '<%= @repo_url %>'
 set :db_engine, '<%= @db_engine %>'
 
-set :imagemagick, '<%= @needs_imagemagick %>'
+set :imagemagick, <%= @needs_imagemagick %>
+set :sidekiq, <%= @uses_sidekiq %>
 
 # Optionals
 # Uncomment, if needed

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deploy_mate
 version: !ruby/object:Gem::Version
-  version: '0.15'
+  version: '0.16'
 platform: ruby
 authors:
 - Tim Adler
@@ -82,10 +82,10 @@ files:
 - Rakefile
 - deploy-mate.gemspec
 - lib/capistrano/README.md
+- lib/capistrano/configs/application.pill.erb
 - lib/capistrano/configs/logrotate.erb
 - lib/capistrano/configs/nginx_app.conf.erb
 - lib/capistrano/configs/nginx_base.conf.erb
-- lib/capistrano/configs/unicorn.pill.erb
 - lib/capistrano/configs/unicorn.rb.erb
 - lib/capistrano/configs/upstart.conf.erb
 - lib/capistrano/deploy_mate_capfile.rb