bovem 3.0.5 → 4.0.0

data/lib/bovem/version.rb

@@ -11,13 +11,13 @@ module Bovem
   # @see http://semver.org
   module Version
     # The major version.
-    MAJOR = 3
+    MAJOR = 4
 
     # The minor version.
     MINOR = 0
 
     # The patch version.
-    PATCH = 5
+    PATCH = 0
 
     # The current version number of Bovem.
     STRING = [MAJOR, MINOR, PATCH].compact.join(".")

data/locales/en.yml

@@ -5,55 +5,56 @@
 #
 
 ---
+en:
   bovem:
     configuration:
-      using: "Using configuration file %1."
-      invalid: "Config file %1 is not valid."
-      not_found: "Config file %1 is not existing or not readable."
+      using: "Using configuration file %s."
+      invalid: "Config file %s is not valid."
+      not_found: "Config file %s is not existing or not readable."
     console:
       prompt: "Please insert a value"
       unknown_reply: "Sorry, your reply was not understood. Please try again."
     shell:
-      error: "due to this error: [%1] %2."
-      run: "Running command: {mark=bright}\"%1\"{/mark}..."
-      run_dry: "Will run command: {mark=bright}\"%1\"{/mark}..."
+      error: "due to this error: [%s] %s."
+      run: "Running command: {mark=bright}\"%s\"{/mark}..."
+      run_dry: "Will run command: {mark=bright}\"%s\"{/mark}..."
       remove_dry: "Will remove file(s):"
-      remove_unwritable: "Cannot remove following non writable file: {mark=bright}%1{/mark}"
-      remove_not_found: "Cannot remove following non existent file: {mark=bright}%1{/mark}"
+      remove_unwritable: "Cannot remove following non writable file: {mark=bright}%s{/mark}"
+      remove_not_found: "Cannot remove following non existent file: {mark=bright}%s{/mark}"
       remove_error: "Cannot remove following file(s):"
       copy: "copy"
       move: "move"
-      copy_move_single_dry: "Will %1 a file:"
-      copy_move_multi_dry: "Will %1 following entries:"
-      copy_move_from: "From: {mark=bright}%1{/mark}"
-      copy_move_to: "To: {mark=bright}%1{/mark}"
-      copy_move_to_multi: "to directory: {mark=bright}%1{/mark}"
-      copy_move_single_to_directory: "Cannot %1 file {mark=bright}%2{/mark} to {mark=bright}%3{/mark} because it is currently a directory."
-      copy_move_src_not_found: "Cannot %1 non existent file {mark=bright}%2{/mark}."
-      copy_move_dst_not_writable_single: "Cannot %1 file {mark=bright}%2{/mark} to non writable directory {mark=bright}%3{/mark}."
-      copy_move_dst_not_writable_multi: "Cannot %1 following file(s) to non writable directory {mark=bright}%2{/mark}:"
-      copy_move_error_single: "Cannot %1 file {mark=bright}%2{/mark} to directory {mark=bright}%3{/mark} due to this error: [%4] %5."
-      copy_move_error_multi: "Cannot %1 following entries to {mark=bright}%2{/mark}:"
-      move_in: "Moving into directory {mark=bright}%1{/mark}"
-      move_out: "Moving back into directory {mark=bright}%1{/mark}"
+      copy_move_single_dry: "Will %s a file:"
+      copy_move_multi_dry: "Will %s following entries:"
+      copy_move_from: "From: {mark=bright}%s{/mark}"
+      copy_move_to: "To: {mark=bright}%s{/mark}"
+      copy_move_to_multi: "to directory: {mark=bright}%s{/mark}"
+      copy_move_single_to_directory: "Cannot %s file {mark=bright}%s{/mark} to {mark=bright}%s{/mark} because it is currently a directory."
+      copy_move_src_not_found: "Cannot %s non existent file {mark=bright}%s{/mark}."
+      copy_move_dst_not_writable_single: "Cannot %s file {mark=bright}%s{/mark} to non writable directory {mark=bright}%s{/mark}."
+      copy_move_dst_not_writable_multi: "Cannot %s following file(s) to non writable directory {mark=bright}%s{/mark}:"
+      copy_move_error_single: "Cannot %s file {mark=bright}%s{/mark} to directory {mark=bright}%s{/mark} due to this error: [%s] %s."
+      copy_move_error_multi: "Cannot %s following entries to {mark=bright}%s{/mark}:"
+      move_in: "Moving into directory {mark=bright}%s{/mark}"
+      move_out: "Moving back into directory {mark=bright}%s{/mark}"
       mkdir_dry: "Will create directories:"
-      mkdir_existing: "The directory {mark=bright}%1{/mark} already exists."
-      mkdir_file: "Path {mark=bright}%1{/mark} is currently a file."
-      mkdir_denied: "Cannot create following directory due to permission denied: {mark=bright}%1{/mark}."
+      mkdir_existing: "The directory {mark=bright}%s{/mark} already exists."
+      mkdir_file: "Path {mark=bright}%s{/mark} is currently a file."
+      mkdir_denied: "Cannot create following directory due to permission denied: {mark=bright}%s{/mark}."
       mkdir_error: "Cannot create following directories:"
     application:
       default_application_name: "__APPLICATION__"
-      ambigous_command: "Command shortcut \"%1\" is ambiguous across commands %2. Please add some other characters."
-      needless_argument: "Option %1 does not expects an argument."
-      missing_argument: "Option %1 expects an argument."
-      invalid_option: "Invalid option %1."
-      invalid_integer: "Option %1 expects a valid integer as argument."
-      invalid_float: "Option %1 expects a valid floating number as argument."
-      conflicting_options: "Options %1 and %2 have conflicting forms."
-      missing_option: "Required option %1 is missing."
-      invalid_value: "Value of option %1 must be one of these values: %2."
-      invalid_for_regexp: "Value of option %1 must match the regular expression: %2."
-      invalid_for_proc: "Value of option %1 is invalid."
+      ambigous_command: "Command shortcut \"%s\" is ambiguous across commands %s. Please add some other characters."
+      needless_argument: "Option %s does not expects an argument."
+      missing_argument: "Option %s expects an argument."
+      invalid_option: "Invalid option %s."
+      invalid_integer: "Option %s expects a valid integer as argument."
+      invalid_float: "Option %s expects a valid floating number as argument."
+      conflicting_options: "Options %s and %s have conflicting forms."
+      missing_option: "Required option %s is missing."
+      invalid_value: "Value of option %s must be one of these values: %s."
+      invalid_for_regexp: "Value of option %s must match the regular expression: %s."
+      invalid_for_proc: "Value of option %s is invalid."
       help_option_short_form: "-h"
       help_option_long_form: "--help"
       help_message: "Shows this message."
@@ -71,8 +72,8 @@
       help_subcommand_invocation: "[command [sub-command ...]] "
       help_subsubcommand_invocation: "[sub-command [sub-sub-command ...]] "
       help_command_description: "Shows a help about a command."
-      existing_command: "The command \"%1\" already exists."
-      existing_option_global: "The global option \"%1\" already exists."
-      existing_option: "The option \"%1\" already exists for the command \"%2\"."
+      existing_command: "The command \"%s\" already exists."
+      existing_option_global: "The global option \"%s\" already exists."
+      existing_option: "The option \"%s\" already exists for the command \"%s\"."
       missing_app_block: "You have to provide a block to the Bovem::Application constructor!"
       join_separator: " and "

data/locales/it.yml

@@ -5,55 +5,56 @@
 #
 
 ---
+it:
   bovem:
     configuration:
-      using: "Uso il file di configurazione %1."
-      invalid: "Il file di configurazione %1 non è valido."
-      not_found: "Il file di configurazione %1 non esiste o non è leggibile."
+      using: "Uso il file di configurazione %s."
+      invalid: "Il file di configurazione %s non è valido."
+      not_found: "Il file di configurazione %s non esiste o non è leggibile."
     console:
       prompt: "Per favore inserisci un valore"
       unknown_reply: "Mi dispiace, la tua risposta non è stata compresa. Per favore prova di nuovo."
     shell:
-      error: "a causa di quest'errore: [%1] %2."
-      run: "Eseguo il comando: {mark=bright}\"%1\"{/mark}..."
-      run_dry: "Eseguirò il comando: {mark=bright}\"%1\"{/mark}..."
+      error: "a causa di quest'errore: [%s] %s."
+      run: "Eseguo il comando: {mark=bright}\"%s\"{/mark}..."
+      run_dry: "Eseguirò il comando: {mark=bright}\"%s\"{/mark}..."
       remove_dry: "Rimuoverò i files:"
-      remove_unwritable: "Non posso rimuovere il file di sola lettura: {mark=bright}%1{/mark}"
-      remove_not_found: "Non posso rimuovere il file non esistente: {mark=bright}%1{/mark}"
+      remove_unwritable: "Non posso rimuovere il file di sola lettura: {mark=bright}%s{/mark}"
+      remove_not_found: "Non posso rimuovere il file non esistente: {mark=bright}%s{/mark}"
       remove_error: "Non posso rimuovere i seguenti file:"
       copy: "la copia"
       move: "lo spostamento"
-      copy_move_single_dry: "Eseguirò %1 di un file:"
-      copy_move_multi_dry: "Eseguirò %1 dei seguenti elementi:"
-      copy_move_from: "Da: {mark=bright}%1{/mark}"
-      copy_move_to: "A: {mark=bright}%1{/mark}"
-      copy_move_to_multi: "nella cartella: {mark=bright}%1{/mark}"
-      copy_move_single_to_directory: "Impossibile eseguire %1 del file {mark=bright}%2{/mark} in {mark=bright}%3{/mark} perché è attualmente una cartella."
-      copy_move_src_not_found: "Impossibile eseguire %1 del file non esistente {mark=bright}%2{/mark}."
-      copy_move_dst_not_writable_single: "Impossibile eseguire %1 del file {mark=bright}%2{/mark} nella cartella di sola lettura {mark=bright}%3{/mark}."
-      copy_move_dst_not_writable_multi: "Impossibile eseguire %1 dei seguenti elementi nella cartella di sola lettura {mark=bright}%2{/mark}:"
-      copy_move_error_single: "Impossibile eseguire %1 file {mark=bright}%2{/mark} nella cartella {mark=bright}%3{/mark} a causa di quest'errore: [%4] %5."
-      copy_move_error_multi: "Impossibile eseguire %1 dei seguenti elementi {mark=bright}%2{/mark}:"
-      move_in: "Entro nella cartella {mark=bright}%1{/mark}"
-      move_out: "Torno indietro alla cartella {mark=bright}%1{/mark}"
+      copy_move_single_dry: "Eseguirò %s di un file:"
+      copy_move_multi_dry: "Eseguirò %s dei seguenti elementi:"
+      copy_move_from: "Da: {mark=bright}%s{/mark}"
+      copy_move_to: "A: {mark=bright}%s{/mark}"
+      copy_move_to_multi: "nella cartella: {mark=bright}%s{/mark}"
+      copy_move_single_to_directory: "Impossibile eseguire %s del file {mark=bright}%s{/mark} in {mark=bright}%s{/mark} perché è attualmente una cartella."
+      copy_move_src_not_found: "Impossibile eseguire %s del file non esistente {mark=bright}%s{/mark}."
+      copy_move_dst_not_writable_single: "Impossibile eseguire %s del file {mark=bright}%s{/mark} nella cartella di sola lettura {mark=bright}%s{/mark}."
+      copy_move_dst_not_writable_multi: "Impossibile eseguire %s dei seguenti elementi nella cartella di sola lettura {mark=bright}%s{/mark}:"
+      copy_move_error_single: "Impossibile eseguire %s file {mark=bright}%s{/mark} nella cartella {mark=bright}%s{/mark} a causa di quest'errore: [%s] %s."
+      copy_move_error_multi: "Impossibile eseguire %s dei seguenti elementi {mark=bright}%s{/mark}:"
+      move_in: "Entro nella cartella {mark=bright}%s{/mark}"
+      move_out: "Torno indietro alla cartella {mark=bright}%s{/mark}"
       mkdir_dry: "Creerò le cartelle:"
-      mkdir_existing: "La cartella {mark=bright}%1{/mark} è già esistente."
-      mkdir_file: "Il percorso {mark=bright}%1{/mark} è attualmente un file."
-      mkdir_denied: "Impossible creare la seguente cartella a causa di permessi negati: {mark=bright}%1{/mark}."
+      mkdir_existing: "La cartella {mark=bright}%s{/mark} è già esistente."
+      mkdir_file: "Il percorso {mark=bright}%s{/mark} è attualmente un file."
+      mkdir_denied: "Impossible creare la seguente cartella a causa di permessi negati: {mark=bright}%s{/mark}."
       mkdir_error: "Impossibile creare le seguenti cartelle:"
     application:
       default_application_name: "__APPLICAZIONE__"
-      ambigous_command: "La scorciatoia di comando \"%1\" è ambigua tra i seguenti comandi %2. Per favore aggiungi qualche altro carattere."
-      needless_argument: "L'opzione %1 non richiede un argomento."
-      missing_argument: "L'opzione %1 richiede un argomento."
-      invalid_option: "L'opzione %1 non è valida."
-      invalid_integer: "L'opzione %1 richiede un numero intero valido come argomento."
-      invalid_float: "L'opzione %1 richiede un numero decimale valido come argomento."
-      conflicting_options: "Le opzioni %1 e %2 hanno forme in conflitto."
-      missing_option: "L'opzione richiesta %1 è mancante."
-      invalid_value: "Il valore dell'opzione %1 deve essere uno dei seguenti valori: %2."
-      invalid_for_regexp: "Il valore dell'opzione %1 deve soddisfare questa espressione regolare: %2."
-      invalid_for_proc: "Il valore dell'opzione %1 non è valido."
+      ambigous_command: "La scorciatoia di comando \"%s\" è ambigua tra i seguenti comandi %s. Per favore aggiungi qualche altro carattere."
+      needless_argument: "L'opzione %s non richiede un argomento."
+      missing_argument: "L'opzione %s richiede un argomento."
+      invalid_option: "L'opzione %s non è valida."
+      invalid_integer: "L'opzione %s richiede un numero intero valido come argomento."
+      invalid_float: "L'opzione %s richiede un numero decimale valido come argomento."
+      conflicting_options: "Le opzioni %s e %s hanno forme in conflitto."
+      missing_option: "L'opzione richiesta %s è mancante."
+      invalid_value: "Il valore dell'opzione %s deve essere uno dei seguenti valori: %s."
+      invalid_for_regexp: "Il valore dell'opzione %s deve soddisfare questa espressione regolare: %s."
+      invalid_for_proc: "Il valore dell'opzione %s non è valido."
       help_option_short_form: "-h"
       help_option_long_form: "--help"
       help_message: "Mostra questo messaggio."
@@ -71,8 +72,8 @@
       help_subcommand_invocation: "[comando [sotto-comando ...]] "
       help_subsubcommand_invocation: "[sotto-comando [sotto-sotto-comando ...]] "
       help_command_description: "Mostra aiuto riguardo un comando."
-      existing_command: "Il comando \"%1\" è già esistente."
-      existing_option_global: "L'opzione globale \"%1\" è già esistente."
-      existing_option: "L'opzione \"%1\" è già esistente per il comando \"%2\"."
+      existing_command: "Il comando \"%s\" è già esistente."
+      existing_option_global: "L'opzione globale \"%s\" è già esistente."
+      existing_option: "L'opzione \"%s\" è già esistente per il comando \"%s\"."
       missing_app_block: "Devi fornire un blocco per il costruttore di Bovem::Application!"
       join_separator: " e "

data/spec/bovem/application_spec.rb

@@ -21,9 +21,9 @@ describe Bovem::Application do
     it "should set good defaults" do
       expect(application.shell).to eq(Bovem::Shell.instance)
       expect(application.console).to eq(application.shell.console)
-      expect(application.skip_commands).to be_false
-      expect(application.show_commands).to be_false
-      expect(application.output_commands).to be_false
+      expect(application.skip_commands).to be_falsey
+      expect(application.show_commands).to be_falsey
+      expect(application.output_commands).to be_falsey
     end
   end
 
@@ -53,7 +53,7 @@ describe Bovem::Application do
 
   describe "#executable_name" do
     it "should return executable name" do
-      expect(application.executable_name).to eq($0)
+      expect(application.executable_name).to eq($PROGRAM_NAME)
     end
   end
 
@@ -123,7 +123,7 @@ describe Bovem::Application do
       check = false
 
       application = Bovem::Application.create(options) { check = true }
-      expect(check).to be_true
+      expect(check).to be_truthy
       expect(application.name).to eq("OK")
     end
 
@@ -134,6 +134,7 @@ describe Bovem::Application do
         option("require", [], {})
         option("format", [], {})
         option("example", [], {})
+        option("pattern", [], {})
 
         action do |command|
           args = command.arguments.join("-")

data/spec/bovem/command_spec.rb

@@ -122,17 +122,17 @@ describe Bovem::Command do
     end
   end 
 
-  describe "#has_description?" do
+  describe "#description?" do
     it "should check if the command has a description" do
-      expect(Bovem::Command.new.has_description?).to be_false
-      expect(Bovem::Command.new({description: "DESCRIPTION"}).has_description?).to be_true
+      expect(Bovem::Command.new.description?).to be_falsey
+      expect(Bovem::Command.new({description: "DESCRIPTION"}).description?).to be_truthy
     end
   end
 
-  describe "#has_banner?" do
+  describe "#banner?" do
     it "should check if the command has a banner" do
-      expect(Bovem::Command.new.has_banner?).to be_false
-      expect(Bovem::Command.new({banner: "BANNER"}).has_banner?).to be_true
+      expect(Bovem::Command.new.banner?).to be_falsey
+      expect(Bovem::Command.new({banner: "BANNER"}).banner?).to be_truthy
     end
   end
 
@@ -201,11 +201,11 @@ describe Bovem::Command do
     end
   end
 
-  describe "#has_commands?" do
+  describe "#commands?" do
     it "should check if the command has subcommands" do
-      expect(command.has_commands?).to be_false
+      expect(command.commands?).to be_falsey
       command.command("subcommand")
-      expect(command.has_commands?).to be_true
+      expect(command.commands?).to be_truthy
     end
   end
 
@@ -233,11 +233,11 @@ describe Bovem::Command do
     end
   end
 
-  describe "#has_options?" do
+  describe "#options?" do
     it "should check if the command has options" do
-      expect(command.has_options?).to be_false
+      expect(command.options?).to be_falsey
       command.option("option")
-      expect(command.has_options?).to be_true
+      expect(command.options?).to be_truthy
     end
   end
 
@@ -268,10 +268,10 @@ describe Bovem::Command do
     end
   end
 
-  describe "#is_application?" do
+  describe "#application?" do
     it "should check if the command is an application" do
-      expect(command.is_application?).to be_false
-      expect(application.is_application?).to be_true
+      expect(command.application?).to be_falsey
+      expect(application.application?).to be_truthy
     end
   end
 
@@ -438,38 +438,38 @@ describe Bovem::Command do
     it "should only return provided options if required to" do
       Bovem::Parser.parse(reference.application, ["--aaa", "111"])
       Bovem::Parser.parse(reference, ["--ccc", "2.0"])
-      expect(reference.get_options(false).symbolize_keys).to eq({application_aaa: 111, aaa: 456, ccc: ["2.0"]})
+      expect(reference.get_options.symbolize_keys).to eq({application_aaa: 111, aaa: 456, ccc: ["2.0"]})
     end
 
     it "should skip application options if required to" do
       Bovem::Parser.parse(reference.application, ["--aaa", "111", "--ddd", "2.0"])
       Bovem::Parser.parse(reference, ["--bbb", "2.0", "--ccc", "A,B,C"])
-      expect(reference.get_options(true, false).symbolize_keys).to eq({aaa: 456, bbb: "2.0", ccc: ["A", "B", "C"]})
-      expect(reference.get_options(true, nil).symbolize_keys).to eq({aaa: 456, bbb: "2.0", ccc: ["A", "B", "C"]})
+      expect(reference.get_options(unprovided: true, application: false).symbolize_keys).to eq({aaa: 456, bbb: "2.0", ccc: ["A", "B", "C"]})
+      expect(reference.get_options(unprovided: true, application: nil).symbolize_keys).to eq({aaa: 456, bbb: "2.0", ccc: ["A", "B", "C"]})
     end
 
     it "should apply the requested prefix for command options" do
       Bovem::Parser.parse(reference.application, ["--aaa", "111", "--ddd", "2.0"])
       Bovem::Parser.parse(reference, ["--bbb", "2.0", "--ccc", "A,B,C"])
-      expect(reference.get_options(true, false, "PREFIX").symbolize_keys).to eq({PREFIXaaa: 456, PREFIXbbb: "2.0", PREFIXccc: ["A", "B", "C"]})
+      expect(reference.get_options(unprovided: true, application: false, prefix: "PREFIX").symbolize_keys).to eq({PREFIXaaa: 456, PREFIXbbb: "2.0", PREFIXccc: ["A", "B", "C"]})
     end
 
     it "should apply the requested prefix for application options" do
       Bovem::Parser.parse(reference.application, ["--aaa", "111", "--ddd", "2.0"])
       Bovem::Parser.parse(reference, ["--bbb", "2.0", "--ccc", "A,B,C"])
-      expect(reference.get_options(true, "APP").symbolize_keys).to eq({APPaaa: 111, APPddd: 2.0, aaa: 456, bbb: "2.0", ccc: ["A", "B", "C"]})
+      expect(reference.get_options(unprovided: true, application: "APP").symbolize_keys).to eq({APPaaa: 111, APPddd: 2.0, aaa: 456, bbb: "2.0", ccc: ["A", "B", "C"]})
     end
 
     it "should only return requested options" do
       Bovem::Parser.parse(reference.application, ["--aaa", "111", "--ddd", "2.0"])
       Bovem::Parser.parse(reference, ["--bbb", "2.0", "--ccc", "A,B,C"])
-      expect(reference.get_options(true, "application_", "", :aaa, :bbb).symbolize_keys).to eq({application_aaa: 111, aaa: 456, bbb: "2.0"})
+      expect(reference.get_options(unprovided: true, whitelist: [:aaa, :bbb]).symbolize_keys).to eq({application_aaa: 111, aaa: 456, bbb: "2.0"})
     end
 
     it "should apply higher precedence to command options in case of conflicts" do
       Bovem::Parser.parse(reference.application, ["--aaa", "111", "--ddd", "2.0"])
       Bovem::Parser.parse(reference, ["--bbb", "2.0", "--ccc", "A,B,C"])
-      expect(reference.get_options(true, "", "").symbolize_keys).to eq({ddd: 2.0, aaa: 456, bbb: "2.0", ccc: ["A", "B", "C"]})
+      expect(reference.get_options(unprovided: true, application: "").symbolize_keys).to eq({ddd: 2.0, aaa: 456, bbb: "2.0", ccc: ["A", "B", "C"]})
     end
   end
 
@@ -517,7 +517,7 @@ describe Bovem::Command do
 
     it "should exit" do
       allow(Kernel).to receive(:puts)
-      allow(Bovem::Console.any_instance).to receive(:write)
+      allow_any_instance_of(Bovem::Console).to receive(:write)
 
       expect(Kernel).to receive(:exit).with(0).exactly(1)
       application.show_help

data/spec/bovem/console_spec.rb

@@ -7,11 +7,7 @@
 require "spec_helper"
 
 describe Bovem::Console do
-  let(:console) {
-    c = Bovem::Console.new
-    c.i18n = :en
-    c
-  }
+  let(:console) { Bovem::Console.new }
 
   before(:each) do
     ENV["TERM"] = "xterm-256color"
@@ -74,7 +70,7 @@ describe Bovem::Console do
     it "should return a Fixnum greater than 0" do
       w = console.line_width
       expect(w).to be_a(Fixnum)
-      expect(w >= 0).to be_true
+      expect(w >= 0).to be_truthy
     end
 
     it "should use $stdin.winsize if available" do
@@ -124,10 +120,10 @@ describe Bovem::Console do
   describe "#wrap" do
     it "should correct wrap text" do
       message = "  ABC__DEF GHI JKL"
-      expect(console.wrap(message, 2)).to eq("ABC__DEF\nGHI\nJKL")
-      expect(console.wrap(message, 3)).to eq("ABC__DEF\nGHI\nJKL")
-      expect(console.wrap(message, 4)).to eq("ABC__DEF\nGHI\nJKL")
-      expect(console.wrap(message, 5)).to eq("ABC__DEF\nGHI\nJKL")
+      expect(console.wrap(message, 2)).to eq("  ABC__DEF\nGHI\nJKL")
+      expect(console.wrap(message, 3)).to eq("  ABC__DEF\nGHI\nJKL")
+      expect(console.wrap(message, 4)).to eq("  ABC__DEF\nGHI\nJKL")
+      expect(console.wrap(message, 5)).to eq("  ABC__DEF\nGHI\nJKL")
       expect(console.wrap(message, 20)).to eq("  ABC__DEF GHI JKL")
 
       expect(console.wrap(message, nil)).to eq(message)
@@ -137,7 +133,7 @@ describe Bovem::Console do
     it "should work well with #indent" do
       message = "AB CD"
       console.set_indentation(2)
-      expect(console.wrap(console.indent(message), 2)).to eq("AB\nCD")
+      expect(console.wrap(console.indent(message), 2)).to eq("  AB\n  CD")
     end
   end
 
@@ -162,18 +158,11 @@ describe Bovem::Console do
     it "should apply modifications to the message" do
       message = "ABC"
       console.set_indentation(2)
-      expect(console.format(message, "\n", false)).to eq("ABC\n")
-      expect(console.format(message, "A")).to eq("  ABCA")
-      expect(console.format(message, "A", 3)).to eq("     ABCA")
-      expect(console.format(message, "A", 3, 4)).to eq("     ABCA")
-      expect(console.format("{mark=red}ABC{/mark}", "\n", true, true, true)).to eq("  ABC\n")
-    end
-  end
-
-  describe "#replace_markers" do
-    it "should just forwards to .replace_markers" do
-      expect(Bovem::Console).to receive(:replace_markers).with("A", "B")
-      console.replace_markers("A", "B")
+      expect(console.format(message, suffix: "\n", indented: false)).to eq("ABC\n")
+      expect(console.format(message, suffix: "A")).to eq("  ABCA")
+      expect(console.format(message, suffix: "A", indented: 3)).to eq("     ABCA")
+      expect(console.format(message, suffix: "A", indented: 3, wrap: 4)).to eq("     ABCA")
+      expect(console.format("{mark=red}ABC{/mark}", plain: true)).to eq("  ABC\n")
     end
   end
 
@@ -184,14 +173,21 @@ describe Bovem::Console do
       allow(console).to receive(:line_width).and_return(80)
 
       expect(console.format_right(message)).to eq("\e[A\e[0G\e[#{75}CABCDE")
-      expect(console.format_right(message, 10)).to eq("\e[A\e[0G\e[#{-5}CABCDE")
+      expect(console.format_right(message, width: 10)).to eq("\e[A\e[0G\e[#{-5}CABCDE")
       expect(console.format_right(extended_message)).to eq("\e[A\e[0G\e[#{75}CABC\e[AD\e[3mE")
-      expect(console.format_right(message, nil, false)).to eq("\e[0G\e[#{75}CABCDE")
+      expect(console.format_right(message, width: nil, go_up: false)).to eq("\e[0G\e[#{75}CABCDE")
       allow(console).to receive(:line_width).and_return(10)
       expect(console.format_right(message)).to eq("\e[A\e[0G\e[#{5}CABCDE")
     end
   end
 
+  describe "#replace_markers" do
+    it "should just forwards to .replace_markers" do
+      expect(Bovem::Console).to receive(:replace_markers).with("A", "B")
+      console.replace_markers("A", "B")
+    end
+  end
+
   describe "#emphasize" do
     it "should correctly emphasize messages" do
       expect(console.emphasize("MSG")).to eq("{mark=bright}MSG{/mark}")
@@ -201,41 +197,41 @@ describe Bovem::Console do
 
   describe "#write" do
     it "should call #format" do
