teuton 2.10.0 → 2.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7936417ce11de28acf3bddee94dcf41b4848742eae8266cce8bf70792ff4e592
-  data.tar.gz: bf8175c24a48e80c6257ab90898b52421157a471010ac1e730b3926962394ef9
+  metadata.gz: b536b04c7402dae68570886c95f147276e7139299623382b9d34e3ae49c45533
+  data.tar.gz: 54fe02357467a8a034379423453ad49e8d053667dafbc48a650924e44c9929b8
 SHA512:
-  metadata.gz: 5a042452b9f025520bce19c4254e799ae9c51e5195804bc8a7d132c63d9271e7de3f03a9c14cb85b799635174a20cddc8a002bd43c565e91395d474059f82d1e
-  data.tar.gz: dd3051109b8b756709e34343bed5301140b33368f4fc3efed751f805960db29495ca9b84bfcaf36251715215a649e53be350cb4cee88e294d74285676a77e837
+  metadata.gz: 2ef830455f9c4b5deb74bd0bbd721821d0589a74c1730c4e5fe7b17c30c38b498114b141680d70312c19d56e1a89d80d8fe3530e56dee46c8a2d91f60d94d483
+  data.tar.gz: 0c7001b5809a2cf428a8377846d7004dd2d9fbb301205ba129eb0fd24e64652ad91f8d3bb87d7d97ca891cbd6b79d088be1fac0386e0efbacb5266006d5a86c7

data/lib/teuton/case/dsl/send.rb

@@ -32,7 +32,8 @@ module DSL
       Net::SFTP.start(ip, username, password: password, port: port) do |sftp|
         sftp.upload!(localfilepath, remotefilepath)
       end
-      msg = Rainbow("==> [ OK ] Case #{get(:tt_members)}: report (#{remotefilepath}) copy to (#{ip})").green
+      # msg = Rainbow("==> [ OK ] Case #{get(:tt_members)}: report (#{remotefilepath}) copy to (#{ip})").green
+      msg = "==> [ OK ] Case #{get(:tt_members)}: report (#{remotefilepath}) copy to (#{ip})"
       verboseln(msg)
       logfile.write "#{msg}\n"
       logfile.flush

data/lib/teuton/case_manager/send_manager.rb

@@ -20,13 +20,14 @@ class SendManager
     threads.each(&:join)
 
     write("Finished!", :green)
-    puts Rainbow("-" * 70).green
+    puts "-" * 70
   end
 
   private
 
   def write(msg, color)
-    puts Rainbow(msg).color(color)
+    # puts Rainbow(msg).color(color)
+    puts msg
     @logfile.write "#{msg}\n"
     @logfile.flush
   end

data/lib/teuton/report/formatter/default/txt.rb

@@ -3,17 +3,14 @@ require "rainbow"
 require_relative "array"
 
 class TXTFormatter < ArrayFormatter
-  def initialize(report, color = false)
-    @color = color
+  def initialize(report, colorize = false)
+    @colorize = colorize
     super(report)
     @ext = "txt"
     @data = {}
   end
 
   def process(options = {})
-    rainbow_state = Rainbow.enabled
-    Rainbow.enabled = @color
-
     build_data(options)
     process_config
     process_logs
@@ -21,36 +18,36 @@ class TXTFormatter < ArrayFormatter
     process_results
     process_hof
     deinit
-
-    Rainbow.enabled = rainbow_state
   end
 
   private
 
   def process_config
-    w "#{Rainbow("CONFIGURATION").bg(:blue)}\n"
+    w "#{colorize("CONFIGURATION", :bg_blue)}\n"
     my_screen_table = Terminal::Table.new do |st|
-      @data[:config].sort.each { |key, value| st.add_row [key.to_s, value.to_s] }
+      @data[:config].sort.each do |key, value|
+        st.add_row [key.to_s, value.to_s]
+      end
     end
     w "#{my_screen_table}\n\n"
   end
 
   def process_logs
-    return if @data[:logs].size == 0
+    return if @data[:logs].empty?
 
-    w "#{Rainbow("LOGS").bg(:blue)}\n"
+    w "#{colorize("LOGS", :bg_blue)}\n"
     @data[:logs].each { |line| w "    #{line}\n" }
   end
 
   def process_groups
-    return if @data[:groups].size == 0
+    return if @data[:groups].empty?
 
