deploy_mate 0.14 → 0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15a9544626e2d3662f301c7739e88022fde3d2cd
-  data.tar.gz: cc4b0b975dd655a93e2e29374808e314ee4d5b88
+  metadata.gz: 010748fec2c76a90ba7f99433ee1f5045980f40f
+  data.tar.gz: 4b5007ee4f0fcd32c37d0053a95e28d9935fb3bd
 SHA512:
-  metadata.gz: 383702d8e2a8ca71022b6342d8667a603aea52387cea5054582b06a7e1d9efb59c70b353799c798caeb9cb0d4c4dc66a68ca5bc67873d78f2b42ae038a7e978e
-  data.tar.gz: 1a0b558d4bd030b35f4343ddc61bab97e00eb03eb63d4f1012066fe46566a9265127aaf5a77ea80e2b86091dacb753bf61206fd7294b16faae2351588256b257
+  metadata.gz: cafffbfdaec1aad29f7cedbeff29878d94e1fc67864eda988a75d03f5741bdc08437fef20a28d8857968b21223af752a9bd43974c0c15e1e07dc381a1d6cc854
+  data.tar.gz: 1b5a3e7443df511271b70be63c40b49e0617131ffc5261940c012383420e5264e2912818249b5e0c52b1f7b3a19a79d55295355a7a0d148b42b8db18b9018644

data/README.md

@@ -9,6 +9,7 @@ The resulting server will work with this setup:
 - Unicorn Rack App Server (http://unicorn.bogomips.org/)
 - Bluepill Process Monitoring (https://github.com/bluepill-rb/bluepill)
 - RVM as user-install (http://rvm.io)
+- [Optional] ImageMagick (http://www.imagemagick.org)
 
 Other stuff taken care of:
 - Logration
@@ -21,7 +22,15 @@ You can choose a Database-Engine:
 
 **If you are not using Amazon AWS as a host:** The GEM needs a working Amazon AWS-style `ubuntu`-user on the system in order to work properly. It will create one, if needed.
 
+It uses the following Capistrano-roles to divide the installed components:
+- **web**: Machines with this role run NGINX as proxy
+- **app**: Machines with this role run the Ruby-webapp
+- **search**: [OPTIONAL] Machines with this role run ElasticSearch
+- **cronjobs**: [OPTIONAL] For environments where `whenever` should manage/run cronjobs
+
 ## Changelog
+* **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`.

data/deploy-mate.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name                      = "deploy_mate"
-  s.version                   = "0.14"
+  s.version                   = "0.15"
 
   s.authors                   = ["Tim Adler"]
   s.date                      = %q{2015-06-23}
@@ -20,6 +20,4 @@ Gem::Specification.new do |s|
   s.add_dependency 'capistrano-rails'
   s.add_dependency 'rake'
 
-  # s.add_development_dependency 'rake', '~> 10.1.0'
-
 end

data/lib/capistrano/deploy_mate_capfile.rb

@@ -28,6 +28,6 @@ require "capistrano/helpers.rb"
 end
 
 # Loads custom tasks from `lib/capistrano/tasks' if you have any defined.
-%w(bluepill logrotate machine nginx rvm unicorn upstart).each do |t|
+%w(bluepill logrotate machine elasticsearch nginx rvm unicorn upstart).each do |t|
   import File.expand_path("../tasks/#{t}.rake", __FILE__)
 end

data/lib/capistrano/tasks/elasticsearch.rake

@@ -0,0 +1,15 @@
+namespace :elasticsearch do
+  include Aptitude
+  task :install do
+    on roles(:search) do
+      unless is_package_installed?("elasticsearch")
+        apt_get_install("openjdk-7-jre-headless") unless is_package_installed?("openjdk-7-jre-headless")
+        execute "wget -qO - https://packages.elasticsearch.org/GPG-KEY-elasticsearch | sudo apt-key add -"
+        sudo 'add-apt-repository "deb http://packages.elasticsearch.org/elasticsearch/1.5/debian stable main"'
+        apt_get_install("elasticsearch") 
+        sudo "update-rc.d elasticsearch defaults 95 10"
+        sudo :service, :elasticsearch, :start
+      end
+    end
+  end
+end

data/lib/capistrano/tasks/machine.rake

@@ -19,6 +19,7 @@ namespace :machine do
       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"
@@ -65,6 +66,12 @@ namespace :machine do
       end
     end
 
+    task :elasticsearch do
+      on roles(:search) do
+        invoke 'elasticsearch:install'
+      end
+    end
+
     task :language_pack_de do
       on roles(:app) do
         apt_get_install("language-pack-de") unless is_package_installed?("language-pack-de")

data/lib/deploy_mate/tasks.rake

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

data/lib/deploy_mate/templates/Capfile.erb

@@ -4,3 +4,8 @@ require 'capistrano/rails/assets'
 require 'capistrano/rails/migrations'
 <% end %>
 Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
+
+# Optionals
+# Uncomment, if needed
+
+# require "whenever/capistrano"

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

@@ -11,4 +11,12 @@ set :default_stage, '<%= @stage_name %>'
 set :repo_url, '<%= @repo_url %>'
 set :db_engine, '<%= @db_engine %>'
 
-set :imagemagick, '<%= @needs_imagemagick %>'
+set :imagemagick, '<%= @needs_imagemagick %>'
+
+# Optionals
+# Uncomment, if needed
+
+# set :whenever_identifier, ->{ "#{fetch(:application)}_#{fetch(:stage)}" }
+# set :whenever_environment, fetch(:stage)
+# set :whenever_roles, [:cronjobs]
+# before "whenever:update_crontab", 'rvm:hook'

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

@@ -1,4 +1,4 @@
-server "<%= @ssh_name %>", roles: [:app, :web, :db], :primary => true
+server "<%= @ssh_name %>", roles: [:app, :web<% if @needs_elasticsearch %>, :search<%end %>], :primary => true
 
 set :unicorn_workers, "2"
 set :nginx_server_name, "<%= @host_name %>"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deploy_mate
 version: !ruby/object:Gem::Version
-  version: '0.14'
+  version: '0.15'
 platform: ruby
 authors:
 - Tim Adler
@@ -100,6 +100,7 @@ files:
 - lib/capistrano/scripts/install_rvm.sh
 - lib/capistrano/scripts/set_defaults.sh
 - lib/capistrano/tasks/bluepill.rake
+- lib/capistrano/tasks/elasticsearch.rake
 - lib/capistrano/tasks/logrotate.rake
 - lib/capistrano/tasks/machine.rake
 - lib/capistrano/tasks/nginx.rake