foreman_remote_execution 0.3.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbd4cc854e9c31820b3dc2a1f9003613c5aa5ca1
-  data.tar.gz: 3f6b42cc33bac2022990315ed31d29fd537a5df9
+  metadata.gz: 5b0446f3fb6c5f2d4640bbe0e15ddee61123fd03
+  data.tar.gz: 49de19a88a35ff89dd770be96886a75600634012
 SHA512:
-  metadata.gz: 7bdbfca1932005c1d8fe09c9a72adb2b72bedd9455a9a6bed8e53fd3fa750dbf659920a6f443503007ac529da9136a5bbee8964fa9271123227e7f501d3ff31e
-  data.tar.gz: 8f7d084a004c1c8b0705e2f37625801090cfb789990a14ce50613781e21e72c9be595f14e0c05a3cb915d70d68fd94966bc5ff9bea80cd13bb58c807fdba56c4
+  metadata.gz: 777c28e28ab17cc1e5db620faff516f3b350cb6ae4acb3361e7fecd99821919d1a2ad5ca3706c79e4df246a7f6c92a78e6a0500de52c8fcbb4ac02411e747dab
+  data.tar.gz: cde19bd5f565b9d823f7668ddb7dbb4458d3d31f1607bef4a685f580bcfd0f340c9fcaef1916b1c9543419f11d6aa794cb7027ee0fa1534f768aefc7fbf9e6b4

data/README.md

@@ -33,6 +33,17 @@ Check the Foreman manual [remote execution section](http://theforeman.org/plugin
 
 Fork and send a Pull Request. Thanks!
 
+## Release Process
+
+### Pull Translations from Transifex
+
+As part of the release process, localization must be synced from Transifex. See the [wiki](http://projects.theforeman.org/projects/foreman/wiki/How_to_Create_a_Plugin#Pulling-translations-from-Transifex) for more information.
+
+### Sync Job Templates from Community Templates
+
+The [community-templates](https://github.com/theforeman/community-templates.git) repo is the source for our job templates.  Prior to release, use the script/sync_templates.sh script to pull in any changes.
+
+
 ## Copyright
 
 Copyright (c) 2015 The Foreman developers

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

@@ -23,7 +23,7 @@ module Api
       def_param_group :foreign_input_set do
         param :foreign_input_set, Hash, :required => true, :action_aware => true do
           param :target_template_id, :identifier, :required => true, :desc => N_('Target template ID')
-          param :include_all, :bool, :desc => N_('Include all inputs form the foreign template')
+          param :include_all, :bool, :desc => N_('Include all inputs from the foreign template')
           param :include, String, :desc => N_('A comma separated list of input names to be included from the foreign template.')
           param :exclude, String, :desc => N_('A comma separated list of input names to be included from the foreign template.')
           param :description, String, :required => false, :desc => N_('Input set description')

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

@@ -12,7 +12,7 @@ module ForemanRemoteExecution
     end
 
     def host_title_actions_with_run_button(*args)
-      title_actions(button_group(link_to(_('Run Job'), new_job_invocation_path(:host_ids => [args.first.id]), :id => :run_button)))
+      title_actions(button_group(link_to(_('Run Job'), new_job_invocation_path(:host_ids => [args.first.id]), :id => :run_button, :class => 'btn btn-default')))
       host_title_actions_without_run_button(*args)
     end
   end

data/app/helpers/remote_execution_helper.rb

@@ -35,7 +35,7 @@ module RemoteExecutionHelper
       when HostStatus::ExecutionStatus::QUEUED
         _('queued')
       when HostStatus::ExecutionStatus::RUNNING
-        _('running %{percent}%') % {:percent => invocation.progress}
+        _('running %{percent}%%') % {:percent => invocation.progress}
       when HostStatus::ExecutionStatus::OK
         _('succeeded')
       when HostStatus::ExecutionStatus::ERROR
@@ -96,7 +96,7 @@ module RemoteExecutionHelper
   def job_invocations_buttons
     [
       documentation_button_rex('3.2ExecutingaJob'),
-      display_link_if_authorized(_('Run Job'), hash_for_new_job_invocation_path)
+      new_link(_('Run Job'))
     ]
   end
 
@@ -206,13 +206,8 @@ module RemoteExecutionHelper
 
   def documentation_button_rex(section = '')
     url = 'http://theforeman.org/plugins/foreman_remote_execution/' +
-      "#{ForemanRemoteExecution::VERSION.split('.').take(2).join('.')}/index.html#" +
-      section
-    link_to(
-      icon_text('help', _('Documentation'),
-                :class => 'icon-white', :kind => 'pficon'),
-      url,
-      :rel => 'external', :class => 'btn btn-info', :target => '_blank')
+      "#{ForemanRemoteExecution::VERSION.split('.').take(2).join('.')}/index.html#"
+    documentation_button section, :root_url => url
   end
 
   def template_input_header(f, template)

data/app/models/job_invocation.rb

@@ -20,6 +20,9 @@ class JobInvocation < ActiveRecord::Base
   scoped_search :on => :job_category, :complete_value => true
   scoped_search :on => :description # FIXME No auto complete because of https://github.com/wvanbergen/scoped_search/issues/138
 
+  has_many :template_invocations_hosts, :through => :template_invocations, :source => :host
+  scoped_search :in => :template_invocations_hosts, :on => :name, :rename => 'host', :complete_value => true
+
   delegate :bookmark, :resolved?, :to => :targeting, :allow_nil => true
 
   include ForemanTasks::Concerns::ActionSubject

data/app/models/job_invocation_composer.rb

@@ -9,7 +9,7 @@ class JobInvocationComposer
     def params
       { :job_category => job_invocation_base[:job_category],
         :targeting => ui_params.fetch(:targeting, {}).merge(:user_id => User.current.id),
-        :triggering => ui_params.fetch(:triggering, {}),
+        :triggering => triggering,
         :host_ids => ui_params[:host_ids],
         :description_format => job_invocation_base[:description_format],
         :concurrency_control => concurrency_control_params,
@@ -57,6 +57,14 @@ class JobInvocationComposer
         :level => job_invocation_base[:concurrency_level]
       }
     end
+
+    def triggering
+      return {} unless ui_params.key?(:triggering)
+      trig = ui_params[:triggering]
+      keys = (1..5).map { |i| "end_time(#{i}i)" }
+      return trig unless trig.key?(:end_time) && trig[:end_time].keys == keys
+      trig.merge(:end_time => Time.local(*trig[:end_time].values_at(*keys)))
+    end
   end
 
   class ApiParams
@@ -304,7 +312,8 @@ class JobInvocationComposer
   end
 
   def valid?
-    targeting.valid? & job_invocation.valid? & !pattern_template_invocations.map(&:valid?).include?(false)
+    targeting.valid? & job_invocation.valid? & !pattern_template_invocations.map(&:valid?).include?(false) &
+      triggering.valid?
   end
 
   def save

data/app/models/job_template.rb

@@ -195,8 +195,8 @@ class JobTemplate < ::Template
   end
 
   def sync_feature(feature_name)
-    if feature_name && (feature = RemoteExecutionFeature.feature(feature_name))
-      feature.job_template ||= self
+    if feature_name && (feature = RemoteExecutionFeature.feature(feature_name)) && feature.job_template.blank?
+      self.remote_execution_features << feature
     end
   end
 

data/app/models/job_template_effective_user.rb

@@ -1,5 +1,7 @@
 class JobTemplateEffectiveUser < ActiveRecord::Base
 
+  attr_accessible :value, :current_user, :overridable
+
   belongs_to :job_template
 
   before_validation :set_defaults

data/app/models/setting/remote_execution.rb

@@ -22,7 +22,10 @@ class Setting::RemoteExecution < Setting
                  'root'),
         self.set('remote_execution_effective_user_method',
                  N_('What command should be used to switch to the effective user. One of %s') % SSHExecutionProvider::EFFECTIVE_USER_METHODS.inspect,
-                 'sudo'),
+                 'sudo',
+                 'remote_execution_effective_user_method',
+                 nil,
+                 { :collection => Proc.new {Hash[SSHExecutionProvider::EFFECTIVE_USER_METHODS.map{|method| [method, method]}]} }),
         self.set('remote_execution_sync_templates',
                  N_('Whether we should sync templates from disk when running db:seed.'),
                  true)

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

@@ -1,4 +1,3 @@
-<%= include_javascript if SETTINGS[:version].short == '1.9' %>
 <%= javascript 'job_templates' %>
 <%= javascript 'lookup_keys' %>
 <%= javascript 'template_input' %>
@@ -6,8 +5,7 @@
 <% title _("Job Templates") %>
 <% title_actions(documentation_button_rex('3.1JobTemplates'),
                  link_to_function(_('Import'), 'show_import_job_template_modal();', :class => 'btn btn-default'),
-                 display_link_if_authorized(_("New Job Template"),
-                                            hash_for_new_job_template_path)) %>
+                 new_link(_("New Job Template"))) %>
 
 <table class="table table-bordered table-striped table-two-pane table-fixed">
   <thead>

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

@@ -4,11 +4,11 @@
 
 <div id="title_action">
   <div class="btn-toolbar pull-right">
-    <%= link_to(_('Back to Job'), job_invocation_path(@template_invocation.job_invocation)) %>
-    <%= button_group(link_to_function(_('Toggle command'), '$("div.preview").toggle()'),
-                     link_to_function(_('Toggle STDERR'), '$("div.line.stderr").toggle()'),
-                     link_to_function(_('Toggle STDOUT'), '$("div.line.stdout").toggle()'),
-                     link_to_function(_('Toggle DEBUG'), '$("div.line.debug").toggle()')) %>
+    <%= link_to(_('Back to Job'), job_invocation_path(@template_invocation.job_invocation), :class => 'btn btn-default') %>
+    <%= button_group(link_to_function(_('Toggle command'), '$("div.preview").toggle()', :class => 'btn btn-default'),
+                     link_to_function(_('Toggle STDERR'), '$("div.line.stderr").toggle()', :class => 'btn btn-default'),
+                     link_to_function(_('Toggle STDOUT'), '$("div.line.stdout").toggle()', :class => 'btn btn-default'),
+                     link_to_function(_('Toggle DEBUG'), '$("div.line.debug").toggle()', :class => 'btn btn-default')) %>
     <%= button_group(template_invocation_task_buttons(@template_invocation_task)) %>
   </div>
 </div>

data/app/views/templates/README.md

@@ -0,0 +1,6 @@
+# Job Templates
+
+**IMPORTANT** Do not submit pull requests here, these templates are only
+updated during the release process.  The
+[community-templates](https://github.com/theforeman/community-templates) repos
+is the canonical source for job templates.

data/foreman_remote_execution.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.description = 'A plugin bringing remote execution to the Foreman, completing the config ' +
                   'management functionality with remote management functionality.'
 
-  s.files =            `git ls-files`.split("\n")
+  s.files =            `git ls-files`.split("\n").reject { |f| f =~ /^scripts/ }
   s.test_files =       `git ls-files test`.split("\n")
   s.extra_rdoc_files = `git ls-files doc`.split("\n") + Dir['README*', 'LICENSE']
 

data/lib/foreman_remote_execution/engine.rb

@@ -27,9 +27,9 @@ module ForemanRemoteExecution
       ForemanTasks.dynflow.config.eager_load_paths << File.join(ForemanRemoteExecution::Engine.root, 'app/lib/actions')
     end
 
-    initializer 'foreman_remote_execution.register_plugin', after: :finisher_hook do |_app|
+    initializer 'foreman_remote_execution.register_plugin', before: :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_remote_execution do
-        requires_foreman '>= 1.11'
+        requires_foreman '>= 1.12'
 
         apipie_documented_controllers ["#{ForemanRemoteExecution::Engine.root}/app/controllers/api/v2/*.rb"]
 

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '0.3.2'
+  VERSION = '1.0.0'
 end

data/test/factories/foreman_remote_execution_factories.rb

@@ -15,6 +15,10 @@ FactoryGirl.define do
     trait :with_description_format do
       description_format 'Factory-built %{job_category}'
     end
+
+    trait :with_feature do
+      remote_execution_feature
+    end
   end
 
   factory :template_input do |f|
@@ -54,6 +58,11 @@ FactoryGirl.define do
   factory :template_invocation_input_value do |f|
     f.sequence(:value) { |n| "Input Value #{n}" }
   end
+
+  factory :remote_execution_feature do |f|
+    f.sequence(:label) { |n| "remote_execution_feature_#{n}" }
+    f.sequence(:name) { |n| "Remote Execution Feature #{n}" }
+  end
 end
 
 FactoryGirl.modify do
@@ -89,7 +98,7 @@ FactoryGirl.modify do
         overrides[:organizations] = [organization] unless organization.nil?
 
         FactoryGirl.create(
-          :subnet,
+          :subnet_ipv4,
           overrides
         )
       end

data/test/unit/concerns/host_extensions_test.rb

@@ -3,14 +3,11 @@ require 'test_plugin_helper'
 describe ForemanRemoteExecution::HostExtensions do
   let(:provider) { 'SSH' }
 
-  before do
-    User.current = FactoryGirl.build(:user, :admin)
-  end
-
+  before { User.current = FactoryGirl.build(:user, :admin) }
   after { User.current = nil }
 
   describe 'ssh specific params' do
-    let(:host) { FactoryGirl.build(:host, :with_execution) }
+    let(:host) { FactoryGirl.create(:host, :with_execution) }
     let(:sshkey) { 'ssh-rsa AAAAB3NzaC1yc2EAAAABJQ foo@example.com' }
 
     before do
@@ -24,7 +21,7 @@ describe ForemanRemoteExecution::HostExtensions do
     end
 
     it 'can override ssh user' do
-      host.host_parameters << FactoryGirl.build(:host_parameter, :name => 'remote_execution_ssh_user', :value => 'amy')
+      host.host_parameters << FactoryGirl.create(:host_parameter, :host => host, :name => 'remote_execution_ssh_user', :value => 'amy')
       host.params['remote_execution_ssh_user'].must_equal 'amy'
     end
 
@@ -33,7 +30,7 @@ describe ForemanRemoteExecution::HostExtensions do
     end
 
     it 'can override effective user method' do
-      host.host_parameters << FactoryGirl.build(:host_parameter, :name => 'remote_execution_effective_user_method', :value => 'su')
+      host.host_parameters << FactoryGirl.create(:host_parameter, :host => host, :name => 'remote_execution_effective_user_method', :value => 'su')
       host.params['remote_execution_effective_user_method'].must_equal 'su'
     end
 

data/test/unit/input_template_renderer_test.rb

@@ -412,6 +412,9 @@ TEMPLATE
         end
 
         context 'with host specified' do
+          before { User.current = FactoryGirl.build(:user, :admin) }
+          after { User.current = nil }
+
           let(:environment) { FactoryGirl.create(:environment) }
           before { renderer.host = FactoryGirl.create(:host, :environment => environment) }
 

data/test/unit/job_template_test.rb

@@ -73,6 +73,10 @@ describe JobTemplate do
   end
 
   context 'importing a new template' do
+    let(:remote_execution_feature) do
+      FactoryGirl.create(:remote_execution_feature)
+    end
+
     let(:template) do
       template = <<-END_TEMPLATE
       <%#
@@ -80,6 +84,7 @@ describe JobTemplate do
       name: Service Restart
       job_category: Service Restart
       provider_type: SSH
+      feature: #{remote_execution_feature.label}
       template_inputs:
       - name: service_name
         input_type: user
@@ -129,6 +134,12 @@ describe JobTemplate do
       template_with_input_sets.template_inputs_with_foreign.map(&:name).must_equal ['service_name']
     end
 
+    it 'imports feature' do
+      template # let is lazy
+      remote_execution_feature.reload
+      remote_execution_feature.job_template.must_equal template
+    end
+
     it 'sets additional options' do
       template.default.must_equal true
     end

data/test/unit/remote_execution_feature_test.rb

@@ -1,6 +1,10 @@
 require 'test_plugin_helper'
 
 describe RemoteExecutionFeature do
+  should validate_presence_of(:name)
+  should validate_presence_of(:label)
+  should validate_uniqueness_of(:name)
+  should validate_uniqueness_of(:label)
 
   let(:install_feature) do
     RemoteExecutionFeature.register(:katello_install_package, N_('Katello: Install package'),

data/test/unit/remote_execution_provider_test.rb

@@ -50,6 +50,9 @@ describe RemoteExecutionProvider do
   end
 
   describe SSHExecutionProvider do
+    before { User.current = FactoryGirl.build(:user, :admin) }
+    after { User.current = nil }
+
     before do
       Setting::RemoteExecution.load_defaults
     end
@@ -69,7 +72,7 @@ describe RemoteExecutionProvider do
     describe 'ssh user' do
       it 'uses the remote_execution_ssh_user on the host param' do
         host.params['remote_execution_ssh_user'] = 'my user'
-        host.host_parameters << FactoryGirl.build(:host_parameter, :name => 'remote_execution_ssh_user', :value => 'my user')
+        host.host_parameters << FactoryGirl.create(:host_parameter, :host => host, :name => 'remote_execution_ssh_user', :value => 'my user')
         proxy_options[:ssh_user].must_equal 'my user'
       end
     end
@@ -77,7 +80,7 @@ describe RemoteExecutionProvider do
     describe 'sudo' do
       it 'uses the remote_execution_ssh_user on the host param' do
         host.params['remote_execution_effective_user_method'] = 'sudo'
-        method_param = FactoryGirl.build(:host_parameter, :name => 'remote_execution_effective_user_method', :value => 'sudo')
+        method_param = FactoryGirl.create(:host_parameter, :host => host, :name => 'remote_execution_effective_user_method', :value => 'sudo')
         host.host_parameters << method_param
         proxy_options[:effective_user_method].must_equal 'sudo'
         method_param.update_attributes!(:value => 'su')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2016-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -254,11 +254,12 @@ files:
 - app/views/template_invocations/_refresh.js.erb
 - app/views/template_invocations/show.html.erb
 - app/views/template_invocations/show.js.erb
-- app/views/templates/package_action.erb
-- app/views/templates/power_action.erb
-- app/views/templates/puppet_run_once.erb
-- app/views/templates/run_command.erb
-- app/views/templates/service_action.erb
+- app/views/templates/README.md
+- app/views/templates/ssh/package_action.erb
+- app/views/templates/ssh/power_action.erb
+- app/views/templates/ssh/puppet_run_once.erb
+- app/views/templates/ssh/run_command.erb
+- app/views/templates/ssh/service_action.erb
 - config/routes.rb
 - db/migrate/20150612121541_add_job_template_to_template.rb
 - db/migrate/20150616080015_create_template_input.rb