deploy_mate 0.18 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c02225815d07b37452f67f963f13d5b36acf51eb
-  data.tar.gz: 84991452955ddc3b8163cfd1a62448db3a5e37e3
+  metadata.gz: c8a1c17d990ca37d1330258385fca3b2197ab656
+  data.tar.gz: 162e91f90cc01f3a9384d17bad97034177dc554c
 SHA512:
-  metadata.gz: da23d19df9d514d86f887454443897411a99ebd2d0b0725c40d819996caaa64940169db8014021fe25c2d8d19006c6293c113c63500e387ec53e04da34276032
-  data.tar.gz: d2d1b78e33ada5b83284002b6b00970e05423f8268616aa0485420b21b92e6a4707071632be214b6c0b777fbdb6ec0ef05faa2317dd6c05ab98567e52d126ba9
+  metadata.gz: 9269bce666c20f07e473fa2679ba67466010969fff2631dea5202f54e416c76b683846246349b41a23c73fe235cdbb2ca33cc9c48444d9074c47a4916df74003
+  data.tar.gz: 476c9bad746e56bd82d2d60be897c66c72a04ef4a882c5511691629d648ccc2ca8ff9564d4e247a3833c1e61bf5c0bec0f9831d17b1cfe7926934544a0d70eb1

data/README.md

@@ -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.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

data/deploy-mate.gemspec

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

data/lib/capistrano/tasks/machine.rake

@@ -22,6 +22,7 @@ namespace :machine do
     invoke "machine:install:nodejs"
     invoke "machine:install:elasticsearch"
     invoke "machine:install:imagemagick" if fetch(:imagemagick)
+    invoke "machine:install:memcached" if fetch(:memcached)
     invoke "machine:install:mysql_dev" if fetch(:db_engine) == "mysql"
     invoke "machine:install:postgres_dev" if fetch(:db_engine) == "postgresql"
   end
@@ -32,20 +33,13 @@ namespace :machine do
   task :check_ubuntu_user do
     on roles(:app) do
       unless am_i?("ubuntu")
-        invoke "machine:create_ubuntu_user"
+        execute_script("create_ubuntu_user.sh") # Creates an Amazon AWS-style 'ubuntu'-user on machines with only 'root'
         error "Please use a use a user named 'ubuntu' to login to the machine."
         fail
       end
     end
   end
 
-  desc "Creates an Amazon AWS-style 'ubuntu'-user on machines with only 'root'"
-  task :create_ubuntu_user do
-    on roles(:app) do
-      execute_script("create_ubuntu_user.sh")
-    end
-  end
-
   desc "Install configs"
   task :setup do
     invoke "nginx:setup"
@@ -68,9 +62,7 @@ namespace :machine do
     end
 
     task :elasticsearch do
-      on roles(:search) do
-        invoke 'elasticsearch:install'
-      end
+      invoke 'elasticsearch:install'
     end
 
     task :language_pack_de do
@@ -113,6 +105,12 @@ namespace :machine do
       end
     end
 
+    task :memcached do
+      on roles(:app) do
+        apt_get_install("memcached") unless is_package_installed?("memcached")
+      end
+    end
+
     task :mysql_dev do
       on roles(:app) do
         apt_get_install("libmysqlclient-dev") unless is_package_installed?("libmysqlclient-dev")

data/lib/deploy_mate/tasks.rake

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

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

@@ -13,6 +13,7 @@ set :db_engine, '<%= @db_engine %>'
 set :app_server, '<%= @app_server %>'
 
 set :imagemagick, <%= @needs_imagemagick %>
+set :memcached, <%= @needs_memcached %>
 set :sidekiq, <%= @uses_sidekiq %>
 
 # Optionals

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deploy_mate
 version: !ruby/object:Gem::Version
-  version: '0.18'
+  version: 0.18.1
 platform: ruby
 authors:
 - Tim Adler