deploy_mate 0.18.4 → 0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 221d9dcd04b1b34307ac5f64f794acac59350c48
-  data.tar.gz: 54a6b901d5cac8605209b3a4a85d00833685a031
+  metadata.gz: bbadfa76146d4f7da098a05d65a15b28897b5fdd
+  data.tar.gz: 65afaa22c3d1b9a2c456de81186e072bd0ff5269
 SHA512:
-  metadata.gz: df7304f62064c6722b1b02c6b918ed1388b92d784509c10597269adf6d2b6c50dd478af477077172a1af95a34e4f4bbe2d1735e3533963f8b61346e9474088b4
-  data.tar.gz: 8aa0a62a0c22561f2f04ed8b630f926bd4cd6bde4d3d22234c5c4efc618b659c7b0ad19ab0c1ba1fe8a17b7e45d9eabc9b6d684f0de06fa8010a5d4fb36145d2
+  metadata.gz: d21d1ba6ab3489312a6212a6af7d3ce95f156d5c86e4855ac922b207ade905722fb2fe07669d25a5b9980e932a8f434a28d0fb17cd1d7d355b36387cca43401c
+  data.tar.gz: 63330fdd41d6364f9068869ab1c2c360f93f9fc8bd827d5566928c3c191eee2e8af55f6b5d693a201740c4f65052d175d0eafac5994b076e5f309d42d7a17994

data/CHANGELOG.md

@@ -0,0 +1,19 @@
+* **0.2 (2016-05-18)**: Configuration moved to YAML-file. SSH-Keys optional. Config-templates overwritable locally.
+* **0.18.4 (2016-03-22)**: Added mandatory task to install `ssh_key`s
+* **0.18.2 (2016-03-08)**: Added basic DDoS and flooding-proof via nginx `req_limit` and `fail2ban`
+* **0.18.1 (2016-03-01)**: Added support for memcached
+* **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
+* **2015-08-27**: Small fix for `nginx`-config regarding gzipping of svgs
+* **2015-08-14**: Important small fix for `nginx`-config regarding ssl
+* **2015-08-07**: Small fix for `rvm`-install
+* **2015-08-06**: Support for optional `sidekiq`
+* **2015-06-23**: Support for optional `elasticsearch`
+* **2015-06-23**: Support for optional `whenever`
+* **2015-06-23**: Support for optional `imagemagick`
+* **2015-06-23**: Support creation of working `ubuntu` user. Error out if another user than `ubuntu` is used.
+* **2015-06-22**: Support for choosing your Ruby-version when creating the `Capfile`. Suggestions come from `.ruby-version` and `Gemfile`.
+* **2015-04-29**: Load custom rake tasks from lib/capistrano/tasks directory.
+You need to run the generator ```rake deploy_mate:install``` again or add ```Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }``` to your Capfile.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    deploy_mate (0.17.5)
+    deploy_mate (0.18.4)
       capistrano (~> 3.0)
       capistrano-bundler
       capistrano-rails

data/README.md

@@ -5,11 +5,11 @@
 This little gem can be added to your ruby-projects in order to **set up a working ruby-server** and **deploy** to it.
 
 The resulting server will work with this setup:
-- NGINX Webserver (http://nginx.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)
+- [NGINX](http://nginx.org/) Webserver
+- [Unicorn](http://unicorn.bogomips.org/) Rack App Server / [Puma](http://puma.io/) Rack App Server
+- [Bluepill](https://github.com/bluepill-rb/bluepill) Process Monitoring
+- [RVM](http://rvm.io) as user-install
+- [Optional] [ImageMagick](http://www.imagemagick.org)
 
 Other stuff taken care of:
 - Logration
@@ -28,75 +28,50 @@ It uses the following Capistrano-roles to divide the installed components:
 - **search**: [OPTIONAL] Machines with this role run ElasticSearch
 - **cronjobs**: [OPTIONAL] For environments where `whenever` should manage/run cronjobs
 
-## Changelog
-* **0.18.4 (2016-03-22)**: Added mandatory task to install `ssh_key`s
-* **0.18.2 (2016-03-08)**: Added basic DDoS and flooding-proof via nginx `req_limit` and `fail2ban`
-* **0.18.1 (2016-03-01)**: Added support for memcached
-* **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
-* **2015-08-27**: Small fix for `nginx`-config regarding gzipping of svgs
-* **2015-08-14**: Important small fix for `nginx`-config regarding ssl
-* **2015-08-07**: Small fix for `rvm`-install
-* **2015-08-06**: Support for optional `sidekiq`
-* **2015-06-23**: Support for optional `elasticsearch`
-* **2015-06-23**: Support for optional `whenever`
-* **2015-06-23**: Support for optional `imagemagick`
-* **2015-06-23**: Support creation of working `ubuntu` user. Error out if another user than `ubuntu` is used.
-* **2015-06-22**: Support for choosing your Ruby-version when creating the `Capfile`. Suggestions come from `.ruby-version` and `Gemfile`.
-* **2015-04-29**: Load custom rake tasks from lib/capistrano/tasks directory.
-You need to run the generator ```rake deploy_mate:install``` again or add ```Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }``` to your Capfile.
-
 ## Installation
-Add this to your project's `Gemfile`:
-
+* Add the gem to your Gemfile (`gem 'deploy_mate'`) and run `bundle install`.
+* Spawn yourself a basic **Ubuntu 14** at the provider of your choice.
+* Create a working SSH-configuration for that server and try it out using `ssh <your-server-name>`.
+
+## Generate the Capistrano files
+* Generate the configuration file: `bundle exec rake deploy_mate:default_config`
+* Edit the configuration file: `open config/deploy_mate.yml`
+* Generate the Capistrano files out of the config: `bundle exec rake deploy_mate:install`
+
+**NOTE** for non-rails applications:
+Since rails supports auto-loading rake tasks, any non-rails application must load the deploy mate rake tasks manually.
+At **the end** of the your project's `Rakefile`:
 ```
-gem 'deploy_mate'
+load 'deploy_mate/tasks.rake'
 ```
-and run `bundle install`.
+When done: **Remove** `load 'deploy_mate/tasks.rake'` from your `Rakefile`. It is not needed anymore and will otherwise only cause problems.
 
-After installing the gem you need to generate the files needed to be able to deploy with **capistrano**.
+## Using deploy mate
 
-Add this at **the end** of your project's `Rakefile`:
-```
-load 'deploy_mate/tasks.rake'
+### Initialize needed server packages
 ```
-then run
+bundle exec cap <your-stage> machine:init
 ```
-rake deploy_mate:install
-````
-
-Follow the instructions.
-
-This will create the following files for you:
 
+### Copy needed templates
 ```
-Capfile
-config/deploy.rb
-config/deploy/<your-stage>.rb
+bundle exec cap <your-stage> machine:setup
 ```
-When done: **Remove** `load 'deploy_mate/tasks.rake'` from your `Rakefile`. It is not needed anymore and will otherwise only cause problems.
 
-## Updating the gem
-Should you need to update your `deploy_mate`-version (e.g. because somebody fixed a bug in the gem), run:
+### Deploy the application
 ```
-bundle update deploy_mate
+bundle exec cap <your-stage> deploy
 ```
-This will bump you up to the latest repo-version.
-
-## Setting up a server
-1. Spawn yourself a basic **Ubuntu 14** at the provider of your choice.
-2. Create a working SSH-configuration for that server and try it our using `ssh <your-server-name>`
-3. Run `cap <your-stage> machine:init` to install the needed packages.
-4. Run `cap <your-stage> machine:setup` the setup all needed configuration-files on the server
-5. Run `cap <your-stage> deploy branch=optional_branch` and be done.
 
-## Reinstalling SSH-Keys
-If you need to redeploy SSH Keys to your server (e.g. somebody leaves your team), run: 
+### Reinstalling SSH-Keys
+If you need to redeploy SSH Keys to your server (e.g. somebody leaves your team),you can
+always come back to your configuration file at `config/deploy_mate.yml`, change the
+values and generate the Capistrano files again with `bundle exec rake deploy_mate:install`.
+To setup just the ssh keys run:
 
 ```
 bundle exec cap <your-stage> machine:install:ssh_keys
 ```
 
-It will pull the SSH Keys from the location configured in your `deploy.rb`. You can also change it there.
+### Overwriting Templates
+You can overwrite the templates used to setup the server. Just place the desired template in your project under `lib/capistrano/configs` and rerun the setup task. All existing templates can be found in this repo under [lib/capistrano/configs](https://github.com/hanseventures/deploy-mate/tree/master/lib/capistrano/configs).

data/deploy-mate.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name                      = "deploy_mate"
-  s.version                   = "0.18.4"
+  s.version                   = "0.20"
 
   s.authors                   = ["Tim Adler", "Marcus Geißler", "Johannes Strampe"]
-  s.date                      = %q{2016-03-22}
+  s.date                      = %q{2016-05-18}
   s.description               = %q{This is how we deploy around here.}
   s.summary                   = s.description
   s.email                     = %q{development (at) hanseventures (dot) com}
@@ -19,5 +19,4 @@ Gem::Specification.new do |s|
   s.add_dependency 'capistrano-bundler'
   s.add_dependency 'capistrano-rails'
   s.add_dependency 'rake'
-
 end

data/lib/capistrano/configs/puma.rb.erb

@@ -1,6 +1,15 @@
 # puma configuration
 
 shared_path = "<%= shared_path %>"
+environment_name = "<%= fetch(:environment) %>"
+
+begin
+  require 'dotenv'
+  dotenv_path = '<%= fetch(:dotenv_path, shared_path.join(".env.#{fetch(:environment)}")) %>'
+  Dotenv.load(dotenv_path)
+rescue LoadError
+  puts "Dotenv not found, skipping load of env vars..."
+end
 
 # Puma can serve each request in a thread from an internal thread pool.
 # The `threads` method setting takes two numbers a minimum and maximum.
@@ -8,12 +17,12 @@ shared_path = "<%= shared_path %>"
 # the maximum value specified for Puma. Default is set to 5 threads for minimum
 # and maximum, this matches the default thread size of Active Record.
 #
-threads_count = <%= fetch(:puma_threads) %>
+threads_count = ENV.fetch("PUMA_THREADS", <%= fetch(:puma_threads) %>)
 threads threads_count, threads_count
 
 # Specifies the `environment` that Puma will run in.
 #
-environment "<%= fetch(:environment) %>"
+environment environment_name
 
 # Specifies the number of `workers` to boot in clustered mode.
 # Workers are forked webserver processes. If using threads and workers together
@@ -21,7 +30,7 @@ environment "<%= fetch(:environment) %>"
 # Workers do not work on JRuby or Windows (both of which do not support
 # processes).
 #
-workers <%= fetch(:puma_workers) %>
+workers ENV.fetch("PUMA_WORKERS", <%= fetch(:puma_workers) %>)
 
 # Use the `preload_app!` method when specifying a `workers` number.
 # This directive tells Puma to first boot the application and load code

data/lib/capistrano/helpers.rb

@@ -2,7 +2,9 @@
 # This file is loaded before the tasks
 
 def template(from, to)
-  erb = File.read(File.expand_path("../configs/#{from}", __FILE__))
+  path = File.expand_path("lib/capistrano/configs/#{from}", ENV['PWD'])
+  path = File.expand_path("../configs/#{from}", __FILE__) unless File.exists?(path)
+  erb = File.read(path)
   compiled = ERB.new(erb).result(binding)
   io = StringIO.new(compiled)
   upload! io, to
@@ -17,4 +19,4 @@ def execute_script(name, params = "")
   execute "chmod 755 #{name}"
   execute "./#{name} #{params}"
   execute "rm #{name}"
-end
+end

data/lib/capistrano/modules/shell.rb

@@ -4,17 +4,4 @@ module Shell
     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

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

data/lib/capistrano/tasks/fail2ban.rake

@@ -4,14 +4,10 @@ namespace :fail2ban do
   desc "Installs the fail2ban configs"
   task :setup do
     on roles(:web) do
-      if file_new_or_overwrite?("/etc/fail2ban/jail.conf")
-        template "fail2ban-nginx-request-limit-jail.conf.erb", "/tmp/fail2ban_jail"
-        sudo "mv /tmp/fail2ban_jail /etc/fail2ban/jail.conf"
-      end
-      if file_new_or_overwrite?("/etc/fail2ban/filter.d/nginx-req-limit.conf")
-        template "fail2ban-nginx-request-limit-jail.conf.erb", "/tmp/fail2ban_req_filter"
-        sudo "mv /tmp/fail2ban_req_filter /etc/fail2ban/filter.d/nginx-req-limit.conf"
-      end
+      template "fail2ban-nginx-request-limit-jail.conf.erb", "/tmp/fail2ban_jail"
+      sudo "mv /tmp/fail2ban_jail /etc/fail2ban/jail.conf"
+      template "fail2ban-nginx-request-limit-jail.conf.erb", "/tmp/fail2ban_req_filter"
+      sudo "mv /tmp/fail2ban_req_filter /etc/fail2ban/filter.d/nginx-req-limit.conf"
     end
   end
 

data/lib/capistrano/tasks/logrotate.rake

@@ -4,10 +4,8 @@ namespace :logrotate do
   desc "Install the logrotate config"
   task :setup do
     on roles(:app) do
-      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
+      template "logrotate.erb", "/tmp/logrotate-#{fetch(:application)}"
+      sudo "mv /tmp/logrotate-#{fetch(:application)} /etc/logrotate.d/#{fetch(:application)}"
       sudo "chown root:root /etc/logrotate.d/#{fetch(:application)}"
     end
   end

data/lib/capistrano/tasks/machine.rake

@@ -190,6 +190,8 @@ namespace :machine do
       on roles(:app) do
         file_patterns = fetch(:ssh_file_names)
 
+        next puts("Skip SSH key installation") if file_patterns == []
+
         puts "Installing SSH Keys from #{file_patterns.join(',')}..."
 
         keys = []

data/lib/capistrano/tasks/nginx.rake

@@ -6,15 +6,11 @@ namespace :nginx do
   desc "Installs the nginx configs"
   task :setup do
     on roles(:web) do
-      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
+      template "nginx_base.conf.erb", "/tmp/nginx_conf"
+      sudo "mv /tmp/nginx_conf /etc/nginx/nginx.conf"
 
-      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
+      template "nginx_app.conf.erb", "/tmp/#{fetch(:application)}_conf"
+      sudo "mv /tmp/#{fetch(:application)}_conf /etc/nginx/sites-available/#{fetch(:application)}.conf"
 
       if file_exists? "/etc/nginx/sites-enabled/default"
         sudo "rm /etc/nginx/sites-enabled/default"

data/lib/capistrano/tasks/puma.rake

@@ -11,9 +11,7 @@ namespace :puma do
   task :setup do
     on roles(:app) do
       execute "mkdir -p #{shared_path}/config"
-      if file_new_or_overwrite?("#{shared_path}/config/puma.rb")
-        template "puma.rb.erb", "#{shared_path}/config/puma.rb"
-      end
+      template "puma.rb.erb", "#{shared_path}/config/puma.rb"
     end
   end
 

data/lib/capistrano/tasks/unicorn.rake

@@ -10,9 +10,7 @@ namespace :unicorn do
   task :setup do
     on roles(:app) do
       execute "mkdir -p #{shared_path}/config"
-      if file_new_or_overwrite?("#{shared_path}/config/unicorn.rb")
-        template "unicorn.rb.erb", "#{shared_path}/config/unicorn.rb"
-      end
+      template "unicorn.rb.erb", "#{shared_path}/config/unicorn.rb"
     end
   end
 

data/lib/capistrano/tasks/upstart.rake

@@ -6,20 +6,16 @@ namespace :upstart do
   desc "Install the upstart config"
   task :setup do
     on roles(:app) do
-      if file_new_or_overwrite?("/etc/init/bluepill.conf")
-        template "upstart.conf.erb", "/tmp/bluepill.conf"
-        sudo "mv /tmp/bluepill.conf /etc/init/"
-      end
+      template "upstart.conf.erb", "/tmp/bluepill.conf"
+      sudo "mv /tmp/bluepill.conf /etc/init/"
       sudo "chown root:root /etc/init/bluepill.conf"
     end
   end
 
   task :start do
     on roles(:app) do
-      if file_new_or_overwrite?("/etc/init/bluepill.conf")
-        template "upstart.conf.erb", "/tmp/bluepill.conf"
-        sudo "mv /tmp/bluepill.conf /etc/init/"
-      end
+      template "upstart.conf.erb", "/tmp/bluepill.conf"
+      sudo "mv /tmp/bluepill.conf /etc/init/"
       sudo "chown root:root /etc/init/bluepill.conf"
     end
   end

data/lib/deploy_mate/tasks.rake

@@ -1,67 +1,48 @@
-require 'readline'
-
 namespace :deploy_mate do
+  desc 'copy the default configuration file to config/deploy_mate.yml'
+  task :default_config do
+    @app_name     = guess_app_name
+    @ruby_version = guess_ruby_version
+    @rails        = to_h(rails?)
+    @imagemagick  = to_h(imagemagick?)
+    @sidekiq      = to_h(sidekiq?)
+    @memcached    = to_h(memcached?)
+
+    puts "Creating default template:\n\n"
+    puts "\t" + config_template('deploy_mate.yml.erb', 'config/deploy_mate.yml')
+    puts "\nConfigure it and then run:\n\n\tbundle exec rake deploy_mate:install\n\n"
+  end
 
-  desc 'Installs the needed capistrano files to deploy with the mate.'
-  task :install do |t,args|
-    puts "I'm your DEPLOY_MATE."
-    puts "We will set up your deployment now."
-
-    @app_name =             ask("[01/16] App-Name (for nginx, servers, etc.)", guess_app_name)
-    @stage_name =           ask("[02/16] Give the first stage a name", "prestage")
-    @ssh_name =             ask("[03/16] SSH-Hostname for the server", "#{@app_name}-#{@stage_name}")
-    @ssh_file_names =       ask("[04/16] SSH Keys to be installed", "~/.ssh/*.pub")
-    @ruby_version =         ask("[05/16] Ruby-Version (the RVM-way, e.g. ruby-2.2.0)", guess_ruby_version)
-    @db_engine =            ask_until("[06/16] What db are you using?", %w( postgresql mysql ), "mysql")
-    @app_server =           ask_until("[07/16] What app server do you want to use?", %w( unicorn puma ), "unicorn")
-    @repo_url =             ask("[08/16] Url-Location of git-repo", "git@github.com:hanseventures/#{@app_name}.git")
-    @is_rails =             yes_or_no?("[09/16] Is this a RAILS project ?", (rails_present? ? "yes" : "no"))
-    @needs_imagemagick =    yes_or_no?("[10/16] Does this project need ImageMagick ?", (needs_imagemagick? ? "yes" : "no"))
-    @uses_sidekiq =         yes_or_no?("[11/16] Does this project use Sidekiq ?", (uses_sidekiq? ? "yes" : "no"))
-    @branch_name =          ask("[12/16] Branch to deploy '#{@stage_name}' from", "dev")
-    @host_name =            ask("[13/16] Web-URL for '#{@stage_name}'", "#{@stage_name}.#{@app_name}")
-    @environment =          ask("[14/16] #{@stage_name}'s environment (RACK_ENV/RAILS_ENV)", "#{@stage_name}")
-    @needs_elasticsearch =  yes_or_no?("[15/16] Do you need ElasticSearch on this machine ?", "no")
-    @needs_memcached =      yes_or_no?("[16/16] Do you need Memcached on this machine ?", (needs_memcached? ? "yes" : "no"))
-
-    puts "Aye!"
-    puts "Worrrrking..."
-
-    config_template("Capfile.erb", "Capfile")
-    sleep 1
-    config_template("deploy.rb.erb", "config/deploy.rb")
-    sleep 1
+  task :install do
+    @config = YAML.load_file(File.expand_path('config/deploy_mate.yml', ENV['PWD']))
+    puts "Creating capistrano deployment files:\n"
     FileUtils.mkdir_p("config/deploy") unless File.exists?("config/deploy")
-    config_template("deploy/stage.rb.erb", "config/deploy/#{@stage_name}.rb")
-    sleep 1
-
-    puts "You can activate OPTIONAL components e.g. 'whenever' in deploy.rb/Capfile."
-
-    puts "Arr, be dun working!"
+    puts config_template("Capfile.erb", "Capfile")
+    puts config_template("deploy.rb.erb", "config/deploy.rb")
+    puts config_template("deploy/stage.rb.erb", "config/deploy/#{@config['stage_name']}.rb")
   end
-
 end
 
 def config_template(from, to)
   erb = File.read(File.expand_path("../templates/#{from}", __FILE__))
   compiled = ERB.new(erb).result(binding)
   File.open(to, "wb") { |f| f.write(compiled) }
-  puts "'#{to}'"
+  to
 end
 
-def uses_sidekiq?
+def sidekiq?
   defined? Sidekiq
 end
 
-def needs_imagemagick?
+def imagemagick?
   defined? RMagick || defined? MiniMagick
 end
 
-def needs_memcached?
+def memcached?
   defined? Dalli
 end
 
-def rails_present?
+def rails?
   defined? Rails
 end
 
@@ -85,32 +66,10 @@ def guess_ruby_version
   ruby_version
 end
 
-def yes_or_no?(prompt, default = nil)
-  answer = "undefined"
-  while(!["yes", "no"].include?(answer))
-    answer = ask("#{prompt} [yes/no]:", (default == "yes" ? "yes" : "no"))
-  end
-  (answer == "yes")
-end
-
-def ask_until(prompt, answers, default)
-  begin
-    answer = ask("#{prompt} (#{answers.join(', ')})", default).downcase
-  end until answers.include? answer
-  answer
-end
-
-def ask(prompt, default = nil)
-  if default
-    Readline.pre_input_hook = -> {
-      Readline.insert_text(default)
-      Readline.redisplay
-    }
-  end
-  data = Readline.readline("#{prompt}: ")
-  return data.chomp
+def to_h(value)
+  value ? "yes" : "no"
 end
 
 def cat_file(filename)
-  File.open(filename, 'rb') { |f| f.read } if File.exist?(filename)
+  File.open(filename, "rb") { |f| f.read } if File.exist?(filename)
 end

data/lib/deploy_mate/templates/Capfile.erb

@@ -1,5 +1,5 @@
 require 'capistrano/deploy_mate_capfile'
-<% if @is_rails %>
+<% if @config['rails'] %>
 require 'capistrano/rails/assets'
 require 'capistrano/rails/migrations'
 <% end %>
@@ -9,4 +9,4 @@ Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
 # Uncomment, if needed
 
 # require "whenever/capistrano"
-# before 'deploy:restart', 'deploy:migrate', 'whenever:update_crontab'
+# before 'deploy:restart', 'deploy:migrate', 'whenever:update_crontab'

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

@@ -1,7 +1,7 @@
-server "<%= @ssh_name %>", roles: [:app, :db, :web<% if @needs_elasticsearch %>, :search<% end %>], :primary => true
+server "<%= @config['ssh_name'] %>", roles: [:app, :db, :web<% if @config['elasticsearch'] %>, :search<% end %>], :primary => true
 
 set :unicorn_workers, "2"
-set :nginx_server_name, "<%= @host_name %>"
+set :nginx_server_name, "<%= @config['host_name'] %>"
 
-set :environment, "<%= @environment %>"
-set :branch, ENV.fetch("branch", "<%= @branch_name %>")
+set :environment, "<%= @config['environment'] %>"
+set :branch, ENV.fetch("branch", "<%= @config['branch_name'] %>")

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

@@ -1,22 +1,22 @@
 # NOTE: copy this file to /config/deploy.rb
-set :application, '<%= @app_name %>'
+set :application, '<%= @config['app_name'] %>'
 
 require "capistrano/deploy_mate_defaults"
 
-set :rvm_ruby_version, '<%= @ruby_version %>'
+set :rvm_ruby_version, '<%= @config['ruby_version'] %>'
 
 # Set app specific vars
-set :stages, %w(<%= @stage_name %>)
-set :default_stage, '<%= @stage_name %>'
-set :repo_url, '<%= @repo_url %>'
-set :db_engine, '<%= @db_engine %>'
-set :app_server, '<%= @app_server %>'
+set :stages, %w(<%= @config['stage_name'] %>)
+set :default_stage, '<%= @config['stage_name'] %>'
+set :repo_url, '<%= @config['repo_url'] %>'
+set :db_engine, '<%= @config['db_engine'] %>'
+set :app_server, '<%= @config['app_server'] %>'
 
-set :imagemagick, <%= @needs_imagemagick %>
-set :memcached, <%= @needs_memcached %>
-set :sidekiq, <%= @uses_sidekiq %>
+set :imagemagick, <%= @config['imagemagick'] %>
+set :memcached, <%= @config['memcached'] %>
+set :sidekiq, <%= @config['sidekiq'] %>
 
-set :ssh_file_names, ['<%= @ssh_file_names %>']
+set :ssh_file_names, [<%= @config['ssh_file_names'].to_a.map { |file| "'#{file}'" }.join(', ') %>]
 
 # Optionals
 # Uncomment, if needed

data/lib/deploy_mate/templates/deploy_mate.yml.erb

@@ -0,0 +1,79 @@
+# This file represents your application deployment configuration and
+# will be used to generate the capistrano deployment and server setup.
+# Please go through this file and when you are ready execute:
+#
+#   bundle exec rake deploy_mate:install
+
+---
+
+  # Name of the application, which is usually the same as the
+  # repository name.
+  app_name: <%= @app_name %>
+
+  # The url of your GIT repository.
+  repo_url: "git@github.com:your-github-name/<%= @app_name %>.git"
+
+  # For which stage should the server-setup/deployment be generated. It is
+  # recommended to start with a prestage system and afterwards configure
+  # the production system when it is ready.
+  stage_name: prestage
+
+  # Under which rails environment will the application run.
+  environment: prestage
+
+  # Which GIT branch should be deployed to the defined server by default?
+  # You can overrule this value by providing a branch on the deployment command:
+  #
+  #   bundle exec cap prestage deploy branch=feature/xyz
+  branch_name: dev
+
+  # Which is the ssh shortcut to connect to the server. It should be configured
+  # in your ~/.ssh/config. You should be able to connect to the server using:
+  #
+  #   ssh specified_ssh_name
+  #
+  ssh_name: prestage-server
+
+  # Since you are able to connect to the server with the specified ssh shortcurt,
+  # usually more persons should be able to access it. You can specify a list of
+  # public ssh keys which will be copied to the ~/.ssh/authorized_keys file on the
+  # server. If the list is empty, the current key setting will be left untouched on
+  # the server.
+  ssh_file_names:
+    - "~/.ssh/*.pub"
+
+  # Under which URL should your server be available? An IP address does the job
+  # too
+  host_name: example.com
+
+  # The ruby version, that will be installed and used on the server. It is used
+  # by RVM and must have a compatible syntax like '2.3.0' or 'ruby-2.3.0'.
+  ruby_version: <%= @ruby_version %>
+
+  # Currently there are two database engines supported: 'postgresql' and 'mysql'
+  db_engine: postgresql
+
+  # Currently there are two appservers supported: 'unicorn' and 'puma'.
+  # Remember to add the chosen appserver to your Gemfile if you are not
+  # already using it locally.
+  app_server: unicorn
+
+  # Are your running a rails application?
+  # Possible values 'yes' or 'no'.
+  rails: <%= @rails %>
+
+  # Are you depending on imagemagick for image manipulation (E.g. paperclip gem)?
+  # Possible values 'yes' or 'no'.
+  imagemagick: <%= @imagemagick %>
+
+  # Are you depending on sidekiq (E.g. as active job backend)?
+  # Possible values 'yes' or 'no'.
+  sidekiq: <%= @sidekiq %>
+
+  # Are you depending on elastic search?
+  # Possible values 'yes' or 'no'.
+  elasticsearch: no
+
+  # Are you depending on memcached for example as a cache store?
+  # Possible values 'yes' or 'no'.
+  memcached: <%= @memcached %>

data/lib/deploy_mate.rb

@@ -0,0 +1,9 @@
+if defined?(Rails)
+  module DeployMate
+    class Railtie < Rails::Railtie
+      rake_tasks do
+        load 'deploy_mate/tasks.rake'
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deploy_mate
 version: !ruby/object:Gem::Version
-  version: 0.18.4
+  version: '0.20'
 platform: ruby
 authors:
 - Tim Adler
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-22 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -78,6 +78,7 @@ files:
 - ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -116,10 +117,12 @@ files:
 - lib/capistrano/tasks/seeds.rake
 - lib/capistrano/tasks/unicorn.rake
 - lib/capistrano/tasks/upstart.rake
+- lib/deploy_mate.rb
 - lib/deploy_mate/tasks.rake
 - lib/deploy_mate/templates/Capfile.erb
 - lib/deploy_mate/templates/deploy.rb.erb
 - lib/deploy_mate/templates/deploy/stage.rb.erb
+- lib/deploy_mate/templates/deploy_mate.yml.erb
 homepage: https://github.com/hanseventures/deploy-mate
 licenses:
 - MIT