hiptest-publisher 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 36283085bf8b4776b1a854fed8a9dc0c96d7e84a
-  data.tar.gz: 040bc62f36aaa7b1aa54b354ba205ce4bc2660d6
+SHA256:
+  metadata.gz: 92594c83a779b66b0e20d2b894a1509199fecee0b47afee44e57284f37eb094c
+  data.tar.gz: 410db2501af2e304eb3135ed3302f36a453d1cc292789e423bc0757e0d6e5720
 SHA512:
-  metadata.gz: 88d3eba37283240cd6632fef52cdc0bd55fda0544428bf29b92cc648760e0ef59c06bbfecf863773e6bbba626f08d17de4d6efec4aabfe07a4cb93e93dec7e80
-  data.tar.gz: f8d676bc23cc00e1428c64b9f1f41b33c269feffbfe0afd3f27c6ba353bfd4d27fee1024eddf2bd568d53526a6f63e9be531504a694ca492b18727a6c9083b77
+  metadata.gz: c781fd1c8ce9ca8f9a857e6e5989fde3c033f1014479dbf324fcc26157190daa90c410735bb8b2529ce336f46e80115d0d45319de19b9b79fa5f0e5898daa1a8
+  data.tar.gz: 40ea3a9a05459ab6d796757196da3bece8a39f160f53b0c9338eebc032a7797bca8eb4030eb2fb98e3b970143f44edf65267b6120b869b3eaf698bc0086c1a5a

data/README.md

@@ -148,6 +148,7 @@ Specific options:
         --not-recursive              Used in conjunction with filter-on-folder-ids or filter-on-folder-name: only exports those folders, not their children (default: false)
         --check-version              Check if a new release of hiptest-publisher is available (default: false)
         --force                      Force overwrite of existing files (do not apply to test files) (default: false)
+        --[no-]color                 Force [un]use of ANSI color in text output
     -v, --verbose                    Run verbosely (default: false)
     -H, --languages-help             Show languages and framework options
     -h, --help                       Show this message

data/config/locales/en.yml

@@ -168,6 +168,7 @@ en:
     aw_renamed: Output signatures of renamed action words
     aw_signature_changed: Output signatures of action words for which signature changed
     check_version: Check if a new release of hiptest-publisher is available
+    color: Force [un]use of ANSI color in text output
     config: Configuration file
     empty_folders: Export empty folders
     execution_environment: Name of the execution environment

data/lib/hiptest-publisher.rb

@@ -86,12 +86,12 @@ module Hiptest
       @client.fetch_project_export
     rescue ClientError => err
       # This should not be an error that needs reporting to an exception monitoring app
-      puts err.message.yellow
+      reporter.show_error(err.message)
       if @exit_on_bad_arguments == false # means we are embedded in hiptest-publisher
         raise
       end
     rescue => err
-      puts I18n.t("errors.default").red
+      reporter.show_failure(I18n.t("errors.default"))
       reporter.dump_error(err)
     end
 
@@ -113,10 +113,8 @@ module Hiptest
       return true unless File.file?(path)
       return true if @cli_options.force_overwrite
 
-      if $stdout.isatty
-        STDOUT.print "\n"
-        STDOUT.print "[#{"?".yellow}] #{I18n.t('overwrite.ask_confirmation', path: path)}"
-        answer = $stdin.gets.chomp.downcase.strip
+      if $stdout.tty?
+        answer = reporter.ask(I18n.t('overwrite.ask_confirmation', path: path))
         return ['y', 'yes'].include?(answer)
       else
         reporter.warning_message(I18n.t('overwrite.warning_message', path: path))

data/lib/hiptest-publisher/formatters/console_formatter.rb

@@ -5,26 +5,35 @@ require 'hiptest-publisher/utils'
 class ConsoleFormatter
   attr_reader :verbose
 
-  def initialize(verbose)
+  def initialize(verbose, color: nil)
     @verbose = verbose
+    @color = color.nil? ? tty? : color
     @immediate_verbose = true
     @verbose_messages = []
   end
 
   def dump_error(error, message = nil)
     return unless verbose
-    puts message.blue if message
+    puts colorize(message, :blue) if message
     line = "-" * 80
