hammer_cli 0.8.0 → 0.9.0

data/lib/hammer_cli/logger.rb

@@ -50,30 +50,33 @@ module HammerCLI
     NOCOLOR_LAYOUT  = Logging::Layouts::Pattern.new(:pattern => pattern, :color_scheme => nil)
     DEFAULT_LOG_DIR = '/var/log/hammer'
 
-    log_dir = File.expand_path(HammerCLI::Settings.get(:log_dir) || DEFAULT_LOG_DIR)
-    begin
-      FileUtils.mkdir_p(log_dir, :mode => 0750)
-    rescue Errno::EACCES => e
-      puts _("No permissions to create log dir %s") % log_dir
-    end
+    def self.initialize_logger(logger)
+      log_dir = File.expand_path(HammerCLI::Settings.get(:log_dir) || DEFAULT_LOG_DIR)
+      begin
+        FileUtils.mkdir_p(log_dir, :mode => 0750)
+      rescue Errno::EACCES => e
+        $stderr.puts _("No permissions to create log dir %s") % log_dir
+      end
 
-    logger   = Logging.logger.root
-    filename = "#{log_dir}/hammer.log"
-    begin
-      logger.appenders = ::Logging.appenders.rolling_file('configure',
-                                                          :filename => filename,
-                                                          :layout   => NOCOLOR_LAYOUT,
-                                                          :truncate => false,
-                                                          :keep     => 5,
-                                                          :size     => (HammerCLI::Settings.get(:log_size) || 1)*1024*1024) # 1MB
-      # set owner and group (it's ignored if attribute is nil)
-      FileUtils.chown HammerCLI::Settings.get(:log_owner), HammerCLI::Settings.get(:log_group), filename
-    rescue ArgumentError => e
-      puts _("File %s not writeable, won't log anything to the file!") % filename
-    end
+      filename = "#{log_dir}/hammer.log"
+      begin
+        logger.appenders = ::Logging.appenders.rolling_file('configure',
+                                                            :filename => filename,
+                                                            :layout   => NOCOLOR_LAYOUT,
+                                                            :truncate => false,
+                                                            :keep     => 5,
+                                                            :size     => (HammerCLI::Settings.get(:log_size) || 1)*1024*1024) # 1MB
+        # set owner and group (it's ignored if attribute is nil)
+        FileUtils.chown HammerCLI::Settings.get(:log_owner), HammerCLI::Settings.get(:log_group), filename
+      rescue ArgumentError => e
+        $stderr.puts _("File %s not writeable, won't log anything to the file!") % filename
+      end
 
-    logger.level = HammerCLI::Settings.get(:log_level)
+      logger.level = HammerCLI::Settings.get(:log_level)
+      logger
+    end
 
+    initialize_logger(Logging.logger.root)
   end
 
 end

data/lib/hammer_cli/options/normalizers.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'csv'
 
 module HammerCLI
   module Options
@@ -78,15 +79,25 @@ module HammerCLI
         end
       end
 
+      CSV_ERROR_MESSAGES = {
+        /Missing or stray quote/ => _('Missing or stray quote.'),
+        /Unquoted fields do not allow/ => _('Unquoted fields do not allow \r or \n.'),
+        /Illegal quoting/ => _('Illegal quoting.'),
+        /Unclosed quoted field/ => _('Unclosed quoted field.'),
+        /Field size exceeded/ => _('Field size exceeded.')
+      }
 
       class List < AbstractNormalizer
 
         def description
-          _("Comma separated list of values.")
+          _("Comma separated list of values. Values containing comma should be double quoted")
         end
 
         def format(val)
-          val.is_a?(String) ? val.split(",") : []
+          (val.is_a?(String) && !val.empty?) ? CSV.parse_line(val) : []
+        rescue CSV::MalformedCSVError => e
+          message = CSV_ERROR_MESSAGES.find { |pattern,| pattern.match e.message } || [e.message]
+          raise ArgumentError.new(message.last)
         end
       end
 

data/lib/hammer_cli/output/adapter/table.rb

@@ -1,5 +1,7 @@
 require 'table_print'
 require File.join(File.dirname(__FILE__), 'wrapper_formatter')
+require 'hammer_cli/table_print/formatter'
+require 'hammer_cli/table_print/column'
 
 module HammerCLI::Output::Adapter
 

data/lib/hammer_cli/output/formatters.rb

@@ -157,7 +157,7 @@ module HammerCLI::Output
       end
 
       def format(value, field_params={})
-        !value || value == "" ? _("no") : _("yes")
+        (value == 0 || !value || value == "") ? _("no") : _("yes")
       end
     end
 

data/lib/hammer_cli/output/utils.rb

@@ -0,0 +1,43 @@
+require 'unicode/display_width'
+
+module HammerCLI
+  module Output
+    module Utils
+      def self.real_length(value)
+        decolorized = value.gsub(/\033\[[^m]*m/, '')
+        Unicode::DisplayWidth.of(decolorized)
+      end
+
+      def self.real_char_length(ch)
+        Unicode::DisplayWidth.of(ch)
+      end
+
+      def self.real_truncate(value, required_size)
+        size = 0
+        index = 0
+        has_colors = false
+        in_color = false
+        value.each_char do |ch|
+          if in_color
+            in_color = false if ch == "m"
+          elsif ch == "\e"
+            has_colors = in_color = true
+          else
+            increment = real_char_length(ch)
+            if size + increment > required_size
+              if has_colors
+                return value[0..index-1] + "\e[0m", size
+              else
+                return value[0..index-1], size
+              end
+            else
+              size += increment
+            end
+          end
+          index += 1
+        end
+        return value, size
+      end
+    end
+  end
+end

data/lib/hammer_cli/table_print/column.rb

@@ -0,0 +1,19 @@
+require 'hammer_cli/output/utils'
+
+module TablePrint
+  class Column
+    def data_width
+      if multibyte_count
+        [
+          HammerCLI::Output::Utils.real_length(name),
+          Array(data).compact.collect(&:to_s).collect{|m| HammerCLI::Output::Utils.real_length(m) }.max
+        ].compact.max || 0
+      else
+        [
+          name.length,
+          Array(data).compact.collect(&:to_s).collect(&:length).max
+        ].compact.max || 0
+      end
+    end
+  end
+end

data/lib/hammer_cli/table_print/formatter.rb

@@ -0,0 +1,18 @@
+require 'hammer_cli/output/utils'
+
+module TablePrint
+  class FixedWidthFormatter
+    def format(value)
+      value = value.to_s
+      padding = width - HammerCLI::Output::Utils.real_length(value)
+      if padding >= 0
+        value += (" " * padding)
+      else
+        value, real_length = HammerCLI::Output::Utils.real_truncate(value, width-3)
+        value += '...'
+        value += ' ' if real_length < (width - 3)
+      end
+      value
+    end
+  end
+end

data/lib/hammer_cli/utils.rb

@@ -43,8 +43,12 @@ end
 
 module HammerCLI
 
+  def self.tty?
+    STDOUT.tty?
+  end
+
   def self.interactive?
-    return false unless STDOUT.tty?
+    return false unless tty?
     return HammerCLI::Settings.get(:_params, :interactive) unless HammerCLI::Settings.get(:_params, :interactive).nil?
     HammerCLI::Settings.get(:ui, :interactive) != false
   end

data/lib/hammer_cli/validator.rb

@@ -42,8 +42,18 @@ module HammerCLI
         @options[name]
       end
 
+      def get_option_value(name)
+        opt = get_option(name)
+        value = opt.get
+        if value.nil?
+          defaults = opt.command.send(:context)[:defaults]
+          value = defaults.get_defaults(name.to_s) if defaults
+        end
+        value
+      end
+
       def option_passed?(option_name)
-        !get_option(option_name).get.nil?
+        !get_option_value(option_name).nil?
       end
 
       def option_switches(opts=nil)
@@ -79,7 +89,7 @@ module HammerCLI
       end
 
       def value
-        get_option(@to_check[0]).get
+        get_option_value(@to_check[0])
       end
     end
 

data/lib/hammer_cli/version.rb

@@ -1,5 +1,5 @@
 module HammerCLI
   def self.version
-    @version ||= Gem::Version.new '0.8.0'
+    @version ||= Gem::Version.new '0.9.0'
   end
 end

data/locale/ca/hammer-cli.edit.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-14 23:26+0200\n"
-"PO-Revision-Date: 2016-06-15 08:49+0000\n"
+"POT-Creation-Date: 2016-09-01 12:28+0200\n"
+"PO-Revision-Date: 2016-09-02 10:08+0000\n"
 "Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Catalan (http://www.transifex.com/foreman/foreman/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -55,8 +55,9 @@ msgid "no value provided"
 msgstr "no s'ha proporcionat cap valor"
 
 #: ../lib/hammer_cli/defaults.rb:77
-msgid "Couldn't create %s please create the path before defaults are enabled."
-msgstr "No s'ha pogut crear %s, si us plau, creeu el camí abans que s'habilitin els per defecte."
+msgid ""
+"Couldn't create %s. Please create the directory before setting defaults."
+msgstr ""
 
 #: ../lib/hammer_cli/defaults.rb:101
 msgid "Defaults management"
@@ -128,9 +129,9 @@ msgstr "S'ha afegit l'opció per defecte %{key_val} amb el valor %{val_val}."
 
 #: ../lib/hammer_cli/defaults_commands.rb:139
 msgid ""
-"\"Provider #{namespace} was not found. See `hammer defaults providers` for "
-"available providers.\""
-msgstr "\"No s'ha trobat el proveïdor #{namespace}. Vegeu `hammer defaults providers` per als proveïdors disponibles.\""
+"Provider %{name} was not found. See `hammer defaults providers` for "
+"available providers."
+msgstr ""
 
 #: ../lib/hammer_cli/defaults_commands.rb:143
 msgid ""
@@ -143,8 +144,8 @@ msgid "%{param} was deleted successfully."
 msgstr "S'ha eliminat correctament %{param}."
 
 #: ../lib/hammer_cli/defaults_commands.rb:151
-msgid "You must specify value or a provider name, cant specify both."
-msgstr "Heu d'especificar el valor o el nom del proveïdor, però no podeu especificar ambdós."
+msgid "You must specify value or a provider name, can't specify both."
+msgstr ""
 
 #: ../lib/hammer_cli/defaults_commands.rb:155
 msgid "Couldn't find the requested param in %s."
@@ -327,15 +328,23 @@ msgstr "el valor ha de ser una combinació de '%s'"
 msgid "Warning: Option %{option} is deprecated. %{message}"
 msgstr "Advertència: L'opció %{option} està en desús. %{message}"
 
-#: ../lib/hammer_cli/options/option_definition.rb:80
+#: ../lib/hammer_cli/options/option_definition.rb:75
+msgid "Deprecated: %{deprecated_msg}"
+msgstr ""
+
+#: ../lib/hammer_cli/options/option_definition.rb:78
+msgid "%{flag} is deprecated: %{deprecated_msg}"
+msgstr ""
+
+#: ../lib/hammer_cli/options/option_definition.rb:101
 msgid "Can be specified multiple times. "
 msgstr "Es pot especificar múltiples vegades."
 
-#: ../lib/hammer_cli/options/option_definition.rb:81
+#: ../lib/hammer_cli/options/option_definition.rb:102
 msgid "Default: "
 msgstr "Per defecte:"
 
-#: ../lib/hammer_cli/options/option_definition.rb:81
+#: ../lib/hammer_cli/options/option_definition.rb:102
 msgid ", or "
 msgstr ", o "
 
@@ -352,9 +361,7 @@ msgid "Name"
 msgstr "Nom"
 
 #: ../lib/hammer_cli/output/adapter/table.rb:63
-msgid ""
-"\"Page #{collection.meta.page} of #{pages} (use --page and --per-page for "
-"navigation)\""
+msgid "Page %{page} of %{total} (use --page and --per-page for navigation)"
 msgstr ""
 
 #: ../lib/hammer_cli/output/formatters.rb:160
@@ -371,6 +378,10 @@ msgid ""
 "configurations to cli.modules.d"
 msgstr "Advertència: la ubicació hammer.modules.d està en desús, moveu les configuracions dels vostres mòduls a cli.modules.d"
 
+#: ../lib/hammer_cli/settings.rb:44
+msgid "Warning: Couldn't load configuration file %{path}: %{message}"
+msgstr ""
+
 #: ../lib/hammer_cli/shell.rb:10
 msgid "Print help for commands"
 msgstr "Imprimeix l'ajuda per a les ordres"

data/locale/ca/hammer-cli.po

@@ -1,7 +1,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 0.8.0\n"
+"Project-Id-Version: hammer-cli 0.9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -124,9 +124,6 @@ msgstr "Error: %s"
 msgid "See: '%{path} --help'"
 msgstr ""
 
-msgid "Invalid username or password"
-msgstr "nom d'usuari no vàlid o contrasenya no vàlida"
-
 msgid "Could not load the API description from the server"
 msgstr ""
 
@@ -212,8 +209,27 @@ msgstr "Llista separada per comes de clau=valor."
 msgid "value must be defined as a comma-separated list of key=value or valid JSON"
 msgstr ""
 
-msgid "Comma separated list of values."
-msgstr "Llista separada per comes dels valors."
+msgid "Missing or stray quote."
+msgstr ""
+
+msgid ""
+"Unquoted fields do not allow 
 or \n"
+"."
+msgstr ""
+
+msgid "Illegal quoting."
+msgstr ""
+
+msgid "Unclosed quoted field."
+msgstr ""
+
+msgid "Field size exceeded."
+msgstr ""
+
+msgid ""
+"Comma separated list of values. Values containing comma should be double quote"
+"d"
+msgstr ""
 
 msgid "numeric value is required"
 msgstr ""

data/locale/de/hammer-cli.edit.po

@@ -8,14 +8,15 @@
 # Ettore Atalan <atalanttore@googlemail.com>, 2014-2016
 # simon11 <simon.stieger.98@live.de>, 2014
 # simon11 <simon.stieger.98@live.de>, 2014
+# tstrachota <tstrachota@redhat.com>, 2016
 # Ulrich Habel <rhaen@pkgbox.de>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-14 23:26+0200\n"
-"PO-Revision-Date: 2016-08-22 15:04+0000\n"
-"Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>\n"
+"POT-Creation-Date: 2016-09-01 12:28+0200\n"
+"PO-Revision-Date: 2016-12-14 15:33+0000\n"
+"Last-Translator: tstrachota <tstrachota@redhat.com>\n"
 "Language-Team: German (http://www.transifex.com/foreman/foreman/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,15 +38,15 @@ msgstr "Option '%<option>s' (oder Umgebung %<env>s) ist erforderlich"
 
 #: ../lib/hammer_cli/clamp.rb:8
 msgid "option '%<switch>s': %<message>s"
-msgstr "Option '%<switch>s': %<message>en"
+msgstr "Option '%<switch>s': %<message>s"
 
 #: ../lib/hammer_cli/clamp.rb:9
 msgid "parameter '%<param>s': %<message>s"
-msgstr "Parameter '%<param>s': %<message>en"
+msgstr "Parameter '%<param>s': %<message>s"
 
 #: ../lib/hammer_cli/clamp.rb:10
 msgid "%<env>s: %<message>s"
-msgstr "%<env>s: %<message>en"
+msgstr "%<env>s: %<message>s"
 
 #: ../lib/hammer_cli/clamp.rb:11
 msgid "Unrecognised option '%<switch>s'"
@@ -60,8 +61,9 @@ msgid "no value provided"
 msgstr "kein Wert geliefert"
 
 #: ../lib/hammer_cli/defaults.rb:77
-msgid "Couldn't create %s please create the path before defaults are enabled."
-msgstr "%s konnte nicht erstellt werden. Bitte erstellen Sie zuerst den Pfad, bevor Standardeinstellungen aktiviert werden."
+msgid ""
+"Couldn't create %s. Please create the directory before setting defaults."
+msgstr ""
 
 #: ../lib/hammer_cli/defaults.rb:101
 msgid "Defaults management"
@@ -133,9 +135,9 @@ msgstr "Hinzugefügte %{key_val}  Standardoption mit Wert %{val_val}."
 
 #: ../lib/hammer_cli/defaults_commands.rb:139
 msgid ""
-"\"Provider #{namespace} was not found. See `hammer defaults providers` for "
-"available providers.\""
-msgstr "\"Anbieter #{namespace} wurde nicht gefunden. Unter `hammer defaults providers` finden Sie alle Anbieter.\""
+"Provider %{name} was not found. See `hammer defaults providers` for "
+"available providers."
+msgstr ""
 
 #: ../lib/hammer_cli/defaults_commands.rb:143
 msgid ""
@@ -148,8 +150,8 @@ msgid "%{param} was deleted successfully."
 msgstr "%{param} wurde erfolgreich gelöscht."
 
 #: ../lib/hammer_cli/defaults_commands.rb:151
-msgid "You must specify value or a provider name, cant specify both."
-msgstr "Sie müssen den Wert oder Namen eines Anbieters angeben, beides kann nicht angegeben werden. "
+msgid "You must specify value or a provider name, can't specify both."
+msgstr ""
 
 #: ../lib/hammer_cli/defaults_commands.rb:155
 msgid "Couldn't find the requested param in %s."
@@ -332,15 +334,23 @@ msgstr "Wert muss eine Kombination aus \"%s\" sein"
 msgid "Warning: Option %{option} is deprecated. %{message}"
 msgstr "Warnung: Option %{option} ist veraltet. %{message}"
 
-#: ../lib/hammer_cli/options/option_definition.rb:80
+#: ../lib/hammer_cli/options/option_definition.rb:75
+msgid "Deprecated: %{deprecated_msg}"
+msgstr "Veraltet: %{deprecated_msg}"
+
+#: ../lib/hammer_cli/options/option_definition.rb:78
+msgid "%{flag} is deprecated: %{deprecated_msg}"
+msgstr "%{flag} ist veraltet: %{deprecated_msg}"
+
+#: ../lib/hammer_cli/options/option_definition.rb:101
 msgid "Can be specified multiple times. "
 msgstr "Kann mehrfach angegeben werden."
 
-#: ../lib/hammer_cli/options/option_definition.rb:81
+#: ../lib/hammer_cli/options/option_definition.rb:102
 msgid "Default: "
 msgstr "Standard: "
 
-#: ../lib/hammer_cli/options/option_definition.rb:81
+#: ../lib/hammer_cli/options/option_definition.rb:102
 msgid ", or "
 msgstr " oder "
 
@@ -357,10 +367,8 @@ msgid "Name"
 msgstr "Name"
 
 #: ../lib/hammer_cli/output/adapter/table.rb:63
-msgid ""
-"\"Page #{collection.meta.page} of #{pages} (use --page and --per-page for "
-"navigation)\""
-msgstr "\"Seite #{collection.meta.page} von #{pages} (Navigation über --page und --per-page)\""
+msgid "Page %{page} of %{total} (use --page and --per-page for navigation)"
+msgstr ""
 
 #: ../lib/hammer_cli/output/formatters.rb:160
 msgid "no"
@@ -376,6 +384,10 @@ msgid ""
 "configurations to cli.modules.d"
 msgstr "Warnung: Speicherort hammer.modules.d ist veraltet, verlegen Sie Ihre Modulkonfigurationen nach cli.modules.d"
 
+#: ../lib/hammer_cli/settings.rb:44
+msgid "Warning: Couldn't load configuration file %{path}: %{message}"
+msgstr ""
+
 #: ../lib/hammer_cli/shell.rb:10
 msgid "Print help for commands"
 msgstr "Hilfe für Befehle anzeigen"