sonic-screwdriver 2.0.0 → 2.2.2

data/lib/sonic/help/list.md

@@ -1,13 +1,13 @@
-List ec2 servers. A filter must be provided.  The filter can be a mix of instance ids and ec2 tags. sonic list will auto-detect the what type of filter it is filter appropriately.  The filter for listing is optional.
+A filter must be provided.  The filter can be a mix of instance ids and ec2 tags. sonic list will auto-detect the what type of filter it is.  The filter is optional.
 
-Examples:
+## Examples
 
     $ sonic list
     $ sonic list hi-web-prod
     $ sonic list hi-web-prod,hi-clock-prod
     $ sonic list i-09482b1a6e330fbf7
 
-Example Output:
+## Example Output
 
     $ sonic list --header i-09482b1a6e330fbf7
     Instance Id Public IP Private IP  Type

data/lib/sonic/list.rb

@@ -35,7 +35,7 @@ module Sonic
 
       if @options[:header] && !zero_instances
         header = ["Instance Id", "Name", "Public IP", "Private IP", "Type"]
-        UI.say header.join("\t").colorize(:green)
+        UI.say header.join("\t").color(:green)
       end
 
       instances.each do |i|

data/lib/sonic/ssh.rb

@@ -1,5 +1,3 @@
-require 'colorize'
-
 module Sonic
   class Ssh
     autoload :IdentifierDetector, 'sonic/ssh/identifier_detector'
@@ -14,7 +12,7 @@ module Sonic
       @user, @identifier = extract_user!(identifier) # extracts/strips user from identifier
       # While --user option is supported at the class level, don't expose at the CLI level
       # to encourage users to use user@host notation.
-      @user ||= options[:user] || settings["bastion"]["user"]
+      @user ||= options[:user] || settings["ssh"]["user"]
 
       @service = @identifier # always set service even though it's not always used as the identifier
       map = settings["ecs_service_cluster_map"]
@@ -82,7 +80,7 @@ module Sonic
     def kernel_exec(*args)
       # append the optional command that can be provided to the ssh command
       full_command = args + @options[:command]
-      puts "=> #{full_command.join(' ')}".colorize(:green)
+      puts "=> #{full_command.join(' ')}".color(:green)
       # https://ruby-doc.org/core-2.3.1/Kernel.html#method-i-exec
       # Using 2nd form
       Kernel.exec(*full_command) unless @options[:noop]

data/lib/sonic/ssh/identifier_detector.rb

@@ -73,7 +73,7 @@ class Ssh
 
       task = response.tasks.first
       unless task
-        puts "Unable to find a #{task_arn.green} container instance or task in the #{@cluster.green} cluster."
+        puts "Unable to find a #{task_arn.color(:green)} container instance or task in the #{@cluster.color(:green)} cluster."
         exit 1
       end
 

data/lib/sonic/ui.rb

@@ -19,10 +19,10 @@ module Sonic
         puts msg unless mute
       end
       def error(msg='')
-        say "ERROR: #{msg}".colorize(:red)
+        say "ERROR: #{msg}".color(:red)
       end
       def warn(msg='')
-        say "WARN: #{msg}".colorize(:yellow)
+        say "WARN: #{msg}".color(:yellow)
       end
     end
   end

data/lib/sonic/version.rb

@@ -1,3 +1,3 @@
 module Sonic
-  VERSION = "2.0.0"
+  VERSION = "2.2.2"
 end

data/sonic.gemspec

@@ -23,9 +23,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "aws-sdk-ecs"
   spec.add_dependency "aws-sdk-s3"
   spec.add_dependency "aws-sdk-ssm"
-  spec.add_dependency "colorize"
   spec.add_dependency "hashie"
   spec.add_dependency "memoist"
+  spec.add_dependency "rainbow"
   spec.add_dependency "thor"
   spec.add_dependency "tty-prompt"
 

data/spec/lib/cli_spec.rb

@@ -11,8 +11,13 @@ describe Sonic::CLI do
       expect(out).to include("=> ssh")
     end
 
-    it "execute should print that command has been sent" do
-      out = execute("exe/sonic execute #{@args} 1,2,3 uptime")
+    it "execute should print that command has been sent --instance-ids" do
+      out = execute("exe/sonic execute #{@args} --instance-ids i-1,i-2,i-3 uptime")
+      expect(out).to include("Command sent")
+    end
+
+    it "execute should print that command has been sent --tags" do
+      out = execute("exe/sonic execute #{@args} --tags Name=value uptime")
       expect(out).to include("Command sent")
     end
 

