hammer_cli 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b39b8afbf9c00645ca1591288ec35f790efba222
-  data.tar.gz: b1b69c66682a9a1b38d2799f15c11da797990ca5
+  metadata.gz: 2dc560a54a8356574b61f94171e0f2f3eaba55be
+  data.tar.gz: baecee7550c67ddd53dd4fb41a75e8b917b7f430
 SHA512:
-  metadata.gz: 403d600bba083967627d060ac6a6ae9620418fce83ac27ad0bd4b44821f42928fcdb0021e45166000b78f28988a7d1dca04344a1ad0d33216300b8475cba57ec
-  data.tar.gz: a572704192a70b48c30df2d2d6e2496a992034c3053300d772bd9a1ea51a5c3e40ba4dfba814f5ce20e03df40185f79166df3746db52b860429b8211e2f16722
+  metadata.gz: a442abbc69a621586676c5a12999856bd1a470e15832f03cc5b5d59e1b7e9e12dd714b1e91faff6534222e68babd344ff340d392fbe4f01879431d1bd13fce4c
+  data.tar.gz: 812bc9348b53072052e49e5384dcbcacb46ce9553cf3bfd71dfa19a1aaeb276f9d3bed21d337f5bbdcb33951b14822664643ae9e2eabf6340289fad88336d283

data/bin/hammer

@@ -79,7 +79,7 @@ HammerCLI::Settings.load({
     :reload_cache => preparser.reload_cache?
   }})
 
-if HammerCLI::Settings.get(:mark_translated)
+if HammerCLI::Settings.get(:ui, :mark_translated)
   include HammerCLI::I18n::Debug
 end
 

data/doc/release_notes.md

@@ -1,6 +1,18 @@
 Release notes
 =============
 
