hammer_cli 0.2.0 → 0.3.0

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

@@ -5,19 +5,20 @@
 # Translators:
 # Automatically generated, 2014
 # Dominic Cleal <dcleal@redhat.com>, 2014
+# Vladimir Pavlov <v.pavlov@i-teco.ru>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-12-10 13:50+0100\n"
-"PO-Revision-Date: 2015-03-09 14:42+0000\n"
-"Last-Translator: Lukáš Zapletal\n"
+"PO-Revision-Date: 2015-07-03 11:00+0000\n"
+"Last-Translator: Vladimir Pavlov <v.pavlov@i-teco.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/foreman/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #: lib/hammer_cli/clamp.rb:5
 msgid "too many arguments"
@@ -133,7 +134,7 @@ msgstr "показать сообщения отладки"
 
 #: lib/hammer_cli/main.rb:9
 msgid "force reload of Apipie cache"
-msgstr ""
+msgstr "принудительно перезагрузить кэш Apipie"
 
 #: lib/hammer_cli/main.rb:11
 msgid "path to custom config file"
@@ -197,7 +198,7 @@ msgstr "Предупреждение. Произошла ошибка при з
 
 #: lib/hammer_cli/modules.rb:87
 msgid "Error: Some of the required modules are disabled in configuration: %s "
-msgstr ""
+msgstr "Ошибка: некоторые из требуемых модулей выключены в конфигурации: %s"
 
 #: lib/hammer_cli/exception_handler.rb:62
 msgid "Error: %s"
@@ -209,7 +210,7 @@ msgstr "Ошибка: %{message}"
 
 #: lib/hammer_cli/exception_handler.rb:69
 msgid "See: '%{path} --help'"
-msgstr ""
+msgstr "Смотри: '%{path} --help'"
 
 #: lib/hammer_cli/exception_handler.rb:86
 msgid "Invalid username or password"
@@ -217,21 +218,21 @@ msgstr "Неверное имя пользователя или пароль"
 
 #: lib/hammer_cli/exception_handler.rb:93
 msgid "Could not load the API description from the server"
-msgstr ""
+msgstr "Не удалось загрузить описание API с сервера"
 
 #: lib/hammer_cli/exception_handler.rb:94
 msgid "is the server down?"
-msgstr ""
+msgstr "сервер выключен?"
 
 #: lib/hammer_cli/exception_handler.rb:95
 msgid ""
 "was '%s' run on the server when using apipie cache? (typical production "
 "settings)"
-msgstr ""
+msgstr "'%s' был запущен на сервере когда использовался кэш apipie? (типовая продуктивная настройка)"
 
 #: lib/hammer_cli/exception_handler.rb:101
 msgid "Missing arguments for %s"
-msgstr ""
+msgstr "Пропущены аргументы для %s"
 
 #: lib/hammer_cli/validator.rb:41
 msgid "Unknown option name '%s'"
@@ -297,4 +298,4 @@ msgstr "Интерактивная оболочка"
 msgid ""
 "can't replace subcommand %<name>s (%<existing_class>s) with %<name>s "
 "(%<new_class>s)"
-msgstr ""
+msgstr "невозможно заменить подкоманду %<name> (%<existing_class>) на %<name> (%<new_class>)"

data/locale/ru/hammer-cli.po

@@ -7,7 +7,7 @@
 # Dominic Cleal <dcleal@redhat.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 0.2.0\n"
+"Project-Id-Version: hammer-cli 0.3.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2014-09-16 09:42+0000\n"
 "Last-Translator: Dominic Cleal <dcleal@redhat.com>\n"
@@ -103,6 +103,10 @@ msgstr "адрес удаленной системы"
 msgid "show version"
 msgstr "показать версию"
 
+#, fuzzy
+msgid "unknown version"
+msgstr "показать версию"
+
 msgid "Show ids of associated resources"
 msgstr "Показать идентификаторы связанных ресурсов"
 
@@ -143,6 +147,9 @@ msgstr "значение должно содержать список пар «
 msgid "Comma separated list of values."
 msgstr "Список значений через запятую"
 
+msgid "numeric value is required"
+msgstr ""
+
 msgid "One of true/false, yes/no, 1/0."
 msgstr "Может принимать значения: true/false, yes/no, 1/0."
 
@@ -152,10 +159,15 @@ msgstr "значение может быть равно true/false, yes/no, 1/0"
 msgid "Unable to parse JSON input"
 msgstr "Не удалось обработать ввод JSON"
 
-msgid "One of %s"
-msgstr "Одно из %s"
+msgid "Possible value(s): %s"
+msgstr ""
 
-msgid "value must be one of '%s'"
+#, fuzzy
+msgid "value must be %s"
+msgstr "может принимать значения «%s»"
+
+#, fuzzy
+msgid "value must be one of %s"
 msgstr "может принимать значения «%s»"
 
 msgid "Date and time in YYYY-MM-DD HH:MM:SS or ISO 8601 format"
@@ -170,6 +182,9 @@ msgstr "Любые комбинации «%s» через запятую"
 msgid "value must be a combination of '%s'"
 msgstr "значение должно содержать комбинацию «%s»"
 
+msgid "\"Warning: Option #{switch} is deprecated. %s\""
+msgstr ""
+
 msgid "Can be specified multiple times. "
 msgstr "Может быть указан повторно."
 

data/locale/zh_CN/hammer-cli.po

@@ -6,7 +6,7 @@
 # Automatically generated, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 0.2.0\n"
+"Project-Id-Version: hammer-cli 0.3.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2014-09-16 12:21+0000\n"
 "Last-Translator: Dominic Cleal <dcleal@redhat.com>\n"
@@ -101,6 +101,10 @@ msgstr "远程系统地址"
 msgid "show version"
 msgstr "显示版本"
 
+#, fuzzy
+msgid "unknown version"
+msgstr "显示版本"
+
 msgid "Show ids of associated resources"
 msgstr "显示关联资源的 id"
 
@@ -139,6 +143,9 @@ msgstr "必须使用逗号分开的 key=value 定义该值"
 msgid "Comma separated list of values."
 msgstr "逗号分开的数值列表。"
 
+msgid "numeric value is required"
+msgstr ""
+
 msgid "One of true/false, yes/no, 1/0."
 msgstr "true/false、yes/no、1/0 之一。"
 
@@ -148,10 +155,15 @@ msgstr "选项值必须是 true/false、yes/no、1/0 之一"
 msgid "Unable to parse JSON input"
 msgstr "无法解析 JSON 输入"
 
-msgid "One of %s"
-msgstr "%s 之一"
+msgid "Possible value(s): %s"
+msgstr ""
 
-msgid "value must be one of '%s'"
+#, fuzzy
+msgid "value must be %s"
+msgstr "选项值必须是 '%s' 之一 "
+
+#, fuzzy
+msgid "value must be one of %s"
 msgstr "选项值必须是 '%s' 之一 "
 
 msgid "Date and time in YYYY-MM-DD HH:MM:SS or ISO 8601 format"
@@ -166,6 +178,9 @@ msgstr "'%s' 的任意组合（逗号分开的列表）"
 msgid "value must be a combination of '%s'"
 msgstr "选项值必须是 '%s' 组合之一"
 
+msgid "\"Warning: Option #{switch} is deprecated. %s\""
+msgstr ""
+
 msgid "Can be specified multiple times. "
 msgstr "可多次指定。"
 

data/locale/zh_TW/hammer-cli.po

@@ -6,7 +6,7 @@
 # Automatically generated, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 0.2.0\n"
+"Project-Id-Version: hammer-cli 0.3.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2014-09-16 13:21+0000\n"
 "Last-Translator: Dominic Cleal <dcleal@redhat.com>\n"
@@ -101,6 +101,10 @@ msgstr "遠端系統位址"
 msgid "show version"
 msgstr "顯示版本"
 
+#, fuzzy
+msgid "unknown version"
+msgstr "顯示版本"
+
 msgid "Show ids of associated resources"
 msgstr "顯示相聯資源的 id"
 
@@ -139,6 +143,9 @@ msgstr "值必須以一列逗號區隔開的 key=value 來定義"
 msgid "Comma separated list of values."
 msgstr "逗號區隔開的值。"
 
+msgid "numeric value is required"
+msgstr ""
+
 msgid "One of true/false, yes/no, 1/0."
 msgstr "true/false、yes/no、1/0 之一。"
 
@@ -148,10 +155,15 @@ msgstr "值必須是 true/false、yes/no、1/0 之一"
 msgid "Unable to parse JSON input"
 msgstr "無法叵析 JSON 輸入"
 
-msgid "One of %s"
-msgstr "%s 之一"
+msgid "Possible value(s): %s"
+msgstr ""
 
-msgid "value must be one of '%s'"
+#, fuzzy
+msgid "value must be %s"
+msgstr "值必須是「%s」之一"
+
+#, fuzzy
+msgid "value must be one of %s"
 msgstr "值必須是「%s」之一"
 
 msgid "Date and time in YYYY-MM-DD HH:MM:SS or ISO 8601 format"
@@ -166,6 +178,9 @@ msgstr "任何（以逗號隔開的）「%s」的組合"
 msgid "value must be a combination of '%s'"
 msgstr "值必須是「%s」的組合"
 
+msgid "\"Warning: Option #{switch} is deprecated. %s\""
+msgstr ""
+
 msgid "Can be specified multiple times. "
 msgstr "可指定多次。"
 

data/test/unit/apipie/option_builder_test.rb

@@ -85,6 +85,16 @@ describe HammerCLI::Apipie::OptionBuilder do
       boolean_option.value_formatter.class.must_equal HammerCLI::Options::Normalizers::Bool
     end
 
+    it "should set enum normalizer" do
+      enum_option = options.find {|o| o.attribute_name == HammerCLI.option_accessor_name("enum_param") }
+      enum_option.value_formatter.class.must_equal HammerCLI::Options::Normalizers::Enum
+      enum_option.value_formatter.allowed_values.sort.must_equal ["one", "two", "three"].sort
+    end
+
+    it "should set number normalizer" do
+      numeric_option = options.find {|o| o.attribute_name == HammerCLI.option_accessor_name("numeric_param") }
+      numeric_option.value_formatter.class.must_equal HammerCLI::Options::Normalizers::Number
+    end
   end
 
 
@@ -143,4 +153,3 @@ describe HammerCLI::Apipie::OptionBuilder do
   end
 
 end
-

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

@@ -138,6 +138,24 @@
                                 "expected_type": "boolean",
                                 "description": "",
                                 "required": false
+                            },
+                            {
+                                "name": "enum_param",
+                                "full_name": "documented[enum_param]",
+                                "allow_nil": true,
+                                "validator": "Must be one of: one, two, three.",
+                                "expected_type": "string",
+                                "description": "",
+                                "required": false
+                            },
+                            {
+                                "name": "numeric_param",
+                                "allow_null": false,
+                                "full_name": "documented[numeric_param]",
+                                "validator": "Must be Number",
+                                "expected_type": "number",
+                                "description": "",
+                                "required": false
                             }
                         ],
                         "full_description": ""

data/test/unit/options/normalizers_test.rb

@@ -101,6 +101,18 @@ describe HammerCLI::Options::Normalizers do
     end
   end
 
+  describe 'number' do
+    let(:formatter) { HammerCLI::Options::Normalizers::Number.new }
+
+    it "should return number on numeric values" do
+      formatter.format("1").must_equal 1
+    end
+
+    it "should raise ArgumentError on non-numeric values" do
+      proc { formatter.format("a") }.must_raise ArgumentError
+    end
+  end
+
   describe 'bool' do
 
     let(:formatter) { HammerCLI::Options::Normalizers::Bool.new }
@@ -206,7 +218,7 @@ describe HammerCLI::Options::Normalizers do
     end
 
     it "should list allowed values in description" do
-      formatter.description.must_equal("One of 'a', 'b'")
+      formatter.description.must_equal("Possible value(s): 'a', 'b'")
     end
 
   end
@@ -273,4 +285,3 @@ describe HammerCLI::Options::Normalizers do
   end
 
 end
-

data/test/unit/options/option_definition_test.rb

@@ -18,6 +18,16 @@ describe HammerCLI::Options::OptionDefinition do
       :context_target => :test_option
   end
 
+  class TestDeprecatedOptionCmd < HammerCLI::AbstractCommand
+    option ["--test-option", "--deprecated"], "TEST_OPTION", "Test option",
+      :context_target => :test_option,
+      :deprecated => { "--deprecated" => "Use --test-option instead" }
+    option "--another-deprecated", "OLD_OPTION", "Test old option",
+      :context_target => :old_option,
+      :deprecated => "It is going to be removed"
+  end
+
+
   describe "formatters" do
 
     it "should use formatter to format a default value" do
@@ -41,6 +51,26 @@ describe HammerCLI::Options::OptionDefinition do
     end
   end
 
+  describe "deprecated options" do
+    it "prints deprecation warning" do
+      context = {}
+      cmd = TestDeprecatedOptionCmd.new("", context)
+
+      out, err = capture_io { cmd.run(["--another-deprecated=VALUE"]) }
+      err.must_match /Warning: Option --another-deprecated is deprecated. It is going to be removed/
+      context[:old_option].must_equal "VALUE"
+    end
+
+    it "prints deprecation warning (extended version)" do
+      context = {}
+      cmd = TestDeprecatedOptionCmd.new("", context)
+
+      out, err = capture_io { cmd.run(["--deprecated=VALUE"]) }
+      err.must_match /Warning: Option --deprecated is deprecated. Use --test-option instead/
+      context[:test_option].must_equal "VALUE"
+    end
+  end
+
   describe "context" do
     it "should save option to context" do
       context = {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Martin Bačovský
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2015-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement