broadside 3.1.3 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc7c5e27460dcaa89e814ebd4d4ed182d0621e55
-  data.tar.gz: e1854045b97ca7b25eb17efb8fe8ce3b3cfc21f5
+  metadata.gz: 7f38120e5ed461522f423547c8f4cb6cb1d80dc2
+  data.tar.gz: 46b2213e403886e691880e640752fd2791bc0b69
 SHA512:
-  metadata.gz: 4a5ceee9eca2a326c375b1cfed70dfbe28d5ad2704c0ba6433ee2a6d819eb1394a6242bce1003f6005ec29f5a270d0bb450d61e06846094441afe516de2ecff5
-  data.tar.gz: 65dced59ea804ea74bf75b906978d5692bbc820f426c327d3182ac7bbe5d3fb4b5cd1d80f6341865570b6382966b1af1d9dfe457ee7d9663013589069ef37212
+  metadata.gz: 452b96e5e2567b1e954897c3652742199b33402e718c9d0cb63131b1756691ed7f4c9895a06695dce6ee75046042290f7b6c7f015d6d9f057fda561b879e5467
+  data.tar.gz: 783ae62663751c666413f2a2a72d2ba6d745e419254c0c8fccd2769cb415686cc4378b00b6da3298eaf11549004c2fdb63445e9496d84027c76c5a0d03d0b112

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 3.2.0
+-- Add ability to execute a bash command on a container
+-- Output actual bash command being run when log level is debug.
+
 # 3.1.3
 -- Better error messaging when trying to bash/ssh/etc to an instance_index that doesn't exist
 

data/lib/broadside/command.rb

@@ -6,6 +6,7 @@ module Broadside
   module Command
     extend LoggingUtils
 
+    BASH = 'bash'.freeze
     DEFAULT_TAIL_LINES = 10
 
     class << self
@@ -95,7 +96,7 @@ module Broadside
         info "Tailing logs for running container at #{ip}..."
 
         cmd = "docker logs -f --tail=#{lines} `#{docker_ps_cmd(target.family)}`"
-        exec(Broadside.config.ssh_cmd(ip) + " '#{cmd}'")
+        system_exec(Broadside.config.ssh_cmd(ip) + " '#{cmd}'")
       end
 
       def ssh(options)
@@ -103,20 +104,26 @@ module Broadside
         ip = get_running_instance_ip!(target, *options[:instance])
         info "Establishing SSH connection to #{ip}..."
 
-        exec(Broadside.config.ssh_cmd(ip))
+        system_exec(Broadside.config.ssh_cmd(ip))
       end
 
       def bash(options)
+        command = options[:command] || BASH
         target = Broadside.config.get_target_by_name!(options[:target])
         ip = get_running_instance_ip!(target, *options[:instance])
-        info "Running bash for running container at #{ip}..."
+        cmd = "docker exec -i -t `#{docker_ps_cmd(target.family)}` #{command}"
+        info "Executing #{command} on running container at #{ip}..."
 
-        cmd = "docker exec -i -t `#{docker_ps_cmd(target.family)}` bash"
-        exec(Broadside.config.ssh_cmd(ip, tty: true) + " '#{cmd}'")
+        system_exec(Broadside.config.ssh_cmd(ip, tty: command == BASH) + " '#{cmd}'")
       end
 
       private
 
+      def system_exec(cmd)
+        debug "Executing: #{cmd}"
+        exec(cmd)
+      end
+
       def get_running_instance_ip!(target, instance_index = 0)
         EcsManager.check_service_and_task_definition_state!(target)
         running_instances = EcsManager.get_running_instance_ips!(target.cluster, target.family)

data/lib/broadside/gli/commands.rb

@@ -91,10 +91,14 @@ command :ssh do |ssh|
   end
 end
 
-desc 'Establish a shell inside a running container.'
+desc 'Establish a shell or run a bash command inside a running container.'
 command :bash do |bash|
   add_command_flags(bash)
 
+  bash.desc 'bash command to run (wrap argument in quotes)'
+  bash.arg_name 'BASH_COMMAND'
+  bash.flag [:c, :command], type: Array
+
   bash.action do |_, options, _|
     Broadside::Command.bash(options)
   end

data/lib/broadside/version.rb

@@ -1,3 +1,3 @@
 module Broadside
-  VERSION = '3.1.3'.freeze
+  VERSION = '3.2.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: broadside
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.2.0
 platform: ruby
 authors:
 - Matthew Leung
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-24 00:00:00.000000000 Z
+date: 2017-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport