foreman_remote_execution 1.6.5 → 1.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 709d81a29ef205492bc65e2605c5f83a0223ba37
-  data.tar.gz: 73ff87cece4feeec31c6e5e7274c0b2300d7c636
+SHA256:
+  metadata.gz: 50fc3a3d806569cd6ef1430201210365ab43135ff49037437b5ff7d5ae26e95c
+  data.tar.gz: 49444e24cc7ce4d174942869a87815c7f58ac1d824493df7cba3c5f592c0dc89
 SHA512:
-  metadata.gz: 7d3649186aad83e9e165bd5453631610ba99f0b9fffcb324ccd195bcf1a8ffec96aaddd03a08fef6ae37059f13b22701be37e85c3d7745f3b8a8d8344658def4
-  data.tar.gz: 78cb04ccfc0e5e3d4638901e264654b87210f3b23b42c1bb170d3bc70e16666d2b8e70bcd920d0839fb1823575f8c73784bca8324fa3f633a3f3a8bbe43a52d0
+  metadata.gz: 221de0ed7b0c41a9451b8fc5fa5d1cc2cea6ef25b969e9b28e166ac31c971da5fdbfe624cca3006832f7618cc6e63aff674264d5d6346e83847f7fdb46aa6969
+  data.tar.gz: 2aa565d2f95cb0704cbc73d49aa7806489fb497a5a73c3738cc23240b8fc582667b8427f892da6a8523baaf69970fba4d343b1751e29e125a84cbba262551ef6

data/.rubocop.yml

@@ -108,3 +108,6 @@ Metrics/AbcSize:
 
 Style/FrozenStringLiteralComment:
   Enabled: false
+
+Layout/EmptyLineAfterGuardClause:
+  Enabled: false

data/app/controllers/job_invocations_controller.rb

@@ -51,17 +51,17 @@ class JobInvocationsController < ApplicationController
   def show
     @job_invocation = resource_base.includes(:template_invocations => :run_host_job_task).find(params[:id])
     @auto_refresh = @job_invocation.task.try(:pending?)
-    hosts_base = @job_invocation.targeting.hosts.authorized(:view_hosts, Host)
+    @resource_base = @job_invocation.targeting.hosts.authorized(:view_hosts, Host)
     # There's no need to do the joining if we're not filtering
     unless params[:search].nil?
-      hosts_base = hosts_base.joins(:template_invocations)
-                             .where(:template_invocations => { :job_invocation_id => @job_invocation.id})
+      @resource_base = @resource_base.joins(:template_invocations)
+                                     .where(:template_invocations => { :job_invocation_id => @job_invocation.id})
     end
-    @hosts = hosts_base.search_for(params[:search], :order => params[:order] || 'name ASC').paginate(:page => params[:page])
+    @hosts = resource_base_search_and_page
   end
 
   def index
-    @job_invocations = resource_base.search_for(params[:search], :order => params[:order]).paginate(:page => params[:page]).with_task.order('job_invocations.id DESC')
+    @job_invocations = resource_base_search_and_page.with_task.order('job_invocations.id DESC')
   end
 
   # refreshes the form

data/app/helpers/remote_execution_helper.rb

@@ -169,6 +169,25 @@ module RemoteExecutionHelper
     end
   end
 
+  # we assume that a line_set will always end with a line break. Sometimes however, the lines can
+  # be cut in the middle. This methods makes sure the cut line ends up in on line set
+  def normalize_line_sets(line_sets)
+    previous_line_break = true
+    line_sets.each_with_index do |line_set, index|
+      # if previous line_set was missing break, add the first line from next set
+      unless previous_line_break
+        first_line_pattern = /\A.*\n/
+        first_line = line_set['output'][first_line_pattern]
+        if first_line
+          line_sets[index - 1]['output'] << first_line
+          line_set['output'].sub!(first_line_pattern, '')
+        end
+      end
+      previous_line_break = line_set['output'] =~ /\n\Z/
+    end
+    line_sets
+  end
+
   def time_in_words_span(time)
     if time.nil?
       _('N/A')

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

@@ -6,6 +6,7 @@
   <thead>
     <tr>
       <th><%= sort :description, :as => _('Description') %></th>
+      <th class="col-md-1"><%= _('Search Query') %></th>
       <th class="col-md-1"><%= _('Status') %></th>
       <th class="col-md-1"><%= _('Succeeded') %></th>
       <th class="col-md-1"><%= _('Failed') %></th>
@@ -19,6 +20,7 @@
     <% @job_invocations.each do |invocation| %>
       <tr>
         <td><%= link_to_if_authorized invocation_description(invocation), hash_for_job_invocation_path(invocation).merge(:auth_object => invocation, :permission => :view_job_invocations, :authorizer => authorizer) %></td>
+        <td><%= trunc_with_tooltip(invocation&.targeting&.search_query, 15) %></td>
         <td><%= link_to_invocation_task_if_authorized(invocation) %></td>
         <td><%= invocation_result(invocation, :success_count) %></td>
         <td><%= invocation_result(invocation, :failed_count) %></td>

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

@@ -1,4 +1,4 @@
-<% output_line_set['output'].gsub("\r\n", "\n").split("\n", -1).each do |line| %>
+<% output_line_set['output'].gsub("\r\n", "\n").sub(/\n\Z/, '').split("\n", -1).each do |line| %>
   <%= content_tag :div, :class => 'line ' + output_line_set['output_type'], :data => { :timestamp => output_line_set['timestamp'] } do %>
 
     <%= content_tag(:span, (@line_counter += 1).to_s.rjust(4).gsub(' ', '&nbsp;').html_safe + ':', :class => 'counter', :title => (output_line_set['timestamp'] && Time.at(output_line_set['timestamp']))) %>

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

@@ -36,7 +36,7 @@
     <%= link_to_function(_('Scroll to bottom'), '$("html, body").animate({ scrollTop: $(document).height() }, "slow");', :class => 'pull-right scroll-link-bottom') %>
 
     <div class="printable">
-      <%= render :partial => 'output_line_set', :collection => @line_sets %>
+      <%= render :partial => 'output_line_set', :collection => normalize_line_sets(@line_sets) %>
     </div>
 
     <%= link_to_function(_('Scroll to top'), '$("html, body").animate({ scrollTop: 0 }, "slow");', :class => 'pull-right scroll-link-top') %>

data/db/migrate/20150612121541_add_job_template_to_template.rb

@@ -1,6 +1,8 @@
 class AddJobTemplateToTemplate < ActiveRecord::Migration[4.2]
   def change
-    add_column :templates, :job_name, :string, :limit => 255
-    add_column :templates, :provider_type, :string, :limit => 255
+    change_table :templates, :bulk => true do |t|
+      t.column :job_name, :string, :limit => 255
+      t.column :provider_type, :string, :limit => 255
+    end
   end
 end

data/db/migrate/20160203104056_add_concurrency_options_to_job_invocation.rb

@@ -1,6 +1,8 @@
 class AddConcurrencyOptionsToJobInvocation < ActiveRecord::Migration[4.2]
   def change
-    add_column :job_invocations, :concurrency_level, :integer, :null => true
-    add_column :job_invocations, :time_span, :integer, :null => true
+    change_table :job_invocations, :bulk => true do |t|
+      t.column :concurrency_level, :integer, :null => true
+      t.column :time_span, :integer, :null => true
+    end
   end
 end

data/db/migrate/20171129103615_add_secrets_to_job_invocations.rb

@@ -1,6 +1,8 @@
 class AddSecretsToJobInvocations < ActiveRecord::Migration[4.2]
   def change
-    add_column :job_invocations, :password, :string
-    add_column :job_invocations, :key_passphrase, :string
+    change_table :job_invocations, :bulk => true do |t|
+      t.column :password, :string
+      t.column :key_passphrase, :string
+    end
   end
 end

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '1.6.5'.freeze
+  VERSION = '1.6.6'.freeze
 end