-    puts line.yellow
-    puts "#{error.class.name}: #{error.message}".red
-    puts "#{error.backtrace.map {|l| "  #{l}\n"}.join}".yellow
-    puts line.yellow
+    puts colorize(line, :yellow)
+    puts colorize("#{error.class.name}: #{error.message}", :red)
+    puts colorize("#{error.backtrace.map {|l| "  #{l}\n"}.join}", :yellow)
+    puts colorize(line, :yellow)
+  end
+
+  def show_error(message)
+    STDOUT.print colorize(message, :yellow)
+  end
+
+  def show_failure(message)
+    STDOUT.print(colorize(message, :red))
   end
 
   def show_options(options, message = nil)
     return unless verbose
     message ||= I18n.t(:verbose_header, version: hiptest_publisher_version)
-    puts message.yellow
+    puts colorize(message, :yellow)
     options.each { |k, v| puts " - #{k}: #{v.inspect}" }
   end
 
@@ -42,18 +51,18 @@ class ConsoleFormatter
     output = STDOUT
 
     if status == :success
-      status_icon = "v".green
+      status_icon = colorize("v", :green)
     elsif status == :warning
-      status_icon = "?".yellow
+      status_icon = colorize("?", :yellow)
     elsif status == :failure
-      status_icon = "x".red
+      status_icon = colorize("x", :red)
       output = STDERR
     end
     if status
       @immediate_verbose = true
       cursor_offset = ""
     else
-      return unless $stdout.tty?
+      return unless tty?
       rows, columns = IO.console.winsize
       return if columns == 0
       @immediate_verbose = false
@@ -68,4 +77,24 @@ class ConsoleFormatter
       @verbose_messages.clear
     end
   end
+
+  def ask(question)
+    return unless tty?
+    STDOUT.print "[#{colorize('?', :yellow)}] #{question}"
+    return $stdin.gets.chomp.downcase.strip
+  end
+
+  def colored?
+    @color
+  end
+
+  private
+
+  def tty?
+    $stdout.tty?
+  end
+
+  def colorize(txt, color)
+    colored? ? txt.send(color) : txt
+  end
 end

data/lib/hiptest-publisher/formatters/reporter.rb

@@ -11,6 +11,14 @@ class Reporter
     notify(:dump_error, error, message)
   end
 
+  def show_error(message)
+    notify(:show_error, message)
+  end
+
+  def show_failure(message)
+    notify(:show_failure, message)
+  end
+
   def show_options(options, message = nil)
     notify(:show_options, options, message)
   end
@@ -48,6 +56,12 @@ class Reporter
     end
     nil
   end
+
+  def ask(question)
+    askable_listener = @listeners.find { |l| l.respond_to?(:ask) }
+    return nil if askable_listener.nil?
+    return askable_listener.ask(question)
+  end
 end
 
 class NullReporter

data/lib/hiptest-publisher/options_parser.rb

@@ -263,6 +263,7 @@ class OptionsParser
       Option.new(nil, 'meta=META', '', String, I18n.t('options.meta'), :meta),
       Option.new(nil, 'check-version', false, nil, I18n.t('options.check_version'), :check_version),
       Option.new(nil, 'force', false, nil, I18n.t('options.force_overwrite'), :force_overwrite),
+      Option.new(nil, '[no-]color', nil, nil, I18n.t('options.color'), :color),
       Option.new('v', 'verbose', false, nil, I18n.t('options.verbose'), :verbose)
     ]
   end
@@ -294,7 +295,7 @@ class OptionsParser
 
     args << "--help" if args.empty?
     opt_parser.parse!(args)
-    reporter.add_listener(ConsoleFormatter.new(options.verbose))
+    reporter.add_listener(ConsoleFormatter.new(options.verbose, color: options.color))
     FileConfigParser.update_options(options, reporter)
 
     reporter.show_options(options.marshal_dump)

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: hiptest-publisher
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - HipTest R&D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-02 00:00:00.000000000 Z
+date: 2020-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.5
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.5
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.5
 - !ruby/object:Gem::Dependency
   name: parseconfig
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.4
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.4
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -88,22 +88,22 @@ dependencies:
   name: multipart-post
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.1
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.1
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: ruby_version
   requirement: !ruby/object:Gem::Requirement
@@ -192,22 +192,22 @@ dependencies:
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.6
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.6
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.6
 - !ruby/object:Gem::Dependency
   name: i18n-tasks
   requirement: !ruby/object:Gem::Requirement
@@ -748,8 +748,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Export your tests from HipTest into executable tests.