hammer_cli 0.1.4 → 0.2.0

data/locale/zh_TW/hammer-cli.po

@@ -1,292 +1,231 @@
 # 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
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 0.1.4\n"
+"Project-Id-Version: hammer-cli 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-15 12:50+0100\n"
 "PO-Revision-Date: 2014-09-16 13:21+0000\n"
 "Last-Translator: Dominic Cleal <dcleal@redhat.com>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/foreman/language/zh_TW/)\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/foreman/l"
+"anguage/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"
 
-#: lib/hammer_cli/subcommand.rb:56
+msgid "too many arguments"
+msgstr "引數過多"
+
+msgid "option '%<option>s' is required"
+msgstr "需要使用 '%<option>s' 選項"
+
+msgid "option '%<option>s' (or env %<env>s) is required"
+msgstr "需要使用 '%<option>s'（或是 %<env>s 環境）選項"
+
+msgid "option '%<switch>s': %<message>s"
+msgstr "選項 '%<switch>s'：%<message>s"
+
+msgid "parameter '%<param>s': %<message>s"
+msgstr "參數 '%<param>s'：%<message>s"
+
+msgid "%<env>s: %<message>s"
+msgstr "%<env>s：%<message>s"
+
+msgid "Unrecognised option '%<switch>s'"
+msgstr "無法辨識的選項 '%<switch>s'"
+
+msgid "No such sub-command '%<name>s'"
+msgstr "此類型的次指令不存在：'%<name>s'"
+
+msgid "no value provided"
+msgstr "未提供值"
+
+msgid "Error: %s"
+msgstr "錯誤：%s"
+
+msgid "Error: %{message}"
+msgstr ""
+
+msgid "See: '%{path} --help'"
+msgstr ""
+
+msgid "Invalid username or password"
+msgstr "無效的使用者名稱或密碼"
+
+msgid "Could not load the API description from the server"
+msgstr ""
+
+msgid "is the server down?"
+msgstr ""
+
 msgid ""
-"can't replace subcommand %<name>s (%<existing_class>s) with %<name>s "
-"(%<new_class>s)"
+"was '%s' run on the server when using apipie cache? (typical production settin"
+"gs)"
+msgstr ""
+
+msgid "Missing arguments for %s"
 msgstr ""
 
-#: lib/hammer_cli/logger.rb:28
 msgid "No permissions to create log dir %s"
 msgstr "沒有建立日誌目錄 %s 的權限"
 
-#: lib/hammer_cli/logger.rb:43
 msgid "File %s not writeable, won't log anything to the file!"
 msgstr "%s 檔案不允許寫入，將不會記錄任何資料至此檔案中！"
 
-#: lib/hammer_cli/main.rb:7
 msgid "be verbose"
 msgstr "詳細提供資料"
 
-#: lib/hammer_cli/main.rb:8
 msgid "show debugging output "
 msgstr "顯示除錯輸出"
 
-#: lib/hammer_cli/main.rb:9
+msgid "force reload of Apipie cache"
+msgstr ""
+
 msgid "path to custom config file"
 msgstr "自訂配置檔案的路徑"
 
-#: lib/hammer_cli/main.rb:11
 msgid "username to access the remote system"
 msgstr "用來存取遠端系統的使用者名稱"
 
-#: lib/hammer_cli/main.rb:13
 msgid "password to access the remote system"
 msgstr "用來存取遠端系統的密碼"
 
-#: lib/hammer_cli/main.rb:15
 msgid "remote system address"
 msgstr "遠端系統位址"
 
-#: lib/hammer_cli/main.rb:18
 msgid "show version"
 msgstr "顯示版本"
 
-#: lib/hammer_cli/main.rb:27
 msgid "Show ids of associated resources"
 msgstr "顯示相聯資源的 id"
 
-#: lib/hammer_cli/main.rb:29
 msgid "Explicitly turn interactive mode on/off"
 msgstr "明確開啓或關閉互動式模式"
 
-#: lib/hammer_cli/main.rb:33
 msgid "Output as CSV (same as --output=csv)"
 msgstr "輸出為 CSV（與 --output=csv 相同）"
 
-#: lib/hammer_cli/main.rb:34
 msgid "Set output format. One of [%s]"
 msgstr "設定輸出模式。[%s] 之一"
 
-#: lib/hammer_cli/main.rb:37
 msgid "Character to separate the values"
 msgstr "用來隔開值的字元"
 
-#: lib/hammer_cli/main.rb:41
 msgid "Get list of possible endings"
 msgstr "取得一列可能的結尾"
 
-#: lib/hammer_cli/validator.rb:41
-msgid "Unknown option name '%s'"
-msgstr "不明選項名稱「%s」"
-
-#: lib/hammer_cli/validator.rb:62
-msgid "You can't set all options %s at one time"
-msgstr "您不可一次將所有選項設為 %s"
-
-#: lib/hammer_cli/validator.rb:63
-msgid "Options %s are required"
-msgstr "%s 選項乃必要的"
-
-#: lib/hammer_cli/validator.rb:79
-msgid "You can't set any of options %s"
-msgstr "您不可將任何選項設為 %s"
-
-#: lib/hammer_cli/validator.rb:80
-msgid "At least one of options %s is required"
-msgstr "需要至少一項 %s 選項"
-
-#: lib/hammer_cli/shell.rb:10
-msgid "Print help for commands"
-msgstr "印出指令的說明"
-
-#: lib/hammer_cli/shell.rb:22
-msgid "Exit interactive shell"
-msgstr "退出互動式 shell"
-
-#: lib/hammer_cli/shell.rb:120
-msgid "Welcome to the hammer interactive shell"
-msgstr "歡迎使用 hammer 互動式 shell"
-
-#: lib/hammer_cli/shell.rb:121
-msgid "Type 'help' for usage information"
-msgstr "請輸入「help」以查看使用說明"
-
-#: lib/hammer_cli/shell.rb:122
 msgid ""
-"Command completion is disabled on ruby < 1.9 due to compatibility problems."
-msgstr "基於相容性上的問題，ruby < 1.9 上已停用了指令完成。"
-
-#: lib/hammer_cli/shell.rb:138
-msgid "Interactive shell"
-msgstr "互動式 shell"
-
-#: lib/hammer_cli/clamp.rb:5
-msgid "too many arguments"
-msgstr "引數過多"
-
-#: lib/hammer_cli/clamp.rb:6
-msgid "option '%<option>s' is required"
-msgstr "需要使用 '%<option>s' 選項"
-
-#: lib/hammer_cli/clamp.rb:7
-msgid "option '%<option>s' (or env %<env>s) is required"
-msgstr "需要使用 '%<option>s'（或是 %<env>s 環境）選項"
-
-#: lib/hammer_cli/clamp.rb:8
-msgid "option '%<switch>s': %<message>s"
-msgstr "選項 '%<switch>s'：%<message>s"
-
-#: lib/hammer_cli/clamp.rb:9
-msgid "parameter '%<param>s': %<message>s"
-msgstr "參數 '%<param>s'：%<message>s"
-
-#: lib/hammer_cli/clamp.rb:10
-msgid "%<env>s: %<message>s"
-msgstr "%<env>s：%<message>s"
-
-#: lib/hammer_cli/clamp.rb:11
-msgid "Unrecognised option '%<switch>s'"
-msgstr "無法辨識的選項 '%<switch>s'"
-
-#: lib/hammer_cli/clamp.rb:12
-msgid "No such sub-command '%<name>s'"
-msgstr "此類型的次指令不存在：'%<name>s'"
-
-#: lib/hammer_cli/clamp.rb:13
-msgid "no value provided"
-msgstr "未提供值"
-
-#: lib/hammer_cli/options/option_definition.rb:68
-msgid "Can be specified multiple times. "
-msgstr "可指定多次。"
+"Legacy configuration of modules detected. Check section about configuration in"
+" user manual"
+msgstr "偵測到了舊式的模組配置。請查看使用者指南中的配置部分"
 
-#: lib/hammer_cli/options/option_definition.rb:69
-msgid "Default: "
-msgstr "預設值："
+msgid "Warning: An error occured while loading module %s"
+msgstr "警告：載入 %s 模組時發生了錯誤"
 
-#: lib/hammer_cli/options/option_definition.rb:69
-msgid ", or "
-msgstr "，或是"
+msgid "Error: Some of the required modules are disabled in configuration: %s "
+msgstr ""
 
-#: lib/hammer_cli/options/normalizers.rb:26
 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:57
 msgid "Comma separated list of values."
 msgstr "逗號區隔開的值。"
 
-#: lib/hammer_cli/options/normalizers.rb:69
 msgid "One of true/false, yes/no, 1/0."
 msgstr "true/false、yes/no、1/0 之一。"
 
-#: lib/hammer_cli/options/normalizers.rb:79
 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:118
 msgid "Unable to parse JSON input"
 msgstr "無法叵析 JSON 輸入"
 
-#: lib/hammer_cli/options/normalizers.rb:131
 msgid "One of %s"
 msgstr "%s 之一"
 
-#: lib/hammer_cli/options/normalizers.rb:138
 msgid "value must be one of '%s'"
 msgstr "值必須是「%s」之一"
 
-#: lib/hammer_cli/options/normalizers.rb:157
 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:164
 msgid "'%s' is not a valid date"
 msgstr "「%s」不是個有效的日期"
 
-#: lib/hammer_cli/options/normalizers.rb:175
 msgid "Any combination (comma separated list) of '%s'"
 msgstr "任何（以逗號隔開的）「%s」的組合"
 
-#: lib/hammer_cli/options/normalizers.rb:195
 msgid "value must be a combination of '%s'"
 msgstr "值必須是「%s」的組合"
 
-#: lib/hammer_cli/settings.rb:28
-msgid ""
-"Warning: location hammer.modules.d is deprecated, move your module "
-"configurations to cli.modules.d"
-msgstr "警告：hammer.modules.d 這個位置已淘汰使用，請將您的模組配置移至 cli.modules.d"
-
-#: lib/hammer_cli/exception_handler.rb:60
-msgid "Error: %s"
-msgstr "錯誤：%s"
-
-#: lib/hammer_cli/exception_handler.rb:66
-msgid "Error: %{message}"
-msgstr ""
+msgid "Can be specified multiple times. "
+msgstr "可指定多次。"
 
-#: lib/hammer_cli/exception_handler.rb:67
-msgid "See: '%{path} --help'"
-msgstr ""
+msgid ", or "
+msgstr "，或是"
 
-#: lib/hammer_cli/exception_handler.rb:84
-msgid "Invalid username or password"
-msgstr "無效的使用者名稱或密碼"
+msgid "Default: "
+msgstr "預設值："
 
-#: lib/hammer_cli/exception_handler.rb:91
-msgid "Could not load the API description from the server"
-msgstr ""
+msgid "Message"
+msgstr "訊息"
 
-#: lib/hammer_cli/exception_handler.rb:92
-msgid "is the server down?"
-msgstr ""
+msgid "Id"
+msgstr "ID"
 
-#: lib/hammer_cli/exception_handler.rb:93
-msgid ""
-"was '%s' run on the server when using apipie cache? (typical production "
-"settings)"
-msgstr ""
+msgid "Name"
+msgstr "名稱"
 
-#: lib/hammer_cli/output/formatters.rb:154
 msgid "no"
 msgstr "否"
 
-#: lib/hammer_cli/output/formatters.rb:154
 msgid "yes"
 msgstr "是"
 
-#: lib/hammer_cli/output/adapter/csv.rb:171
-msgid "Message"
-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"
 
-#: lib/hammer_cli/output/adapter/csv.rb:175
-msgid "Id"
-msgstr "ID"
+msgid "Print help for commands"
+msgstr "印出指令的說明"
 
-#: lib/hammer_cli/output/adapter/csv.rb:180
-msgid "Name"
-msgstr "名稱"
+msgid "Exit interactive shell"
+msgstr "退出互動式 shell"
+
+msgid "Welcome to the hammer interactive shell"
+msgstr "歡迎使用 hammer 互動式 shell"
+
+msgid "Type 'help' for usage information"
+msgstr "請輸入「help」以查看使用說明"
+
+msgid "Interactive shell"
+msgstr "互動式 shell"
 
-#: lib/hammer_cli/modules.rb:10
 msgid ""
-"Legacy configuration of modules detected. Check section about configuration "
-"in user manual"
-msgstr "偵測到了舊式的模組配置。請查看使用者指南中的配置部分"
+"can't replace subcommand %<name>s (%<existing_class>s) with %<name>s (%<new_cl"
+"ass>s)"
+msgstr ""
 
-#: lib/hammer_cli/modules.rb:42
-msgid "Warning: An error occured while loading module %s"
-msgstr "警告：載入 %s 模組時發生了錯誤"
+msgid "Unknown option name '%s'"
+msgstr "不明選項名稱「%s」"
+
+msgid "You can't set all options %s at one time"
+msgstr "您不可一次將所有選項設為 %s"
+
+msgid "Options %s are required"
+msgstr "%s 選項乃必要的"
+
+msgid "You can't set any of options %s"
+msgstr "您不可將任何選項設為 %s"
+
+msgid "At least one of options %s is required"
+msgstr "需要至少一項 %s 選項"

data/test/unit/options/normalizers_test.rb

@@ -56,10 +56,38 @@ 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 a comma separated string with spaces" do
+      formatter.format("a= 1 , b = 2 ,c =3").must_equal({'a' => '1', 'b' => '2', 'c' => '3'})
+    end
+
+    it "should parse a comma separated string with spaces using single quotes" do
+      formatter.format("a= ' 1 ' , b =' 2',c ='3'").must_equal({'a' => ' 1 ', 'b' => ' 2', 'c' => '3'})
+    end
+
+    it "should parse a comma separated string with spaces using double quotes" do
+      formatter.format("a= \" 1 \" , b =\" 2\",c =\"3\"").must_equal({'a' => ' 1 ', 'b' => ' 2', 'c' => '3'})
+    end
+
+    it "should deal with equal sign in value" do
+      formatter.format("a=1,b='2=2',c=3").must_equal({'a' => '1', 'b' => '2=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 arrays with spaces" 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 arrays with spaces using by single quotes" do
+      formatter.format("a=1,b=['1 1', ' 2 ', ' 3 3'],c=3").must_equal({'a' => '1', 'b' => ['1 1', ' 2 ', ' 3 3'], 'c' => '3'})
+    end
+
+    it "should parse arrays with spaces using by double quotes" do
+      formatter.format("a=1,b=[\"1 1\", \" 2 \", \" 3 3\"],c=3").must_equal({'a' => '1', 'b' => ['1 1', ' 2 ', ' 3 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

data/test/unit/output/fields_test.rb

@@ -126,3 +126,63 @@ describe Fields::ContainerField do
   end
 
 end
+
+
+describe Fields::Label do
+
+  describe "display?" do
+
+    context "blank is allowed" do
+      let(:field) do
+        Fields::Label.new :label => "Label" do
+          field :a, "A"
+          field :b, "B"
+        end
+      end
+
+      it "returns true when all the keys are present" do
+        field.display?({:a => 1, :b => 2}).must_equal true
+      end
+
+      it "returns true when some of the keys are present" do
+        field.display?({:a => 1}).must_equal true
+      end
+
+      it "returns true the hash is empty" do
+        field.display?({}).must_equal true
+      end
+
+      it "returns true the hash does not contain the required keys" do
+        field.display?({:c => 3}).must_equal true
+      end
+
+    end
+
+    context "blank is not allowed" do
+      let(:field) do
+        Fields::Label.new :label => "Label", :hide_blank => true do
+          field :a, "A", Fields::Field, :hide_blank => true
+          field :b, "B", Fields::Field, :hide_blank => true
+        end
+      end
+
+      it "returns true when all the keys are present" do
+        field.display?({:a => 1, :b => 2}).must_equal true
+      end
+
+      it "returns true when some of the keys are present" do
+        field.display?({:a => 1}).must_equal true
+      end
+
+      it "returns false when there are some displayed subfields" do
+        field.display?({}).must_equal false
+      end
+
+      it "returns false the hash does not contain the required keys" do
+        field.display?({:c => 3}).must_equal false
+      end
+
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Martin Bačovský
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2015-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -43,16 +43,16 @@ dependencies:
   name: logging
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -85,16 +85,16 @@ dependencies:
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: fast_gettext
   requirement: !ruby/object:Gem::Requirement
@@ -113,16 +113,16 @@ dependencies:
   name: locale
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <=
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.9
+        version: 2.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <=
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.9
+        version: 2.0.6
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -293,31 +293,55 @@ files:
 - locale/Makefile
 - locale/README.md
 - locale/de/LC_MESSAGES/hammer-cli.mo
+- locale/de/hammer-cli.edit.po
 - locale/de/hammer-cli.po
+- locale/de/hammer-cli.po.time_stamp
 - locale/en/LC_MESSAGES/hammer-cli.mo
+- locale/en/hammer-cli.edit.po
 - locale/en/hammer-cli.po
+- locale/en/hammer-cli.po.time_stamp
 - locale/en_GB/LC_MESSAGES/hammer-cli.mo
+- locale/en_GB/hammer-cli.edit.po
 - locale/en_GB/hammer-cli.po
+- locale/en_GB/hammer-cli.po.time_stamp
 - locale/es/LC_MESSAGES/hammer-cli.mo
+- locale/es/hammer-cli.edit.po
 - locale/es/hammer-cli.po
+- locale/es/hammer-cli.po.time_stamp
 - locale/fr/LC_MESSAGES/hammer-cli.mo
+- locale/fr/hammer-cli.edit.po
 - locale/fr/hammer-cli.po
+- locale/fr/hammer-cli.po.time_stamp
 - locale/hammer-cli.pot
 - locale/it/LC_MESSAGES/hammer-cli.mo
+- locale/it/hammer-cli.edit.po
 - locale/it/hammer-cli.po
+- locale/it/hammer-cli.po.time_stamp
 - locale/ja/LC_MESSAGES/hammer-cli.mo
+- locale/ja/hammer-cli.edit.po
 - locale/ja/hammer-cli.po
+- locale/ja/hammer-cli.po.time_stamp
 - locale/ko/LC_MESSAGES/hammer-cli.mo
+- locale/ko/hammer-cli.edit.po
 - locale/ko/hammer-cli.po
+- locale/ko/hammer-cli.po.time_stamp
 - locale/pt_BR/LC_MESSAGES/hammer-cli.mo
+- locale/pt_BR/hammer-cli.edit.po
 - locale/pt_BR/hammer-cli.po
+- locale/pt_BR/hammer-cli.po.time_stamp
 - locale/ru/LC_MESSAGES/hammer-cli.mo
+- locale/ru/hammer-cli.edit.po
 - locale/ru/hammer-cli.po
+- locale/ru/hammer-cli.po.time_stamp
 - locale/zanata.xml
 - locale/zh_CN/LC_MESSAGES/hammer-cli.mo
+- locale/zh_CN/hammer-cli.edit.po
 - locale/zh_CN/hammer-cli.po
+- locale/zh_CN/hammer-cli.po.time_stamp
 - locale/zh_TW/LC_MESSAGES/hammer-cli.mo
+- locale/zh_TW/hammer-cli.edit.po
 - locale/zh_TW/hammer-cli.po
+- locale/zh_TW/hammer-cli.po.time_stamp
 - test/reports/TEST-Fields-ContainerField-display-.xml
 - test/reports/TEST-Fields-ContainerField-display-blank-is-allowed.xml
 - test/reports/TEST-Fields-ContainerField-display-blank-is-not-allowed.xml