data/test/functional/api/v2/foreign_input_sets_controller_test.rb

@@ -13,7 +13,7 @@ module Api
       test 'should get index' do
         get :index, params: { :template_id => @template.id }
         input_sets = ActiveSupport::JSON.decode(@response.body)
-        assert !input_sets.empty?, 'Should respond with input sets'
+        assert_not input_sets.empty?, 'Should respond with input sets'
         assert_response :success
       end
 
@@ -21,7 +21,7 @@ module Api
         get :show, params: { :template_id => @template.to_param, :id => @input_set.to_param }
         assert_response :success
         input_set = ActiveSupport::JSON.decode(@response.body)
-        assert !input_set.empty?
+        assert_not input_set.empty?
         assert_equal input_set['target_template_name'], @foreign_template.name
       end
 
@@ -51,7 +51,7 @@ module Api
       test 'should destroy' do
         delete :destroy, params: { :template_id => @template.to_param, :id => @input_set.to_param }
         assert_response :ok
-        refute ForeignInputSet.exists?(@input_set.id)
+        assert_not ForeignInputSet.exists?(@input_set.id)
       end
     end
   end

data/test/functional/api/v2/job_invocations_controller_test.rb

@@ -16,7 +16,7 @@ module Api
       test 'should get index' do
         get :index
         invocations = ActiveSupport::JSON.decode(@response.body)
-        refute_empty invocations, 'Should response with invocation'
+        assert_not_empty invocations, 'Should response with invocation'
         assert_response :success
       end
 
@@ -24,7 +24,7 @@ module Api
         get :show, params: { :id => @invocation.id }
         assert_response :success
         template = ActiveSupport::JSON.decode(@response.body)
-        refute_empty template
+        assert_not_empty template
         assert_equal template['job_category'], @invocation.job_category
       end
 

data/test/functional/api/v2/job_templates_controller_test.rb

@@ -10,7 +10,7 @@ module Api
       test 'should get index' do
         get :index
         templates = ActiveSupport::JSON.decode(@response.body)
-        assert !templates.empty?, 'Should response with template'
+        assert_not templates.empty?, 'Should response with template'
         assert_response :success
       end
 
@@ -20,7 +20,7 @@ module Api
         @template.save!
         get :index, params: { :organization_id => @organization.id }
         templates = ActiveSupport::JSON.decode(@response.body)
-        assert !templates.empty?, 'Should respond with template'
+        assert_not templates.empty?, 'Should respond with template'
         assert_response :success
       end
 
@@ -28,10 +28,10 @@ module Api
         get :show, params: { :id => @template.to_param }
         assert_response :success
         template = ActiveSupport::JSON.decode(@response.body)
-        assert !template.empty?
+        assert_not template.empty?
         assert_equal template['name'], @template.name
-        refute_nil template['created_at']
-        refute_nil template['updated_at']
+        assert_not_nil template['created_at']
+        assert_not_nil template['updated_at']
       end
 
       test 'should create valid' do
@@ -74,7 +74,7 @@ module Api
       test 'should destroy' do
         delete :destroy, params: { :id => @template.to_param }
         assert_response :ok
-        refute JobTemplate.exists?(@template.id)
+        assert_not JobTemplate.exists?(@template.id)
       end
 
       test 'should clone template' do

data/test/functional/api/v2/remote_execution_features_controller_test.rb

@@ -13,7 +13,7 @@ module Api
       test 'should get index' do
         get :index
         remote_execution_features = ActiveSupport::JSON.decode(@response.body)
-        refute remote_execution_features.empty?, 'Should respond with input sets'
+        assert_not remote_execution_features.empty?, 'Should respond with input sets'
         assert_response :success
       end
 
@@ -21,7 +21,7 @@ module Api
         get :show, params: { :id => @remote_execution_feature.to_param }
         assert_response :success
         remote_execution_feature = ActiveSupport::JSON.decode(@response.body)
-        refute remote_execution_feature.empty?
+        assert_not remote_execution_feature.empty?
         assert_equal remote_execution_feature['name'], @remote_execution_feature.name
       end
 

data/test/helpers/remote_execution_helper_test.rb

@@ -0,0 +1,26 @@
+require 'test_plugin_helper'
+
+class RemoteExecutionHelperTest < ActionView::TestCase
+  describe '#normalize_line_sets' do
+    let :line_sets do
+      [{"output_type"=>"stdout", "output"=>"one", "timestamp"=>1},
+       {"output_type"=>"stdout", "output"=>"\r\ntwo\r\n", "timestamp"=>2},
+       {"output_type"=>"stdout", "output"=>"\r\nthr", "timestamp"=>3},
+       {"output_type"=>"stdout", "output"=>"ee\r\nfour\r\n", "timestamp"=>4},
+       {"output_type"=>"stdout", "output"=>"\r\n\r\n", "timestamp"=>5},
+       {"output_type"=>"stdout", "output"=>"five\r\n", "timestamp"=>6},
+       {"output_type"=>"stdout", "output"=>"Exit status: 0", "timestamp"=>7}]
+    end
+
+    it 'ensures the line sets end with new line' do
+      new_line_sets = normalize_line_sets(line_sets)
+      new_line_sets.map { |s| s['output'] }.must_equal(["one\r\n",
+                                                        "two\r\n",
+                                                        "\r\nthree\r\n",
+                                                        "four\r\n",
+                                                        "\r\n\r\n",
+                                                        "five\r\n",
+                                                        "Exit status: 0"])
+    end
+  end
+end

data/test/unit/actions/run_host_job_test.rb

@@ -54,7 +54,7 @@ module ForemanRemoteExecution
 
           it 'creates a new status' do
             subject.finalize
-            refute_nil host.execution_status_object
+            assert_not_nil host.execution_status_object
           end
         end
       end

data/test/unit/actions/run_hosts_job_test.rb

@@ -50,15 +50,15 @@ module ForemanRemoteExecution
     context 'targeting resolving' do
       it 'resolves dynamic targeting in plan' do
         targeting.targeting_type = 'dynamic_query'
-        refute targeting.resolved?
+        assert_not targeting.resolved?
         delayed
-        refute targeting.resolved?
+        assert_not targeting.resolved?
         planned
         targeting.hosts.must_include(host)
       end
 
       it 'resolves the hosts on static targeting in delay' do
-        refute targeting.resolved?
+        assert_not targeting.resolved?
         delayed
         targeting.hosts.must_include(host)
         # Verify Targeting#resolve_hosts! won't be hit again

data/test/unit/input_template_renderer_test.rb

@@ -73,7 +73,7 @@ class InputTemplateRendererTest < ActiveSupport::TestCase
           end
 
           it 'cannot render the content' do
-            refute result
+            assert_not result
             renderer.error_message.wont_be_nil
             renderer.error_message.wont_be_empty
           end
@@ -125,7 +125,7 @@ class InputTemplateRendererTest < ActiveSupport::TestCase
           it 'handles circular references in templates' do
             renderer.invocation = FactoryBot.build(:template_invocation, :template => template_without_inputs)
             renderer.template = template_without_inputs
-            refute renderer.render
+            assert_not renderer.render
             renderer.error_message.must_include 'Recursive rendering of templates detected'
           end
 
@@ -335,7 +335,7 @@ class InputTemplateRendererTest < ActiveSupport::TestCase
 
       describe 'rendering' do
         it 'can\'t render the content without host since we don\'t have facts' do
-          refute result
+          assert_not result
         end
 
         it 'registers an error' do
@@ -349,7 +349,7 @@ class InputTemplateRendererTest < ActiveSupport::TestCase
 
           describe 'rendering' do
             it 'can\'t render the content without host since we don\'t have fact value' do
-              refute result
+              assert_not result
             end
 
             it 'registers an error' do
@@ -371,7 +371,7 @@ class InputTemplateRendererTest < ActiveSupport::TestCase
             describe 'rendering' do
               it 'can\'t render the content without host since we don\'t have fact value' do
                 fact # let is lazy
-                refute result
+                assert_not result
               end
 
               it 'registers an error' do
@@ -433,7 +433,7 @@ class InputTemplateRendererTest < ActiveSupport::TestCase
 
       describe 'rendering' do
         it 'can\'t render the content without host since we don\'t have host so no classification' do
-          refute result
+          assert_not result
         end
 
         it 'registers an error' do
@@ -451,7 +451,7 @@ class InputTemplateRendererTest < ActiveSupport::TestCase
 
           describe 'rendering' do
             it 'can\'t render the content without host since we don\'t have variable value in classification' do
-              refute result
+              assert_not result
             end
 
             it 'registers an error' do
@@ -542,7 +542,7 @@ class InputTemplateRendererTest < ActiveSupport::TestCase
 
       describe 'rendering' do
         it 'can\'t render the content without host since we don\'t have host so no classification' do
-          refute result
+          assert_not result
         end
 
         it 'registers an error' do
@@ -557,7 +557,7 @@ class InputTemplateRendererTest < ActiveSupport::TestCase
 
           describe 'rendering' do
             it 'can\'t render the content without host since we don\'t have puppet parameter in classification' do
-              refute result
+              assert_not result
             end
 
             it 'registers an error' do

data/test/unit/job_invocation_composer_test.rb

@@ -131,7 +131,7 @@ class JobInvocationComposerTest < ActiveSupport::TestCase
 
         it 'returns false if there is one provider' do
           composer.stubs(:available_provider_types => [ 'SSH' ])
-          refute composer.needs_provider_type_selection?
+          assert_not composer.needs_provider_type_selection?
         end
       end
 
@@ -440,7 +440,7 @@ class JobInvocationComposerTest < ActiveSupport::TestCase
           composer.job_invocation.expects(:valid?).returns(false)
           composer.targeting.expects(:valid?).returns(false)
           composer.pattern_template_invocations.each { |invocation| invocation.expects(:valid?).returns(false) }
-          refute composer.valid?
+          assert_not composer.valid?
         end
       end
 
@@ -621,7 +621,7 @@ class JobInvocationComposerTest < ActiveSupport::TestCase
         assert composer.save!
         assert_equal bookmark, composer.job_invocation.targeting.bookmark
         assert_equal composer.job_invocation.targeting.user, User.current
-        refute_empty composer.job_invocation.pattern_template_invocations
+        assert_not_empty composer.job_invocation.pattern_template_invocations
       end
     end
 
@@ -636,7 +636,7 @@ class JobInvocationComposerTest < ActiveSupport::TestCase
       it 'creates invocation with a search query' do
         assert composer.save!
         assert_equal 'some hosts', composer.job_invocation.targeting.search_query
-        refute_empty composer.job_invocation.pattern_template_invocations
+        assert_not_empty composer.job_invocation.pattern_template_invocations
       end
     end
 
@@ -772,7 +772,7 @@ class JobInvocationComposerTest < ActiveSupport::TestCase
 
       it 'accepts the params' do
         composer.save!
-        refute composer.job_invocation.new_record?
+        assert_not composer.job_invocation.new_record?
       end
     end
 

data/test/unit/job_invocation_test.rb

@@ -55,8 +55,8 @@ class JobInvocationTest < ActiveSupport::TestCase
       job_invocation.pattern_template_invocations.first.reload
     end
 
-    it { refute job_invocation.reload.pattern_template_invocations.empty? }
-    it { refute job_invocation.reload.pattern_template_invocations.first.input_values.empty? }
+    it { assert_not job_invocation.reload.pattern_template_invocations.empty? }
+    it { assert_not job_invocation.reload.pattern_template_invocations.first.input_values.empty? }
 
     it "can look up templates not belonging to user's organization" do
       organization = job_invocation.pattern_template_invocations.first.template.organizations.first
@@ -73,7 +73,7 @@ class JobInvocationTest < ActiveSupport::TestCase
     it 'validates required inputs have values' do
       assert job_invocation.valid?
       @input_value.destroy
-      refute job_invocation.reload.valid?
+      assert_not job_invocation.reload.valid?
     end
 
     describe 'descriptions' do
@@ -179,7 +179,7 @@ class JobInvocationTest < ActiveSupport::TestCase
 
     it 'returns false if task state is pending' do
       job_invocation.task.expects(:pending?).returns(true)
-      refute job_invocation.finished?
+      assert_not job_invocation.finished?
     end
 
     it 'returns true if task is not pending' do

data/test/unit/job_template_effective_user_test.rb

@@ -14,7 +14,7 @@ class JobTemplateEffectiveUserTest < ActiveSupport::TestCase
     end
 
     it 'does not use the current user' do
-      refute effective_user.current_user?
+      assert_not effective_user.current_user?
     end
   end
 

data/test/unit/job_template_test.rb

@@ -13,11 +13,11 @@ class JobTemplateTest < ActiveSupport::TestCase
     it 'has a unique name' do
       template1 = FactoryBot.create(:job_template)
       template2 = FactoryBot.build(:job_template, :name => template1.name)
-      refute template2.valid?
+      assert_not template2.valid?
     end
 
     it 'needs a job_category' do
-      refute job_template.valid?
+      assert_not job_template.valid?
     end
 
     it 'does not need a job_category if it is a snippet' do
@@ -29,7 +29,7 @@ class JobTemplateTest < ActiveSupport::TestCase
       job_template.job_category = 'Miscellaneous'
       job_template.foreign_input_sets << FactoryBot.build(:foreign_input_set, :target_template => template_with_inputs)
       job_template.foreign_input_sets << FactoryBot.build(:foreign_input_set, :target_template => template_with_inputs)
-      refute job_template.valid?
+      assert_not job_template.valid?
       job_template.errors.full_messages.first.must_include 'Duplicated inputs detected: ["command"]'
     end
   end
@@ -213,7 +213,7 @@ class JobTemplateTest < ActiveSupport::TestCase
 
     it 'will not overwrite by default' do
       existing
-      refute JobTemplate.import_raw!(updated)
+      assert_not JobTemplate.import_raw!(updated)
     end
 
     let(:synced_template) do

data/test/unit/remote_execution_feature_test.rb

@@ -60,7 +60,7 @@ class RemoteExecutionFeatureTest < ActiveSupport::TestCase
       feature.must_be :persisted?
       feature.label.must_equal 'new_feature_that_does_not_exist'
       feature.name.must_equal 'name'
-      refute feature.host_action_button
+      assert_not feature.host_action_button
     end
 
     it 'creates a feature with host action flag' do

data/test/unit/targeting_test.rb

@@ -12,7 +12,7 @@ class TargetingTest < ActiveSupport::TestCase
   describe '#resolved?' do
     context 'resolved_at is nil' do
       before { targeting.resolved_at = nil }
-      it { refute targeting.resolved? }
+      it { assert_not targeting.resolved? }
     end
 
     context 'resolved_at is set' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.6.6
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-22 00:00:00.000000000 Z
+date: 2018-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -360,6 +360,7 @@ files:
 - test/functional/api/v2/template_invocations_controller_test.rb
 - test/functional/job_invocations_controller_test.rb
 - test/functional/job_templates_controller_test.rb
+- test/helpers/remote_execution_helper_test.rb
 - test/test_plugin_helper.rb
 - test/unit/actions/run_host_job_test.rb
 - test/unit/actions/run_hosts_job_test.rb
@@ -408,7 +409,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A plugin bringing remote execution to the Foreman, completing the config
@@ -424,6 +425,7 @@ test_files:
 - test/functional/api/v2/template_invocations_controller_test.rb
 - test/functional/job_invocations_controller_test.rb
 - test/functional/job_templates_controller_test.rb
+- test/helpers/remote_execution_helper_test.rb
 - test/test_plugin_helper.rb
 - test/unit/actions/run_host_job_test.rb
 - test/unit/actions/run_hosts_job_test.rb