-      expect(console).to receive(:format).with("A", "B", "C", "D", "E")
-      console.write("A", "B", "C", "D", "E")
+      expect(console).to receive(:format).with("A", suffix: "B", indented: "C", wrap: "D", plain: "E")
+      console.write("A", suffix: "B", indented: "C", wrap: "D", plain: "E")
     end
   end
 
   describe "#write_banner_aligned" do
     it "should call #min_banner_length and #format" do
       expect(Bovem::Console).to receive(:min_banner_length).and_return(1)
-      expect(console).to receive(:format).with("    A", "B", "C", "D", "E")
-      console.write_banner_aligned("A", "B", "C", "D", "E")
+      expect(console).to receive(:write).with("    A", suffix: "B", indented: "C", wrap: "D", plain: "E", print: "F")
+      console.write_banner_aligned("A", suffix: "B", indented: "C", wrap: "D", plain: "E", print: "F")
     end
   end
 
   describe "#get_banner" do
     it "should correctly format arguments" do
       expect(console.get_banner("LABEL", "red")).to eq("{mark=blue}[{mark=red}LABEL{/mark}]{/mark}")
-      expect(console.get_banner("LABEL", "red", true)).to eq("{mark=red}[{mark=red}LABEL{/mark}]{/mark}")
-      expect(console.get_banner("LABEL", "red", false, "yellow")).to eq("{mark=yellow}[{mark=red}LABEL{/mark}]{/mark}")
-      expect(console.get_banner("LABEL", "red", false, "blue", nil)).to eq("{mark=blue}{mark=red}LABEL{/mark}{/mark}")
-      expect(console.get_banner("LABEL", "red", false, "blue", "A")).to eq("{mark=blue}A{mark=red}LABEL{/mark}{/mark}")
-      expect(console.get_banner("LABEL", "red", false, "blue", ["A", "B"])).to eq("{mark=blue}A{mark=red}LABEL{/mark}B{/mark}")
+      expect(console.get_banner("LABEL", "red", full_colored: true)).to eq("{mark=red}[{mark=red}LABEL{/mark}]{/mark}")
+      expect(console.get_banner("LABEL", "red", bracket_color: "yellow")).to eq("{mark=yellow}[{mark=red}LABEL{/mark}]{/mark}")
+      expect(console.get_banner("LABEL", "red", brackets: nil)).to eq("{mark=blue}{mark=red}LABEL{/mark}{/mark}")
+      expect(console.get_banner("LABEL", "red", brackets: "A")).to eq("{mark=blue}A{mark=red}LABEL{/mark}{/mark}")
+      expect(console.get_banner("LABEL", "red", brackets: ["A", "B"])).to eq("{mark=blue}A{mark=red}LABEL{/mark}B{/mark}")
     end
   end
 
   describe "#info" do
     it "should forward everything to #get_banner" do
-      expect(console).to receive(:get_banner).with("I", "bright cyan", false).at_least(1).and_return("")
-      console.info("OK", "\n", true, false, false, false, false, false)
-      expect(console).to receive(:get_banner).with("I", "bright cyan", true).at_least(1).and_return("")
-      console.info("OK", "\n", true, false, false, false, true, false)
+      expect(console).to receive(:get_banner).with("I", "bright cyan", full_colored: false).at_least(1).and_return("")
+      console.info("OK", suffix: "\n", full_colored: false)
+      expect(console).to receive(:get_banner).with("I", "bright cyan", full_colored: true).at_least(1).and_return("")
+      console.info("OK", suffix: "\n", full_colored: true)
     end
 
     it "should forward everything to #write" do
-      expect(console).to receive(:write).with(/.+/, "B", "C", "D", "E", false)
-      console.info("A", "B", "C", "D", "E", "F", "G", false)
+      expect(console).to receive(:write).with(/.+/, suffix: "B", indented: 0, wrap: "D", plain: "E", print: false)
+      console.info("A", suffix: "B", indented: "C", wrap: "D", plain: "E", print: false)
     end
   end
 
@@ -246,96 +242,98 @@ describe Bovem::Console do
     end
 
     it "should format good percentage progresses" do
-      expect(console.progress(1, 100, :percentage)).to eq("  1 %")
-      expect(console.progress(33, 100, :percentage)).to eq(" 33 %")
-      expect(console.progress(1400, 100, :percentage)).to eq("1400 %")
-      expect(console.progress(50, 70, :percentage)).to eq(" 71 %")
-      expect(console.progress(50, 70, :percentage, 2)).to eq(" 71.43 %")
-      expect(console.progress(50, 70, :percentage, 3)).to eq(" 71.429 %")
-      expect(console.progress(0, 0, :percentage)).to eq("100 %")
-      expect(console.progress(1, 0, :percentage)).to eq("100 %")
-      expect(console.progress(0, 100, :percentage)).to eq("  0 %")
+      expect(console.progress(1, 100, type: :percentage)).to eq("  1 %")
+      expect(console.progress(33, 100, type: :percentage)).to eq(" 33 %")
+      expect(console.progress(1400, 100, type: :percentage)).to eq("1400 %")
+      expect(console.progress(50, 70, type: :percentage)).to eq(" 71 %")
+      expect(console.progress(50, 70, type: :percentage, precision: 2)).to eq(" 71.43 %")
+      expect(console.progress(50, 70, type: :percentage, precision: 3)).to eq(" 71.429 %")
+      expect(console.progress(0, 0, type: :percentage)).to eq("100 %")
+      expect(console.progress(1, 0, type: :percentage)).to eq("100 %")
+      expect(console.progress(0, 100, type: :percentage)).to eq("  0 %")
     end
   end
 
   describe "#begin" do
     it "should forward everything to #get_banner" do
-      expect(console).to receive(:get_banner).with("*", "bright green", false).at_least(1).and_return("")
-      console.begin("OK", "\n", true, false, false, false, false, false)
+      expect(console).to receive(:get_banner).with("*", "bright green", full_colored: false).at_least(1).and_return("")
+      console.begin("OK", suffix: "\n", full_colored: false)
+      expect(console).to receive(:get_banner).with("*", "bright green", full_colored: true).at_least(1).and_return("")
+      console.begin("OK", suffix: "\n", full_colored: true)
     end
 
     it "should forward everything to #write" do
