hammer_cli 0.7.0 → 0.8.0

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

@@ -8,8 +8,8 @@ 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: 2016-03-08 16:59+0000\n"
+"POT-Creation-Date: 2016-06-14 23:26+0200\n"
+"PO-Revision-Date: 2016-08-12 16:30+0000\n"
 "Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/foreman/foreman/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -54,17 +54,17 @@ msgstr "此類型的次指令不存在：'%<name>s'"
 msgid "no value provided"
 msgstr "未提供值"
 
-#: ../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 ""
+msgstr "無法建立 %s，請在啟用預設值前建立路徑。"
 
-#: ../lib/hammer_cli/defaults.rb:82
+#: ../lib/hammer_cli/defaults.rb:101
 msgid "Defaults management"
-msgstr ""
+msgstr "預設值管理"
 
 #: ../lib/hammer_cli/defaults_commands.rb:25
 msgid "List all the providers"
-msgstr ""
+msgstr "列出所有供應者"
 
 #: ../lib/hammer_cli/defaults_commands.rb:37
 msgid "Provider"
@@ -72,7 +72,7 @@ msgstr "供應商"
 
 #: ../lib/hammer_cli/defaults_commands.rb:38
 msgid "Supported defaults"
-msgstr ""
+msgstr "已支援的預設值"
 
 #: ../lib/hammer_cli/defaults_commands.rb:39
 msgid "Description"
@@ -80,7 +80,7 @@ msgstr "說明"
 
 #: ../lib/hammer_cli/defaults_commands.rb:56
 msgid "List all the default parameters"
-msgstr ""
+msgstr "列出所有預設參數"
 
 #: ../lib/hammer_cli/defaults_commands.rb:67
 msgid "Parameter"
@@ -92,63 +92,63 @@ msgstr "值"
 
 #: ../lib/hammer_cli/defaults_commands.rb:86
 msgid "Delete a default param"
-msgstr ""
+msgstr "刪除預設參數"
 
 #: ../lib/hammer_cli/defaults_commands.rb:87
 msgid "The name of the default option"
-msgstr ""
+msgstr "預設選項的名稱"
 
 #: ../lib/hammer_cli/defaults_commands.rb:103
 msgid "Add a default parameter to config"
-msgstr ""
+msgstr "新增預設參數至配置"
 
 #: ../lib/hammer_cli/defaults_commands.rb:104
 msgid "The name of the default option (e.g. organization_id)."
-msgstr ""
+msgstr "預設選項的名稱（例如 organization_id）。"
 
 #: ../lib/hammer_cli/defaults_commands.rb:105
 msgid "The value for the default option"
-msgstr ""
+msgstr "預設選項的值"
 
 #: ../lib/hammer_cli/defaults_commands.rb:106
 msgid ""
 "The name of the provider providing the value. For list available providers "
 "see `hammer defaults providers`."
-msgstr ""
+msgstr "提供這個值的供應者。欲知可用供應者的清單，請參見「hammer defaults providers」。"
 
 #: ../lib/hammer_cli/defaults_commands.rb:134
 msgid ""
 "Added %{key_val} default-option with value that will be generated from the "
 "server."
-msgstr ""
+msgstr "已新增 %{key_val} 預設選項與預設值，這是由伺服器所產生。"
 
 #: ../lib/hammer_cli/defaults_commands.rb:135
 msgid "Added %{key_val} default-option with value %{val_val}."
-msgstr ""
+msgstr "已新增 %{key_val} 預設選項，數值為 %{val_val}。"
 
 #: ../lib/hammer_cli/defaults_commands.rb:139
 msgid ""
 "\"Provider #{namespace} was not found. See `hammer defaults providers` for "
 "available providers.\""
-msgstr ""
+msgstr "\"找不到供應者 #{namespace}。欲知可用的供應者，請參見 `hammer defaults providers`。\""
 
 #: ../lib/hammer_cli/defaults_commands.rb:143
 msgid ""
 "The param name is not supported by provider. See `hammer defaults providers`"
 " for supported params."
-msgstr ""
+msgstr "供應者並不支援此參數名稱。欲知支援的參數名稱，請參閱 `hammer defaults providers`。"
 
 #: ../lib/hammer_cli/defaults_commands.rb:147
 msgid "%{param} was deleted successfully."
-msgstr ""
+msgstr "已成功刪除 %{param}。"
 
 #: ../lib/hammer_cli/defaults_commands.rb:151
 msgid "You must specify value or a provider name, cant specify both."
-msgstr ""
+msgstr "您必須指定值或供應者名稱，但不能同時指定兩者。"
 
 #: ../lib/hammer_cli/defaults_commands.rb:155
 msgid "Couldn't find the requested param in %s."
-msgstr ""
+msgstr "在 %s 中找不到要求的參數。"
 
 #: ../lib/hammer_cli/exception_handler.rb:62
 msgid "Error: %s"
@@ -266,65 +266,66 @@ msgstr "警告：載入 %s 模組時發生了錯誤"
 msgid "Error: Some of the required modules are disabled in configuration: %s "
 msgstr "錯誤：某些必要的模組在配置中已停用：%s "
 
-#: ../lib/hammer_cli/options/normalizers.rb:26
+#: ../lib/hammer_cli/options/normalizers.rb:29
 msgid "Comma-separated list of key=value."
 msgstr "逗號區隔開的一列 key=value。"
 
-#: ../lib/hammer_cli/options/normalizers.rb:39
-msgid "value must be defined as a comma-separated list of key=value"
-msgstr "值必須以一列逗號區隔開的 key=value 來定義"
+#: ../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 "逗號區隔開的值。"
 
-#: ../lib/hammer_cli/options/normalizers.rb:88
+#: ../lib/hammer_cli/options/normalizers.rb:100
 msgid "numeric value is required"
-msgstr ""
+msgstr "需要數字值"
 
-#: ../lib/hammer_cli/options/normalizers.rb:102
+#: ../lib/hammer_cli/options/normalizers.rb:114
 msgid "One of true/false, yes/no, 1/0."
 msgstr "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 "值必須是 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 "無法叵析 JSON 輸入"
 
-#: ../lib/hammer_cli/options/normalizers.rb:165
+#: ../lib/hammer_cli/options/normalizers.rb:177
 msgid "Possible value(s): %s"
-msgstr ""
+msgstr "可能的值：%s"
 
-#: ../lib/hammer_cli/options/normalizers.rb:173
+#: ../lib/hammer_cli/options/normalizers.rb:185
 msgid "value must be %s"
-msgstr "值必須是「%s」之一"
+msgstr "值必須是 %s"
 
-#: ../lib/hammer_cli/options/normalizers.rb:175
+#: ../lib/hammer_cli/options/normalizers.rb:187
 msgid "value must be one of %s"
-msgstr "值必須是「%s」之一"
+msgstr "值必須是 %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 "日期與時間，格式為 YYYY-MM-DD HH:MM:SS 或是 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」不是個有效的日期"
 
-#: ../lib/hammer_cli/options/normalizers.rb:214
+#: ../lib/hammer_cli/options/normalizers.rb:226
 msgid "Any combination (comma separated list) of '%s'"
 msgstr "任何（以逗號隔開的）「%s」的組合"
 
-#: ../lib/hammer_cli/options/normalizers.rb:234
+#: ../lib/hammer_cli/options/normalizers.rb:246
 msgid "value must be a combination of '%s'"
 msgstr "值必須是「%s」的組合"
 
 #: ../lib/hammer_cli/options/option_definition.rb:56
 msgid "Warning: Option %{option} is deprecated. %{message}"
-msgstr ""
+msgstr "警告：選項 %{option} 已淘汰。%{message}"
 
 #: ../lib/hammer_cli/options/option_definition.rb:80
 msgid "Can be specified multiple times. "
@@ -338,26 +339,32 @@ msgstr "預設值："
 msgid ", or "
 msgstr "，或是"
 
-#: ../lib/hammer_cli/output/adapter/csv.rb:174
+#: ../lib/hammer_cli/output/adapter/csv.rb:179
 msgid "Message"
 msgstr "訊息"
 
-#: ../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 "名稱"
 
-#: ../lib/hammer_cli/output/formatters.rb:154
-msgid "yes"
-msgstr "是"
+#: ../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 "否"
 
+#: ../lib/hammer_cli/output/formatters.rb:160
+msgid "yes"
+msgstr "是"
+
 #: ../lib/hammer_cli/settings.rb:27
 msgid ""
 "Warning: location hammer.modules.d is deprecated, move your module "
@@ -402,10 +409,26 @@ msgstr "您不可一次將所有選項設為 %s"
 msgid "Options %s are required"
 msgstr "%s 選項乃必要的"
 
-#: ../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 "您不可將任何選項設為 %s"
 
-#: ../lib/hammer_cli/validator.rb:80
+#: ../lib/hammer_cli/validator.rb:91
 msgid "At least one of options %s is required"
 msgstr "需要至少一項 %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/zh_TW/hammer-cli.po

@@ -7,7 +7,7 @@
 # tchuang <tchuang@redhat.com>, 2015. #zanata
 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"
 "PO-Revision-Date: 2015-04-28 05:21+0000\n"
 "Last-Translator: tchuang <tchuang@redhat.com>\n"
@@ -47,7 +47,7 @@ msgstr "此類型的次指令不存在：'%<name>s'"
 msgid "no value provided"
 msgstr "未提供值"
 
-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"
@@ -103,8 +103,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 ""
@@ -115,7 +115,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."
@@ -256,6 +256,12 @@ msgstr "值必須是「%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 "可指定多次。"
 
@@ -274,9 +280,7 @@ msgstr "ID"
 msgid "Name"
 msgstr "名稱"
 
-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"
@@ -290,6 +294,9 @@ msgid ""
 "ons to cli.modules.d"
 msgstr "警告：hammer.modules.d 這個位置已淘汰使用，請將您的模組配置移至 cli.modules.d"
 
+msgid "Warning: Couldn't load configuration file %{path}: %{message}"
+msgstr ""
+
 msgid "Print help for commands"
 msgstr "印出指令的說明"
 

data/test/functional/defaults_test.rb

@@ -151,7 +151,7 @@ describe 'commands' do
     it 'reports missing parameter value or source' do
       options = ['--param-name=organization_id']
 
-      expected_result = CommandExpectation.new("You must specify value or a provider name, cant specify both.\n", "", HammerCLI::EX_USAGE)
+      expected_result = CommandExpectation.new("You must specify value or a provider name, can't specify both.\n", "", HammerCLI::EX_USAGE)
 
       result = run_cmd(cmd + options, @context)
       assert_cmd(expected_result, result)

data/test/unit/apipie/option_builder_test.rb

@@ -14,10 +14,6 @@ describe HammerCLI::Apipie::OptionBuilder do
     })
   end
 
-  before :each do
-    HammerCLI::I18n.clear
-  end
-
   let(:resource) {api.resource(:documented)}
   let(:action) {resource.action(:index)}
   let(:builder) { HammerCLI::Apipie::OptionBuilder.new(resource, action) }

data/test/unit/exception_handler_test.rb

@@ -51,7 +51,7 @@ describe HammerCLI::ExceptionHandler do
     ex = RestClient::ResourceNotFound.new
     output.default_adapter = :silent
     handler.handle_exception(ex)
-    @log_output.readline.strip.must_equal 'ERROR  Exception : Resource Not Found'
+    @log_output.readline.strip.must_match /ERROR  Exception : (Resource )?Not Found/
   end
 
 end

data/test/unit/i18n_test.rb

@@ -23,28 +23,74 @@ describe HammerCLI::I18n do
     end
   end
 
-  before :each do
-    HammerCLI::I18n.clear
+  let(:fast_gettext_version) { '1.2.0' }
+
+  before do
+    @domains_backup ||= HammerCLI::I18n.domains.dup
+    HammerCLI::I18n.stubs(:fast_gettext_version).returns(fast_gettext_version)
+    HammerCLI::I18n.init
+  end
+
+  after do
+    mocha_teardown
+    HammerCLI::I18n.init(@domains_backup)
   end
 
   let(:domain1) { TestLocaleDomain.new('domain1', true) }
   let(:domain2) { TestLocaleDomain.new('domain2', true) }
   let(:unavailable_domain) { TestLocaleDomain.new('domain3', false) }
 
