aws-ssm-console 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf3706d8206b5c6056c7a0bcb6f108e54ef0cbb0
-  data.tar.gz: f840803944a85f5a49e6b9e5d5504f3e9e3ecff4
+  metadata.gz: d1b7150d2747265daac976d0d9e7eb9817ef9cd4
+  data.tar.gz: 0bfe9b384a10b7238ecd397e30b723f8875b0d86
 SHA512:
-  metadata.gz: dd58c5938dc01717511f72f5854a619fb10f32e81ab976176fe08ab9680e366a6ef9f522139f0294453e9586029c11a05f03fc45cbb76b3c6e189b64169af33e
-  data.tar.gz: d5a8debec31d2aee3b757c2ca46b0dabd7194b5d6aa4f6f0980dd8aa841e2b3d40e50456152f8ac476731d910642fdd9c63f8a6f5cd78af6c99d01d292e85815
+  metadata.gz: 823b89833f82b17ca5674563540f9a27aee55cea005d2e0d267e8ceb312699b2731ccfe5f04b72842a1f584f0b1e781d55a9121441125aed52434393791e9538
+  data.tar.gz: 03a99c3a5782b43e90c9549370ec98fb1ecb32a0fa7c0270216b66ce7579b801347f06c242282985b8054c5956d0d4835f898acb50e54cc87267ac443ad9570d

data/README.md

@@ -28,11 +28,20 @@ You should configure some environment variables to use AWS SDK.
 
 ### Run Command
 
+#### Interactive mode
+
 ```
 $ bin/aws-ssm-console --instance-ids=i-xxxx,i-yyyy,...
 >> 
 ```
 
+#### Batch mode
+
+```
+$ bin/aws-ssm-console -c ls --instance-ids=i-xxxx,i-yyyy,...
+...
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/aws-ssm-console.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'aws-ssm-console'
-  spec.version       = '0.1.1'
+  spec.version       = '0.2.0'
   spec.authors       = ['koshigoe']
   spec.email         = ['koshigoeb@gmail.com']
   spec.license       = 'MIT'

data/bin/aws-ssm-console

@@ -2,15 +2,5 @@
 
 require 'bundler/setup'
 require 'aws/ssm/console'
-require 'optparse'
 
-options = {}
-OptionParser.new do |opt|
-  opt.on('--instance-ids id,id,...', Array) { |v| options[:instance_ids] = v }
-
-  opt.parse!(ARGV)
-end
-
-raise ArgumentError, '--instance-ids is required' unless options[:instance_ids]
-
-Aws::SSM::Console.run(options[:instance_ids])
+Aws::SSM::Console::CLI.new(ARGV).run

data/lib/aws/ssm/console.rb

@@ -1,5 +1,7 @@
 require 'aws-sdk'
 require 'aws/ssm/console/version'
+require 'aws/ssm/console/cli'
+require 'aws/ssm/console/options'
 require 'aws/ssm/console/runner'
 require 'aws/ssm/console/command'
 require 'aws/ssm/console/printer'
@@ -10,10 +12,6 @@ module Aws
       def self.client
         @client ||= Aws::SSM::Client.new
       end
-
-      def self.run(instance_ids)
-        Aws::SSM::Console::Runner.new(instance_ids).run
-      end
     end
   end
 end

data/lib/aws/ssm/console/cli.rb

@@ -0,0 +1,22 @@
+module Aws
+  module SSM
+    module Console
+      class CLI
+        attr_reader :options
+
+        def initialize(argv)
+          @options = Options.new(argv)
+        end
+
+        def run
+          runner = Aws::SSM::Console::Runner.new(options.instance_ids)
+          if options.command
+            runner.invoke(options.command)
+          else
+            runner.run
+          end
+        end
+      end
+    end
+  end
+end

data/lib/aws/ssm/console/options.rb

@@ -0,0 +1,42 @@
+require 'optparse'
+
+module Aws
+  module SSM
+    module Console
+      class Options
+        attr_reader :instance_ids,
+                    :command
+
+        def initialize(argv)
+          @instance_ids = []
+          @command = nil
+
+          parser.parse!(argv)
+          validate!
+        end
+
+        private
+
+        def parser
+          @parser = OptionParser.new do |opt|
+            opt.on('--instance-ids id,id,...', Array) { |v| @instance_ids += v }
+            opt.on('-c command', String) { |v| @command = v }
+            opt.on('--tag Name:Value', String) { |v| @instance_ids += collect_instance_ids_by_tag(v) }
+          end
+        end
+
+        def validate!
+          raise ArgumentError, 'EC2 instance IDs required.' if instance_ids.empty?
+        end
+
+        def collect_instance_ids_by_tag(tag)
+          name, value = tag.split(':', 2)
+          filters = [{ name: "tag:#{name}", values: [value] }]
+          Aws::EC2::Client.new.describe_instances(filters: filters).reservations.each_with_object([]) do |reservation, res|
+            reservation.instances.each { |instance| res << instance.instance_id }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/aws/ssm/console/printer.rb

@@ -37,7 +37,7 @@ module Aws
             response = Aws::SSM::Console.client.list_command_invocations(command_id: command_id, instance_id: instance_id, details: true)
             response.command_invocations.each do |invocation|
               invocation.command_plugins.map do |command_plugin|
-                yield(instance_id, command_plugin.status, command_plugin.output.split("\n").map { |x| "\t#{x}" }.join("\n"))
+                yield(instance_id, command_plugin.status, command_plugin.output.to_s.split("\n").map { |x| "\t#{x}" }.join("\n"))
               end
             end
           end

data/lib/aws/ssm/console/runner.rb

@@ -4,6 +4,10 @@ module Aws
   module SSM
     module Console
       class Runner
+        extend Forwardable
+
+        delegate invoke: :@command
+
         attr_reader :command
 
         def initialize(instance_ids)
@@ -11,8 +15,13 @@ module Aws
         end
 
         def run
+          stty_save = `stty -g`.chomp
+          trap('INT') { system 'stty', stty_save; exit }
+
           loop do
-            command.invoke(Readline.readline('>> ', true))
+            cmd = Readline.readline('>> ', true)
+            break unless cmd
+            command.invoke(cmd)
           end
         end
       end

data/lib/aws/ssm/console/version.rb

@@ -1,7 +1,9 @@
 module Aws
   module SSM
     module Console
-      VERSION = '0.1.1'.freeze
+      GEMSPEC_PATH = File.expand_path('../../../../../aws-ssm-console.gemspec', __FILE__)
+      GEMSPEC = Gem::Specification.load(GEMSPEC_PATH)
+      VERSION = GEMSPEC.version.to_s.freeze
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-ssm-console
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - koshigoe
@@ -85,7 +85,9 @@ files:
 - bin/console
 - bin/setup
 - lib/aws/ssm/console.rb
+- lib/aws/ssm/console/cli.rb
 - lib/aws/ssm/console/command.rb
+- lib/aws/ssm/console/options.rb
 - lib/aws/ssm/console/printer.rb
 - lib/aws/ssm/console/runner.rb
 - lib/aws/ssm/console/version.rb