+### 0.8.0 (2016-09-01)
+* Fix tests with rest-client >= 2.0.0 ([#16404](http://projects.theforeman.org/issues/16404))
+* Add missing apostrophe in error message ([#16316](http://projects.theforeman.org/issues/16316))
+* Improve error for missing ~/.hammer directory ([#16312](http://projects.theforeman.org/issues/16312))
+* Option deprecation indication in help ([PR #212](https://github.com/theforeman/hammer-cli/pull/212)) ([#16161](http://projects.theforeman.org/issues/16161))
+* Preserve original exception message ([#14436](http://projects.theforeman.org/issues/14436))
+* Added exception handling while parsing configuration file. ([#14436](http://projects.theforeman.org/issues/14436))
+* Gettext speed improvements ([PR #198](https://github.com/theforeman/hammer-cli/pull/198)) ([#14092](http://projects.theforeman.org/issues/14092))
+* Explicitly list man page in gemspec files ([PR #210](https://github.com/theforeman/hammer-cli/pull/210)) ([#7453](http://projects.theforeman.org/issues/7453))
+* Adds man page to hammer ([PR #163](https://github.com/theforeman/hammer-cli/pull/163)) ([#7453](http://projects.theforeman.org/issues/7453))
+* I18n - fix extraction of variables in strings ([PR #209](https://github.com/theforeman/hammer-cli/pull/209))
+
 ### 0.7.0 (2016-06-14)
 * Let print adapters decide whether to paginate ([#15257](http://projects.theforeman.org/issues/15257))
 * Add support for testing values in option  validation ([#13832](http://projects.theforeman.org/issues/13832))

data/lib/hammer_cli/defaults.rb

@@ -74,7 +74,7 @@ module HammerCLI
         new_file.write ":defaults:"
         new_file.close
       else
-        raise DefaultsPathError.new(_("Couldn't create %s please create the path before defaults are enabled.") % path)
+        raise DefaultsPathError.new(_("Couldn't create %s. Please create the directory before setting defaults.") % path)
       end
     end
 

data/lib/hammer_cli/defaults_commands.rb

@@ -136,7 +136,7 @@ module HammerCLI
     end
 
     def provider_prob_message(namespace)
-      print_message(_("Provider #{namespace} was not found. See `hammer defaults providers` for available providers."))
+      print_message(_("Provider %{name} was not found. See `hammer defaults providers` for available providers.") % {:name => namespace})
     end
 
     def defaults_not_supported_by_provider
@@ -148,7 +148,7 @@ module HammerCLI
     end
 
     def bad_input
-      print_message(_("You must specify value or a provider name, cant specify both."))
+      print_message(_("You must specify value or a provider name, can't specify both."))
     end
 
     def variable_not_found

data/lib/hammer_cli/i18n.rb

@@ -4,68 +4,40 @@ require 'locale'
 module HammerCLI
   module I18n
 
-    module AllDomains
-      def _(key)
-        FastGettext::TranslationMultidomain.D_(key)
-      end
-
-      def n_(*keys)
-        FastGettext::TranslationMultidomain.Dn_(*keys)
-      end
-
-      def s_(key, separator=nil)
-        FastGettext::TranslationMultidomain.Ds_(key, separator)
-      end
-
-      def ns_(*keys)
-        FastGettext::TranslationMultidomain.Dns_(*keys)
-      end
-    end
+    TEXT_DOMAIN = 'hammer-cli'
 
     # include this module to see translations highlighted
     module Debug
       DL = '>'
       DR = '<'
 
-      # slightly modified copy of fast_gettext D_* method
+      # slightly modified copy of fast_gettext _ method
       def _(key)
-        FastGettext.translation_repositories.each_key do |domain|
-          result = FastGettext::TranslationMultidomain.d_(domain, key) {nil}
-          return DL + result + DR unless result.nil?
-        end
-        DL + key + DR
+        _wrap { FastGettext::Translation._(key) }
       end
 
-      # slightly modified copy of fast_gettext D_* method
+      # slightly modified copy of fast_gettext n_ method
       def n_(*keys)
-        FastGettext.translation_repositories.each_key do |domain|
-          result = FastGettext::TranslationMultidomain.dn_(domain, *keys) {nil}
-          return DL + result + DR unless result.nil?
-        end
-        DL + keys[-3].split(keys[-2]||FastGettext::NAMESPACE_SEPARATOR).last + DR
+        _wrap { FastGettext::Translation.n_(*keys) }
       end
 
-      # slightly modified copy of fast_gettext D_* method
-      def s_(key, separator=nil)
-        FastGettext.translation_repositories.each_key do |domain|
-          result = FastGettext::TranslationMultidomain.ds_(domain, key, separator) {nil}
-          return DL + result + DR unless result.nil?
-        end
-        DL + key.split(separator||FastGettext::NAMESPACE_SEPARATOR).last + DR
+      # slightly modified copy of fast_gettext s_ method
+      def s_(key, separator=nil, &block)
+        _wrap { FastGettext::Translation.s_(key, separator, &block) }
       end
 
-      # slightly modified copy of fast_gettext D_* method
-      def ns_(*keys)
-        FastGettext.translation_repositories.each_key do |domain|
-          result = FastGettext::TranslationMultidomain.dns_(domain, *keys) {nil}
-          return DL + result + DR unless result.nil?
-        end
-        DL + keys[-2].split(FastGettext::NAMESPACE_SEPARATOR).last + DR
+      # slightly modified copy of fast_gettext ns_ method
+      def ns_(*args, &block)
+        _wrap { FastGettext::Translation.ns_(*args, &block) }
+      end
+
+      def _wrap(&block)
+        result = yield
+        DL + result + DR unless result.nil?
       end
     end
 
     class AbstractLocaleDomain
-
       def available_locales
         Dir.glob(locale_dir+'/*').select { |f| File.directory? f }.map { |f| File.basename(f) }
       end
@@ -87,7 +59,6 @@ module HammerCLI
 
 
     class LocaleDomain < AbstractLocaleDomain
-
       def translated_files
         Dir.glob(File.join(File.dirname(__FILE__), '../**/*.rb'))
       end
@@ -99,18 +70,14 @@ module HammerCLI
       def domain_name
         'hammer-cli'
       end
-
     end
 
     class SystemLocaleDomain < LocaleDomain
-
       def locale_dir
         '/usr/share/locale'
       end
-
     end
 
-
     def self.locale
       lang_variant = Locale.current.to_simple.to_str
       lang = lang_variant.gsub(/_.*/, "")
@@ -123,34 +90,56 @@ module HammerCLI
       end
     end
 
-
     def self.domains
       @domains ||= []
-      @domains
     end
 
-
     def self.add_domain(domain)
       if domain.available?
         domains << domain
-        FastGettext.add_text_domain(domain.domain_name, :path => domain.locale_dir, :type => domain.type, :report_warning => false)
+        if base_repo_type == :merge
+          translation_repository.add_repo(build_repository(domain))
+        else
+          translation_repository.chain << build_repository(domain)
+        end
       end
     end
 
+    def self.build_repository(domain)
+      FastGettext::TranslationRepository.build(domain.domain_name, :path => domain.locale_dir, :type => domain.type, :report_warning => false)
+    end
 
-    def self.clear
-      FastGettext.translation_repositories.clear
-      domains.clear
+    def self.translation_repository
+      FastGettext.translation_repositories[HammerCLI::I18n::TEXT_DOMAIN]
     end
 
-    Encoding.default_external='UTF-8' if defined? Encoding
-    FastGettext.locale = locale
+    def self.base_repo_type
+      (fast_gettext_version >= '1.2.0') ? :merge : :chain
+    end
 
+    def self.fast_gettext_version
+      FastGettext::VERSION
+    end
+
+    def self.init(default_domains = [])
+      Encoding.default_external='UTF-8' if defined? Encoding
+      FastGettext.locale = locale
+      FastGettext.text_domain = HammerCLI::I18n::TEXT_DOMAIN
+      FastGettext.translation_repositories[HammerCLI::I18n::TEXT_DOMAIN] = FastGettext::TranslationRepository.build(HammerCLI::I18n::TEXT_DOMAIN, :type => base_repo_type, :chain => [])
+
+      @domains = []
+      default_domains.each do |domain|
+        add_domain(domain)
+      end
+    end
+
+    init
   end
 end
 
 include FastGettext::Translation
-include HammerCLI::I18n::AllDomains
+
 
 domain = [HammerCLI::I18n::LocaleDomain.new, HammerCLI::I18n::SystemLocaleDomain.new].find { |d| d.available? }
 HammerCLI::I18n.add_domain(domain) if domain
+

data/lib/hammer_cli/options/option_definition.rb

@@ -62,6 +62,27 @@ module HammerCLI
         super(switch)
       end
 
+      def deprecation_message(switch)
+        if deprecated_switches.class <= String && switches.include?(switch)
+          deprecated_switches
+        elsif deprecated_switches.class <= Hash && deprecated_switches.keys.include?(switch)
+          deprecated_switches[switch]
+        end
+      end
+
+      def description
+        if deprecated_switches.class <= String
+          format_deprecation_msg(super, _('Deprecated: %{deprecated_msg}') % { deprecated_msg: deprecated_switches })
+        elsif deprecated_switches.class <= Hash
+          full_msg = deprecated_switches.map do |flag, msg|
+            _('%{flag} is deprecated: %{deprecated_msg}') % { flag: flag, deprecated_msg: msg }
+          end.join(', ')
+          format_deprecation_msg(super, full_msg)
+        else
+          super
+        end
+      end
+
       def format_description
         if value_formatter.nil?
           ""
@@ -104,6 +125,10 @@ module HammerCLI
 
       private
 
+      def format_deprecation_msg(option_desc, deprecation_msg)
+        "#{option_desc} (#{deprecation_msg})"
+      end
+
       def infer_attribute_name
         HammerCLI.option_accessor_name(super)
       end

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

@@ -60,7 +60,7 @@ module HammerCLI::Output::Adapter
 
       if collection.meta.pagination_set? && collection.count < collection.meta.subtotal
         pages = (collection.meta.subtotal.to_f/collection.meta.per_page).ceil
-        puts _("Page #{collection.meta.page} of #{pages} (use --page and --per-page for navigation)")
+        puts _("Page %{page} of %{total} (use --page and --per-page for navigation)") % {:page => collection.meta.page, :total => pages}
       end
     end
 

data/lib/hammer_cli/settings.rb

@@ -34,10 +34,14 @@ module HammerCLI
 
     def self.load_from_file(file_path)
       if File.file? file_path
-        config = YAML::load(File.open(file_path))
-        if config
-          load(config)
-          path_history << file_path
+        begin
+          config = YAML::load(File.open(file_path))
+          if config
+            load(config)
+            path_history << file_path
+          end
+        rescue Exception => e
+          warn _("Warning: Couldn't load configuration file %{path}: %{message}") % { path: file_path, message: e.message }
         end
       end
     end

data/lib/hammer_cli/version.rb

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

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

@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the hammer-cli package.
 # 
 # Translators:
-# Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2015
+# Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-08 08:56+0000\n"
-"PO-Revision-Date: 2015-12-11 09:44+0000\n"
-"Last-Translator: Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>\n"
+"POT-Creation-Date: 2016-06-14 23:26+0200\n"
+"PO-Revision-Date: 2016-06-15 08:49+0000\n"
+"Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Catalan (http://www.transifex.com/foreman/foreman/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,11 +54,11 @@ msgstr "No hi ha la suborde '%<name>s'"
 msgid "no value provided"
 msgstr "no s'ha proporcionat cap valor"
 
-#: ../lib/hammer_cli/defaults.rb:72
+#: ../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."
 
-#: ../lib/hammer_cli/defaults.rb:82
+#: ../lib/hammer_cli/defaults.rb:101
 msgid "Defaults management"
 msgstr "Gestió dels per defecte"
 
@@ -266,59 +266,60 @@ msgstr "Advertència: S'ha produït un error mentre es carregava el mòdul %s"
 msgid "Error: Some of the required modules are disabled in configuration: %s "
 msgstr "Error: Alguns dels mòduls requerits estan inhabilitats en la configuració: %s "
 
-#: ../lib/hammer_cli/options/normalizers.rb:26
+#: ../lib/hammer_cli/options/normalizers.rb:29
 msgid "Comma-separated list of key=value."
 msgstr "Llista separada per comes de clau=valor."
 
-#: ../lib/hammer_cli/options/normalizers.rb:39
-msgid "value must be defined as a comma-separated list of key=value"
-msgstr "El valor ha d'estar definit com a una llista separada per comes de clau=valor"
+#: ../lib/hammer_cli/options/normalizers.rb:43
+msgid ""
+"value must be defined as a comma-separated list of key=value or valid JSON"
+msgstr ""
 
-#: ../lib/hammer_cli/options/normalizers.rb:73
+#: ../lib/hammer_cli/options/normalizers.rb:85
 msgid "Comma separated list of values."
 msgstr "Llista separada per comes dels valors."
 
-#: ../lib/hammer_cli/options/normalizers.rb:88
+#: ../lib/hammer_cli/options/normalizers.rb:100
 msgid "numeric value is required"
 msgstr "es requereix un valor numèric"
 
-#: ../lib/hammer_cli/options/normalizers.rb:102
+#: ../lib/hammer_cli/options/normalizers.rb:114
 msgid "One of true/false, yes/no, 1/0."
 msgstr "Un de true/false, yes/no, 1/0."
 
-#: ../lib/hammer_cli/options/normalizers.rb:112
+#: ../lib/hammer_cli/options/normalizers.rb:124
 msgid "value must be one of true/false, yes/no, 1/0"
 msgstr "el valor ha de ser un de true/false, yes/no, 1/0"
 
-#: ../lib/hammer_cli/options/normalizers.rb:151
+#: ../lib/hammer_cli/options/normalizers.rb:163
 msgid "Unable to parse JSON input"
 msgstr "No es pot analitzar sintàcticament l'entrada de JSON"
 
-#: ../lib/hammer_cli/options/normalizers.rb:165
+#: ../lib/hammer_cli/options/normalizers.rb:177
 msgid "Possible value(s): %s"
 msgstr "Valors possibles: %s"
 
-#: ../lib/hammer_cli/options/normalizers.rb:173
+#: ../lib/hammer_cli/options/normalizers.rb:185
 msgid "value must be %s"
 msgstr "el valor ha de ser %s"
 
-#: ../lib/hammer_cli/options/normalizers.rb:175
+#: ../lib/hammer_cli/options/normalizers.rb:187
 msgid "value must be one of %s"
 msgstr "el valor ha de ser un de %s"
 
-#: ../lib/hammer_cli/options/normalizers.rb:196
+#: ../lib/hammer_cli/options/normalizers.rb:208
 msgid "Date and time in YYYY-MM-DD HH:MM:SS or ISO 8601 format"
 msgstr "Data i hora en format YYYY-MM-DD HH:MM:SS o ISO 8601"
 
-#: ../lib/hammer_cli/options/normalizers.rb:203
+#: ../lib/hammer_cli/options/normalizers.rb:215
 msgid "'%s' is not a valid date"
 msgstr "'%s' no és una data vàlida"
 
-#: ../lib/hammer_cli/options/normalizers.rb:214
+#: ../lib/hammer_cli/options/normalizers.rb:226
 msgid "Any combination (comma separated list) of '%s'"
 msgstr "Qualsevol combinació (llista separada per comes) de '%s'"
 
-#: ../lib/hammer_cli/options/normalizers.rb:234
+#: ../lib/hammer_cli/options/normalizers.rb:246
 msgid "value must be a combination of '%s'"
 msgstr "el valor ha de ser una combinació de '%s'"
 
@@ -338,26 +339,32 @@ msgstr "Per defecte:"
 msgid ", or "
 msgstr ", o "
 
-#: ../lib/hammer_cli/output/adapter/csv.rb:174
+#: ../lib/hammer_cli/output/adapter/csv.rb:179
 msgid "Message"
 msgstr "Missatge"
 
-#: ../lib/hammer_cli/output/adapter/csv.rb:178
+#: ../lib/hammer_cli/output/adapter/csv.rb:183
 msgid "Id"
 msgstr "ID"
 
-#: ../lib/hammer_cli/output/adapter/csv.rb:183
+#: ../lib/hammer_cli/output/adapter/csv.rb:188
 msgid "Name"
 msgstr "Nom"
 
-#: ../lib/hammer_cli/output/formatters.rb:154
-msgid "yes"
-msgstr "si"
+#: ../lib/hammer_cli/output/adapter/table.rb:63
+msgid ""
+"\"Page #{collection.meta.page} of #{pages} (use --page and --per-page for "
+"navigation)\""
+msgstr ""
 
-#: ../lib/hammer_cli/output/formatters.rb:154
+#: ../lib/hammer_cli/output/formatters.rb:160
 msgid "no"
 msgstr "no"
 
+#: ../lib/hammer_cli/output/formatters.rb:160
+msgid "yes"
+msgstr "si"
+
 #: ../lib/hammer_cli/settings.rb:27
 msgid ""
 "Warning: location hammer.modules.d is deprecated, move your module "
@@ -402,10 +409,26 @@ msgstr "No podeu establir totes les opcions %s alhora"
 msgid "Options %s are required"
 msgstr "Es requereixen %s opcions"
 
-#: ../lib/hammer_cli/validator.rb:79
+#: ../lib/hammer_cli/validator.rb:77
+msgid "You can't set option %s"
+msgstr ""
+
+#: ../lib/hammer_cli/validator.rb:78
+msgid "Option %s is required"
+msgstr ""
+
+#: ../lib/hammer_cli/validator.rb:90
 msgid "You can't set any of options %s"
 msgstr "No podeu establir cap de les opcions %s"
 
-#: ../lib/hammer_cli/validator.rb:80
+#: ../lib/hammer_cli/validator.rb:91
 msgid "At least one of options %s is required"
 msgstr "Com a mínim es requereix una de les opcions %s"
+
+#: ../lib/hammer_cli/validator.rb:116
+msgid "One of options %s is required"
+msgstr ""
+
+#: ../lib/hammer_cli/validator.rb:120
+msgid "Only one of options %s can be set"
+msgstr ""

data/locale/ca/hammer-cli.po

@@ -1,7 +1,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 0.7.0\n"
+"Project-Id-Version: hammer-cli 0.8.0\n"
 "Report-Msgid-Bugs-To: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,7 +40,7 @@ msgstr "No hi ha la suborde '%<name>s'"
 msgid "no value provided"
 msgstr "no s'ha proporcionat cap valor"
 
-msgid "Couldn't create %s please create the path before defaults are enabled."
+msgid "Couldn't create %s. Please create the directory before setting defaults."
 msgstr ""
 
 msgid "Defaults management"
@@ -96,8 +96,8 @@ msgid "Added %{key_val} default-option with value %{val_val}."
 msgstr ""
 
 msgid ""
-"\"Provider #{namespace} was not found. See `hammer defaults providers` for avai"
-"lable providers.\""
+"Provider %{name} was not found. See `hammer defaults providers` for available "
+"providers."
 msgstr ""
 
 msgid ""
@@ -108,7 +108,7 @@ msgstr ""
 msgid "%{param} was deleted successfully."
 msgstr ""
 
-msgid "You must specify value or a provider name, cant specify both."
+msgid "You must specify value or a provider name, can't specify both."
 msgstr ""
 
 msgid "Couldn't find the requested param in %s."
@@ -251,6 +251,12 @@ msgstr "el valor ha de ser una combinació de '%s'"
 msgid "Warning: Option %{option} is deprecated. %{message}"
 msgstr ""
 
+msgid "Deprecated: %{deprecated_msg}"
+msgstr ""
+
+msgid "%{flag} is deprecated: %{deprecated_msg}"
+msgstr ""
+
 msgid "Can be specified multiple times. "
 msgstr "Es pot especificar múltiples vegades."
 
@@ -269,9 +275,7 @@ msgstr "ID"
 msgid "Name"
 msgstr "Nom"
 
-msgid ""
-"\"Page #{collection.meta.page} of #{pages} (use --page and --per-page for navig"
-"ation)\""
+msgid "Page %{page} of %{total} (use --page and --per-page for navigation)"
 msgstr ""
 
 msgid "no"
@@ -287,6 +291,9 @@ msgstr ""
 "Advertència: la ubicació hammer.modules.d està en desús, moveu les configuraci"
 "ons dels vostres mòduls a cli.modules.d"
 
+msgid "Warning: Couldn't load configuration file %{path}: %{message}"
+msgstr ""
+
 msgid "Print help for commands"
 msgstr "Imprimeix l'ajuda per a les ordres"