hammer_cli 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e93c3909bae5e1ce10cef180e409f5046ac7207
-  data.tar.gz: 23865ff20011788a464be2f5e61775311f787aa2
+  metadata.gz: f291ac84923a7a842e1464948770660d9eda7bc9
+  data.tar.gz: 593e26e92e365344b6b5e2f319266e7a842a10d6
 SHA512:
-  metadata.gz: 5d3984b23d9f786da504884d19b1ce39b1043c36bb9c340b7ecdeebd11c3f2567213c7fbed67c661627374d5f76f9c2aeaef9451c9c6609c6c2bda51604a16a8
-  data.tar.gz: 907a881b80c1269b0cbcb87ee70dab37865a29ab14b2304f9d642413d42901eb88b96bdbf8e49372dae34b1548492e4a4ad155fd4527dc6b404fb9c0bf94c378
+  metadata.gz: 8ecca4d5ca8efe937fa4194f807f555078b7c494fbf33c78b88dbd7cbdae2a21d41835d255e1bbebcfdba5fd9ebef01e9b3c55a678413c4ac41026ba188318c8
+  data.tar.gz: 263225f32a3c48c8a4de9748436f3129ebca50f0d2ce3a41c25188c77370125e9c22766870e038a82ca9a2af490935aa95548226b34681fa3ee16f926817afae

data/doc/release_notes.md

@@ -1,6 +1,13 @@
 Release notes
 =============
 
+### 0.1.3
+* Fixed detection of list type options  ([#7144](http://projects.theforeman.org/issues/7144))
+* Key-value normalizer accepts arrays ([#7133](http://projects.theforeman.org/issues/7133))
+* Make the zanata settings consistent ([#7111](http://projects.theforeman.org/issues/7111))
+* Adding system locale domain ([#7083](http://projects.theforeman.org/issues/7083))
+
+
 ### 0.1.2
 * Allow override of request options, e.g. :response => :raw
 * Lazy loaded subcommands ([#6761](http://projects.theforeman.org/issues/6761))

data/lib/hammer_cli/apipie/option_builder.rb

@@ -59,9 +59,9 @@ module HammerCLI::Apipie
     def option_opts(param)
       opts = {}
       opts[:required] = true if (param.required? and require_options?)
-      # FIXME: There is a bug in apipie, it does not produce correct expected type for Arrays
-      # When it's fixed, we should test param["expected_type"] == "array"
-      opts[:format] = HammerCLI::Options::Normalizers::List.new if param.validator.include? "Array"
+      if param.expected_type == :array || param.validator =~ /Array/i
+        opts[:format] = HammerCLI::Options::Normalizers::List.new
+      end
       opts[:attribute_name] = HammerCLI.option_accessor_name(param.name)
       return opts
     end

data/lib/hammer_cli/i18n.rb

@@ -102,6 +102,14 @@ module HammerCLI
 
     end
 
+    class SystemLocaleDomain < LocaleDomain
+
+      def locale_dir
+        '/usr/share/locale'
+      end
+
+    end
+
 
     def self.locale
       lang_variant = Locale.current.to_simple.to_str
@@ -145,4 +153,5 @@ include FastGettext::Translation
 include HammerCLI::I18n::AllDomains
 
 HammerCLI::I18n.add_domain(HammerCLI::I18n::LocaleDomain.new)
+HammerCLI::I18n.add_domain(HammerCLI::I18n::SystemLocaleDomain.new)
 

data/lib/hammer_cli/options/normalizers.rb

@@ -28,14 +28,25 @@ module HammerCLI
 
         def format(val)
           return {} unless val.is_a?(String)
+          return {} if val.empty?
 
-          val.split(",").inject({}) do |result, item|
-            parts = item.split("=")
-            if parts.size != 2
-              raise ArgumentError, _("value must be defined as a comma-separated list of key=value")
-            end
-            result.update(parts[0] => parts[1])
+          result = {}
+
+          pair_re = '([^,]+)=([^,\[]+|\[[^\[\]]*\])'
+          full_re = "^((%s)[,]?)+$" % pair_re
+
+          unless Regexp.new(full_re).match(val)
+            raise ArgumentError, _("value must be defined as a comma-separated list of key=value")
           end
+
+          val.scan(Regexp.new(pair_re)) do |key, value|
+            value = value.strip
+            value = value.scan(/[^,\[\]]+/) if value.start_with?('[')
+
+            result[key.strip]=value
+          end
+          return result
+
         end
       end
 

data/lib/hammer_cli/version.rb

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

data/locale/en/hammer-cli.po

@@ -6,7 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 0.1.2\n"
+"Project-Id-Version: hammer-cli 0.1.3\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-05-09 16:07-0400\n"
 "PO-Revision-Date: 2014-03-04 16:38+0000\n"

data/locale/en_GB/hammer-cli.po

@@ -5,10 +5,10 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 0.1.2\n"
+"Project-Id-Version: hammer-cli 0.1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-01 12:42+0200\n"
-"PO-Revision-Date: 2014-08-01 08:17+0000\n"
+"POT-Creation-Date: 2014-08-13 16:09+0200\n"
+"PO-Revision-Date: 2014-08-14 09:42+0000\n"
 "Last-Translator: Lukáš Zapletal\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/foreman/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -194,18 +194,29 @@ msgid "Error: %s"
 msgstr ""
 
 #: lib/hammer_cli/exception_handler.rb:66
-msgid "Error: %{message}\\n\\nSee: '%{path} --help'"
+msgid "Error: %{message}"
 msgstr ""
 
-#: lib/hammer_cli/exception_handler.rb:83
+#: lib/hammer_cli/exception_handler.rb:67
+msgid "See: '%{path} --help'"
+msgstr ""
+
+#: lib/hammer_cli/exception_handler.rb:84
 msgid "Invalid username or password"
 msgstr ""
 
-#: lib/hammer_cli/exception_handler.rb:90
+#: lib/hammer_cli/exception_handler.rb:91
+msgid "Could not load the API description from the server"
+msgstr ""
+
+#: lib/hammer_cli/exception_handler.rb:92
+msgid "is the server down?"
+msgstr ""
+
+#: lib/hammer_cli/exception_handler.rb:93
 msgid ""
-"Could not load API description from the server\\n  - is your server "
-"down?\\n\\\\n          \"  - was \\\"#{rake_command}\\\" run on the server "
-"when using apipie cache? (typical production settings))\\n\""
+"was '%s' run on the server when using apipie cache? (typical production "
+"settings)"
 msgstr ""
 
 #: lib/hammer_cli/validator.rb:41
@@ -272,3 +283,9 @@ msgstr ""
 #: lib/hammer_cli/shell.rb:138
 msgid "Interactive shell"
 msgstr ""
+
+#: lib/hammer_cli/subcommand.rb:56
+msgid ""
+"can't replace subcommand %<name>s (%<existing_class>s) with %<name>s "
+"(%<new_class>s)"
+msgstr ""

data/locale/es/hammer-cli.po

@@ -6,11 +6,11 @@
 # Sergio Ocón <sergio@redhat.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 0.1.2\n"
+"Project-Id-Version: hammer-cli 0.1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-01 12:42+0200\n"
-"PO-Revision-Date: 2014-08-06 09:30+0000\n"
-"Last-Translator: Sergio Ocón <sergio@redhat.com>\n"
+"POT-Creation-Date: 2014-08-13 16:09+0200\n"
+"PO-Revision-Date: 2014-08-14 09:42+0000\n"
+"Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/foreman/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -195,19 +195,30 @@ msgid "Error: %s"
 msgstr "Error: %s"
 
 #: lib/hammer_cli/exception_handler.rb:66
-msgid "Error: %{message}\\n\\nSee: '%{path} --help'"
-msgstr "Error: %{message}\\n\\nMire: '%{path} --help'"
+msgid "Error: %{message}"
+msgstr ""
+
+#: lib/hammer_cli/exception_handler.rb:67
+msgid "See: '%{path} --help'"
+msgstr ""
 
-#: lib/hammer_cli/exception_handler.rb:83
+#: lib/hammer_cli/exception_handler.rb:84
 msgid "Invalid username or password"
 msgstr "Nombre o password inválidos"
 
-#: lib/hammer_cli/exception_handler.rb:90
+#: lib/hammer_cli/exception_handler.rb:91
+msgid "Could not load the API description from the server"
+msgstr ""
+
+#: lib/hammer_cli/exception_handler.rb:92
+msgid "is the server down?"
+msgstr ""
+
+#: lib/hammer_cli/exception_handler.rb:93
 msgid ""
-"Could not load API description from the server\\n  - is your server "
-"down?\\n\\\\n          \"  - was \\\"#{rake_command}\\\" run on the server "
-"when using apipie cache? (typical production settings))\\n\""
-msgstr "No se pudo cargar la descripción de la API del servidor\\n - está caído=\\n\\\\n \" - se ejecutó \\\"#{rake_command}\\\" en el servidor mientras se usaba la cache apipie? (configuración típica en producción))\\n\""
+"was '%s' run on the server when using apipie cache? (typical production "
+"settings)"
+msgstr ""
 
 #: lib/hammer_cli/validator.rb:41
 msgid "Unknown option name '%s'"
@@ -273,3 +284,9 @@ msgstr "El completado de comandos está deshabilitado para ruby <1.9 debido a pr
 #: lib/hammer_cli/shell.rb:138
 msgid "Interactive shell"
 msgstr "Shell interactivo"
+
+#: lib/hammer_cli/subcommand.rb:56
+msgid ""
+"can't replace subcommand %<name>s (%<existing_class>s) with %<name>s "
+"(%<new_class>s)"
+msgstr ""

data/locale/fr/hammer-cli.po

@@ -7,10 +7,10 @@
 # Pierre-Emmanuel Dutang <dutangp@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 0.1.2\n"
+"Project-Id-Version: hammer-cli 0.1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-01 12:42+0200\n"
-"PO-Revision-Date: 2014-08-05 11:01+0000\n"
+"POT-Creation-Date: 2014-08-13 16:09+0200\n"
+"PO-Revision-Date: 2014-08-19 12:01+0000\n"
 "Last-Translator: Claer <transiblu@claer.hammock.fr>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/foreman/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -196,19 +196,30 @@ msgid "Error: %s"
 msgstr "Erreur : %s"
 
 #: lib/hammer_cli/exception_handler.rb:66
-msgid "Error: %{message}\\n\\nSee: '%{path} --help'"
-msgstr "Erreur : %{message}\\n\\nVoir : '%{path} --help'"
+msgid "Error: %{message}"
+msgstr "Erreur : %{message}"
 
-#: lib/hammer_cli/exception_handler.rb:83
+#: lib/hammer_cli/exception_handler.rb:67
+msgid "See: '%{path} --help'"
+msgstr "Voir : '%{path} --help'"
+
+#: lib/hammer_cli/exception_handler.rb:84
 msgid "Invalid username or password"
 msgstr "Utilisateur ou mot de passe incorrect"
 
-#: lib/hammer_cli/exception_handler.rb:90
+#: lib/hammer_cli/exception_handler.rb:91
+msgid "Could not load the API description from the server"
+msgstr "Impossible de charger la description de l'API depuis le serveur"
+
+#: lib/hammer_cli/exception_handler.rb:92
+msgid "is the server down?"
+msgstr "Le serveur est-il éteint ?"
+
+#: lib/hammer_cli/exception_handler.rb:93
 msgid ""
-"Could not load API description from the server\\n  - is your server "
-"down?\\n\\\\n          \"  - was \\\"#{rake_command}\\\" run on the server "
-"when using apipie cache? (typical production settings))\\n\""
-msgstr "Impossible de charger la description de l'API depuis le serveur\\n - serveur éteint ?\\n\\n \" - est ce que \\\"#{rake_command}\\\" est lancé sur le serveur en même temps que le cache apipie est actif ? (fonctionnement classique en production)\\n\""
+"was '%s' run on the server when using apipie cache? (typical production "
+"settings)"
+msgstr "Est ce que '%s' était lancé pendant que le cache apipie était en cours d'utilisation ? (état normal pour un serveur de production)"
 
 #: lib/hammer_cli/validator.rb:41
 msgid "Unknown option name '%s'"
@@ -274,3 +285,9 @@ msgstr "La complétion automatique est désactivée pour ruby < 1.9 à cause de
 #: lib/hammer_cli/shell.rb:138
 msgid "Interactive shell"
 msgstr "Shell interactif"
+
+#: lib/hammer_cli/subcommand.rb:56
+msgid ""
+"can't replace subcommand %<name>s (%<existing_class>s) with %<name>s "
+"(%<new_class>s)"
+msgstr "impossible de remplacer la sous-commande %<name>s (%<existing_class>s) par %<name>s (%<new_class>s)"

data/locale/hammer-cli.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 0.1.2\n"
+"Project-Id-Version: hammer-cli 0.1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-13 16:09+0200\n"
+"POT-Creation-Date: 2014-08-20 13:02+0200\n"
 "PO-Revision-Date: 2014-03-04 16:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -70,47 +70,47 @@ msgstr ""
 msgid "Comma-separated list of key=value."
 msgstr ""
 
-#: lib/hammer_cli/options/normalizers.rb:35
+#: lib/hammer_cli/options/normalizers.rb:39
 msgid "value must be defined as a comma-separated list of key=value"
 msgstr ""
 
-#: lib/hammer_cli/options/normalizers.rb:46
+#: lib/hammer_cli/options/normalizers.rb:57
 msgid "Comma separated list of values."
 msgstr ""
 
-#: lib/hammer_cli/options/normalizers.rb:58
+#: lib/hammer_cli/options/normalizers.rb:69
 msgid "One of true/false, yes/no, 1/0."
 msgstr ""
 
-#: lib/hammer_cli/options/normalizers.rb:68
+#: lib/hammer_cli/options/normalizers.rb:79
 msgid "value must be one of true/false, yes/no, 1/0"
 msgstr ""
 
-#: lib/hammer_cli/options/normalizers.rb:107
+#: lib/hammer_cli/options/normalizers.rb:118
 msgid "Unable to parse JSON input"
 msgstr ""
 
-#: lib/hammer_cli/options/normalizers.rb:120
+#: lib/hammer_cli/options/normalizers.rb:131
 msgid "One of %s"
 msgstr ""
 
-#: lib/hammer_cli/options/normalizers.rb:127
+#: lib/hammer_cli/options/normalizers.rb:138
 msgid "value must be one of '%s'"
 msgstr ""
 
-#: lib/hammer_cli/options/normalizers.rb:146
+#: lib/hammer_cli/options/normalizers.rb:157
 msgid "Date and time in YYYY-MM-DD HH:MM:SS or ISO 8601 format"
 msgstr ""
 
-#: lib/hammer_cli/options/normalizers.rb:153
+#: lib/hammer_cli/options/normalizers.rb:164
 msgid "'%s' is not a valid date"
 msgstr ""
 
-#: lib/hammer_cli/options/normalizers.rb:164
+#: lib/hammer_cli/options/normalizers.rb:175
 msgid "Any combination (comma separated list) of '%s'"
 msgstr ""
 
-#: lib/hammer_cli/options/normalizers.rb:184
+#: lib/hammer_cli/options/normalizers.rb:195
 msgid "value must be a combination of '%s'"
 msgstr ""
 

data/locale/zanata.xml

@@ -17,9 +17,8 @@
         <locale>te</locale>
         <locale>pa</locale>
         <locale>kn</locale>
-        <locale>de</locale>
-        <locale>es</locale>
-        <locale>gl</locale>
+        <locale map-from="de">de-DE</locale>
+        <locale map-from="es">es-ES</locale>
         <locale map-from="pt_BR">pt-BR</locale>
         <locale map-from="bn">bn-IN</locale>
         <locale map-from="ta">ta-IN</locale>

data/test/unit/fixtures/apipie/documented.json

@@ -54,7 +54,7 @@
                                 "allow_null": false,
                                 "full_name": "organization_ids",
                                 "validator": "Array of numbers",
-                                "expected_type": "Array",
+                                "expected_type": "array",
                                 "description": "",
                                 "required": false
                             },
@@ -107,7 +107,7 @@
                                         "allow_null": false,
                                         "full_name": "documented[array_param]",
                                         "validator": "Must be Array",
-                                        "expected_type": "string",
+                                        "expected_type": "array",
                                         "description": "",
                                         "required": true
                                     }

data/test/unit/options/normalizers_test.rb

@@ -56,6 +56,18 @@ describe HammerCLI::Options::Normalizers do
       formatter.format("a=1,b=2,c=3").must_equal({'a' => '1', 'b' => '2', 'c' => '3'})
     end
 
+    it "should parse arrays" do
+      formatter.format("a=1,b=[1,2,3],c=3").must_equal({'a' => '1', 'b' => ['1', '2', '3'], 'c' => '3'})
+    end
+
+    it "should parse array with one item" do
+      formatter.format("a=1,b=[abc],c=3").must_equal({'a' => '1', 'b' => ['abc'], 'c' => '3'})
+    end
+
+    it "should parse empty array" do
+      formatter.format("a=1,b=[],c=3").must_equal({'a' => '1', 'b' => [], 'c' => '3'})
+    end
+
     it "should parse a comma separated string 2" do
       proc { formatter.format("a=1,b,c=3") }.must_raise ArgumentError
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Martin Bačovský
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-13 00:00:00.000000000 Z
+date: 2014-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -645,4 +645,3 @@ test_files:
 - test/unit/modules_test.rb
 - test/unit/test_helper.rb
 - test/unit/connection_test.rb
-has_rdoc: