foreman_remote_execution 0.2.3 → 0.3.0

data/app/views/job_templates/_custom_tabs.html.erb

@@ -11,10 +11,10 @@
 
   <%= text_f f, :description_format,
              :disabled => @template.locked?,
-             :help_inline => popover(_('Explanation'), _('This template is used to generate the description.
-                                                          Input values can be used using the syntax %{package}.
-                                                          You may also include the job category and template
-                                                          name using %{job_category} and %{template_name}.')) %>
+             :help_inline => popover(_('Explanation'), _('This template is used to generate the description. ' +
+                                                         'Input values can be used using the syntax %{package}. ' +
+                                                         'You may also include the job category and template ' +
+                                                         'name using %{job_category} and %{template_name}.')) %>
 
   <%= select_f f, :provider_type, providers_options, :first, :last, :disabled => @template.locked? %>
 

data/app/views/job_templates/index.html.erb

@@ -7,13 +7,13 @@
                  display_link_if_authorized(_("New Job Template"),
                                             hash_for_new_job_template_path)) %>
 
-<table class="table table-bordered table-striped table-two-pane">
+<table class="table table-bordered table-striped table-two-pane table-fixed">
   <thead>
     <tr>
-      <th><%= sort :name, :as => s_("JobTemplate|Name") %></th>
-      <th><%= sort :snippet, :as => s_("JobTemplate|Snippet") %></th>
-      <th><%= sort :locked, :as => s_("JobTemplate|Locked"), :default => "DESC" %></th>
-      <th></th>
+      <th class="col-md-6"><%= sort :name, :as => s_("JobTemplate|Name") %></th>
+      <th class="col-md-1"><%= sort :snippet, :as => s_("JobTemplate|Snippet") %></th>
+      <th class="col-md-1"><%= sort :locked, :as => s_("JobTemplate|Locked"), :default => "DESC" %></th>
+      <th class="col-md-1"><%= _('Actions') %></th>
     </tr>
   </thead>
   <tbody>

data/app/views/overrides/nics/_execution_interface.html.erb

@@ -1 +1,9 @@
-<%= checkbox_f f, :execution, :help_inline => _("The execution interface is used for remote execution"), :class => :interface_execution %>
+<%= checkbox_f(
+  f,
+  :execution,
+  :help_inline => popover(
+    '', _("The execution interface is used for remote execution"),
+    :rel => 'popover-modal'),
+  :label_size => 'col-md-3',
+  :label => _('Remote execution'),
+  :class => :interface_execution) %>

data/app/views/remote_execution_features/_form.html.erb

@@ -0,0 +1,24 @@
+<%= form_for @remote_execution_feature do |f| %>
+  <div class="row">
+    <%= field(f, :name) { @remote_execution_feature.name } %>
+  </div>
+  <div class="row">
+    <%= field(f, :label) { @remote_execution_feature.label } %>
+  </div>
+  <div class="row">
+    <%= field(f, :description) { @remote_execution_feature.description } %>
+  </div>
+  <div class="row">
+    <%= field(f, :provided_inputs) { @remote_execution_feature.provided_inputs } %>
+  </div>
+  <div class="row">
+    <% job_templates = JobTemplate.authorized(:view_job_templates) %>
+    <% if @remote_execution_feature.job_template_id.present? && job_templates.where(:id => @remote_execution_feature.job_template_id).empty? %>
+      <div class="alert alert-warning" role="alert">
+        <%= _("You are not allowed to see the currently assigned template. Saving the form now would unassign the template.") %>
+      </div>
+    <% end %>
+    <%= selectable_f f, :job_template_id, job_templates.map { |t| [ t.name, t.id ] }, { :include_blank => true }, :class => 'input_type_selector' %>
+  </div>
+<%= submit_or_cancel f %>
+<% end %>

data/app/views/remote_execution_features/index.html.erb

@@ -0,0 +1,21 @@
+<% title _('Remote Execution Features') %>
+
+<table class="table table-bordered table-striped table-condensed">
+  <thead>
+    <tr>
+      <th><%= sort :label, :as => _('Label') %></th>
+      <th><%= sort :name, :as => _('Name') %></th>
+      <th><%= sort :description, :as => _('Description') %></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% @remote_execution_features.each do |feature| %>
+      <tr>
+        <td><%= link_to_if_authorized feature.label, hash_for_remote_execution_feature_path(feature).merge(:auth_object => feature, :permission => :edit_remote_execution_features) %></td>
+        <td><%= feature.name %></td>
+        <td><%= feature.description %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

data/app/views/remote_execution_features/show.html.erb

@@ -0,0 +1,3 @@
+<% title _("Edit Remote Execution Feature") %>
+
+<%= render :partial => 'form' %>

data/app/views/template_inputs/_form.html.erb

@@ -15,6 +15,7 @@
         <%= text_f f, :puppet_parameter_name, :class => 'puppet_parameter_input_type', :required => true, :disabled => @template.locked? %>
       </div>
       <div class="user_input_type custom_input_type_fields" style="<%= (f.object.user_template_input? || f.object.new_record?) ? '' : 'display:none' %>">
+        <%= checkbox_f f, :advanced, :disabled => @template.locked? %>
         <%= textarea_f f, :options, :rows => 3, :class => 'user_input_type', :help_inline => _("A list of options the user can select from. If not provided, the user will be given a free-form field"),
                                     :disabled => @template.locked? %>
       </div>

data/app/views/template_inputs/_invocation_form.html.erb

@@ -0,0 +1,7 @@
+<%= input_values_fields.fields_for input.id.to_s, composer.template_invocation_input_value_for(job_template, input) do |input_fields| %>
+  <% unless input.options.blank? %>
+    <%= selectable_f input_fields, :value, input.options_array, {:include_blank => !input.required}, :require => input.required, :label => input.name, :help_inline => input.description, :id => input.name, :onchange => "regenerate_description(this);" %>
+  <% else %>
+    <%= textarea_f input_fields, :value, :label => input.name, :help_inline => input.description, :required => input.required, :rows => 2, :onchange => "regenerate_description(this);", :id => input.name %>
+  <% end %>
+<% end %>

data/app/views/templates/package_action.erb

@@ -9,11 +9,12 @@ template_inputs:
   description: A script to run prior to the package action
   input_type: user
   required: false
+  advanced: true
 - name: action
   description: 'The package action: install, update, or remove'
   input_type: user
   required: true
-  options: "install\nupdate\nremove"
+  options: "install\nupdate\nremove\ngroup install\ngroup remove"
 - name: package
   description: The name of the package, if any
   input_type: user
@@ -22,9 +23,20 @@ template_inputs:
   description: A script to run after the package action
   input_type: user
   required: false
+  advanced: true
 %>
 
-die() {
+<%
+  supported_families = ['Redhat', 'Debian']
+  render_error(N_('Unsupported or no operating system found for this host.')) unless @host.operatingsystem && supported_families.include?(@host.operatingsystem.family)
+%>
+
+# Helper function that exits with a particular message and code.
+#
+# Usage:
+#   exit_with_message "Could not do a thing" 2
+#
+function exit_with_message() {
   echo "${1}, exiting..."
   exit $2
 }
@@ -33,7 +45,7 @@ die() {
   # Pre Script
   <%= input("pre_script") %>
   RETVAL=$?
-  [ $RETVAL -eq 0 ] || die "Pre script failed" $RETVAL
+  [ $RETVAL -eq 0 ] || exit_with_message "Pre script failed" $RETVAL
 <% end -%>
 
 # Action
@@ -43,11 +55,11 @@ die() {
   apt-get -y <%= input("action") %> <%= input("package") %>
 <% end -%>
 RETVAL=$?
-[ $RETVAL -eq 0 ] || die "Package action failed" $RETVAL
+[ $RETVAL -eq 0 ] || exit_with_message "Package action failed" $RETVAL
 
 <% unless input("post_script").blank? -%>
   # Post Script
   <%= input("post_script") %>
   RETVAL=$?
-  [ $RETVAL -eq 0 ] || die "Post script failed" $RETVAL
+  [ $RETVAL -eq 0 ] || exit_with_message "Post script failed" $RETVAL
 <% end -%>

data/app/views/templates/power_action.erb

@@ -0,0 +1,22 @@
+<%#
+kind: job_template
+name: Power Action - SSH Default
+job_category: Power
+description_format: '%{action} host'
+provider_type: SSH
+template_inputs:
+- name: action
+  description: Action to perform on the service
+  input_type: user
+  options: "restart\nshutdown"
+  required: true
+%>
+
+echo <%= input('action') %> host && sleep 3
+<%= case input('action')
+      when 'restart'
+        'reboot'
+      else
+        'shutdown -h now'
+      end %>
+

data/app/views/templates/puppet_run_once.erb

@@ -2,7 +2,7 @@
 kind: job_template
 name: Puppet Run Once - SSH Default
 job_category: Puppet
-description_format: '%{job_category} with "%{puppet_options}"'
+description_format: 'Run Puppet once with "%{puppet_options}"'
 provider_type: SSH
 template_inputs:
 - name: puppet_options

data/config/routes.rb

@@ -25,6 +25,8 @@ Rails.application.routes.draw do
     end
   end
 
+  resources :remote_execution_features, :only => [:show, :index, :update]
+
   # index is needed so the auto_complete_search can be constructed, otherwise autocompletion in filter does not work
   resources :template_invocations, :only => [:show, :index] do
     collection do
@@ -53,6 +55,8 @@ Rails.application.routes.draw do
         resources :template_inputs, :only => [:index, :show, :create, :destroy, :update]
         resources :foreign_input_sets, :only => [:index, :show, :create, :destroy, :update]
       end
+
+      resources :remote_execution_features, :only => [:show, :index, :update]
     end
   end
 end

data/db/migrate/20160113162007_expand_all_template_invocations.rb

@@ -18,7 +18,7 @@ class ExpandAllTemplateInvocations < ActiveRecord::Migration
       job_invocation.pattern_template_invocations.each do |pattern_template_invocation|
         job_invocation.targeting.hosts.each do |host|
           task = job_invocation.sub_tasks.find do |sub_task|
-            sub_task.locks.find { |lock| lock.resource_type == 'Host::Managed' && lock.resource_id == host.id && lock.name == 'link_resource'}.present?
+            sub_task.locks.find { |lock| lock.resource_type == 'Host::Managed' && lock.resource_id == host.id && lock.name == 'link_resource' }.present?
           end
           next if task.nil? # job invocations with static targeting that failed too early
 

data/db/migrate/20160118124600_create_remote_execution_features.rb

@@ -0,0 +1,14 @@
+class CreateRemoteExecutionFeatures < ActiveRecord::Migration
+  def change
+    create_table :remote_execution_features do |t|
+      t.string :label, :index => true, :null => false
+      t.string :name, :null => false
+      t.string :description
+      t.text :provided_inputs
+      t.integer :job_template_id
+    end
+    add_index :remote_execution_features, :label
+    add_index :remote_execution_features, :job_template_id
+    add_foreign_key :remote_execution_features, :templates, :column => :job_template_id
+  end
+end

data/db/migrate/20160125155108_make_job_template_name_unique.rb

@@ -0,0 +1,12 @@
+class MakeJobTemplateNameUnique < ActiveRecord::Migration
+  def up
+    duplicates = JobTemplate.unscoped.group(:name).count.delete_if { |_name, value| value == 1 }
+    duplicates.each_key do |duplicated_name|
+      templates = JobTemplate.where(:name => duplicated_name)
+      templates.each_with_index do |template, index|
+        new_name = JobTemplate.exists?(:name => "#{template.name}-#{index}") ? "#{template.name}-#{index}-#{SecureRandom.hex(2)}" : "#{template.name}-#{index}"
+        template.update_attribute(:name, new_name)
+      end
+    end
+  end
+end

data/db/migrate/20160127134031_add_advanced_to_template_input.rb

@@ -0,0 +1,11 @@
+class AddAdvancedToTemplateInput < ActiveRecord::Migration
+  def up
+    add_column :template_inputs, :advanced, :boolean, :default => false, :null => false
+    template = JobTemplate.find_by_name('Package Action - SSH Default')
+    TemplateInput.where(:name => ['pre_script', 'post_script'], :template_id => template.try(:id)).update_all(:advanced => true)
+  end
+
+  def down
+    remove_column :template_inputs, :advanced
+  end
+end

data/db/migrate/20160127162711_reword_puppet_template_description.rb

@@ -0,0 +1,9 @@
+class RewordPuppetTemplateDescription < ActiveRecord::Migration
+  def up
+    JobTemplate.where(:name => 'Puppet Run Once - SSH Default').update_all(:description_format => 'Run Puppet once with "%{puppet_options}"')
+  end
+
+  def down
+    JobTemplate.where(:name => 'Puppet Run Once - SSH Default').update_all(:description_format => '%{job_category} with "%{puppet_options}"')
+  end
+end

data/db/migrate/20160203104056_add_concurrency_options_to_job_invocation.rb

@@ -0,0 +1,6 @@
+class AddConcurrencyOptionsToJobInvocation < ActiveRecord::Migration
+  def change
+    add_column :job_invocations, :concurrency_level, :integer, :null => true
+    add_column :job_invocations, :time_span, :integer, :null => true
+  end
+end

data/db/seeds.d/70-job_templates.rb

@@ -1,7 +1,8 @@
 User.as_anonymous_admin do
   JobTemplate.without_auditing do
     Dir[File.join("#{ForemanRemoteExecution::Engine.root}/app/views/templates/**/*.erb")].each do |template|
-      JobTemplate.import(File.read(template), :default => true, :locked => true)
+      sync = !Rails.env.test? && Setting[:remote_execution_sync_templates]
+      JobTemplate.import!(File.read(template), :default => true, :locked => true, :update => sync)
     end
   end
 end

data/doc/plugins/div_tag.rb

@@ -1,7 +1,7 @@
 module Jekyll
   class DivTag < Liquid::Block
     def render(context)
-      content            = super
+      content = super
 
       <<-HTML.gsub(/^ +\|/, '')
         |<#{tag} class="#{@markup}">

data/doc/plugins/plantuml.rb

@@ -36,7 +36,7 @@ module Jekyll
 
       site.static_files << Jekyll::StaticFile.new(site, tmproot, folder, filename)
 
-      "<img src='" + "#{ site.baseurl }/" + folder + filename + "'>"
+      "<img src='#{site.baseurl}/#{folder}#{filename}>"
     end
 
     private

data/doc/plugins/tags.rb

@@ -30,7 +30,7 @@ module Jekyll
     end
 
     def new_tag(tag, posts)
-      self.class.types.each { |type|
+      self.class.types.each do |type|
         if layout = site.config["tag_#{type}_layout"]
           data = { 'layout' => layout, 'posts' => posts.sort.reverse!, 'tag' => tag, 'title' => tag }
 
@@ -43,10 +43,10 @@ module Jekyll
           page_name = "#{pretty? ? 'index' : name}#{site.layouts[data['layout']].ext}"
 
           site.pages << TagPage.new(
-              site, site.source, tag_dir, page_name, data
+            site, site.source, tag_dir, page_name, data
           )
         end
-      }
+      end
     end
 
     def add_tag_cloud(num = 5, name = 'tag_data')
@@ -61,10 +61,9 @@ module Jekyll
     def calculate_tag_cloud(num = 5)
       range = 0
 
-      tags = active_tags.map { |tag, posts|
+      tags = active_tags.map do |tag, posts|
         [tag.to_s, range < (size = posts.size) ? range = size : size]
-      }
-
+      end
 
       range = 1..range
 
@@ -100,9 +99,9 @@ module Jekyll
   module Filters
 
     def tag_cloud(site)
-      active_tag_data.map { |tag, set|
+      active_tag_data.map do |tag, set|
         tag_link(tag, tag_url(tag), :class => "set-#{set} label label-default")
-      }.join(' ')
+      end.join(' ')
     end
 
     def tag_link(tag, url = tag_url(tag), html_opts = nil)

data/doc/plugins/toc.rb

@@ -1,7 +1,6 @@
 module Jekyll
   module FancyToCFilter
     def fancytoc(input)
-
       converter     = @context.registers[:site].converters.find { |c| c.is_a? Jekyll::Converters::Markdown }
       extensions    = converter.instance_variable_get(:@parser).instance_variable_get(:@redcarpet_extensions)
       toc_generator = Redcarpet::Markdown.new(Redcarpet::Render::HTML_TOC, extensions)

data/foreman_remote_execution.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = `git ls-files doc`.split("\n") + Dir['README*', 'LICENSE']
 
   s.add_dependency 'deface'
-  s.add_dependency 'dynflow', '~> 0.8.8'
+  s.add_dependency 'dynflow', '~> 0.8.10'
   s.add_dependency 'foreman-tasks', '~> 0.7.11'
 
   s.add_development_dependency 'rubocop'

data/lib/foreman_remote_execution/engine.rb

@@ -29,7 +29,7 @@ module ForemanRemoteExecution
 
     initializer 'foreman_remote_execution.register_plugin', after: :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_remote_execution do
-        requires_foreman '>= 1.10'
+        requires_foreman '>= 1.11'
 
         apipie_documented_controllers ["#{ForemanRemoteExecution::Engine.root}/app/controllers/api/v2/*.rb"]
 
@@ -45,6 +45,8 @@ module ForemanRemoteExecution
                                             :'api/v2/job_templates' => [:update],
                                             :'api/v2/template_inputs' => [:create, :update, :destroy],
                                             :'api/v2/foreign_input_sets' => [:create, :update, :destroy]}, :resource_type => 'JobTemplate'
+          permission :edit_remote_execution_features, { :remote_execution_features => [:index, :show, :update],
+                                                        :'api/v2/remote_execution_features' => [:index, :show, :update]}, :resource_type => 'RemoteExecutionFeature'
           permission :destroy_job_templates, { :job_templates => [:destroy],
                                                :'api/v2/job_templates' => [:destroy] }, :resource_type => 'JobTemplate'
           permission :lock_job_templates, { :job_templates => [:lock, :unlock] }, :resource_type => 'JobTemplate'
@@ -72,7 +74,8 @@ module ForemanRemoteExecution
           :create_job_templates,
           :lock_job_templates,
           :view_audit_logs,
-          :filter_autocompletion_for_template_invocation
+          :filter_autocompletion_for_template_invocation,
+          :edit_remote_execution_features
         ]
 
         # Add a new role called 'Remote Execution User ' if it doesn't exist
@@ -85,6 +88,11 @@ module ForemanRemoteExecution
              caption: N_('Job templates'),
              parent: :hosts_menu,
              after: :provisioning_templates
+        menu :admin_menu, :remote_execution_features,
+             url_hash: { controller: :remote_execution_features, action: :index },
+             caption: N_('Remote Execution Features'),
+             parent: :administer_menu,
+             after: :bookmarks
 
         menu :top_menu, :job_invocations,
              url_hash: { controller: :job_invocations, action: :index },

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '0.2.3'
+  VERSION = '0.3.0'
 end

data/locale/action_names.rb

@@ -0,0 +1,8 @@
+# Autogenerated!
+_("Create architecture")
+_("Delete architecture")
+_("Update architecture")
+_("Import facts")
+_("Import puppetclasses")
+_("Action with sub plans")
+_("Remote action:")