-  it "registers available domains at gettext" do
-    FastGettext.expects(:add_text_domain).with do |name, options|
-      (name == domain1.domain_name) && (options[:path] == domain1.locale_dir) && (options[:type] == domain1.type)
+  # skip the tests on older versions of fast_gettext (ruby 2.0)
+  if FastGettext::VERSION >= '1.2.0'
+    describe "with fast_gettext >= 1.2.0" do
+      it "creates base merge repository" do
+        HammerCLI::I18n.translation_repository.class.must_equal FastGettext::TranslationRepository::Merge
+      end
+
+      it "registers available domains at gettext" do
+        repo = mock
+        FastGettext::TranslationRepository.expects(:build).with(domain1.domain_name,
+          :path => domain1.locale_dir,
+          :type => domain1.type,
+          :report_warning => false).returns(repo)
+
+        HammerCLI::I18n.translation_repository.expects(:add_repo).with(repo)
+        HammerCLI::I18n.add_domain(domain1)
+      end
+
+      it "skips registering domains that are not available" do
+        HammerCLI::I18n.add_domain(domain1)
+        HammerCLI::I18n.add_domain(domain2)
+        HammerCLI::I18n.add_domain(unavailable_domain)
+        HammerCLI::I18n.domains.must_equal [domain1, domain2]
+      end
     end
-    HammerCLI::I18n.add_domain(domain1)
   end
 
-  it "skips registering domains that are not available" do
-    HammerCLI::I18n.add_domain(domain1)
-    HammerCLI::I18n.add_domain(domain2)
-    HammerCLI::I18n.add_domain(unavailable_domain)
-    HammerCLI::I18n.domains.must_equal [domain1, domain2]
-  end
+  describe "with fast_gettext < 1.2.0" do
+    let(:fast_gettext_version) { '1.1.0' }
 
+    it "creates base chain repository" do
+      HammerCLI::I18n.translation_repository.class.must_equal FastGettext::TranslationRepository::Chain
+    end
+
+    it "registers available domains at gettext" do
+      repo = mock
+      FastGettext::TranslationRepository.expects(:build).with(domain1.domain_name,
+        :path => domain1.locale_dir,
+        :type => domain1.type,
+        :report_warning => false).returns(repo)
+
+      HammerCLI::I18n.translation_repository.chain.expects(:<<).with(repo)
+      HammerCLI::I18n.add_domain(domain1)
+    end
 
+    it "skips registering domains that are not available" do
+      HammerCLI::I18n.add_domain(domain1)
+      HammerCLI::I18n.add_domain(domain2)
+      HammerCLI::I18n.add_domain(unavailable_domain)
+      HammerCLI::I18n.domains.must_equal [domain1, domain2]
+    end
+  end
 end
 

data/test/unit/options/option_definition_test.rb

@@ -27,6 +27,9 @@ describe HammerCLI::Options::OptionDefinition do
       :deprecated => "It is going to be removed"
   end
 
+  def opt_with_deprecation(deprecation)
+    HammerCLI::Options::OptionDefinition.new(["--test-option", "--better-switch"], "TEST_OPTION", "Test option", :deprecated => deprecation)
+  end
 
   describe "formatters" do
 
@@ -69,6 +72,21 @@ describe HammerCLI::Options::OptionDefinition do
       err.must_match /Warning: Option --deprecated is deprecated. Use --test-option instead/
       context[:test_option].must_equal "VALUE"
     end
+
+    it 'shows depracated message in help' do
+      opt = opt_with_deprecation("Use --better-switch instead")
+      opt.description.must_equal "Test option (Deprecated: Use --better-switch instead)"
+    end
+
+    it 'shows flag specific depracated message in help' do
+      opt = opt_with_deprecation('--test-option' => "Use --better-switch instead")
+      opt.description.must_equal "Test option (--test-option is deprecated: Use --better-switch instead)"
+    end
+
+    it 'shows multiple flag specific depracated messages in help' do
+      opt = opt_with_deprecation('--test-option' => "Use --better-switch instead", '--test-option2' => 'This is deprecated too')
+      opt.description.must_equal "Test option (--test-option is deprecated: Use --better-switch instead, --test-option2 is deprecated: This is deprecated too)"
+    end
   end
 
   describe "context" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Martin Bačovský
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -282,6 +282,7 @@ files:
 - locale/zh_TW/hammer-cli.edit.po
 - locale/zh_TW/hammer-cli.po
 - locale/zh_TW/hammer-cli.po.time_stamp
+- man/hammer.1.gz
 - test/functional/defaults_test.rb
 - test/functional/test_helper.rb
 - test/reports/TEST-Fields-ContainerField-display-.xml