hammer_cli 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfc3de6a7599c2ab526183074b333b1c3ad55970
-  data.tar.gz: 0c5a264582fdd5dc5fcfcdbfe4f20cb1ccb8f3f0
+  metadata.gz: 9027b34462e30b995c85afac2a0c61eb4dee544f
+  data.tar.gz: 51aeab33dc28f1242992eccc6feca4a5a5895411
 SHA512:
-  metadata.gz: 75df4210b14e233c11f681e06d2045518e9fb39233094b5283012ebd4ff59e341edc74a077f986c8da14770b5c507a0ed0e6d623098357a7e74ca70fae345594
-  data.tar.gz: 06045bbf7c133b0b826a6822faa9df3f215f19895b2d3b76f73e9bbaefe9f4d4b0a3e3a91c97ee7a7a59aae0a70728a7c10bc93dcd27af2762227dbdc0747524
+  metadata.gz: 61d84ed050de0079e88d80ae2f4a4b94e136f061d1a041c631ebe043ec4ff776b4a63713ce415ebd2b15d87aaf86a243a895610baa0d04c89d8385c625b59e44
+  data.tar.gz: 42882c180f2e21aad6cf99a8a784d8e9be6439caa6a82e77dc7007227861c95fae4715cdbe52de2dfdae46c54b4e9cc56aa7d3419f6bcde505c2ff770b302759

data/README.md

@@ -4,13 +4,9 @@ Hammer - the CLI tool (not only) for Foreman
 Hammer is a generic [clamp-based](https://github.com/mdub/clamp) CLI framework.
 Hammer-cli provides just the core functionality. The core is extensible using plugins that contain application-specific commands.
 
-This architecture allows for easy customization according to your application. Nearly any Ruby script can be turned into a Hammer command, so the possibilities are endless.
+This architecture allows for easy customization according to your application. Nearly any Ruby script can be turned into a Hammer command, so the possibilities are endless. You also can easily add custom commands for your specific use, such as bulk actions or admin tasks.
 
-Available plugins are currently:
-  - [hammer-cli-foreman](https://github.com/theforeman/hammer-cli-foreman) - commands corresponding to Foreman API
-  - [hammer-cli-katello](https://github.com/theforeman/hammer-cli-katello) - commands for managing Katello
-
-You also can easily add custom commands for your specific use, such as bulk actions or admin tasks.
+Available plugins are listed on [the Foreman's wiki](http://projects.theforeman.org/projects/hammer-cli/wiki/List_of_Plugins).
 
 Check out the [release notes](doc/release_notes.md#release-notes) to see what's new in the latest version.
 

data/doc/developer_docs.md

@@ -13,3 +13,6 @@ Contents:
  - [Development tips](development_tips.md#development-tips)
  - [Option normalizers](option_normalizers.md#option-normalizers)
  - [Internationalization](i18n.md#internationalization)
+
+Links:
+ - slides from tutorial at Config Management Camp 2015: [Hacking with hammer](https://tstrachota.fedorapeople.org/slides/hacking_with_hammer/)

data/doc/release_notes.md

@@ -1,6 +1,20 @@
 Release notes
 =============
 
+### 0.2.0 (2015-04-23)
+* Rubygem locale pined to version >= 2.0.6 ([#10154](http://projects.theforeman.org/issues/10154))
+* Restricted logging version as in 2.0.0 ruby 1.8.7 support was dropped
+* Allow :hide_blank for labels ([#9925](http://projects.theforeman.org/issues/9925))
+* Only initialise text domains that have files in the dir ([#9648](http://projects.theforeman.org/issues/9648))
+* Version fails with error ([#9742](http://projects.theforeman.org/issues/9742))
+* Ignore spaces in key value formatting ([#9721](http://projects.theforeman.org/issues/9721))
+* Fixing warning of already initialized constant ([#9714](http://projects.theforeman.org/issues/9714))
+* Highline pinned to < 1.7 ([#9507](http://projects.theforeman.org/issues/9507))
+* Docs - link to slides from cfgmgmt camp
+* Update to gettext 3.x, unpin locale ([#8980](http://projects.theforeman.org/issues/8980))
+* Docs - link to available plugins listed on external wiki.
+
+
 ### 0.1.4 (2014-12-10)
 * hammer-cli CSV formatter doesn't properly format values with custom formatters, moving to correct implementation ([#8569](http://projects.theforeman.org/issues/8569))
 * added support for dependeces among modules ([#7566](http://projects.theforeman.org/issues/7566))

data/lib/hammer_cli/abstract.rb

@@ -65,7 +65,9 @@ module HammerCLI
 
     class SortedBuilder < Clamp::Help::Builder
 
-      DEFAULT_LABEL_INDENT = 29
+      def default_label_indent
+        29
+      end
 
       def add_list(heading, items)
         items.sort! do |a, b|
@@ -74,7 +76,7 @@ module HammerCLI
 
         puts "\n#{heading}:"
 
-        label_width = DEFAULT_LABEL_INDENT
+        label_width = default_label_indent
         items.each do |item|
           label, description = item.help
           label_width = label.size if label.size > label_width

data/lib/hammer_cli/i18n.rb

@@ -79,7 +79,7 @@ module HammerCLI
       end
 
       def available?
-        File.exist?(locale_dir)
+        Dir[File.join(locale_dir, '**', "#{domain_name}.#{type}")].any?
       end
 
       attr_reader :locale_dir, :domain_name
@@ -108,10 +108,6 @@ module HammerCLI
         '/usr/share/locale'
       end
 
-      def domain_name
-        "#{super}@system"
-      end
-
     end
 
 
@@ -156,6 +152,5 @@ end
 include FastGettext::Translation
 include HammerCLI::I18n::AllDomains
 
-HammerCLI::I18n.add_domain(HammerCLI::I18n::LocaleDomain.new)
-HammerCLI::I18n.add_domain(HammerCLI::I18n::SystemLocaleDomain.new)
-
+domain = [HammerCLI::I18n::LocaleDomain.new, HammerCLI::I18n::SystemLocaleDomain.new].find { |d| d.available? }
+HammerCLI::I18n.add_domain(domain) if domain

data/lib/hammer_cli/main.rb

@@ -20,7 +20,7 @@ module HammerCLI
     option "--version", :flag, _("show version") do
       puts "hammer (%s)" % HammerCLI.version
       HammerCLI::Modules.names.each do |m|
-        module_version = HammerCLI::Modules.find_by_name(m).version
+        module_version = HammerCLI::Modules.find_by_name(m).version rescue _("unknown version")
         puts " * #{m} (#{module_version})"
       end
       exit(HammerCLI::EX_OK)

data/lib/hammer_cli/options/normalizers.rb

@@ -32,7 +32,7 @@ module HammerCLI
 
           result = {}
 
-          pair_re = '([^,]+)=([^,\[]+|\[[^\[\]]*\])'
+          pair_re = '([^,=]+)=([^,\[]+|\[[^\[\]]*\])'
           full_re = "^((%s)[,]?)+$" % pair_re
 
           unless Regexp.new(full_re).match(val)
@@ -43,10 +43,26 @@ module HammerCLI
             value = value.strip
             value = value.scan(/[^,\[\]]+/) if value.start_with?('[')
 
-            result[key.strip]=value
+            result[key.strip] = strip_value(value)
           end
           return result
+        end
+
+        private
+
+        def strip_value(value)
+          if value.is_a? Array
+            value.map do |item|
+              strip_chars(item.strip, '"\'')
+            end
+          else
+            strip_chars(value.strip, '"\'')
+          end
+        end
 
+        def strip_chars(string, chars)
+          chars = Regexp.escape(chars)
+          string.gsub(/\A[#{chars}]+|[#{chars}]+\z/, '')
         end
       end
 

data/lib/hammer_cli/output/dsl.rb

@@ -30,8 +30,7 @@ module HammerCLI::Output
       self.fields << type.new(options, &block)
     end
 
-    def label(label, &block)
-      options = {}
+    def label(label, options={}, &block)
       options[:path] = current_path.clone
       options[:label] = label
       custom_field Fields::Label, options, &block

data/lib/hammer_cli/output/fields.rb

@@ -81,6 +81,15 @@ module Fields
   end
 
   class Label < ContainerField
+
+    def display?(value)
+      return true if not hide_blank?
+
+      fields.any? do |f|
+        f.display?(HammerCLI::Output::Adapter::Abstract.data_for_field(f, value))
+      end
+    end
+
   end
 
   class Collection < ContainerField

data/lib/hammer_cli/version.rb

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

data/locale/Makefile

@@ -10,9 +10,10 @@ DOMAIN = hammer-cli
 VERSION = $(shell ruby -e 'require "rubygems";spec = Gem::Specification::load("../hammer_cli.gemspec");puts spec.version')
 POTFILE = $(DOMAIN).pot
 MOFILE = $(DOMAIN).mo
-POFILES = $(shell find . -name '*.po')
+POFILES = $(shell find . -name '$(DOMAIN).po')
 MOFILES = $(patsubst %.po,%.mo,$(POFILES))
 POXFILES = $(patsubst %.po,%.pox,$(POFILES))
+EDITFILES = $(patsubst %.po,%.edit.po,$(POFILES))
 
 %.mo: %.po
 	mkdir -p $(shell dirname $@)/LC_MESSAGES
@@ -30,13 +31,6 @@ all-mo: $(MOFILES)
 	! grep -q msgid $@
 
 check: $(POXFILES)
-	msgfmt -c ${POTFILE}
-
-# Merge PO files
-update-po:
-	for f in $(shell find ./ -name "*.po") ; do \
-		msgmerge -N --backup=none -U $$f ${POTFILE} ; \
-	done
 
 # Unify duplicate translations
 uniq-po:
@@ -44,22 +38,20 @@ uniq-po:
 		msguniq $$f -o $$f ; \
 	done
 
-tx-pull:
+tx-pull: $(EDITFILES)
 	tx pull -f
 	for f in $(POFILES) ; do \
 		sed -i 's/^\("Project-Id-Version: \).*$$/\1$(DOMAIN) $(VERSION)\\n"/' $$f; \
 	done
-	-git commit -a -m "i18n - extracting new, pulling from tx"
 
+# Extract strings and update the .pot, prepare .edit.po files
 extract-strings:
 	bundle exec rake gettext:find
 
-reset-po:
-	# merging po files is unnecessary when using transifex.com
-	git checkout -- ../locale/*/*po
+# Merge .edit.po into .po
+update-po:
+	bundle exec rake gettext:find
 
-tx-update: tx-pull extract-strings reset-po $(MOFILES)
-	# amend mo files
-	git add ../locale/*/LC_MESSAGES
-	git commit -a --amend -m "i18n - extracting new, pulling from tx"
+tx-update: extract-strings tx-pull $(MOFILES)
+	git commit -m "i18n - extracting new, pulling from tx" ../locale
 	-echo Changes commited!

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

@@ -0,0 +1,303 @@
+# 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:
+# Dominic Cleal <dcleal@redhat.com>, 2014
+# Ettore Atalan <atalanttore@googlemail.com>, 2014
+# simon11 <simon.stieger.98@live.de>, 2014
+# simon11 <simon.stieger.98@live.de>, 2014
+# Ulrich Habel <rhaen@pkgbox.de>, 2014
+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"
+"Language-Team: German (http://www.transifex.com/projects/p/foreman/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: lib/hammer_cli/clamp.rb:5
+msgid "too many arguments"
+msgstr "Zu viele Argumente"
+
+#: lib/hammer_cli/clamp.rb:6
+msgid "option '%<option>s' is required"
+msgstr "Option \"%<option>s\" ist erforderlich"
+
+#: lib/hammer_cli/clamp.rb:7
+msgid "option '%<option>s' (or env %<env>s) is required"
+msgstr "Option \"%<option>s\" (oder Umgebung %<env>s) ist erforderlich"
+
+#: lib/hammer_cli/clamp.rb:8
+msgid "option '%<switch>s': %<message>s"
+msgstr "Option '%<switch>s': %<message>en"
+
+#: lib/hammer_cli/clamp.rb:9
+msgid "parameter '%<param>s': %<message>s"
+msgstr "Parameter '%<param>s': %<message>en"
+
+#: lib/hammer_cli/clamp.rb:10
+msgid "%<env>s: %<message>s"
+msgstr "%<env>s: %<message>en"
+
+#: lib/hammer_cli/clamp.rb:11
+msgid "Unrecognised option '%<switch>s'"
+msgstr "Unbekannte Option \"%<switch>s\""
+
+#: lib/hammer_cli/clamp.rb:12
+msgid "No such sub-command '%<name>s'"
+msgstr "Unterbefehl \"%<name>s\" existiert nicht"
+
+#: lib/hammer_cli/clamp.rb:13
+msgid "no value provided"
+msgstr "kein Wert geliefert"
+
+#: lib/hammer_cli/options/option_definition.rb:68
+msgid "Can be specified multiple times. "
+msgstr "Kann mehrfach angegeben werden."
+
+#: lib/hammer_cli/options/option_definition.rb:69
+msgid "Default: "
+msgstr "Standard: "
+
+#: lib/hammer_cli/options/option_definition.rb:69
+msgid ", or "
+msgstr ", oder "
+
+#: lib/hammer_cli/options/normalizers.rb:26
+msgid "Comma-separated list of key=value."
+msgstr "Kommagetrennte Liste mit Schlüssel-Wert-Paaren."
+
+#: lib/hammer_cli/options/normalizers.rb:39
+msgid "value must be defined as a comma-separated list of key=value"
+msgstr "Wert muss als kommagetrennte Liste mit Schlüssel-Wert-Paaren definiert sein"
+
+#: lib/hammer_cli/options/normalizers.rb:57
+msgid "Comma separated list of values."
+msgstr "Kommagetrennte Liste von Werten."
+
+#: lib/hammer_cli/options/normalizers.rb:69
+msgid "One of true/false, yes/no, 1/0."
+msgstr "Eines von 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 "Gültige Werte sind true/false, yes/no, 1/0"
+
+#: lib/hammer_cli/options/normalizers.rb:118
+msgid "Unable to parse JSON input"
+msgstr "JSON Eingabe nicht lesbar"
+
+#: lib/hammer_cli/options/normalizers.rb:131
+msgid "One of %s"
+msgstr "Einer von %s"
+
+#: lib/hammer_cli/options/normalizers.rb:138
+msgid "value must be one of '%s'"
+msgstr "Gültige Werte sind \"%s\""
+
+#: lib/hammer_cli/options/normalizers.rb:157
+msgid "Date and time in YYYY-MM-DD HH:MM:SS or ISO 8601 format"
+msgstr "Datum und Uhrzeit im Format JJJJ-MM-TT HH:MM:SS oder ISO-8601-Format"
+
+#: lib/hammer_cli/options/normalizers.rb:164
+msgid "'%s' is not a valid date"
+msgstr "'%s' ist kein gültiges Datum."
+
+#: lib/hammer_cli/options/normalizers.rb:175
+msgid "Any combination (comma separated list) of '%s'"
+msgstr "Eine Kombination (kommagetrennte Liste) aus \"%s\""
+
+#: lib/hammer_cli/options/normalizers.rb:195
+msgid "value must be a combination of '%s'"
+msgstr "Wert muss eine Kombination aus \"%s\" sein"
+
+#: lib/hammer_cli/logger.rb:28
+msgid "No permissions to create log dir %s"
+msgstr "Keine Berechtigung zum Anlegen von Protokollverzeichnis %s"
+
+#: lib/hammer_cli/logger.rb:43
+msgid "File %s not writeable, won't log anything to the file!"
+msgstr "Datei %s ist schreibgeschützt, in diese Datei kann nicht protokolliert werden!"
+
+#: lib/hammer_cli/main.rb:7
+msgid "be verbose"
+msgstr "ausführliche Ausgabe"
+
+#: lib/hammer_cli/main.rb:8
+msgid "show debugging output "
+msgstr "Debugausgabe anzeigen"
+
+#: lib/hammer_cli/main.rb:9
+msgid "force reload of Apipie cache"
+msgstr ""
+
+#: lib/hammer_cli/main.rb:11
+msgid "path to custom config file"
+msgstr "Pfad zur angepassten Konfigurationsdatei"
+
+#: lib/hammer_cli/main.rb:13
+msgid "username to access the remote system"
+msgstr "Benutzername zum Zugriff auf das entfernte System"
+
+#: lib/hammer_cli/main.rb:15
+msgid "password to access the remote system"
+msgstr "Passwort zum Zugriff auf das entfernte System"
+
+#: lib/hammer_cli/main.rb:17
+msgid "remote system address"
+msgstr "Adresse des entfernten Systems"
+
+#: lib/hammer_cli/main.rb:20
+msgid "show version"
+msgstr "Version anzeigen"
+
+#: lib/hammer_cli/main.rb:29
+msgid "Show ids of associated resources"
+msgstr "IDs zugehöriger Ressourcen anzeigen"
+
+#: lib/hammer_cli/main.rb:31
+msgid "Explicitly turn interactive mode on/off"
+msgstr "Interaktiven Modus explizit aktivieren/deaktivieren"
+
+#: lib/hammer_cli/main.rb:35
+msgid "Output as CSV (same as --output=csv)"
+msgstr "Ausgabe als CSV (entspricht --output=csv)"
+
+#: lib/hammer_cli/main.rb:36
+msgid "Set output format. One of [%s]"
+msgstr "Ausgabeformat festlegen. Einer von [%s]"
+
+#: lib/hammer_cli/main.rb:39
+msgid "Character to separate the values"
+msgstr "Trennzeichen"
+
+#: lib/hammer_cli/main.rb:43
+msgid "Get list of possible endings"
+msgstr "Liste möglicher Endungen abrufen"
+
+#: lib/hammer_cli/settings.rb:28
+msgid ""
+"Warning: location hammer.modules.d is deprecated, move your module "
+"configurations to cli.modules.d"
+msgstr "Warnung: Speicherort hammer.modules.d ist veraltet, verlegen Sie Ihre Modulkonfigurationen nach cli.modules.d"
+
+#: lib/hammer_cli/modules.rb:12
+msgid ""
+"Legacy configuration of modules detected. Check section about configuration "
+"in user manual"
+msgstr "Veraltete Konfiguration von Modulen entdeckt. Prüfen Sie den Abschnitt zum Thema Konfiguration im Benutzerhandbuch"
+
+#: lib/hammer_cli/modules.rb:60
+msgid "Warning: An error occured while loading module %s"
+msgstr "Warnung: Beim Laden von Modul %s ist ein Fehler aufgetreten"
+
+#: lib/hammer_cli/modules.rb:87
+msgid "Error: Some of the required modules are disabled in configuration: %s "
+msgstr ""
+
+#: lib/hammer_cli/exception_handler.rb:62
+msgid "Error: %s"
+msgstr "Fehler: %s"
+
+#: lib/hammer_cli/exception_handler.rb:68
+msgid "Error: %{message}"
+msgstr "Fehler: %{message}"
+
+#: lib/hammer_cli/exception_handler.rb:69
+msgid "See: '%{path} --help'"
+msgstr "Siehe: '%{path} --help'"
+
+#: lib/hammer_cli/exception_handler.rb:86
+msgid "Invalid username or password"
+msgstr "Falscher Benutzername oder falsches Passwort"
+
+#: lib/hammer_cli/exception_handler.rb:93
+msgid "Could not load the API description from the server"
+msgstr "Die API-Beschreibung konnte nicht vom Server geladen werden"
+
+#: lib/hammer_cli/exception_handler.rb:94
+msgid "is the server down?"
+msgstr "ist der Server nicht verfügbar?"
+
+#: lib/hammer_cli/exception_handler.rb:95
+msgid ""
+"was '%s' run on the server when using apipie cache? (typical production "
+"settings)"
+msgstr ""
+
+#: lib/hammer_cli/exception_handler.rb:101
+msgid "Missing arguments for %s"
+msgstr ""
+
+#: lib/hammer_cli/validator.rb:41
+msgid "Unknown option name '%s'"
+msgstr "Unbekannter Optionsname '%s'"
+
+#: lib/hammer_cli/validator.rb:62
+msgid "You can't set all options %s at one time"
+msgstr "Nicht alle Optionen %s sind gleichzeitig setzbar"
+
+#: lib/hammer_cli/validator.rb:63
+msgid "Options %s are required"
+msgstr "Optionen %s sind erforderlich"
+
+#: lib/hammer_cli/validator.rb:79
+msgid "You can't set any of options %s"
+msgstr "Sie können keine der Optionen %s festlegen"
+
+#: lib/hammer_cli/validator.rb:80
+msgid "At least one of options %s is required"
+msgstr "Mindestens eine der Optionen %s ist erforderlich"
+
+#: lib/hammer_cli/output/adapter/csv.rb:174
+msgid "Message"
+msgstr "Hinweis"
+
+#: lib/hammer_cli/output/adapter/csv.rb:178
+msgid "Id"
+msgstr "Kennung"
+
+#: lib/hammer_cli/output/adapter/csv.rb:183
+msgid "Name"
+msgstr "Name"
+
+#: lib/hammer_cli/output/formatters.rb:154
+msgid "no"
+msgstr "nein"
+
+#: lib/hammer_cli/output/formatters.rb:154
+msgid "yes"
+msgstr "ja"
+
+#: lib/hammer_cli/shell.rb:10
+msgid "Print help for commands"
+msgstr "Hilfe anzeigen"
+
+#: lib/hammer_cli/shell.rb:22
+msgid "Exit interactive shell"
+msgstr "Interaktive Shell verlassen"
+
+#: lib/hammer_cli/shell.rb:116
+msgid "Welcome to the hammer interactive shell"
+msgstr "Willkommen zur interaktiven Hammer-Shell"
+
+#: lib/hammer_cli/shell.rb:117
+msgid "Type 'help' for usage information"
+msgstr "Geben Sie \"help\" ein, um Informationen zur Verwendung zu erhalten"
+
+#: lib/hammer_cli/shell.rb:133
+msgid "Interactive shell"
+msgstr "Interaktive Shell"
+
+#: lib/hammer_cli/subcommand.rb:56
+msgid ""
+"can't replace subcommand %<name>s (%<existing_class>s) with %<name>s "
+"(%<new_class>s)"
+msgstr ""