deploy_mate 0.11 → 0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 331e342b761f203348e39e17f3deb3ea338eb868
-  data.tar.gz: 3a0ea8e0bc854d1569c799c7ff602221fb56f258
+  metadata.gz: df92af3b0b6a83b873bfee7b3b530e587c36c25a
+  data.tar.gz: d22321dbdc778da42189d9675d2bb9d6dc021311
 SHA512:
-  metadata.gz: 9956a9f6494627990d13e8394ffbc394ac7cbe83b42d6b071dab50e8f2a865df5dcd0e7a1ac3e3a16011d3fc60bd09229224cf803815ccb9fc252b0535198b8a
-  data.tar.gz: 1c74e9cde74a5fe37f2f2404a378442194472f30d323b6f852ff06dfb582898122a56369e430695f187d330904240fb6c673bd93e1ac3ad8b218d91d50b475d9
+  metadata.gz: fdd8f006ea0e5438a65cee27a31a142126341476ff7674b1c25f40ba7b0a6da796b3e4db9bf825b9b2a03715d96ff0ccfb0609afe17d7af998f375898669bb80
+  data.tar.gz: 932117d4c5e14a6961569ce72f3e3deaf8cdfe0fe08a902b9d100d72532fb2e13d769eedc4da37968d562c0f0fa10a187c1175d3a56e2f430285f511365275cf

data/README.md

@@ -20,6 +20,7 @@ You can choose Database:
 - Postgres
 
 ## Changelog
+* **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/deploy-mate.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name                      = "deploy_mate"
-  s.version                   = "0.11"
+  s.version                   = "0.12"
 
   s.authors                   = ["Tim Adler"]
-  s.date                      = %q{2015-04-02}
+  s.date                      = %q{2015-06-22}
   s.description               = %q{This is how we deploy around here.}
   s.summary                   = s.description
   s.email                     = %q{tim.adler (at) hanseventures (dot) com}

data/lib/deploy_mate/tasks.rake

@@ -7,15 +7,16 @@ namespace :deploy_mate do
     puts "I'm your DEPLOY_MATE."
     puts "We will setting up your deployment now."
 
-    @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")
+    @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}.com")
-    @environment = ask("#{@stage_name}'s environment (RACK_ENV/RAILS_ENV):", "#{@stage_name}")
+    @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")
 
     puts "Aye!"
@@ -49,6 +50,22 @@ def guess_app_name
   Dir.pwd.split(File::SEPARATOR).last
 end
 
+def guess_ruby_version
+  ruby_version = nil
+  ruby_version = cat_file(".ruby-version")
+  ruby_version.strip! if ruby_version
+  unless ruby_version
+    gem_file_content = cat_file("Gemfile")
+    if gem_file_content
+      match =  gem_file_content.match("^ruby '(?<version>[0-9.]*)'")
+      if match
+        ruby_version = "ruby-" + match["version"]
+      end
+    end
+  end
+  ruby_version
+end
+
 def yes_or_no?(prompt, default = nil)
   answer = "undefined"
   while(!["yes", "no"].include?(answer))
@@ -74,3 +91,7 @@ def ask(prompt, default = nil)
   data = Readline.readline("#{prompt}: ")
   return data.chomp
 end
+
+def cat_file(filename)
+  File.open(filename, 'rb') { |f| f.read } if File.exist?(filename)
+end

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

@@ -3,6 +3,8 @@ set :application, '<%= @app_name %>'
 
 require "capistrano/deploy_mate_defaults"
 
+set :rvm_ruby_version, '<%= @ruby_version %>'
+
 # Set app specific vars
 set :stages, %w(<%= @stage_name %>)
 set :default_stage, '<%= @stage_name %>'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deploy_mate
 version: !ruby/object:Gem::Version
-  version: '0.11'
+  version: '0.12'
 platform: ruby
 authors:
 - Tim Adler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano