hammer_cli 0.3.0 → 0.4.0

data/locale/zh_CN/hammer-cli.po

@@ -1,28 +1,25 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the hammer-cli package.
-#
-# Translators:
-# Automatically generated, 2014
+# Leah Liu <lliu@redhat.com>, 2013. #zanata
+# Leah Liu <lliu@redhat.com>, 2014. #zanata
+# Leah Liu <lliu@redhat.com>, 2015. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 0.3.0\n"
+"Project-Id-Version: hammer-cli 0.4.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"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/foreman/la"
-"nguage/zh_CN/)\n"
+"PO-Revision-Date: 2015-04-27 01:22+0000\n"
+"Last-Translator: Leah Liu <lliu@redhat.com>\n"
+"Language-Team: Chinese (China)\n"
+"Language: zh-CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+"X-Generator: Zanata 3.6.0\n"
 
 msgid "too many arguments"
-msgstr "太多参数"
+msgstr "参数太多"
 
 msgid "option '%<option>s' is required"
-msgstr "需要选项 '%<option>s' "
+msgstr "需要选项 '%<option>s'"
 
 msgid "option '%<option>s' (or env %<env>s) is required"
 msgstr "需要选项 '%<option>s'（或者 env %<env>s）"
@@ -37,57 +34,58 @@ msgid "%<env>s: %<message>s"
 msgstr "%<env>s: %<message>s"
 
 msgid "Unrecognised option '%<switch>s'"
-msgstr "未识别的选项 '%<switch>s' "
+msgstr "无法识别的选项 '%<switch>s'"
 
 msgid "No such sub-command '%<name>s'"
-msgstr "没有此子命令 '%<name>s'"
+msgstr "没有子命令 '%<name>s'"
 
 msgid "no value provided"
-msgstr "未提供值"
+msgstr "未提供数值"
 
+# translation auto-copied from project nm-applet, version 0.8.1, document nm-applet
 msgid "Error: %s"
 msgstr "错误：%s"
 
 msgid "Error: %{message}"
-msgstr ""
+msgstr "错误：%{message}"
 
 msgid "See: '%{path} --help'"
-msgstr ""
+msgstr "请查看： '%{path} --help'"
 
 msgid "Invalid username or password"
-msgstr "无效用户名或者密码"
+msgstr "无效用户名或密码"
 
 msgid "Could not load the API description from the server"
-msgstr ""
+msgstr "无法从服务器载入 API 描述"
 
 msgid "is the server down?"
-msgstr ""
+msgstr "服务器宕机了吗？"
 
 msgid ""
 "was '%s' run on the server when using apipie cache? (typical production settin"
 "gs)"
-msgstr ""
+msgstr "使用 apipie 缓存时服务器中是否运行了 '%s'？（典型产品设置）"
 
 msgid "Missing arguments for %s"
-msgstr ""
+msgstr "缺少 %s 的参数"
 
 msgid "No permissions to create log dir %s"
-msgstr "没有生产日志目录 %s 的权限"
+msgstr "没有创建日志目录 %s 的权限"
 
 msgid "File %s not writeable, won't log anything to the file!"
-msgstr "无法写入文件 %s，不会在该文件中记录任何信息！"
+msgstr "无法写入文件 %s，因此无法记录文件的任何变化！"
 
 msgid "be verbose"
-msgstr "详细输出"
+msgstr "更详细"
 
 msgid "show debugging output "
-msgstr "显示 debug 输出结果"
+msgstr "显示调试输出结果"
 
 msgid "force reload of Apipie cache"
-msgstr ""
+msgstr "强制重新载入 Apipie 缓存"
 
 msgid "path to custom config file"
-msgstr "定制配置文件路径"
+msgstr "到自定义配置文件的路径"
 
 msgid "username to access the remote system"
 msgstr "访问远程系统的用户名"
@@ -98,12 +96,12 @@ msgstr "访问远程系统的密码"
 msgid "remote system address"
 msgstr "远程系统地址"
 
+# translation auto-copied from project libvirt, version 1.1.1, document libvirt
 msgid "show version"
 msgstr "显示版本"
 
-#, fuzzy
 msgid "unknown version"
-msgstr "显示版本"
+msgstr "未知版本"
 
 msgid "Show ids of associated resources"
 msgstr "显示关联资源的 id"
@@ -112,13 +110,13 @@ msgid "Explicitly turn interactive mode on/off"
 msgstr "明确打开/关闭互动模式"
 
 msgid "Output as CSV (same as --output=csv)"
-msgstr "输出为 CSV（等同于 --output=csv）"
+msgstr "作为 CSV 输出（与 --output=csv 相同） "
 
 msgid "Set output format. One of [%s]"
-msgstr "设定输出格式。[%s] 之一。"
+msgstr "设定输出格式。[%s] 之一"
 
 msgid "Character to separate the values"
-msgstr "分开选项值的字符"
+msgstr "用来分开数值的字符"
 
 msgid "Get list of possible endings"
 msgstr "获取可能结尾的列表"
@@ -126,19 +124,19 @@ msgstr "获取可能结尾的列表"
 msgid ""
 "Legacy configuration of modules detected. Check section about configuration in"
 " user manual"
-msgstr "探测到模块继承配置。请在用户手册中查看有关配置的章节。"
+msgstr "探测到遗留的模块配置。请在用户手册中查看有关配置一节。"
 
 msgid "Warning: An error occured while loading module %s"
 msgstr "警告：载入模块 %s 时出错"
 
 msgid "Error: Some of the required modules are disabled in configuration: %s "
-msgstr ""
+msgstr "错误：在配置中禁用了一些要求的模块：%s"
 
 msgid "Comma-separated list of key=value."
 msgstr "用逗号分开的 key=value 列表。"
 
 msgid "value must be defined as a comma-separated list of key=value"
-msgstr "必须使用逗号分开的 key=value 定义该值"
+msgstr "必须使用以逗号分开的 key=value 列表定义数值"
 
 msgid "Comma separated list of values."
 msgstr "逗号分开的数值列表。"
@@ -147,10 +145,10 @@ msgid "numeric value is required"
 msgstr ""
 
 msgid "One of true/false, yes/no, 1/0."
-msgstr "true/false、yes/no、1/0 之一。"
+msgstr "从 true/false、yes/no、1/0 中选择一组。"
 
 msgid "value must be one of true/false, yes/no, 1/0"
-msgstr "选项值必须是 true/false、yes/no、1/0 之一"
+msgstr "数值必须是 true/false、yes/no、1/0 中的一个"
 
 msgid "Unable to parse JSON input"
 msgstr "无法解析 JSON 输入"
@@ -160,11 +158,11 @@ msgstr ""
 
 #, fuzzy
 msgid "value must be %s"
-msgstr "选项值必须是 '%s' 之一 "
+msgstr "数值必须是 '%s' 中的一个"
 
 #, fuzzy
 msgid "value must be one of %s"
-msgstr "选项值必须是 '%s' 之一 "
+msgstr "数值必须是 '%s' 中的一个"
 
 msgid "Date and time in YYYY-MM-DD HH:MM:SS or ISO 8601 format"
 msgstr "日期和时间格式为 YYYY-MM-DD HH:MM:SS 或者 ISO 8601 格式"
@@ -173,45 +171,51 @@ msgid "'%s' is not a valid date"
 msgstr "'%s' 不是有效日期"
 
 msgid "Any combination (comma separated list) of '%s'"
-msgstr "'%s' 的任意组合（逗号分开的列表）"
+msgstr "'%s' 的任意组合（用逗号分开的列表）"
 
 msgid "value must be a combination of '%s'"
-msgstr "选项值必须是 '%s' 组合之一"
+msgstr "数值必须为 '%s' 之一"
 
 msgid "\"Warning: Option #{switch} is deprecated. %s\""
 msgstr ""
 
 msgid "Can be specified multiple times. "
-msgstr "可多次指定。"
+msgstr "无法多次指定。"
 
 msgid ", or "
 msgstr "，或者"
 
+# translation auto-copied from project control-center, version 3.8.6, document gnome-control-center-2.0
 msgid "Default: "
 msgstr "默认："
 
+# translation auto-copied from project webkitgtk3, version 2.0.3, document webkitgtk3, author Leah Liu
 msgid "Message"
 msgstr "信息"
 
+# translation auto-copied from project libvirt, version 1.1.1, document libvirt
 msgid "Id"
 msgstr "Id"
 
+# translation auto-copied from project nm-applet, version 0.8.1, document nm-applet
 msgid "Name"
 msgstr "名称"
 
+# translation auto-copied from project firstboot, version 19.6, document firstboot, author Leah Liu
 msgid "no"
 msgstr "否"
 
+# translation auto-copied from project NetworkManager, version 0.9.9.0, document NetworkManager
 msgid "yes"
 msgstr "是"
 
 msgid ""
 "Warning: location hammer.modules.d is deprecated, move your module configurati"
 "ons to cli.modules.d"
-msgstr "警告：位置 hammer.modules.d 失效，请将模块配置转移到 cli.modules.d。"
+msgstr "警告：位置 hammer.modules.d 已启用，请将您的模块配置移至 cli.modules.d。"
 
 msgid "Print help for commands"
-msgstr "打印命令帮助信息"
+msgstr "输出命令帮助信息"
 
 msgid "Exit interactive shell"
 msgstr "退出互动 shell"
@@ -220,7 +224,7 @@ msgid "Welcome to the hammer interactive shell"
 msgstr "欢迎使用 hammer 互动 shell"
 
 msgid "Type 'help' for usage information"
-msgstr "输入‘help’查看用法信息"
+msgstr "输入 ‘help’ 获取用法信息"
 
 msgid "Interactive shell"
 msgstr "互动 shell"
@@ -228,19 +232,19 @@ msgstr "互动 shell"
 msgid ""
 "can't replace subcommand %<name>s (%<existing_class>s) with %<name>s (%<new_cl"
 "ass>s)"
-msgstr ""
+msgstr "无法使用 %<name>s（%<new_class>s）替换子命令 %<name>s（%<existing_class>s）"
 
 msgid "Unknown option name '%s'"
 msgstr "未知选项名称 '%s'"
 
 msgid "You can't set all options %s at one time"
-msgstr "您无法一次设置所有选项 %s"
+msgstr "无法一次设置所有选项 %s"
 
 msgid "Options %s are required"
-msgstr "必须提供选项 %s"
+msgstr "需要选项 %s"
 
 msgid "You can't set any of options %s"
-msgstr "您无法设置任意选项 %s"
+msgstr "无法设置任意选项 %s"
 
 msgid "At least one of options %s is required"
-msgstr "至少需要一个选项 %s"
+msgstr "至少需要选项 %s 中的一个"

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

@@ -9,9 +9,9 @@ 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"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/foreman/language/zh_TW/)\n"
+"PO-Revision-Date: 2015-09-16 12:51+0000\n"
+"Last-Translator: mbacovsky <martin.bacovsky@gmail.com>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/foreman/foreman/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -132,7 +132,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"
@@ -196,7 +196,7 @@ msgstr "警告：載入 %s 模組時發生了錯誤"
 
 #: 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"
@@ -204,11 +204,11 @@ msgstr "錯誤：%s"
 
 #: lib/hammer_cli/exception_handler.rb:68
 msgid "Error: %{message}"
-msgstr ""
+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"
@@ -216,21 +216,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 "使用 apipie 快取時 '%s' 是否有在伺服器上運作？（典型的生產設定）"
 
 #: 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'"
@@ -296,4 +296,4 @@ msgstr "互動式 shell"
 msgid ""
 "can't replace subcommand %<name>s (%<existing_class>s) with %<name>s "
 "(%<new_class>s)"
-msgstr ""
+msgstr "無法將次指令 %<name>s (%<existing_class>s) 替換為 %<name>s (%<new_class>s)"

data/locale/zh_TW/hammer-cli.po

@@ -4,19 +4,21 @@
 #
 # Translators:
 # Automatically generated, 2014
+# tchuang <tchuang@redhat.com>, 2015. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 0.3.0\n"
+"Project-Id-Version: hammer-cli 0.4.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"
+"PO-Revision-Date: 2015-04-28 05:21+0000\n"
+"Last-Translator: tchuang <tchuang@redhat.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/foreman/l"
 "anguage/zh_TW/)\n"
+"Language: zh-TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Zanata 3.6.0\n"
 
 msgid "too many arguments"
 msgstr "引數過多"
@@ -49,27 +51,27 @@ msgid "Error: %s"
 msgstr "錯誤：%s"
 
 msgid "Error: %{message}"
-msgstr ""
+msgstr "錯誤：%{message}"
 
 msgid "See: '%{path} --help'"
-msgstr ""
+msgstr "請參閱：'%{path} --help'"
 
 msgid "Invalid username or password"
 msgstr "無效的使用者名稱或密碼"
 
 msgid "Could not load the API description from the server"
-msgstr ""
+msgstr "無法從伺服器載入 API 描述"
 
 msgid "is the server down?"
-msgstr ""
+msgstr "伺服器是否沒有在運作？"
 
 msgid ""
 "was '%s' run on the server when using apipie cache? (typical production settin"
 "gs)"
-msgstr ""
+msgstr "使用 apipie 快取時 '%s' 是否有在伺服器上運作？（典型的生產設定）"
 
 msgid "Missing arguments for %s"
-msgstr ""
+msgstr "%s 缺少了引數"
 
 msgid "No permissions to create log dir %s"
 msgstr "沒有建立日誌目錄 %s 的權限"
@@ -84,7 +86,7 @@ msgid "show debugging output "
 msgstr "顯示除錯輸出"
 
 msgid "force reload of Apipie cache"
-msgstr ""
+msgstr "強制重新載入 Apipie 快取"
 
 msgid "path to custom config file"
 msgstr "自訂配置檔案的路徑"
@@ -101,9 +103,8 @@ msgstr "遠端系統位址"
 msgid "show version"
 msgstr "顯示版本"
 
-#, fuzzy
 msgid "unknown version"
-msgstr "顯示版本"
+msgstr "不明的版本"
 
 msgid "Show ids of associated resources"
 msgstr "顯示相聯資源的 id"
@@ -132,7 +133,7 @@ msgid "Warning: An error occured while loading module %s"
 msgstr "警告：載入 %s 模組時發生了錯誤"
 
 msgid "Error: Some of the required modules are disabled in configuration: %s "
-msgstr ""
+msgstr "錯誤：某些必要的模組在配置中已停用：%s "
 
 msgid "Comma-separated list of key=value."
 msgstr "逗號區隔開的一列 key=value。"
@@ -228,7 +229,7 @@ msgstr "互動式 shell"
 msgid ""
 "can't replace subcommand %<name>s (%<existing_class>s) with %<name>s (%<new_cl"
 "ass>s)"
-msgstr ""
+msgstr "無法將次指令 %<name>s (%<existing_class>s) 替換為 %<name>s (%<new_class>s)"
 
 msgid "Unknown option name '%s'"
 msgstr "不明選項名稱「%s」"

data/test/unit/abstract_test.rb

@@ -86,6 +86,8 @@ describe HammerCLI::AbstractCommand do
   context "logging" do
 
     before :each do
+      HammerCLI::Settings.clear
+      HammerCLI::Settings.load(:watch_plain => false)
       @log_output = Logging::Appenders['__test__']
       @log_output.reset
     end
@@ -96,13 +98,6 @@ describe HammerCLI::AbstractCommand do
       @log_output.readline.strip.must_equal "INFO  HammerCLI::AbstractCommand : Called with options: {}"
     end
 
-    it "password should be hidden in logs" do
-      test_command_class = Class.new(HammerCLI::AbstractCommand)
-      test_command_class.option(['--password'], 'PASSWORD', 'Password')
-      test_command = test_command_class.new("")
-      test_command.run ['--password=pass']
-      @log_output.readline.strip.must_equal "INFO  HammerCLI::AbstractCommand : Called with options: {\"option_password\"=>\"***\"}"
-    end
 
     class TestLogCmd < HammerCLI::AbstractCommand
       def execute
@@ -170,6 +165,29 @@ describe HammerCLI::AbstractCommand do
       test_command.run []
       @log_output.read.must_include "DEBUG  TestLogCmd5 : Test\n{\n  :a => \"a\"\n}"
     end
+
+    class TestLogCmd6 < HammerCLI::AbstractCommand
+      def execute
+        logger.watch "Test", { :password => 'password', "password" => "password" }
+        0
+      end
+    end
+
+    it "censors passwords from the debug logs" do
+      test_command = Class.new(TestLogCmd6).new("")
+      HammerCLI::Settings.clear
+      HammerCLI::Settings.load(:watch_plain => true)
+      test_command.run []
+      @log_output.read.must_include "DEBUG  TestLogCmd6 : Test\n{\n  :password  => \"***\",\n  \"password\" => \"***\"\n}"
+    end
+
+    it "password parameters should be hidden in logs" do
+      test_command_class = Class.new(HammerCLI::AbstractCommand)
+      test_command_class.option(['--password'], 'PASSWORD', 'Password')
+      test_command = test_command_class.new("")
+      test_command.run ['--password=pass']
+      @log_output.readline.strip.must_equal "INFO  HammerCLI::AbstractCommand : Called with options: {\"option_password\"=>\"***\"}"
+    end
   end
 
   context "subcommand behavior" do

data/test/unit/logger_test.rb

@@ -0,0 +1,18 @@
+require File.join(File.dirname(__FILE__), 'test_helper')
+require 'tempfile'
+
+describe Logging::LogEvent do
+  context "filtering" do
+    before :each do
+      @log_output = Logging::Appenders['__test__']
+      @log_output.reset
+    end
+
+    it "can filter log data" do
+      Logging::LogEvent.add_data_filter(/pat/, 'mat')
+      Logging.logger.root.debug "pat"
+      Logging::LogEvent.data_filters.pop # clean the last filter
+      @log_output.read.must_include 'mat'
+    end
+  end
+end

data/test/unit/settings_test.rb

@@ -91,7 +91,7 @@ describe HammerCLI::Settings do
     end
 
     it "loads settings from file" do
-      settings.load_from_paths [config2.path, config1.path]
+      [config1.path, config2.path].each { |config| settings.load_from_file config }
       settings.get(:host).must_equal 'https://localhost.localdomain/'
       settings.get(:username).must_equal 'admin'
     end
@@ -103,7 +103,7 @@ describe HammerCLI::Settings do
     end
 
     it "store config path history" do
-      settings.load_from_paths [config2.path, config1.path]
+      [config1.path, config2.path].each { |config| settings.load_from_file config }
       settings.path_history.must_equal [config1.path, config2.path]
     end
 
@@ -120,7 +120,8 @@ describe HammerCLI::Settings do
           f.write("  :param2: 'value2'\n")
         end
 
-        settings.load_from_paths [config1.path, dir]
+        settings.load_from_paths [dir]
+        settings.load_from_file config1.path
 
         settings.get(:host).must_equal 'https://localhost/'
         settings.get(:username).must_equal 'admin'

data/test/unit/test_helper.rb

@@ -8,13 +8,13 @@ SimpleCov.start do
 end
 SimpleCov.root Pathname.new(File.dirname(__FILE__) + "../../../")
 
-
 require 'minitest/autorun'
 require 'minitest/spec'
 require "minitest-spec-context"
 require "mocha/setup"
 
 require 'hammer_cli'
+require 'hammer_cli/logger'
 
 Logging.logger.root.appenders = Logging::Appenders['__test__'] || Logging::Appenders::StringIo.new('__test__')