-      expect(console).to receive(:write).with(/.+/, "B", "C", "D", "E", false)
-      console.begin("A", "B", "C", "D", "E", "F", "G", false)
+      expect(console).to receive(:write).with(/.+/, suffix: "B", indented: 0, wrap: "D", plain: "E", print: false)
+      console.begin("A", suffix: "B", indented: "C", wrap: "D", plain: "E", print: false)
     end
   end
 
   describe "#warn" do
     it "should forward everything to #get_banner" do
-      expect(console).to receive(:get_banner).with("W", "bright yellow", false).at_least(1).and_return("")
-      console.warn("OK", "\n", true, false, false, false, false, false)
-      expect(console).to receive(:get_banner).with("W", "bright yellow", true).at_least(1).and_return("")
-      console.warn("OK", "\n", true, false, false, false, true, false)
+      expect(console).to receive(:get_banner).with("W", "bright yellow", full_colored: false).at_least(1).and_return("")
+      console.warn("OK", suffix: "\n", full_colored: false)
+      expect(console).to receive(:get_banner).with("W", "bright yellow", full_colored: true).at_least(1).and_return("")
+      console.warn("OK", suffix: "\n", full_colored: true)
     end
 
     it "should forward everything to #write" do
-      expect(console).to receive(:write).with(/.+/, "B", "C", "D", "E", false)
-      console.warn("A", "B", "C", "D", "E", "F", "G", false)
+      expect(console).to receive(:write).with(/.+/, suffix: "B", indented: 0, wrap: "D", plain: "E", print: false)
+      console.warn("A", suffix: "B", indented: "C", wrap: "D", plain: "E", print: false)
     end
   end
 
   describe "#error" do
     it "should forward everything to #get_banner" do
-      expect(console).to receive(:get_banner).with("E", "bright red", false).at_least(1).and_return("")
-      console.error("OK", "\n", true, false, false, false, false, false)
-      expect(console).to receive(:get_banner).with("E", "bright red", true).at_least(1).and_return("")
-      console.error("OK", "\n", true, false, false, false, true, false)
+      expect(console).to receive(:get_banner).with("E", "bright red", full_colored: false).at_least(1).and_return("")
+      console.error("OK", suffix: "\n", full_colored: false)
+      expect(console).to receive(:get_banner).with("E", "bright red", full_colored: true).at_least(1).and_return("")
+      console.error("OK", suffix: "\n", full_colored: true)
     end
 
     it "should forward everything to #write" do
-      expect(console).to receive(:write).with(/.+/, "B", "C", "D", "E", false)
-      console.error("A", "B", "C", "D", "E", "F", "G", false)
+      expect(console).to receive(:write).with(/.+/, suffix: "B", indented: 0, wrap: "D", plain: "E", print: false)
+      console.error("A", suffix: "B", indented: "C", wrap: "D", plain: "E", print: false)
     end
   end
 
   describe "#fatal" do
     it "should forward anything to #error" do
       allow(Kernel).to receive(:exit).and_return(true)
-      expect(console).to receive(:error).with("A", "B", "C", "D", "E", "F", "G", false)
-      console.fatal("A", "B", "C", "D", "E", "F", "G", "H", false)
+      expect(console).to receive(:error).with("A", suffix: "B", indented: "C", wrap: "D", plain: "E", indented_banner: "F", full_colored: "G", print: true)
+      console.fatal("A", suffix: "B", indented: "C", wrap: "D", plain: "E", indented_banner: "F", full_colored: "G")
     end
 
     it "should call abort with the right error code" do
       allow(Kernel).to receive(:exit).and_return(true)
 
       expect(Kernel).to receive(:exit).with(-1).exactly(2)
-      console.fatal("A", "B", "C", "D", "E", "F", "G", -1, false)
-      console.fatal("A", "B", "C", "D", "E", "F", "G", "H", false)
+      console.fatal("A", suffix: "B", indented: "C", wrap: "D", plain: "E", indented_banner: "F", full_colored: "G", return_code: -1, print: false)
+      console.fatal("A", suffix: "B", indented: "C", wrap: "D", plain: "E", indented_banner: "F", full_colored: "G", return_code: "H", print: false)
     end
   end
 
   describe "#debug" do
     it "should forward everything to #get_banner" do
-      expect(console).to receive(:get_banner).with("D", "bright magenta", false).at_least(1).and_return("")
-      console.debug("OK", "\n", true, false, false, false, false, false)
-      expect(console).to receive(:get_banner).with("D", "bright magenta", true).at_least(1).and_return("")
-      console.debug("OK", "\n", true, false, false, false, true, false)
+      expect(console).to receive(:get_banner).with("D", "bright magenta", full_colored: false).at_least(1).and_return("")
+      console.debug("OK", suffix: "\n", full_colored: false)
+      expect(console).to receive(:get_banner).with("D", "bright magenta", full_colored: true).at_least(1).and_return("")
+      console.debug("OK", suffix: "\n", full_colored: true)
     end
 
     it "should forward everything to #write" do
-      expect(console).to receive(:write).with(/.+/, "B", "C", "D", "E", false)
-      console.debug("A", "B", "C", "D", "E", "F", "G", false)
+      expect(console).to receive(:write).with(/.+/, suffix: "B", indented: 0, wrap: "D", plain: "E", print: false)
+      console.debug("A", suffix: "B", indented: "C", wrap: "D", plain: "E", print: false)
     end
   end
 
   describe "#status" do
     it "should get the right status" do
