hammer_cli_foreman_remote_execution 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdb90815b99416e087efed5bf5901d8207aee6c9
-  data.tar.gz: 28ac9b4a9e859af2fac1354ab87dcebf54d40601
+  metadata.gz: 668a26b604338f2325ffe7fa678ba91e074b7191
+  data.tar.gz: 91d012897fdaed83e57047dede6a404a50b14673
 SHA512:
-  metadata.gz: 21ecf180e141ffbb370d15cbb1fb798fd25c3c5fb1a18a138f18da2b85e3339299cc55cf8da8faa79a42b66c9f3ff1009ffd7957b2831a603ca4287344f47874
-  data.tar.gz: dac550144f0ecc605bf5d418274bbb5970d04803d185c08428fca862c9e562f1c7c46437392ad71b55a40fffb447bb62e11485b9996cd0f5a0cabdb5df813484
+  metadata.gz: b6ca4ef659fb3e336e63ff77e95a3c0f8e575fdc8a68377f295e702c3a929b130e36c8d7726ddcf52cc1e416467ca9807f1ef117a7151722154651ba1876e2bb
+  data.tar.gz: 8763f12279e5866092c58fc750c18bf0952f7b4d472b8e402d984b108388dcd4e8b2c951299b23ae827aba061ec23903ec930ef849e93087594bc6586514436a

data/.gitignore

@@ -18,3 +18,7 @@ tags
 .idea
 *.sw?
 *~
+
+# Locale files
+locale/*/*.edit.po
+locale/*/*.po.time_stamp

data/README.md

@@ -8,41 +8,60 @@ CLI Plugin for Foreman Remote Execution
 
 This [Hammer CLI](https://github.com/theforeman/hammer-cli) plugin contains commands for [foreman_remote_execution](https://github.com/theforeman/foreman_remote_execution).
 
-Examples
---------
+# Examples
 
-### Create a Template
+## Templates
+
+### List templates
+
+```
+hammer job-template list
+```
+
+### Create a template
 
 ```
 hammer job-template create --file /tmp/template.txt --name "Ping a Host"\
-  --provider-type Ssh --job-name "Ping"
+  --provider-type SSH --job-category "Commands"
 ```
 
-### Create a Template Input
+### Create a template input
 
 ```
 hammer template-input create --template-id 17 --name hostname\
   --input-type user --options www.google.com,www.facebook.com,localhost
 ```
 
-### Run a Job Examples
+## Jobs
+
+### Show jobs
+
+```
+hammer job-invocation list
+```
+
+Show details:
+
+```
+hammer job-invocation info --id 83
+```
 
-#### Command line inputs
+### Run a job with command line inputs
 
 ```
-hammer job-invocation create --job-name "Run Command" --inputs command="ping -c 50 www.google.com"\
-  --search-query "name ~ rex01"
+hammer job-invocation create --job-template "Run Command - SSH Default" \
+  --inputs command="ping -c 50 www.google.com" --search-query "name ~ rex01"
 ```
 
 ```
-hammer job-invocation create --job-name "Package Action"\
+hammer job-invocation create --job-template "Package Action - SSH Default" \
   --inputs package=vim-enhanced,action=install --search-query "name ~ rex01"
 ```
 
-#### File inputs:
+### Run a job with file inputs
 
 ```
-hammer job-invocation create --job-name "Run Command"\
+hammer job-invocation create --job-template "Run Command - SSH Default"\
   --input-files command=/tmp/script.sh --search-query "name ~ rex01"
 ```
 
@@ -60,7 +79,6 @@ Alternatively, pass the `--async` option to see the output so far:
 hammer job-invocation output --id 155 --host rex01.example.com --async
 ```
 
-License
--------
+## License
 
 This project is licensed under the GPLv3+.

data/Rakefile

@@ -9,17 +9,28 @@ Rake::TestTask.new :test do |t|
 end
 
 namespace :gettext do
-  desc 'Update pot file'
-  task :find do
-    require 'hammer_cli_foreman_remote_execution/version'
-    require 'hammer_cli_foreman_remote_execution/i18n'
-    require 'gettext/tools'
+
+  task :setup do
+    require "hammer_cli_foreman_remote_execution/version"
+    require "hammer_cli_foreman_remote_execution/i18n"
+    require 'gettext/tools/task'
 
     domain = HammerCLIForemanRemoteExecution::I18n::LocaleDomain.new
-    GetText.update_pofiles(domain.domain_name, domain.translated_files,
-                           "#{domain.domain_name} #{HammerCLIForemanRemoteExecution.version}",
-                           :po_root => domain.locale_dir)
+    GetText::Tools::Task.define do |task|
+      task.package_name = domain.domain_name
+      task.package_version = HammerCLIForemanRemoteExecution.version.to_s
+      task.domain = domain.domain_name
+      task.mo_base_directory = domain.locale_dir
+      task.po_base_directory = domain.locale_dir
+      task.files = domain.translated_files
+    end
+  end
+
+  desc "Update pot file"
+  task :find => [:setup] do
+    Rake::Task["gettext:po:update"].invoke
   end
+
 end
 
 namespace :pkg do

data/lib/hammer_cli_foreman_remote_execution.rb

@@ -8,6 +8,7 @@ module HammerCLIForemanRemoteExecution
   require 'hammer_cli_foreman_remote_execution/job_template'
   require 'hammer_cli_foreman_remote_execution/template_input'
   require 'hammer_cli_foreman_remote_execution/foreign_input_set'
+  require 'hammer_cli_foreman_remote_execution/remote_execution_feature'
 
   def self.exception_handler_class
     HammerCLIForeman::ExceptionHandler

data/lib/hammer_cli_foreman_remote_execution/foreign_input_set.rb

@@ -5,8 +5,8 @@ module HammerCLIForemanRemoteExecution
 
     class ListCommand < HammerCLIForeman::ListCommand
       output do
-        field :id, _('Id')
-        field :target_template_id, _('Target template id')
+        field :id, _('ID')
+        field :target_template_id, _('Target template ID')
         field :target_template_name, _('Target template name')
       end
 
@@ -15,9 +15,9 @@ module HammerCLIForemanRemoteExecution
 
     class InfoCommand < HammerCLIForeman::InfoCommand
       output do
-        field :id, _('Id')
+        field :id, _('ID')
         field :name, _('Name')
-        field :target_template_id, _('Target template id')
+        field :target_template_id, _('Target template ID')
         field :target_template_name, _('Target template name')
         field :include_all, _('Include all')
         field :include, _('Include')

data/lib/hammer_cli_foreman_remote_execution/i18n.rb

@@ -2,7 +2,9 @@ require 'hammer_cli/i18n'
 
 module HammerCLIForemanRemoteExecution
   module I18n
+
     class LocaleDomain < HammerCLI::I18n::LocaleDomain
+
       def translated_files
         Dir.glob(File.join(File.dirname(__FILE__), '../**/*.rb'))
       end
@@ -15,7 +17,17 @@ module HammerCLIForemanRemoteExecution
         'hammer-cli-foreman-remote-execution'
       end
     end
+
+    class SystemLocaleDomain < LocaleDomain
+
+      def locale_dir
+        '/usr/share/locale'
+      end
+
+    end
+
   end
 end
 
-HammerCLI::I18n.add_domain(HammerCLIForemanRemoteExecution::I18n::LocaleDomain.new)
+domain = [HammerCLIForemanRemoteExecution::I18n::LocaleDomain.new, HammerCLIForemanRemoteExecution::I18n::SystemLocaleDomain.new].find { |d| d.available? }
+HammerCLI::I18n.add_domain(domain) if domain

data/lib/hammer_cli_foreman_remote_execution/job_invocation.rb

@@ -4,7 +4,7 @@ module HammerCLIForemanRemoteExecution
 
     class ListCommand < HammerCLIForeman::ListCommand
       output do
-        field :id, _('Id')
+        field :id, _('ID')
         field :description, _('Description')
         field :status_label, _('Status')
         field :succeeded, _('Success')

data/lib/hammer_cli_foreman_remote_execution/job_template.rb

@@ -4,7 +4,7 @@ module HammerCLIForemanRemoteExecution
 
     class ListCommand < HammerCLIForeman::ListCommand
       output do
-        field :id, _('Id')
+        field :id, _('ID')
         field :name, _('Name')
         field :job_category, _('Job Category')
         field :provider_type, _('Provider')

data/lib/hammer_cli_foreman_remote_execution/remote_execution_feature.rb

@@ -0,0 +1,41 @@
+module HammerCLIForemanRemoteExecution
+  class RemoteExecutionFeature < HammerCLIForeman::Command
+    resource :remote_execution_features
+    desc _('Manage remote execution features')
+
+    class ListCommand < HammerCLIForeman::ListCommand
+      output do
+        field :id, _('ID')
+        field :name, _('Name')
+        field :description, _('Description')
+        field :job_template_name, _('Job template name')
+      end
+
+      build_options
+    end
+
+    class InfoCommand < HammerCLIForeman::InfoCommand
+      output do
+        field :id, _('ID')
+        field :label, _('Label')
+        field :name, _('Name')
+        field :description, _('Description')
+        field :job_template_name, _('Job template name')
+        field :job_template_id, _('Job template ID')
+      end
+
+      build_options
+    end
+
+    class UpdateCommand < HammerCLIForeman::UpdateCommand
+      success_message _('Remote execution feature updated')
+      failure_message _('Could not update the remote execution feature')
+
+      build_options
+    end
+
+    autoload_subcommands
+  end
+
+  HammerCLI::MainCommand.subcommand 'remote-execution-feature', _('Manage remote execution features'), RemoteExecutionFeature
+end

data/lib/hammer_cli_foreman_remote_execution/template_input.rb

@@ -5,7 +5,7 @@ module HammerCLIForemanRemoteExecution
 
     class ListCommand < HammerCLIForeman::ListCommand
       output do
-        field :id, _('Id')
+        field :id, _('ID')
         field :name, _('Name')
         field :input_type, _('Input type')
       end
@@ -15,7 +15,7 @@ module HammerCLIForemanRemoteExecution
 
     class InfoCommand < HammerCLIForeman::InfoCommand
       output do
-        field :id, _('Id')
+        field :id, _('ID')
         field :name, _('Name')
         field :input_type, _('Input type')
 

data/lib/hammer_cli_foreman_remote_execution/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIForemanRemoteExecution
   def self.version
-    @version ||= Gem::Version.new '0.0.4'
+    @version ||= Gem::Version.new '0.0.5'
   end
 end

data/locale/Makefile

@@ -0,0 +1,57 @@
+#
+# Makefile for PO merging and MO generation. More info in the README.
+#
+# make all-mo (default) - generate MO files
+# make check - check translations using translate-tool
+# make tx-update - download and merge translations from Transifex
+# make clean - clean everything
+#
+DOMAIN = hammer-cli-foreman-remote-execution
+VERSION = $(shell ruby -e 'require "rubygems";spec = Gem::Specification::load("../hammer_cli_foreman_remote_execution.gemspec");puts spec.version')
+POTFILE = $(DOMAIN).pot
+MOFILE = $(DOMAIN).mo
+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
+	msgfmt -o $(shell dirname $@)/LC_MESSAGES/$(MOFILE) $<
+
+# Generate MO files from PO files
+all-mo: $(MOFILES)
+
+# Check for malformed strings
+%.pox: %.po
+	msgfmt -c $<
+	pofilter --nofuzzy -t variables -t blank -t urls -t emails -t long -t newlines \
+		-t endwhitespace -t endpunc -t puncspacing -t options -t printf -t validchars --gnome $< > $@
+	cat $@
+	! grep -q msgid $@
+
+check: $(POXFILES)
+
+# Unify duplicate translations
+uniq-po:
+	for f in $(shell find ./ -name "*.po") ; do \
+		msguniq $$f -o $$f ; \
+	done
+
+tx-pull: $(EDITFILES)
+	tx pull -f
+	for f in $(POFILES) ; do \
+		sed -i 's/^\("Project-Id-Version: \).*$$/\1$(DOMAIN) $(VERSION)\\n"/' $$f; \
+	done
+
+# Extract strings and update the .pot, prepare .edit.po files
+extract-strings:
+	bundle exec rake gettext:find
+
+# Merge .edit.po into .po
+update-po:
+	bundle exec rake gettext:find
+
+tx-update: extract-strings tx-pull $(MOFILES)
+	git commit -m "i18n - extracting new, pulling from tx" ../locale
+	-echo Changes commited!

data/locale/README.md

@@ -0,0 +1,18 @@
+Updating the translations
+-------------------------
+
+  1. Check if there are any new languages with progress more than 50% on [transifex](https://www.transifex.com/projects/p/foreman/resource/hammer-cli-foreman/). If so, do the following for each of the new languages:
+
+  ```
+    mkdir locale/<lang>
+    cp locale/hammer-cli-foreman.pot locale/<lang>/hammer-cli-foreman.po
+  ```
+  2. Make sure you have `transifex-client` installed
+
+  3. Update the translations. From GIT repo root directory run:
+
+  ```
+    make -C locale tx-update
+  ```
+
+  It will download translations from transifex, generates `mo` files, updates strings in `pot` file and wraps all the changes in a new commit. Transifex automatically updates its strings when the commit is pushed to Github.

data/locale/en/hammer-cli-foreman-remote-execution.po

@@ -0,0 +1,209 @@
+# English translations for hammer-cli-foreman-remote-execution package.
+# Copyright (C) 2016 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the hammer-cli-foreman-remote-execution package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: hammer-cli-foreman-remote-execution 0.0.4\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2016-02-10 14:04-0500\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: English\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"\n"
+
+msgid "Manage foreign input sets"
+msgstr ""
+
+msgid "ID"
+msgstr ""
+
+msgid "Target template ID"
+msgstr ""
+
+msgid "Target template name"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Include all"
+msgstr ""
+
+msgid "Include"
+msgstr ""
+
+msgid "Exclude"
+msgstr ""
+
+msgid "Foreign input set updated"
+msgstr ""
+
+msgid "Could not update the input set"
+msgstr ""
+
+msgid "Foreign input set created"
+msgstr ""
+
+msgid "Could not create the input set"
+msgstr ""
+
+msgid "Foreign input set deleted"
+msgstr ""
+
+msgid "Could not delete the input set"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Success"
+msgstr ""
+
+msgid "Failed"
+msgstr ""
+
+msgid "Pending"
+msgstr ""
+
+msgid "Total"
+msgstr ""
+
+msgid "Start"
+msgstr ""
+
+msgid "Job Category"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
+msgid "Cron line"
+msgstr ""
+
+msgid "Recurring logic ID"
+msgstr ""
+
+msgid "Hosts"
+msgstr ""
+
+msgid "View the output for a host"
+msgstr ""
+
+msgid "Do not wait for job to complete, shows current output only"
+msgstr ""
+
+msgid "Job invocation %{id} created"
+msgstr ""
+
+msgid "Schedule the execution for a later time"
+msgstr ""
+
+msgid "Execution should be cancelled if it cannot be started before --start-at"
+msgstr ""
+
+msgid "Create a recurring execution"
+msgstr ""
+
+msgid "Perform no more executions after this time, used with --cron-line"
+msgstr ""
+
+msgid "Specify inputs from command line"
+msgstr ""
+
+msgid "Read input values from files"
+msgstr ""
+
+msgid "Dynamic search queries are evaluated at run time"
+msgstr ""
+
+msgid "Manage job invocations"
+msgstr ""
+
+msgid "Provider"
+msgstr ""
+
+msgid "Type"
+msgstr ""
+
+msgid "Inputs"
+msgstr ""
+
+msgid "View job template content"
+msgstr ""
+
+msgid "Path to a file that contains the template"
+msgstr ""
+
+msgid "Job template created"
+msgstr ""
+
+msgid "Could not create the job template"
+msgstr ""
+
+msgid "Job template updated"
+msgstr ""
+
+msgid "Could not update the job template"
+msgstr ""
+
+msgid "Job template deleted"
+msgstr ""
+
+msgid "Could not delete the job template"
+msgstr ""
+
+msgid "Manage job templates"
+msgstr ""
+
+msgid ""
+"Comma-separated list of key=file, where file is a path to a text file to be re"
+"ad"
+msgstr ""
+
+msgid ""
+"Cron line format 'a b c d e', where:\n"
+"  a. is minute (range: 0-59)\n"
+"  b. is hour (range: 0-23)\n"
+"  c. is day of month (range: 1-31)\n"
+"  d. is month (range: 1-12)\n"
+"  e. is day of week (range: 0-6)"
+msgstr ""
+
+msgid "Manage template inputs"
+msgstr ""
+
+msgid "Input type"
+msgstr ""
+
+msgid "Fact name"
+msgstr ""
+
+msgid "Variable name"
+msgstr ""
+
+msgid "Puppet parameter name"
+msgstr ""
+
+msgid "Options"
+msgstr ""
+
+msgid "Template input created"
+msgstr ""
+
+msgid "Could not create the template input"
+msgstr ""
+
+msgid "Template input deleted"
+msgstr ""
+
+msgid "Could not delete the template input"
+msgstr ""