command_proposal 1.0.15 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 321b3627d2af7cf183da1cd1071775e7f13907b0fda6101acce253f9649f8a42
-  data.tar.gz: c9a30e58a53bb372807e05e765a7b92368433ced38325e8d7800e9f6b983eeb8
+  metadata.gz: 193d5b467c63b2d95e5ca542ac33354a4ee6343d9da70ff0cefd5557e28c55f5
+  data.tar.gz: fd8fae6e4623ce876852e8c11608a0c917e7e7aeaa0ece76c5dddafcbf9a673c
 SHA512:
-  metadata.gz: ddcd08648f107fb5e50c57ae46a7ff93ddb1f7e79ea900e7a052afd6fb31574fd85fae1bf4a2214313a6fae8b46d79e4406d2be6756714319d928c259b612557
-  data.tar.gz: 629c1bc1f60e363396a7672122dc0a945c042baed8c43339fbc5ae7d80cb71aa645de0d3c199709d923cc1c1376e3d305b273ef3f71275ae53215899e59e3ef1
+  metadata.gz: 48d63efa8ed693c2b30e3839deb6d406446c66ec067492bd3ef9300973a675d85f3421303def7abdcae2168336b158268401b59e3a84abe37ea5c94629ff2aa4
+  data.tar.gz: b7ace39b402981e847a73d5a89c28a75c96e7b2c4f310b5b2a5bae9248ccd24c31ed128da7bb5ef8bb214f1cc986e7ed1113916c99bb2bd196a93f9465f393e0

data/app/models/command_proposal/comment.rb

@@ -9,6 +9,6 @@ class ::CommandProposal::Comment < ApplicationRecord
   self.table_name = :command_proposal_comments
   include ::CommandProposal::Service::ExternalBelong
 
-  belongs_to :iteration, optional: true
+  belongs_to :iteration, optional: true, class_name: "CommandProposal::Iteration"
   external_belongs_to :author
 end

data/app/models/command_proposal/iteration.rb

@@ -18,14 +18,14 @@ require_dependency "command_proposal/service/json_wrapper"
 
 class ::CommandProposal::Iteration < ApplicationRecord
   self.table_name = :command_proposal_iterations
-  serialize :args, ::CommandProposal::Service::JSONWrapper
+  serialize :args, ::CommandProposal::Service::JsonWrapper
   include ::CommandProposal::Service::ExternalBelong
 
   TRUNCATE_COUNT = 2000
   # Also hardcoded in JS: app/assets/javascripts/command_proposal/console.js
 
-  has_many :comments
-  belongs_to :task
+  has_many :comments, class_name: "CommandProposal::Comment"
+  belongs_to :task, class_name: "CommandProposal::Task"
   external_belongs_to :requester
   external_belongs_to :approver
 
@@ -65,6 +65,10 @@ class ::CommandProposal::Iteration < ApplicationRecord
     task.primary_iteration == self
   end
 
+  def approved?
+    super || (session_type == "function" && approved_at?)
+  end
+
   def complete?
     success? || failed? || cancelled? || terminated?
   end

data/app/models/command_proposal/service/json_wrapper.rb

@@ -1,6 +1,6 @@
 module CommandProposal
   module Service
-    class JSONWrapper
+    class JsonWrapper
       # Allows directly setting pre-stringified JSON.
       def self.dump(obj)
         return obj if obj.is_a?(String)

data/app/models/command_proposal/service/proposal_presenter.rb

@@ -13,6 +13,7 @@ module CommandProposal
       delegate :description, to: :iteration
       delegate :args, to: :iteration
       delegate :code, to: :iteration
+      delegate :result, to: :iteration
       delegate :status, to: :iteration
       delegate :approved_at, to: :iteration
       delegate :started_at, to: :iteration

data/app/models/command_proposal/task.rb

@@ -9,7 +9,7 @@ class ::CommandProposal::Task < ApplicationRecord
   self.table_name = :command_proposal_tasks
   attr_accessor :user, :skip_approval
 
-  has_many :iterations
+  has_many :iterations, class_name: "CommandProposal::Iteration"
   has_many :ordered_iterations, -> { order(created_at: :desc) }, class_name: "CommandProposal::Iteration"
 
   scope :search, ->(text) {

data/app/views/command_proposal/tasks/_lines.html.erb

@@ -1,5 +1,5 @@
 <% if lines.blank? && !(skip_empty ||= false) -%><div class="line"></div><% end
--%><% lines&.split("\n").each do |line|
+-%><% lines&.split("\n")&.each do |line|
   truncate = ::CommandProposal::Iteration::TRUNCATE_COUNT
   -%><div class="line"><%= line.truncate(truncate) -%></div><%=
   if line.length > truncate

data/lib/command_proposal/services/runner.rb

@@ -65,7 +65,7 @@ module CommandProposal
       end
 
       def quick_run(friendly_id)
-        task = ::CommandProposal::Task.module.find_by!(friendly_id: friendly_id)
+        task = ::CommandProposal::Task.find_by!(friendly_id: friendly_id)
         iteration = task&.primary_iteration
 
         raise CommandProposal::Error, ":#{friendly_id} does not have approval to run." unless iteration&.approved?
@@ -98,12 +98,12 @@ module CommandProposal
           return @iteration.result = results_from_exception(e)
         end
 
-        stored_stdout = $stdout
-        $stdout = StringIO.new
+        stored_stdout = $stdout # quiet
+        $stdout = StringIO.new # quiet
         result = nil # Init var for scope
         status = nil
 
-        running_thread = Thread.new do
+        runner_proc = proc {
           begin
             # Run `bring` functions in here so we can capture any string outputs
             # OR! Run the full runner and instead of saving to an iteration, return the string for prepending here
@@ -115,28 +115,36 @@ module CommandProposal
 
             result = results_from_exception(e)
           end
-        end
-
-        while running_thread.status.present?
-          @iteration.reload
+        }
 
-          if $stdout.try(:string) != @iteration.result
-            @iteration.update(result: $stdout.try(:string).dup)
+        if Rails.application.config.active_job&.queue_adapter == :inline
+          runner_proc.call
+        else
+          running_thread = Thread.new do
+            runner_proc.call
           end
 
-          if @iteration.cancelling?
-            running_thread.exit
-            status = :cancelled
-          end
+          while running_thread.status.present?
+            @iteration.reload
 
-          sleep 0.4
+            if $stdout.try(:string) != @iteration.result
+              @iteration.update(result: $stdout.try(:string).dup)
+            end
+
+            if @iteration.cancelling?
+              running_thread.exit
+              status = :cancelled
+            end
+
+            sleep 0.4
+          end
         end
 
         output = $stdout.try(:string)
         output = nil if output == ""
         # Not using presence because we want to maintain other empty objects such as [] and {}
 
-        $stdout = stored_stdout
+        $stdout = stored_stdout # quiet
         @iteration.status = status
         @iteration.result = [output, result].compact.join("\n")
       end

data/lib/command_proposal/services/shut_down.rb

@@ -13,7 +13,7 @@ module CommandProposal
       def terminate(iteration)
         return unless iteration.running?
 
-        terminated_result = iteration.result + "\n\n~~~~~ TERMINATED ~~~~~"
+        terminated_result = "#{iteration&.result}\n\n~~~~~ TERMINATED ~~~~~"
         iteration.update(
           status: :terminated,
           result: terminated_result,

data/lib/command_proposal/version.rb

@@ -1,3 +1,3 @@
 module CommandProposal
-  VERSION = "1.0.15"
+  VERSION = "1.0.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: command_proposal
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.18
 platform: ruby
 authors:
 - Rocco Nicholls
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-05 00:00:00.000000000 Z
+date: 2022-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -162,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Gives the ability to run approved commands through a UI in your browser