escualo 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd24960afca58b87794380c99c0482f885d4d2a9
-  data.tar.gz: 6ffbeeb83d025654a463bdbe3cc1fc120d538d01
+  metadata.gz: 94fdbc6e029b1e587bd78584afed3fcee6b9fa82
+  data.tar.gz: 99f625f87c6f92f46c0aed5247b760d234efdaa5
 SHA512:
-  metadata.gz: 0cc553efd833313068883ff160cf60299db9fd1c3830246421258f010a76535ff58801fa2ef1eda153f3c59282ffea96eb8d67ce2ad93f5fca086b0c1c82daec
-  data.tar.gz: c38e7217aff732c52ced5f67801fb6309e91a0763354b979679d12d3195a1c797b1d507324b51526d9520ededac8118c3ed6fd2af6ca8a55ad6a52a5e4564fca
+  metadata.gz: 010338220fb75ac626f542cea1dc4a215f5474fcb08c633318e5cd87994590af13cadeee49edf5928d15147838dc390e5367dd5b94ebd9bfc0667ee80b778955
+  data.tar.gz: 79ff646ed04f46ba5544d7a7313c58ba0f2f7317bddaa65e3edaf5fb95b49b1f04bfea90d4343f1dcbf229c93c4f820ee9d909a144c75d9ebb60fb64c254e877

data/lib/command.rb

@@ -3,12 +3,10 @@ class Commander::Command
     action do |args, options|
       if $ssh_remote
         say "Connecting to remote host #{$hostname}... " if options.verbose
-        Net::SSH.start($hostname, $username, $ssh_options.compact) do |ssh|
-          block.call(args, options, ssh)
-        end
       else
-        block.call(args, options, Net::SSH::Connection::LocalSession.new)
+        say 'Running commands locally... ' if options.verbose
       end
+      Net::SSH.with_session(ssh_session_options) { |ssh| block.call(args, options, ssh) }
     end
   end
 end

data/lib/commands/bootstrap.rb

@@ -18,7 +18,7 @@ command 'bootstrap' do |c|
   c.ssh_action do |_args, options, ssh|
     ask_monit_password(options) unless  options.monit_password || options.no_monit
     options.default monit_version: '5.16',
-                    environment: 'production'
+                    env: 'production'
 
     do_unless Escualo::Env.present?(ssh, :ESCUALO_BASE_VERSION),
               'This host has already been bootstrapped',

data/lib/commands/globals.rb

@@ -31,4 +31,11 @@ global_option '--ssh-port PORT', String, 'The ssh port to connect. Defaults to 2
   $ssh_remote = true
 end
 
-global_option '--verbose', TrueClass, 'Dumps extra output'
+global_option '--verbose', TrueClass, 'Dumps extra output'
+
+def ssh_session_options
+  $ssh_options.merge(
+      username: $username,
+      hostname: $hostname,
+      local: !$ssh_remote).compact
+end

data/lib/commands/script.rb

@@ -18,7 +18,7 @@ command 'script' do |c|
     end
 
     step 'Running remote commands...' do
-      Net::SSH.start($hostname, $username, $ssh_options.compact) do |ssh|
+      Net::SSH.with_session(ssh_session_options) do |ssh|
         run_commands_for! file['remote'], ssh, options
       end
     end

data/lib/escualo/env.rb

@@ -13,7 +13,7 @@ module Escualo
     def self.set_builtins(ssh, options)
       set ssh, ESCUALO_BASE_VERSION: Escualo::BASE_VERSION
       set ssh, Escualo::Env.locale_variables
-      set ssh, Escualo::Env.environment_variables(options.environment)
+      set ssh, Escualo::Env.environment_variables(options.env)
     end
 
     def self.list(ssh)
@@ -21,6 +21,7 @@ module Escualo
     end
 
     def self.clean(ssh, options)
+      options.env = get(ssh, 'RACK_ENV').split('=').second.strip
       ssh.exec!("rm ~/.escualo/vars/*")
       set_builtins ssh, options
     end

data/lib/escualo/version.rb

@@ -1,4 +1,4 @@
 module Escualo
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
   BASE_VERSION = '3.2'
 end

data/lib/escualo.rb

@@ -1,8 +1,15 @@
+require 'timeout'
+
+def timeout(*args, &block)
+  Timeout.timeout(*args, &block)
+end
+
 require 'net/ssh'
 require 'net/scp'
 require 'yaml'
 require 'mumukit/core'
 
+
 module Escualo
 end
 

data/lib/ssh/local_session.rb

@@ -1,6 +1,20 @@
 require 'fileutils'
 require 'open3'
 
+module Net::SSH
+  def self.with_session(options, &block)
+    if options.delete(:local)
+      block.call(Net::SSH::Connection::LocalSession.new)
+    else
+      start(options.delete(:hostname),
+            options.delete(:username),
+            options.compact) do |ssh|
+        block.call(ssh)
+      end
+    end
+  end
+end
+
 class Net::SSH::Connection::LocalSession
   include Net::SSH::Connection::Perform
   include Net::SSH::Connection::Upload

metadata

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