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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 002150433708bb563757f2ef3cc21fc87e0388e2
-  data.tar.gz: 64857892d8fbc611a72331e90a911239f808a562
+  metadata.gz: 4d3035a0d9dd7ac8f7b5dd79b887977db11a88a2
+  data.tar.gz: b82f7711f5d74ae2630e5376482852a072559378
 SHA512:
-  metadata.gz: 5a756b321848f7c1bdaafcf41da7573a9d67b0398e44f684d6d591c0639f2edc3798b3dea1155af4f90819e3632fb3569474c75c12fb1bc34a46bbb9ecf88af7
-  data.tar.gz: a80fccd7831292c544a86f3e1e5545daad80294f4a6e1ac51e541766f139909ee7086117724185cf20ead681622c96b286ef1f3011ec1333bfb933dc91bd1be3
+  metadata.gz: a4f93bea43e2a5b10831c2948cd234e10ea5d74bfb90c79a8e05fc54eb96d6c7afd644b47d079730e90fa055721b26607eae2733c508e5f53b1f8c281fcf3d99
+  data.tar.gz: c43bac58d37eff2b546e10e92fca070836a7cc30a4b87f4e01e222801c4c7fcb1be3cd27bf49d92943664fa6dba930c96c465c49a04c7f5488fe9afb0370623f

data/VERSION

@@ -1 +1 @@
-0.8.0-beta1
+0.8.0-beta2

data/lib/gaptool_client/commands.rb

@@ -4,6 +4,7 @@ require 'rainbow'
 require 'json'
 require 'clamp'
 require 'set'
+require 'logger'
 require 'gaptool_client/api'
 require 'gaptool_client/helpers'
 require 'gaptool_client/ssh'
@@ -82,7 +83,7 @@ module Gaptool
     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 ['-B', '--batch-size'], 'SIZE', "How many hosts to run in parallel (defaults to #{Gaptool::SSH::BATCH_SIZE})", default: Gaptool::SSH::BATCH_SIZE
     parameter 'COMMAND ...', 'Command to run', attribute_name: :commands
 
     def execute
@@ -216,7 +217,7 @@ module Gaptool
     option ['-s', '--serial'], :flag, 'Run command serially. Order of execution is unknown.'
     option ['-W', '--whyrun'], :flag, 'Whyrun, like dry-run but different.'
     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 ['-B', '--batch-size'], 'SIZE', "How many hosts to run in parallel (defaults to #{Gaptool::SSH::BATCH_SIZE})", default: Gaptool::SSH::BATCH_SIZE
 
     def execute
       attrs = Gaptool::Helpers.split_attrs(attribute_list)
@@ -241,9 +242,9 @@ module Gaptool
         pull = "#{git} fetch --all; #{git} reset --hard origin/`#{git} rev-parse --abbrev-ref HEAD`"
         wopts = node['whyrun'] ? ' -W ' : ''
 
-        unless node['chef_branch'].nil?
-          json['chefbranch'] = node['chef_branch']
-          pull = "#{git} checkout -f #{node['chef_branch']}; #{git} fetch --all; #{git} reset --hard origin/#{node['chef_branch']}"
+        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']}"
         end
         upload!(StringIO.new(json.to_json), '/tmp/chef.json')
         script = <<-EOS
@@ -278,7 +279,7 @@ EOS
     option ['-H', '--hidden'], :flag, 'Display hidden hosts'
     option ['-s', '--serial'], :flag, 'Run command serially. Order of execution is unknown.'
     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 ['-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, 'More verbose output'
 
     def execute
@@ -377,4 +378,77 @@ EOS
       puts "gaptool-server #{vinfo['server_version']}"
     end
   end
+
+  class ScpCommand < 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
+    parameter 'SRC', 'Source file spec', attribute_name: :src
+    parameter '[DEST]', 'Dest file spec.', attribute_name: :dest
+
+    def execute
+      if src.start_with?(':')
+        # from remote to local
+        signal_usage_error('SRC and DEST cannot be both remote') \
+          if dest && dest.start_with?(':')
+        source = src[1..-1]
+        destf = dest ? dest : File.join(Dir.pwd, File.basename(source))
+        destd = File.dirname(destf)
+        Gaptool::Helpers.error("Cannot write to #{destd}") \
+          unless File.writable?(destd)
+
+        pre_hook = proc do |node|
+          download! node['source'], "#{node['destf']}.#{node['instance']}"
+        end
+
+      else
+        # from local to remote
+        signal_usage_error('SRC and DEST cannot be both local') \
+          if dest && !dest.start_with?(':')
+        begin
+          source = File.realpath(src)
+        rescue => e
+          Gaptool::Helpers.error(e)
+        end
+        destf = dest ? dest[1..-1] : File.basename(src)
+        if destf.end_with?('/')
+          destd = destf
+          destf = File.join(destf, File.basename(src))
+        else
+          destd = File.dirname(destf)
+        end
+
+        pre_hook = proc do |node|
+          if test("[ -w #{node['destd']} ]")
+            upload! node['source'], node['destf']
+          else
+            fail "No such directory #{node['destd']}" \
+              unless test("[ -d #{node['destd']} ]")
+            tmp = File.join('/tmp', File.basename(node['destf']))
+            upload! node['source'], tmp
+            execute("sudo mv #{tmp} #{node['destf']}")
+          end
+        end
+      end
+
+      params = exclude_hidden? ? {} : { hidden: true }
+      nodes = Gaptool::API.query_nodes(params.merge(instance: instance,
+                                                    role: role,
+                                                    environment: environment))
+      nodes = nodes.map { |x| x.merge('source' => source, 'destd' => destd, 'destf' => destf) }
+
+      res = Gaptool::SSH.exec(
+        nodes, [],
+        pre_hooks: [pre_hook], serial: serial?,
+        continue_on_errors: continue_on_errors?,
+        batch_size: batch_size,
+        log_level: Logger::INFO
+      )
+      exit res
+    end
+  end
 end

data/lib/gaptool_client/ssh.rb

@@ -77,8 +77,8 @@ EOF
       File.open(config, 'w') { |f| f.write(content) }
     end
 
-    def self.configure_sshkit
-      SSHKit.config.output_verbosity = Logger::WARN
+    def self.configure_sshkit(opts = {})
+      SSHKit.config.output_verbosity = opts[:log_level] || Logger::WARN
       SSHKit::Backend::Netssh.configure do |ssh|
         ssh.connection_timeout = 30
         ssh.ssh_options = {
@@ -99,12 +99,12 @@ EOF
       end
       pre = opts[:pre_hooks] || []
       post = opts[:post_hooks] || []
+      Gaptool::SSH.configure_sshkit(log_level: opts[:log_level])
       opts = {
         limit: opts[:batch_size].to_i || BATCH_SIZE,
         on_errors: opts[:continue_on_errors] ? :continue : :exit,
         wait: opts[:wait] || 0
       }
-      Gaptool::SSH.configure_sshkit
       runner_cls = if serial
                      SSHKit::Runner::SafeSequential
                    else

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 'scp', 'Copy file to-from instance(s)', ScpCommand
     subcommand 'version', 'Show version', VersionCommand
   end
 end

metadata

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