hammer_cli_foreman_templates 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c9940a9b1ee7f78f853be626ec6c12ef4836ecf7
-  data.tar.gz: 324d0dc97ba2d88254bbbbdde8d1a3cfe4de8c68
+SHA256:
+  metadata.gz: 8f6da17ea43bb64f7903d23cb2dbdcbd2bd6f3fd68aa4f1e3ec7977c991cafe2
+  data.tar.gz: a9f3dfbf5ba28b9132eb2596e0e344fc913b212c536c05010e35f56296259c86
 SHA512:
-  metadata.gz: 920c4fbc3508ecce17204bb57619c065a06c8a6aa7dbd6526a12d5452e87c7a254a4a149f9e1ff76a21d86f985186adbc4e116f98ce0201d702636799b5086df
-  data.tar.gz: c50266c5c8745f49f1051e28f22bc6f1cd80d5d47770f05a0eb61110134afe3ee3428208d2b0af26d35c4eb5ebbbd9be43ca02c2d1caa09f83708e20762aed21
+  metadata.gz: 6bf9fdf5b46253f61d5810b0d8c8bd8f78cb98bae4529c1189853ac26159ec3b5e1590373cdfbbccf0f5e0968f56a2ec5ef8e5d854aba5bf20f572808aa4cae7
+  data.tar.gz: ecfc7ef16c7dd17b918e9367371da6d8056d4b07ce408cf0337d4470d1784c0bb698f8976882fc392c62fba09370c5ff9123e70a95d35b9ef7e0320524ba9be2

data/README.md

@@ -1,8 +1,39 @@
-# hammer_cli_foreman_templates
+# Hammer CLI Foreman Templates
 
-Next-gen CLI tool for [ForemanTemplates](http://www.theforeman.org/plugins/foreman_templates/)
+This Hammer CLI plugin contains set of commands for [foreman_templates](
+  https://github.com/theforeman/foreman_templates
+), a plugin to Foreman for syncing the contents of the Foreman Community
+Templates [repository](
+  https://github.com/theforeman/community-templates/
+) (or a git repo of your choice).
 
-hammer-cli development docs for [help](https://github.com/theforeman/hammer-cli/blob/master/doc/developer_docs.md#hammer-development-docs)
+## Versions
+
+This is the list of which version of Foreman Templates is needed to which version of this plugin.
+
+| Hammer Templates  | 0.1.0+ |
+|-------------------|--------|
+| Foreman Templates | 5.0.2+ |
+
+## Installation
+
+    $ gem install hammer_cli_foreman_templates
+
+    $ mkdir -p ~/.hammer/cli.modules.d/
+
+    $ cat <<EOQ > ~/.hammer/cli.modules.d/foreman_templates.yml
+    :foreman_templates:
+      :enable_module: true
+    EOQ
+
+    # to confirm things work, this should return useful output
+    hammer import-templates --help
+    hammer export-templates --help
+
+## More info
+
+See our [Hammer CLI installation and configuration instuctions](
+https://github.com/theforeman/hammer-cli/blob/master/doc/installation.md#installation).
 
 ## Development setup
 With this guide, you'll be able to set up hammer_cli_foreman_templates with hammer-cli-foreman for development.
@@ -69,5 +100,3 @@ You should see in the output:
 Extension module hammer_cli_foreman_templates (version) loaded
 ```
 If you see no errors, you should be good to go.
-
-

data/lib/hammer_cli_foreman_templates.rb

@@ -3,9 +3,14 @@ require 'hammer_cli_foreman/template'
 
 module HammerCLIForemanTemplates
   require 'hammer_cli_foreman_templates/version'
+  require 'hammer_cli_foreman_templates/exception_handler'
   require 'hammer_cli_foreman_templates/import'
   require 'hammer_cli_foreman_templates/export'
 
+  def self.exception_handler_class
+    HammerCLIForemanTemplates::ExceptionHandler
+  end
+
   HammerCLI::MainCommand.lazy_subcommand(
     ImportCommand.command_name,
     ImportCommand.desc,

data/lib/hammer_cli_foreman_templates/exception_handler.rb

@@ -0,0 +1,23 @@
+module HammerCLIForemanTemplates
+  class ExceptionHandler < HammerCLIForeman::ExceptionHandler
+    def mappings
+      [
+        [RestClient::InternalServerError, :handle_internal_error]
+      ] + super
+    end
+
+    protected
+
+    def handle_internal_error(e)
+      handle_templates_error(e)
+      HammerCLI::EX_SOFTWARE
+    end
+
+    def handle_templates_error(e)
+      response = JSON.parse(e.response)
+      response = HammerCLIForeman.record_to_common_format(response)
+      print_error(response['error'] || response['warning'])
+      log_full_error e
+    end
+  end
+end

data/lib/hammer_cli_foreman_templates/export.rb

@@ -5,9 +5,26 @@ module HammerCLIForemanTemplates
 
     resource :template, :export
 
-    success_message _('Export finished')
+    success_message _('Export finished.')
     failure_message _('Could not export')
 
-    build_options without: [:verbose]
+    option '--verbose', 'BE_VERBOSE', _('Be verbose'),
+           format: HammerCLI::Options::Normalizers::Bool.new
+
+    output do
+      field :id, _('Id'), Fields::Id
+      field :name, _('Name')
+      field :type, _('Type')
+      field :exported, _('Exported')
+    end
+
+    def execute
+      templates = send_request['templates']
+      templates = [] unless option_verbose
+      print_data(templates)
+      HammerCLI::EX_OK
+    end
+
+    build_options
   end
 end

data/lib/hammer_cli_foreman_templates/import.rb

@@ -5,9 +5,48 @@ module HammerCLIForemanTemplates
 
     resource :template, :import
 
-    success_message _('Import finished')
+    success_message _('Import finished.')
     failure_message _('Could not import')
 
-    build_options without: [:verbose]
+    output do
+      field :id, _('Id'), Fields::Id
+      field :name, _('Name')
+      field :type, _('Type')
+      field :imported, _('Imported')
+      field :changed, _('Changed')
+      field nil, _('Changes'), Fields::Label, hide_blank: true do
+        field :diff, nil, Fields::LongText, hide_blank: true
+      end
+      field nil, _('Errors'), Fields::Label, hide_blank: true do
+        field :validation_errors, _('Validation'), Fields::Collection, hide_blank: true do
+          field nil, nil
+        end
+        field :additional_errors, _('Additional'), Fields::LongText, hide_blank: true
+        field :exception, _('Exception'), Fields::LongText, hide_blank: true
+      end
+    end
+
+    def execute
+      templates = send_request['templates']
+      if option_verbose
+        templates.each do |template|
+          if template['validation_errors'].empty?
+            template['validation_errors'] = nil
+          else
+            validation_errors = []
+            template['validation_errors'].each do |key, value|
+              validation_errors << "#{key.capitalize}: #{value}"
+            end
+            template['validation_errors'] = validation_errors
+          end
+        end
+      else
+        templates = []
+      end
+      print_data(templates)
+      HammerCLI::EX_OK
+    end
+
+    build_options
   end
 end

data/lib/hammer_cli_foreman_templates/version.rb

@@ -1,6 +1,6 @@
 
 module HammerCLIForemanTemplates
   def self.version
-    @version ||= Gem::Version.new '0.1.1'
+    @version ||= Gem::Version.new '0.1.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_foreman_templates
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - The Foreman team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-13 00:00:00.000000000 Z
+date: 2018-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman
@@ -38,14 +38,15 @@ files:
 - README.md
 - config/foreman_templates.yml
 - lib/hammer_cli_foreman_templates.rb
+- lib/hammer_cli_foreman_templates/exception_handler.rb
 - lib/hammer_cli_foreman_templates/export.rb
 - lib/hammer_cli_foreman_templates/i18n.rb
 - lib/hammer_cli_foreman_templates/import.rb
 - lib/hammer_cli_foreman_templates/version.rb
 - test/test_helper.rb
-homepage: http://github.com/theforeman/hammer-cli-foreman-templates
+homepage: https://github.com/theforeman/hammer-cli-foreman-templates
 licenses:
-- GPL-3
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -63,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Foreman Hammer commands for exporting and importing templates