-      expect(console.status(:ok, false, true, false)).to eq({label: " OK ", color: "bright green"})
-      expect(console.status(:pass, false, true, false)).to eq({label: "PASS", color: "bright cyan"})
-      expect(console.status(:warn, false, true, false)).to eq({label: "WARN", color: "bright yellow"})
-      expect(console.status(:fail, false, true, false)).to eq({label: "FAIL", color: "bright red"})
-      expect(console.status("NO", false, true, false)).to eq({label: " OK ", color: "bright green"})
-      expect(console.status(nil, false, true, false)).to eq({label: " OK ", color: "bright green"})
+      expect(console.status(:ok, print: false)).to eq({label: " OK ", color: "bright green"})
+      expect(console.status(:pass, print: false)).to eq({label: "PASS", color: "bright cyan"})
+      expect(console.status(:warn, print: false)).to eq({label: "WARN", color: "bright yellow"})
+      expect(console.status(:fail, print: false)).to eq({label: "FAIL", color: "bright red"})
+      expect(console.status("NO", print: false)).to eq({label: " OK ", color: "bright green"})
+      expect(console.status(nil, print: false)).to eq({label: " OK ", color: "bright green"})
     end
 
     it "should create the banner" do
@@ -344,10 +342,11 @@ describe Bovem::Console do
     end
 
     it "should format correctly" do
-      expect(console).to receive(:format_right).with(/.+/, true, true, false)
-      console.status(:ok, false, true)
-      expect(console).to receive(:format).with(/.+/, "\n", true, true, false)
-      console.status(:ok, false, true, false)
+      expect(console).to receive(:format_right).with(/.+/, width: true, go_up: true, plain: false)
+      expect(console).to receive(:format).with(/.+/, suffix: "\n", indent: true, wrap: true, plain: false)
+
+      console.status(:ok)
+      console.status(:ok, right: false)
     end
   end
 
@@ -357,30 +356,30 @@ describe Bovem::Console do
 
       prompt = "PROMPT"
       expect(Kernel).to receive(:print).with("Please insert a value: ")
-      console.read(true)
+      console.read(prompt: true)
       expect(Kernel).to receive(:print).with(prompt + ": ")
-      console.read(prompt)
+      console.read(prompt: prompt)
       expect(Kernel).not_to receive("print")
-      console.read(nil)
+      console.read(prompt: nil)
     end
 
     it "should read a value or a default" do
       allow($stdin).to receive(:gets).and_return("VALUE\n")
-      expect(console.read(nil, "DEFAULT")).to eq("VALUE")
+      expect(console.read(prompt: nil, default_value: "DEFAULT")).to eq("VALUE")
       allow($stdin).to receive(:gets).and_return("\n")
-      expect(console.read(nil, "DEFAULT")).to eq("DEFAULT")
+      expect(console.read(prompt: nil, default_value: "DEFAULT")).to eq("DEFAULT")
     end
 
     it "should return the default value if the user quits" do
       allow($stdin).to receive(:gets).and_raise(Interrupt)
-      expect(console.read(nil, "DEFAULT")).to eq("DEFAULT")
+      expect(console.read(prompt: nil, default_value: "DEFAULT")).to eq("DEFAULT")
     end
 
     it "should validate against an object or array validator" do
       count = 0
 
       allow($stdin).to receive(:gets) do
-        if count == 0 then
+        if count == 0
           count += 1
           "2\n"
         else
@@ -390,13 +389,13 @@ describe Bovem::Console do
 
       expect(console).to receive(:write).with("Sorry, your reply was not understood. Please try again.", false, false).exactly(4)
       count = 0
-      console.read(nil, nil, "A")
+      console.read(prompt: nil, validator: "A")
       count = 0
-      console.read(nil, nil, "1")
+      console.read(prompt: nil, validator: "1")
       count = 0
-      console.read(nil, nil, "nil")
+      console.read(prompt: nil, validator: "nil")
       count = 0
-      console.read(nil, nil, ["A", 1])
+      console.read(prompt: nil, validator: ["A", 1])
     end
 
     it "should validate against an regexp validator" do
@@ -412,12 +411,12 @@ describe Bovem::Console do
       end
 
       expect(console).to receive(:write).with("Sorry, your reply was not understood. Please try again.", false, false)
-      console.read(nil, nil, /[abc]/)
+      console.read(prompt: nil, validator: /[abc]/)
     end
 
     it "should hide echo to the user when the terminal shows echo" do
       expect($stdin).to receive(:noecho).and_return("VALUE")
-      console.read(nil, nil, nil, false)
+      console.read(prompt: nil, echo: false)
     end
   end
 
@@ -428,9 +427,9 @@ describe Bovem::Console do
     end
 
     it "should print the message and indentate correctly" do
-      expect(console).to receive(:begin).with("A", "B", "C", "D", "E", "F", "G")
+      expect(console).to receive(:begin).with("A", suffix: "B", indented: "C", wrap: "D", plain: "E", indented_banner: "F", full_colored: "G")
       expect(console).to receive(:with_indentation).with("H", "I")
-      console.task("A", "B", "C", "D", "E", "F", "G", "H", "I") { :ok }
+      console.task("A", suffix: "B", indented: "C", wrap: "D", plain: "E", indented_banner: "F", full_colored: "G", block_indentation: "H", block_indentation_absolute: "I") { :ok }
     end
 
     it "should execute the given block" do
@@ -440,9 +439,9 @@ describe Bovem::Console do
 
     it "should write the correct status" do
       allow(console).to receive(:begin)
-      expect(console).to receive(:status).with(:ok, false)
+      expect(console).to receive(:status).with(:ok, plain: false)
       console.task("OK") { :ok }
-      expect(console).to receive(:status).with(:fail, false)
+      expect(console).to receive(:status).with(:fail, plain: false)
       expect { console.task("") { :fatal }}.to raise_error(SystemExit)
     end