data/spec/lib/sonic/execute_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Sonic::Execute do
   before(:each) do
     @options = {
-      filter: "i-066b140d9479e9681,i-09482b1a6e330fbf7"
+      instance_ids: "i-066b140d9479e9681,i-09482b1a6e330fbf7"
     }
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sonic-screwdriver
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.2
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-01 00:00:00.000000000 Z
+date: 2021-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: memoist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: memoist
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -260,11 +260,9 @@ files:
 - ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
-- ".ruby-version"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - LICENSE.txt
 - README.md
@@ -421,8 +419,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: Multi-functional tool to manage AWS infrastructure

data/.ruby-version

@@ -1 +0,0 @@
-2.5.1

data/Gemfile.lock

@@ -1,163 +0,0 @@
-PATH
-  remote: .
-  specs:
-    sonic-screwdriver (2.0.0)
-      activesupport
-      aws-sdk-ec2
-      aws-sdk-ecs
-      aws-sdk-s3
-      aws-sdk-ssm
-      colorize
-      hashie
-      memoist
-      thor
-      tty-prompt
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (5.2.0)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    aws-eventstream (1.0.0)
-    aws-partitions (1.89.1)
-    aws-sdk-core (3.21.2)
-      aws-eventstream (~> 1.0)
-      aws-partitions (~> 1.0)
-      aws-sigv4 (~> 1.0)
-      jmespath (~> 1.0)
-    aws-sdk-ec2 (1.34.0)
-      aws-sdk-core (~> 3)
-      aws-sigv4 (~> 1.0)
-    aws-sdk-ecs (1.13.0)
-      aws-sdk-core (~> 3)
-      aws-sigv4 (~> 1.0)
-    aws-sdk-kms (1.5.0)
-      aws-sdk-core (~> 3)
-      aws-sigv4 (~> 1.0)
-    aws-sdk-s3 (1.13.0)
-      aws-sdk-core (~> 3, >= 3.21.2)
-      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.0)
-    aws-sdk-ssm (1.13.0)
-      aws-sdk-core (~> 3)
-      aws-sigv4 (~> 1.0)
-    aws-sigv4 (1.0.2)
-    byebug (10.0.2)
-    cli_markdown (0.1.0)
-    codeclimate-test-reporter (1.0.8)
-      simplecov (<= 0.13)
-    coderay (1.1.2)
-    colorize (0.8.1)
-    concurrent-ruby (1.0.5)
-    diff-lcs (1.3)
-    docile (1.1.5)
-    equatable (0.5.0)
-    ffi (1.9.23)
-    formatador (0.2.5)
-    guard (2.14.2)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, < 4.0)
-      lumberjack (>= 1.0.12, < 2.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.9.12)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-bundler (2.1.0)
-      bundler (~> 1.0)
-      guard (~> 2.2)
-      guard-compat (~> 1.1)
-    guard-compat (1.2.1)
-    guard-rspec (4.7.3)
-      guard (~> 2.1)
-      guard-compat (~> 1.1)
-      rspec (>= 2.99.0, < 4.0)
-    hashie (3.5.7)
-    hitimes (1.2.6)
-    i18n (1.0.1)
-      concurrent-ruby (~> 1.0)
-    jmespath (1.4.0)
-    json (2.1.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    lumberjack (1.0.13)
-    memoist (0.16.0)
-    method_source (0.9.0)
-    minitest (5.11.3)
-    necromancer (0.4.0)
-    nenv (0.3.0)
-    notiffany (0.1.1)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
-    pastel (0.7.2)
-      equatable (~> 0.5.0)
-      tty-color (~> 0.4.0)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rake (12.3.1)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    ruby_dep (1.5.0)
-    shellany (0.0.1)
-    simplecov (0.13.0)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    thor (0.20.0)
-    thread_safe (0.3.6)
-    timers (4.1.2)
-      hitimes
-    tty-color (0.4.2)
-    tty-cursor (0.5.0)
-    tty-prompt (0.16.1)
-      necromancer (~> 0.4.0)
-      pastel (~> 0.7.0)
-      timers (~> 4.0)
-      tty-cursor (~> 0.5.0)
-      tty-reader (~> 0.3.0)
-    tty-reader (0.3.0)
-      tty-cursor (~> 0.5.0)
-      tty-screen (~> 0.6.4)
-      wisper (~> 2.0.0)
-    tty-screen (0.6.4)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    wisper (2.0.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler
-  byebug
-  cli_markdown
-  codeclimate-test-reporter
-  guard
-  guard-bundler
-  guard-rspec
-  rake
-  sonic-screwdriver!
-
-BUNDLED WITH
-   1.16.1