foreman_remote_execution 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42b3d239b3161263e650d3d6d6dba548e732145b
-  data.tar.gz: aeadb8c264c040867f45d224fc87724f056976db
+  metadata.gz: 9b67393920eea010c57e8994ea08e08b39ac660d
+  data.tar.gz: 5d99f91e886a5c512faced47136702fb4660977c
 SHA512:
-  metadata.gz: 4b507b186ef9ba52d7612e2843fed86c268bb9dda737e6c8e029a7c9a1046b45caf5495d7e65ed35ce4f9e4a1b8fc2fc9c33ae9763684b5a77e60b61fb69a9ae
-  data.tar.gz: 0b7dbd1acb92629cf67f3a4a80f87ba7280f832196efaf471f60d50b278d9823e6da9907991b25552304bf78608305c84c048162d9ae56df8bbb68da9caa2078
+  metadata.gz: f72a2ec071b11e5de82585ecaf63371d267215074d1e246bf2d2b29da086d09075b243a798689b1b54a92adf748726b753c7e3c6dd0c4a2a5c2ae795a5dcae9c
+  data.tar.gz: 7290328eb26ea95a4fb882a6f8d1258dc51052e289098105c6e261be6203cb06d8254c2eb223640ec30fa8cc6b1359b6dc99f18ab9f5468a7b642c7b209e00f3

data/.rubocop.yml

@@ -6,10 +6,8 @@ AllCops:
   Exclude:
     - 'doc/plugins/**'
 
-# TODO: uncomment when on rubocop 0.35.1
-#Rails/Date:
-  #Exclude:
-    #- foreman_remote_execution.gemspec
+Rails/Date:
+  Enabled: false
 
 # Don't enforce documentation
 Style/Documentation:
@@ -32,7 +30,7 @@ Style/RedundantSelf:
   Enabled: false
 
 Metrics/ClassLength:
-  Max: 200
+  Max: 500
 
 Style/FileName:
   Exclude:

data/.rubocop_todo.yml

@@ -1,26 +1,20 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-07-07 10:58:32 -0400 using RuboCop version 0.28.0.
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2016-04-25 14:06:56 -0400 using RuboCop version 0.35.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-Lint/AmbiguousRegexpLiteral:
-  Enabled: false
-
-# Offense count: 1
-# Configuration parameters: AllowSafeAssignment.
-Lint/AssignmentInCondition:
-  Enabled: false
-
-# Offense count: 1
+# Offense count: 7
 # Cop supports --auto-correct.
+# Configuration parameters: IgnoreEmptyBlocks.
 Lint/UnusedBlockArgument:
   Enabled: false
 
-# Offense count: 3
+# Offense count: 11
 # Cop supports --auto-correct.
+# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
 Lint/UnusedMethodArgument:
   Enabled: false
 
@@ -28,78 +22,98 @@ Lint/UnusedMethodArgument:
 Lint/UselessAssignment:
   Enabled: false
 
-# Offense count: 2
+# Offense count: 35
 Metrics/AbcSize:
   Max: 42
 
-# Offense count: 46
+# Offense count: 3
+Metrics/CyclomaticComplexity:
+  Max: 8
+
+# Offense count: 775
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
-  Max: 171
+  Max: 204
 
-# Offense count: 1
+# Offense count: 3
+Metrics/PerceivedComplexity:
+  Max: 8
+
+# Offense count: 2
 # Configuration parameters: Include.
 Rails/DefaultScope:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/AndOr:
-  Enabled: false
+  Exclude:
+    - 'app/models/job_invocation.rb'
+    - 'app/models/job_template.rb'
 
 # Offense count: 2
-# Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/BarePercentLiterals:
-  Enabled: false
+Rails/TimeZone:
+  Exclude:
+    - 'app/models/job_invocation_composer.rb'
+    - 'test/functional/api/v2/job_invocations_controller_test.rb'
 
-# Offense count: 1
+# Offense count: 15
+# Cop supports --auto-correct.
 # Configuration parameters: IndentWhenRelativeTo, SupportedStyles, IndentOneStep.
 Style/CaseIndentation:
   Enabled: false
 
 # Offense count: 4
 # Cop supports --auto-correct.
-Style/ColonMethodCall:
-  Enabled: false
-
-# Offense count: 1
 # Configuration parameters: Keywords.
 Style/CommentAnnotation:
   Enabled: false
 
 # Offense count: 1
+Style/DoubleNegation:
+  Exclude:
+    - 'app/models/input_template_renderer.rb'
+
+# Offense count: 5
 # Cop supports --auto-correct.
 Style/EmptyLines:
   Enabled: false
 
-# Offense count: 1
+# Offense count: 12
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/EmptyLinesAroundBlockBody:
   Enabled: false
 
-# Offense count: 7
+# Offense count: 19
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/EmptyLinesAroundClassBody:
   Enabled: false
 
-# Offense count: 5
+# Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/EmptyLinesAroundModuleBody:
   Enabled: false
 
-# Offense count: 1
+# Offense count: 2
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/FormatString:
+  Exclude:
+    - 'app/controllers/job_templates_controller.rb'
+    - 'app/lib/actions/remote_execution/run_hosts_job.rb'
+
+# Offense count: 9
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
-  Enabled: false
+  Exclude:
+    - 'app/controllers/api/v2/template_inputs_controller.rb'
+    - 'app/models/concerns/foreman_remote_execution/errors_flattener.rb'
+    - 'app/models/concerns/foreman_remote_execution/nic_extensions.rb'
+    - 'app/models/job_template.rb'
+    - 'app/models/targeting.rb'
+    - 'app/models/template_invocation.rb'
 
-# Offense count: 36
+# Offense count: 1299
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues.
 Style/HashSyntax:
   Enabled: false
 
@@ -107,9 +121,10 @@ Style/HashSyntax:
 # Cop supports --auto-correct.
 # Configuration parameters: Width.
 Style/IndentationWidth:
-  Enabled: false
+  Exclude:
+    - 'app/models/template_invocation.rb'
 
-# Offense count: 2
+# Offense count: 12
 # Cop supports --auto-correct.
 Style/LineEndConcatenation:
   Enabled: false
@@ -117,18 +132,8 @@ Style/LineEndConcatenation:
 # Offense count: 1
 # Cop supports --auto-correct.
 Style/MethodCallParentheses:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/MethodDefParentheses:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/MultilineIfThen:
-  Enabled: false
+  Exclude:
+    - 'test/unit/actions/run_hosts_job_test.rb'
 
 # Offense count: 6
 # Cop supports --auto-correct.
@@ -136,78 +141,71 @@ Style/MultilineIfThen:
 Style/MultilineOperationIndentation:
   Enabled: false
 
-# Offense count: 4
-# Cop supports --auto-correct.
-Style/NegatedIf:
-  Enabled: false
-
-# Offense count: 1
-# Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
-Style/Next:
-  Enabled: false
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/Not:
-  Enabled: false
-
 # Offense count: 10
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
   Enabled: false
 
-# Offense count: 2
+# Offense count: 1
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/RaiseArgs:
+  Enabled: false
+
+# Offense count: 8
 # Cop supports --auto-correct.
 # Configuration parameters: AllowMultipleReturnValues.
 Style/RedundantReturn:
   Enabled: false
 
-# Offense count: 3
+# Offense count: 33
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/SignalException:
   Enabled: false
 
 # Offense count: 1
+# Configuration parameters: Methods.
+Style/SingleLineBlockParams:
+  Exclude:
+    - 'app/models/job_template.rb'
+
+# Offense count: 2
 # Cop supports --auto-correct.
 Style/SpaceAfterComma:
-  Enabled: false
+  Exclude:
+    - 'test/functional/api/v2/job_invocations_controller_test.rb'
 
-# Offense count: 2
+# Offense count: 5
 # Cop supports --auto-correct.
+# Configuration parameters: MultiSpaceAllowedForOperators.
 Style/SpaceAroundOperators:
-  Enabled: false
+  Exclude:
+    - 'db/migrate/20150708133242_add_invocation.rb'
+    - 'test/unit/input_template_renderer_test.rb'
+    - 'test/unit/job_invocation_composer_test.rb'
 
-# Offense count: 2
+# Offense count: 43
 # Cop supports --auto-correct.
 Style/SpaceInsideBrackets:
   Enabled: false
 
-# Offense count: 4
+# Offense count: 89
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SupportedStyles.
 Style/SpaceInsideHashLiteralBraces:
   Enabled: false
 
+# Offense count: 7
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/StringLiterals:
+  Exclude:
+    - 'locale/action_names.rb'
+
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: IgnoredMethods.
 Style/SymbolProc:
-  Enabled: false
-
-# TODO: uncomment when on rubocop 0.35.1
-#Rails/FindBy:
-  #Enabled: false # rails 4
-
-# TODO: uncomment when on rubocop 0.35.1
-#Style/UnneededPercentQ:
-  #Enabled: false
-
-# TODO: uncomment when on rubocop 0.35.1
-#Lint/EndAlignment:
-  #Enabled: false
-
-# TODO: uncomment when on rubocop 0.35.1
-#Metrics/ModuleLength:
-  #Enabled: false
+  Exclude:
+    - 'app/models/concerns/foreman_remote_execution/host_extensions.rb'

data/app/assets/javascripts/job_templates.js

@@ -0,0 +1,10 @@
+function show_import_job_template_modal() {
+  var modal_window = $('#importJobTemplateModal');
+  modal_window.modal({'show': true});
+  modal_window.find('a[rel="popover-modal"]').popover();
+}
+
+function close_import_job_template_modal() {
+  var modal_window = $('#importJobTemplateModal');
+  modal_window.modal('hide');
+}

data/app/assets/stylesheets/modal_window.css.scss

@@ -0,0 +1,4 @@
+div.modal-body {
+  overflow-y: auto;
+  max-height: 500px;
+}

data/app/controllers/api/v2/job_templates_controller.rb

@@ -7,7 +7,7 @@ module Api
       include ::Foreman::Controller::ProvisioningTemplates
 
       before_filter :find_optional_nested_object
-      before_filter :find_resource, :only => %w{show update destroy clone}
+      before_filter :find_resource, :only => %w{show update destroy clone export}
 
       before_filter :handle_template_upload, :only => [:create, :update]
 
@@ -22,6 +22,23 @@ module Api
         @job_templates = resource_scope_for_index
       end
 
+      api :POST, '/job_templates/import', N_('Import a job template from ERB')
+      param :template, String, :required => true, :desc => N_('Template ERB')
+      param :overwrite, :bool, :required => false, :desc => N_('Overwrite template if it already exists')
+      def import
+        options = params[:overwrite] ? { :update => true } : { :build_new => true }
+
+        @job_template = JobTemplate.import(params[:template], options)
+        @job_template ||= JobTemplate.new
+        process_response @job_template.save
+      end
+
+      api :GET, '/job_templates/:id/export', N_('Export a job template to ERB')
+      param :id, :identifier, :required => true
+      def export
+        send_data @job_template.to_erb, :type => 'text/plain', :disposition => 'attachment', :filename => @job_template.filename
+      end
+
       api :GET, '/job_templates/:id', N_('Show job template details')
       param :id, :identifier, :required => true
       def show
@@ -110,6 +127,10 @@ module Api
         case params[:action]
         when 'clone'
           :create
+        when 'import'
+          :create
+        when 'export'
+          :view
         else
           super
         end

data/app/controllers/job_templates_controller.rb

@@ -24,6 +24,26 @@ class JobTemplatesController < ::TemplatesController
     end
   end
 
+  def import
+    contents = params.fetch(:imported_template, {}).fetch(:template, nil).try(:read)
+
+    @template = JobTemplate.import(contents, :update => Foreman::Cast.to_bool(params[:imported_template][:overwrite]))
+    if @template && @template.save
+      flash[:notice] = _('Job template imported successfully.')
+      redirect_to job_templates_path(:search => "name = \"#{@template.name}\"")
+    else
+      @template ||= JobTemplate.import(contents, :build_new => true)
+      @template.valid?
+      flash[:warning] = _('Unable to save template. Correct highlighted errors')
+      render :action => 'new'
+    end
+  end
+
+  def export
+    find_resource unless @template.present?
+    send_data @template.to_erb, :type => 'text/plain', :disposition => 'attachment', :filename => @template.filename
+  end
+
   private
 
   def find_resource
@@ -36,7 +56,7 @@ class JobTemplatesController < ::TemplatesController
 
   def action_permission
     case params[:action]
-      when 'auto_complete_job_category'
+      when 'auto_complete_job_category', 'export'
         :view_job_templates
       else
         super

data/app/helpers/concerns/foreman_remote_execution/job_templates_extensions.rb

@@ -9,8 +9,9 @@ module ForemanRemoteExecution
     def permitted_actions_with_run_button(template)
       original = permitted_actions_without_run_button(template)
 
-      if template.is_a?(JobTemplate) && !template.snippet
-        original.unshift(display_link_if_authorized(_('Run'), hash_for_new_job_invocation_path(:template_id => template.id)))
+      if template.is_a?(JobTemplate)
+        original.unshift(display_link_if_authorized(_('Export'), hash_for_export_job_template_path(:id => template.id), 'data-no-turbolink' => true))
+        original.unshift(display_link_if_authorized(_('Run'), hash_for_new_job_invocation_path(:template_id => template.id))) unless template.snippet
       end
 
       original

data/app/helpers/remote_execution_helper.rb

@@ -1,7 +1,7 @@
 # rubocop:disable Metrics/ModuleLength
 module RemoteExecutionHelper
   def providers_options
-    RemoteExecutionProvider.providers.map { |key, provider| [ key, _(provider) ] }
+    RemoteExecutionProvider.providers.map { |key, provider| [ key, _(provider.humanized_name) ] }
   end
 
   def template_input_types_options
@@ -62,6 +62,10 @@ module RemoteExecutionHelper
   def template_invocation_status(task)
     if task.nil?
       icon_text('question', 'N/A', :kind => 'fa')
+    elsif task.state == 'running'
+      icon_text('running', _('running'), :kind => 'pficon')
+    elsif task.state == 'planned'
+      icon_text('build', _('planned'), :kind => 'pficon')
     else
       case task.result
         when 'warning', 'error'
@@ -72,8 +76,6 @@ module RemoteExecutionHelper
           end
         when 'success'
           icon_text('ok', _('success'), :kind => 'pficon')
-        when 'pending'
-          icon_text('question', _('pending'), :kind => 'fa')
         else
           task.result
       end