escualo 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1920e5a93953d72791592fcdddc60524c037384d
-  data.tar.gz: 61741d127b8bcbf8c0af9885c255ba1629fca4da
+  metadata.gz: 432ee25813d9e628b9ee1dcd7854f6c5f4ad26fd
+  data.tar.gz: fa4492ebbe50f6e552d8b6a3750c46248da78bf0
 SHA512:
-  metadata.gz: ef23cd97b873bb69fcb09d32ed0ae2b6f1775df637eb3171e84c5f2e21b12ec58b71d8375f79b0a4fba40400f2f04c0e095116a107cd15bdf5c050e10465ebbd
-  data.tar.gz: 798e17ff92292ff69b5307a15c523a8bf9dbd04f464748ca17bc574453db1880d6e532038e2304c4f4499137b427b57d6ebe24a1484759d2df45a200ccb8b89c
+  metadata.gz: 1a0a3c01d37d9eaf25cf86a3379985994e4f976cf419c8ad7152d74e40a64980e6b5415e84cdc1435e5d0ca6dd100903db162b27dcc49acfc149d9733587da83
+  data.tar.gz: 51c6aaa54956684835e5b982ce40522c2635b1b9a501a054120626882b16148ef2cfb5c0966f481285d4d48d30d822b0f7b20060f0e627698b7dec1cbba81c8e

data/lib/commands/script.rb

@@ -1,7 +1,7 @@
-def run_commands_for!(script, extra='', ssh)
+def run_commands_for!(script, extra='', ssh, options)
   script.map { |it| "escualo #{it} #{extra}" }.each do |command|
     puts "Running `#{command}`"
-    puts ssh.shell.exec! command
+    ssh.shell.perform! command, options
   end
 end
 
@@ -19,15 +19,20 @@ command 'script' do |c|
   c.description = 'Runs a escualo configuration'
   c.action do |args, options|
     file = YAML.load_file args.first
+    local_ssh = Net::SSH::Connection::LocalSession.new
 
     step 'Running local commands...' do
-      run_commands_for! file['local'], ssh_options, Net::SSH::Connection::LocalSession.new
+      run_commands_for! file['local'], ssh_options, local_ssh, options
     end
 
     step 'Running remote commands...' do
       Net::SSH.start($hostname, $username, $ssh_options.compact) do |ssh|
-        run_commands_for! file['remote'], ssh
+        run_commands_for! file['remote'], ssh, options
       end
     end
+
+    step 'Running deploy commands...' do
+      run_commands_for! file['deploy'], ssh_options, local_ssh, options
+    end
   end
 end

data/lib/escualo/artifact.rb

@@ -60,12 +60,12 @@ module Escualo
     end
 
     def self.create_codechange_script(ssh, name)
-      ssh.upload_template! "/var/scripts/#{name}/codechange", "codechange.sh", name: name
+      ssh.upload_template! "/var/scripts/#{name}/codechange", 'codechange.sh', name: name
       ssh.exec! "chmod +x /var/scripts/#{name}/codechange"
     end
 
     def self.configure_upstart(ssh, options)
-      ssh.upload_template! "/etc/init/#{name}.conf", 'upstart.conf', options
+      ssh.upload_template! "/etc/init/#{options[:name]}.conf", 'upstart.conf', options
     end
   end
 end

data/lib/escualo/bootstrap.rb

@@ -13,6 +13,7 @@ module Escualo
                  libreadline6-dev \
                  curl \
                  git \
+                 monit \
                  libssl-dev \
                  ruby2.0 \
                  ruby2.0-dev \
@@ -34,18 +35,19 @@ module Escualo
     end
 
     def self.setup_monit(ssh, options)
-      ssh.exec! %Q{
-        service monit stop && \
-        cd /tmp && \
-        wget https://mmonit.com/monit/dist/binary/5.16/monit-#{options.monit_version}-linux-x64.tar.gz && \
-        tar -xzf monit-#{options.monit_version}-linux-x64.tar.gz && \
-        cp monit-#{options.monit_version}/bin/monit /usr/bin/monit && \
-        ln -s /etc/monit/monitrc /etc/monitrc && \
-        service monit start && \
-        'set httpd port 2812 and' > /etc/monit/conf.d/web-server && \
-        '  allow 0.0.0.0/0.0.0.0' >> /etc/monit/conf.d/web-server && \
-        '  allow admin:#{options.monit_password}' >> /etc/monit/conf.d/web-server && \
-        monit reload}
+      ssh.perform! %Q{
+        service monit stop
+        cd /tmp &&
+        wget https://mmonit.com/monit/dist/binary/5.16/monit-#{options.monit_version}-linux-x64.tar.gz &&
+        tar -xzf monit-#{options.monit_version}-linux-x64.tar.gz &&
+        cp monit-#{options.monit_version}/bin/monit /usr/bin/monit
+        ln -s /etc/monit/monitrc /etc/monitrc
+        service monit start
+        'set httpd port 2812 and' > /etc/monit/conf.d/web-server
+        '  allow 0.0.0.0/0.0.0.0' >> /etc/monit/conf.d/web-server
+        '  allow admin:#{options.monit_password}' >> /etc/monit/conf.d/web-server
+        monit reload
+    }, options
     end
 
     def self.install_gems(ssh, options)

data/lib/escualo/remote.rb

@@ -2,7 +2,7 @@ module Escualo
   module Remote
     def self.attach(dir, name)
       remote_name = "escualo-#{name}-#{$hostname}"
-      remote_url = "ssh://#{$username}@#{$hostname}:#{$ssh_options[:port]}/var/repo/#{name}.git"
+      remote_url = "ssh://#{$username}@#{$hostname}:#{$ssh_port}/var/repo/#{name}.git"
       %x{cd #{dir} && git remote add #{remote_name} #{remote_url}}
     end
 

data/lib/escualo/version.rb

@@ -1,4 +1,4 @@
 module Escualo
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
   BASE_VERSION = '3.1'
 end

data/lib/ssh/session.rb

@@ -11,10 +11,10 @@ class Net::SSH::Connection::Session
       ch.exec command do |ch, success|
         raise 'could not execute command' unless success
         ch.on_data do |c, data|
-          $stdout.print data
+          $stdout.print data unless garbage? data
         end
         ch.on_extended_data do |c, type, data|
-          $stderr.print data
+          $stderr.print data unless garbage? data
         end
       end
     end
@@ -25,6 +25,12 @@ class Net::SSH::Connection::Session
     Shell.new self
   end
 
+  private
+
+  def garbage?(data)
+    data.start_with?('bash: cannot set terminal process group') || data.start_with?('bash: no job control in this shell')
+  end
+
   class Shell
     attr_reader :ssh
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: escualo
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli