escualo 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5322dd31b4d98ae12f54ab2d2ffa396fda9b8e6
-  data.tar.gz: e332f460abb9c54bf517cc6be73f7b700adfad56
+  metadata.gz: bd24960afca58b87794380c99c0482f885d4d2a9
+  data.tar.gz: 6ffbeeb83d025654a463bdbe3cc1fc120d538d01
 SHA512:
-  metadata.gz: f6ae8b63746dd639017357831198cfc70aefee53d936d3db565f3603c75deca5126cf6c7c36b2c9bdb856ad3f648f99cb1bcb874e8dca675579ee8e87882d7e0
-  data.tar.gz: c3236170f00afe556761a18bb7d87a9f982f6b6ee6e00b3ec5e81c68f0cf149158e8a1eb8776bb9e43b13b7cdd91735d1995bc41a96b017b7de8964e24946948
+  metadata.gz: 0cc553efd833313068883ff160cf60299db9fd1c3830246421258f010a76535ff58801fa2ef1eda153f3c59282ffea96eb8d67ce2ad93f5fca086b0c1c82daec
+  data.tar.gz: c38e7217aff732c52ced5f67801fb6309e91a0763354b979679d12d3195a1c797b1d507324b51526d9520ededac8118c3ed6fd2af6ca8a55ad6a52a5e4564fca

data/lib/commands/script.rb

@@ -5,24 +5,16 @@ def run_commands_for!(script, extra='', ssh, options)
   end
 end
 
-def ssh_options
-  [$hostname.try { |it| "--hostname #{it}" },
-   $username.try { |it| "--username #{it}" },
-   $password.try { |it| "--password #{it}" },
-   $ssh_key.try { |it| "--ssh-key #{it}" },
-   $ssh_port.try { |it| "--ssh-port #{it}" }
-  ].compact.join(' ')
-end
-
 command 'script' do |c|
   c.syntax = 'escualo script <FILE>'
   c.description = 'Runs a escualo configuration'
   c.action do |args, options|
     file = YAML.load_file args.first
     local_ssh = Net::SSH::Connection::LocalSession.new
+    delegated_options = Escualo::Script.delegated_options options
 
     step 'Running local commands...' do
-      run_commands_for! file['local'], ssh_options, local_ssh, options
+      run_commands_for! file['local'], delegated_options, local_ssh, options
     end
 
     step 'Running remote commands...' do
@@ -32,7 +24,7 @@ command 'script' do |c|
     end
 
     step 'Running deploy commands...' do
-      run_commands_for! file['deploy'], ssh_options, local_ssh, options
+      run_commands_for! file['deploy'], delegated_options, local_ssh, options
     end
   end
 end

data/lib/escualo/bootstrap.rb

@@ -67,7 +67,7 @@ module Escualo
     end
 
     def self.install_gems(ssh, options)
-      ssh.shell.perform! "gem install bundler && gem install escualo -v #{Escualo::VERSION}", options
+      ssh.shell.perform! 'gem install bundler && gem install escualo', options
     end
   end
-end
+end

data/lib/escualo/script.rb

@@ -3,6 +3,17 @@ module Escualo
     def self.each_command(script, extra='', &block)
       script.map { |it| "escualo #{it} #{extra}" }.each(&block) if script
     end
+
+    def self.delegated_options(options)
+      [options.hostname.try { |it| "--hostname #{it}" },
+       options.username.try { |it| "--username #{it}" },
+       options.password.try { |it| "--password #{it}" },
+       options.ssh_key.try { |it| "--ssh-key #{it}" },
+       options.ssh_port.try { |it| "--ssh-port #{it}" },
+       options.trace && '--trace',
+       options.verbose && '--verbose'
+      ].compact.join(' ')
+    end
   end
 end
 

data/lib/escualo/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: escualo
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-17 00:00:00.000000000 Z
+date: 2016-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander