gaptool-client 0.8.0.pre.beta2 → 0.8.0.pre.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d3035a0d9dd7ac8f7b5dd79b887977db11a88a2
-  data.tar.gz: b82f7711f5d74ae2630e5376482852a072559378
+  metadata.gz: 4fc4330da672fc107c70bda1d79f2cedb56e5263
+  data.tar.gz: b4e11ee2bd119cb1bf4583c39dfbe2c384c8a999
 SHA512:
-  metadata.gz: a4f93bea43e2a5b10831c2948cd234e10ea5d74bfb90c79a8e05fc54eb96d6c7afd644b47d079730e90fa055721b26607eae2733c508e5f53b1f8c281fcf3d99
-  data.tar.gz: c43bac58d37eff2b546e10e92fca070836a7cc30a4b87f4e01e222801c4c7fcb1be3cd27bf49d92943664fa6dba930c96c465c49a04c7f5488fe9afb0370623f
+  metadata.gz: 860ffa9d687753c1e5d452a205d7db7ee317dbffed6037aa66b516fe4b665da07b52c369c7c6d02e729a716ff46a2d962b9582468ce042b86cb74d52e17c234c
+  data.tar.gz: 753ab4bc8d11193c440f190743a1d46b49ce29ad55f0988ffd9b7c705ea169e5c3d94bcaec4fd9212050e283fb5e70a5cbfb08211f748f34e478df525a73bf95

data/VERSION

@@ -1 +1 @@
-0.8.0-beta2
+0.8.0-beta3

data/lib/gaptool_client/commands.rb

@@ -97,6 +97,42 @@ module Gaptool
     end
   end
 
+  class RunScriptCommand < Clamp::Command
+    option ['-r', '--role'], 'ROLE', 'Instance role'
+    option ['-e', '--environment'], 'ENVIRONMENT', 'Instance environment'
+    option ['-i', '--instance'], 'INSTANCE', 'Instance id (i-xxxxxxxx)'
+    option ['-s', '--serial'], :flag, 'Run command serially. Order of execution is unknown.'
+    option ['-x', '--exclude-hidden'], :flag, 'Exclude hidden hosts'
+    option ['-c', '--continue-on-errors'], :flag, 'Continue execution even if one or more hosts fail'
+    option ['-B', '--batch-size'], 'SIZE', "How many hosts to run in parallel (defaults to #{Gaptool::SSH::BATCH_SIZE})", default: Gaptool::SSH::BATCH_SIZE
+    option ['-v', '--verbose'], :flag, 'Enable verbose logging;'
+    option ['-D', '--debug'], :flag, 'Enable debug logging;'
+    parameter 'SCRIPT', 'Ruby script to run'
+
+    def execute
+      params = exclude_hidden? ? {} : { hidden: true }
+      nodes = Gaptool::API.query_nodes(params.merge(instance: instance,
+                                                    role: role, environment: environment))
+      log_level = if debug?
+                    Logger::DEBUG
+                  elsif verbose?
+                    Logger::INFO
+                  end
+      command = "echo 'done'" unless log_level
+      sc = File.read(script)
+      nodes = nodes.map { |x| x.merge(script: sc, file: script, verbose: log_level.nil?) }
+      hook = proc do |node|
+        node.handler.on_data('', :stdout, "Executing #{node[:file]}", '') if node[:verbose]
+        eval(node[:script])
+      end
+      res = Gaptool::SSH.exec(nodes, [command],
+                              pre_hooks: [hook], serial: serial?,
+                              continue_on_errors: continue_on_errors?,
+                              log_level: log_level, batch_size: batch_size)
+      exit res
+    end
+  end
+
   class SSHConfigCommand < Clamp::Command
     option ['-r', '--remove'], :flag, 'Remove ssh configuration'
 
@@ -237,14 +273,14 @@ module Gaptool
       pre_hook = proc do |node|
         cl = Gaptool::API.new
         json = cl.getnodeattrs(node['instance'], node['attrs'])
-        json['run_list'] ||= node['chef_runlist'] || ['recipe[main]']
+        json['run_list'] ||= node['chef_runlist'] || ['role[base]']
         git = 'sudo -u admin git'
         pull = "#{git} fetch --all; #{git} reset --hard origin/`#{git} rev-parse --abbrev-ref HEAD`"
         wopts = node['whyrun'] ? ' -W ' : ''
 
         unless node['attrs']['chef_branch'].nil?
           json['chefbranch'] = node['attrs']['chef_branch']
-          pull = "#{git} checkout -f #{node['attrs']['chef_branch']}; #{git} fetch --all; #{git} reset --hard origin/#{node['attrs']['chef_branch']}"
+          pull = "#{git} checkout -fB #{node['attrs']['chef_branch']}; #{git} fetch --all; #{git} reset --hard origin/#{node['attrs']['chef_branch']}"
         end
         upload!(StringIO.new(json.to_json), '/tmp/chef.json')
         script = <<-EOS

data/lib/gaptool_client/ssh.rb

@@ -114,6 +114,7 @@ EOF
       runner = runner_cls.new(hosts, opts) do |host|
         pre.each { |h| instance_exec(host, &h) }
         commands.each do |cmd|
+          next if cmd.nil? || cmd.empty?
           execute(:bash, "-l -c '#{cmd}'",
                   interaction_handler: host.handler)
         end

data/lib/gaptool_client.rb

@@ -16,6 +16,7 @@ module Gaptool
     subcommand 'deploy', 'deploy on an application', DeployCommand
     subcommand 'rehash', 'Regenerate all host metadata. KNOW WHAT THIS DOES BEFORE RUNNING IT', RehashCommand
     subcommand 'runcmd', 'Run command on instance', RuncmdCommand
+    subcommand 'runscript', 'Run command on instance', RunScriptCommand
     subcommand 'scp', 'Copy file to-from instance(s)', ScpCommand
     subcommand 'version', 'Show version', VersionCommand
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaptool-client
 version: !ruby/object:Gem::Version
-  version: 0.8.0.pre.beta2
+  version: 0.8.0.pre.beta3
 platform: ruby
 authors:
 - Francesco Laurita
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json