-    w "\n#{Rainbow("GROUPS").bg(:blue)}\n"
+    w "\n#{colorize("GROUPS", :bg_blue)}\n"
     @data[:groups].each { |g| process_group g }
   end
 
   def process_results
-    w "\n#{Rainbow("RESULTS").bg(:blue)}\n"
+    w "\n#{colorize("RESULTS", :bg_blue)}\n"
     my_screen_table = Terminal::Table.new do |st|
       @data[:results].each do |key, value|
         st.add_row [key.to_s, value.to_s]
@@ -62,16 +59,16 @@ class TXTFormatter < ArrayFormatter
   def process_hof
     return if @data[:hall_of_fame].size < 3
 
-    w "\n#{Rainbow("HALL OF FAME").bg(:blue)}\n"
+    w "\n#{colorize("HALL OF FAME", :bg_blue)}\n"
     my_screen_table = Terminal::Table.new do |st|
       @data[:hall_of_fame].each do |line|
-        mycolor = :green
-        mycolor = :red if line[0] < 50
-        text1 = Rainbow(line[0]).color(mycolor)
-        text2 = Rainbow(line[1]).color(mycolor)
+        color = :green
+        color = :red if line[0] < 50
+        text1 = colorize(line[0], color)
+        text2 = colorize(line[1], color)
         if line[0] == @data[:results][:grade]
-          text1 = text1.bright
-          text2 = text2.bright
+          text1 = colorize(text1, :bright)
+          text2 = colorize(text2, :bright)
         end
         st.add_row [text1, text2]
       end
@@ -83,12 +80,13 @@ class TXTFormatter < ArrayFormatter
 
   def process_group(group)
     tab = "  "
-    w "- #{Rainbow(group[:title]).blue.bright}\n"
+    w "- #{colorize(group[:title], :blue_bright)}\n"
     group[:targets].each do |i|
       color = :red
       color = :green if i[:check]
       w tab * 2 + format("%02d", i[:target_id].to_i)
-      w " (" + Rainbow(i[:score].to_s + "/" + i[:weight].to_s).color(color) + ")\n"
+      text = "#{i[:score]}/#{i[:weight]}"
+      w " (#{colorize(text, color)})\n"
       w "#{tab * 4}Description : #{i[:description]}\n"
       w "#{tab * 4}Command     : #{i[:command]}\n"
       w "#{tab * 4}Output      : #{i[:output]}\n"
@@ -98,4 +96,24 @@ class TXTFormatter < ArrayFormatter
       w "#{tab * 4}Result      : #{i[:result]}\n"
     end
   end
+
+  def colorize(text, option)
+    return text unless @colorize
+
+    case option
+    when :bg_blue
+      Rainbow(text).bg(:blue)
+    when :blue_bright
+      Rainbow(text).blue.bright
+    when :bright
+      Rainbow(text).bright
+    when :green
+      Rainbow(text).color(:green)
+    when :red
+      Rainbow(text).color(:red)
+    else
+      puts option
+      exit 1
+    end
+  end
 end

data/lib/teuton/report/formatter/formatter.rb

@@ -16,8 +16,8 @@ module Formatter
   def self.call(report, options, filename)
     klass = get(options[:format])
     if klass.nil?
-      puts Rainbow("[ERROR] Unkown format: #{options[:format]}").red
-      puts Rainbow("        export format: FORMAT").red
+      puts "[ERROR] Unkown format <#{options[:format]}>. Fix line <export format: FORMAT>"
+      puts "        Available format values: colored_text, html, json, txt, or yaml"
       exit 1
     end
     formatter = klass.new(report)

data/lib/teuton/version.rb

@@ -1,5 +1,5 @@
 module Teuton
-  VERSION = "2.10.0"
+  VERSION = "2.10.2"
   APPNAME = "teuton"
   GEMNAME = "teuton"
   DOCKERNAME = "dvarrui/#{GEMNAME}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teuton
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.10.2
 platform: ruby
 authors:
 - David Vargas Ruiz
@@ -10,19 +10,19 @@ cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rainbow
+  name: json_pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: net-sftp
   requirement: !ruby/object:Gem::Requirement
@@ -66,33 +66,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: json_pure
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.8'
-- !ruby/object:Gem::Dependency
-  name: thor
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -108,19 +94,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: ed25519
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: bcrypt_pbkdf
   requirement: !ruby/object:Gem::Requirement