deploy_mate 0.13 → 0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecff54aca5c2d8f35ce98fbfd84d318298d67e4b
-  data.tar.gz: 1ab1844832d1b169399e08391d1359689e76ce55
+  metadata.gz: 15a9544626e2d3662f301c7739e88022fde3d2cd
+  data.tar.gz: cc4b0b975dd655a93e2e29374808e314ee4d5b88
 SHA512:
-  metadata.gz: a671312408425d9c58d9493d2b875065dc8ea2b9193e663b6a36750dbc3b6edd682580568e856da694e91f93e7afe822e1f10dbd96a79b1b721a5e493762cf0e
-  data.tar.gz: 739d9c612e3b5285dda0a4b52131efd85d5d559fe1df63dae8ebfd7015b0c36ab47c40306a6dc0c75bda08aee3619e8aa9f6efc063e15b88dbabe109a8008c41
+  metadata.gz: 383702d8e2a8ca71022b6342d8667a603aea52387cea5054582b06a7e1d9efb59c70b353799c798caeb9cb0d4c4dc66a68ca5bc67873d78f2b42ae038a7e978e
+  data.tar.gz: 1a0b558d4bd030b35f4343ddc61bab97e00eb03eb63d4f1012066fe46566a9265127aaf5a77ea80e2b86091dacb753bf61206fd7294b16faae2351588256b257

data/README.md

@@ -15,11 +15,14 @@ Other stuff taken care of:
 - Automatic updates
 - NTP
 
-You can choose Database:
+You can choose a Database-Engine:
 - MySQL
 - Postgres
 
+**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.
+
 ## Changelog
+* **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.

data/deploy-mate.gemspec

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

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: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
@@ -98,6 +99,12 @@ namespace :machine do
       end
     end
 
+    task :imagemagick do
+      on roles(:app) do
+        apt_get_install("imagemagick") unless is_package_installed?("imagemagick")
+      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,17 +7,18 @@ namespace :deploy_mate do
     puts "I'm your DEPLOY_MATE."
     puts "We will setting up your deployment now."
 
-    @ruby_version = ask("Ruby-Version (the RVM-way, e.g. ruby-2.2.0)", guess_ruby_version)
-    @app_name = ask("App-Name (for nginx, servers, etc.)", guess_app_name)
-    @repo_url = ask("Url-Location of git-repo", "git@github.com:hanseventures/#{@app_name}.git")
-    @is_rails = yes_or_no?("Is this a RAILS project ?", (rails_present? ? "yes" : "no"))
-
-    @stage_name = ask("Give the first stage a name", "prestage")
-    @ssh_name = ask("SSH-Hostname for the server", "#{@app_name}-#{@stage_name}")
-    @branch_name = ask("Branch to deploy '#{@stage_name}' from", "dev")
-    @host_name = ask("Web-URL for '#{@stage_name}'", "#{@stage_name}.#{@app_name}")
-    @environment = ask("#{@stage_name}'s environment (RACK_ENV/RAILS_ENV)", "#{@stage_name}")
-    @db_engine = ask_until("What db are you using?", %w( postgresql mysql ), "mysql")
+    @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")
 
     puts "Aye!"
     puts "Worrrrking..."
@@ -42,6 +43,10 @@ def config_template(from, to)
   puts "'#{to}'"
 end
 
+def needs_imagemagick?
+  defined? RMagick || defined? MiniMagick
+end
+
 def rails_present?
   defined? Rails
 end

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

@@ -10,3 +10,5 @@ set :stages, %w(<%= @stage_name %>)
 set :default_stage, '<%= @stage_name %>'
 set :repo_url, '<%= @repo_url %>'
 set :db_engine, '<%= @db_engine %>'
+
+set :imagemagick, '<%= @needs_imagemagick %>'

metadata

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