escualo 0.2.12 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d810cfadeace91fa3da01f727262afd51728784
-  data.tar.gz: 1727137e9e977b53214a53128d8ce52d84df0863
+  metadata.gz: d93e2ffee46b1ffcb014f4051fffa207a496534c
+  data.tar.gz: 35e3379e10b51444dc50955b7f53e0c994ecf179
 SHA512:
-  metadata.gz: 4d98cc07e4cd95335dcf1cf100dbd1184d95d7e73a72b8a9d15a979a0639372fdff8f6c9612ed39f170749ab5ced9894c8714887081e50b9168d0752201a76ed
-  data.tar.gz: 552dc4329fd55dee90c67e22a9d45184dd528a04c9c8c1d0ba851a09b5f441ab67d30965b141fe750e1715b5f592bea716ae7d8ce314fb470ee770770e898390
+  metadata.gz: f783d45a44dff3f86a903ce7e79304995589b597d437195d2b2b58c5bc3b8bab409275d5c80494aa5f45413d6ddd680ad930260150942a0431e7c8cb74aa19bc
+  data.tar.gz: c46b22123a40942bfbaacc46319fefa6f8f0f8b138d6fb3f3df909e8b711d79185501c81ba2098a5a7a75e88ab47c47dd915189ee643c24a6c2813c74a451eb1

data/lib/commands/bootstrap.rb

@@ -4,6 +4,9 @@ command 'bootstrap' do |c|
   c.option '--swap', TrueClass, 'Setup swap?'
   c.option '--monit-version VERSION', String, 'Monit version'
   c.option '--monit-password PASSWORD', String, 'Monit password. Will be prompted otherwise'
+  c.option '--no-monit', TrueClass, 'Skip monit installation'
+  c.option '--with-rbenv', TrueClass, 'Use rbenv instead of native ruby installation'
+
   c.option '-f', '--force', TrueClass, 'Force bootstrap even if already done?'
 
   c.ssh_action do |_args, options, ssh|
@@ -23,11 +26,12 @@ command 'bootstrap' do |c|
 
       step 'Installing base software...' do
         Escualo::Bootstrap.install_base ssh, options
+        Escualo::Bootstrap.install_ruby ssh, options
       end
 
       step 'Installing and configuring monit...' do
         Escualo::Bootstrap.setup_monit ssh, options
-      end
+      end unless options.no_monit
 
       step 'Enabling swap...' do
         Escualo::Bootstrap.enable_swap ssh

data/lib/commands/script.rb

@@ -1,5 +1,5 @@
 def run_commands_for!(script, extra='', ssh, options)
-  script.map { |it| "escualo #{it} #{extra}" }.each do |command|
+  Escualo::Script.each_command script, extra do |command|
     puts "Running `#{command}`"
     ssh.shell.perform! command, options
   end

data/lib/escualo.rb

@@ -12,6 +12,7 @@ require_relative './ssh'
 require_relative './escualo/version'
 require_relative './escualo/env'
 require_relative './escualo/bootstrap'
+require_relative './escualo/script'
 require_relative './escualo/plugin'
 require_relative './escualo/remote'
 require_relative './escualo/artifact'

data/lib/escualo/bootstrap.rb

@@ -16,14 +16,28 @@ module Escualo
                  git \
                  monit \
                  libssl-dev \
-                 ruby2.0 \
-                 ruby2.0-dev \
                  zlib1g \
                  zlib1g-dev \
                  libreadline-dev
       }, options
     end
 
+    def self.install_ruby(ssh, options)
+      if options.with_rbenv
+        ssh.shell.perform! %q{
+        curl https://raw.githubusercontent.com/fesplugas/rbenv-installer/master/bin/rbenv-installer | bash
+        echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc
+        echo 'eval "$(rbenv init -)"' >> ~/.bashrc
+      }
+      else
+        ssh.shell.perform! %q{
+        apt-get install -y \
+                 ruby2.0 \
+                 ruby2.0-dev
+      }, options
+      end
+    end
+
     def self.enable_swap(ssh)
       ssh.exec! %q{ \
         test -e /swapfile ||

data/lib/escualo/script.rb

@@ -0,0 +1,8 @@
+module Escualo
+  module Script
+    def self.each_command(script, extra='', &block)
+      script.map { |it| "escualo #{it} #{extra}" }.each(&block) if script
+    end
+  end
+end
+

data/lib/escualo/version.rb

@@ -1,4 +1,4 @@
 module Escualo
-  VERSION = '0.2.12'
+  VERSION = '0.3.0'
   BASE_VERSION = '3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: escualo
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.3.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-09 00:00:00.000000000 Z
+date: 2016-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -143,6 +143,7 @@ files:
 - lib/escualo/plugin/postgre.rb
 - lib/escualo/plugin/rabbit.rb
 - lib/escualo/remote.rb
+- lib/escualo/script.rb
 - lib/escualo/version.rb
 - lib/ssh.rb
 - lib/ssh/local_session.rb