gaptool-client 0.6.13 → 0.6.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca27da90fc36a000640f74677dbf15ab1d614c5c
-  data.tar.gz: ac94919d2e88b4d0c59a8f715437e07398e8b198
+  metadata.gz: 8ed7aec78e38e775659a5c972701836ba26bd0bf
+  data.tar.gz: 81242d83526297e991438283510aa26398f7d982
 SHA512:
-  metadata.gz: 1787d004c74ce095af217bb2103a178f71d882f14aa0abecaea09ce108cfca06b98a4a12a84debb01b00c6df610a162e7c8b11d2d5a4cad5fa56f6e73c1e4d2e
-  data.tar.gz: 877ff78d98d121dd6b2248ba4edbebd05e4d72b0011bc76bec20e54e4d1ef005dc4a78f5d9fe8b5d1a62a8b1ebbc35e3b542289c006ba0084027079c671d2563
+  metadata.gz: fb71d1eb887b8efe99d8e8ecdfb0a4b61976b81a6168f07bdda6eed75113ee3fd212276fcd3b6a66fecc93f120db9b5b6ae34c2517763352f1f501dfe8d88ae6
+  data.tar.gz: 61978da8b616780f2f94e6ece704adc5d3726aa59462a6925e5dd0d5e7098ce159da73ed35712a7c8006e8a238d4e1166670cb44f137d07a6e1071b80ab6d4fb

data/VERSION

@@ -1 +1 @@
-0.6.13
+0.6.14

data/lib/gaptool-client.rb

@@ -40,32 +40,30 @@ def sshcmd(node, commands)
     :keys_only => true,
     :paranoid => false
   ) do |ssh|
-    stdout_data = ""
-    stderr_data = ""
     exit_code = nil
     exit_signal = nil
     commands.each do |command|
       ssh.open_channel do |channel|
-        channel.exec(command) do |ch, success|
+        channel.exec(command) do |chx, success|
           unless success
             abort "FAILED: couldn't execute command (ssh.channel.exec)"
           end
-          channel.on_data do |ch,data|
+          channel.on_data do |chd,data|
             puts "#{Rainbow(node['role']).yellow}:#{Rainbow(node['environment']).yellow}:#{Rainbow(node['instance']).yellow}> #{data}"
           end
 
-          channel.on_extended_data do |ch,type,data|
+          channel.on_extended_data do |che,type,data|
             puts "#{Rainbow(node['role']).yellow}:#{Rainbow(node['environment']).yellow}:#{Rainbow(node['instance']).red}> #{data}"
           end
 
-          channel.on_request("exit-status") do |ch,data|
+          channel.on_request("exit-status") do |chs,data|
             exit_code = data.read_long
             if exit_code != 0
               exit exit_code
             end
           end
 
-          channel.on_request("exit-signal") do |ch, data|
+          channel.on_request("exit-signal") do |chg, data|
             exit_signal = data.read_string
           end
         end
@@ -247,17 +245,24 @@ module Gaptool
         nodes = $api.getenvroles(role, environment)
       end
       nodes.peach do |node|
+        if node['chef_runlist'].nil?
+          runlist = ['recipe[main]']
+        elsif node['chef_runlist'].is_a? Array
+          runlist = node['chef_runlist']
+        else
+          runlist = eval(node['chef_runlist'])
+        end
         json = {
           'this_server' => "#{role}-#{environment}-#{node['instance']}",
           'role' => role,
           'environment' => environment,
           'app_user' => node['appuser'],
-          'run_list' => node['chef_runlist'].nil? ? ['recipe[main]'] : eval(node['chef_runlist']),
+          'run_list' => runlist,
           'hostname' => node['hostname'],
           'instance' => node['instance'],
           'zone' => node['zone'],
           'itype' => node['itype'],
-          'apps' => eval(node['apps']),
+          'apps' => eval(node['apps'] || '[]'),
         }.merge(attrs)
         git="git fetch --all; git reset --hard origin/`git rev-parse --abbrev-ref HEAD`"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaptool-client
 version: !ruby/object:Gem::Version
-  version: 0.6.13
+  version: 0.6.14
 platform: ruby
 authors:
 - Francesco Laurita
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -226,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: gaptool-client
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: client for gaptool-server