command_proposal 1.0.7 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31a6d83b17c11473a1b540ed85ee8d9f9eb18e7c0e19e2a5ba3d5dec32ecec48
-  data.tar.gz: 8c98bf481ccb61042260928daf5f2b89783b9cdb577db44ff5ce6c9ddd264579
+  metadata.gz: 3b612ae41c1fc8d8b0026ece90e73dae10192904a4ff739a8e11b2185e12c6f4
+  data.tar.gz: ae0ff52ce13d86c9fa32210d1d0121ac52a891aa87e5a951ee6c3e7796fe1a06
 SHA512:
-  metadata.gz: 0c70f51608c1d81770bf4cbe084f445da6a1aac249243e8c05ebb8fca375ef21c33d9b7bb118085d60853b483480675c4ed723ed9fd5074067fd1d12d6fc990e
-  data.tar.gz: ec49a4f24e8384a56fb24add427e26b56df0b414fb3916830b414440f92a97a6183762696f7e995f0a12baab224c7176ac1cc0a43610b1200b3ad6db9240eb0f
+  metadata.gz: 0f5742d0fb9bbf6b642e978a3ce6f017dfdeca31b9c3776ee720b1b8e27d4ade589bc9f776ef4fb0a4c16891c4617aa5c21b375760d75e2d3ce3d1172261fca2
+  data.tar.gz: 17a14923c1c3b23942005d8d448bb621e4aafa72c4bf4ae75a8a9bb863e682b05f2fd0d0caf55ca70b087cb376598615c81574bec62a96fdaac6f5afee018402

data/app/helpers/command_proposal/application_helper.rb

@@ -48,10 +48,7 @@ module CommandProposal
     end
 
     def engine
-      @engine ||= begin
-        name = `rails routes | grep command_proposal_engine`[/\w*command_proposal_engine/]
-        send(name)
-      end
+      @engine ||= send(::CommandProposal.engine_name)
     end
 
     # Runner controller doesn't map to a model, so needs special handling

data/app/jobs/command_proposal/application_job.rb

@@ -1,4 +1,7 @@
 module CommandProposal
   class ApplicationJob < ActiveJob::Base
+    rescue_from(StandardError) do |exception|
+      Rails.logger.error "[#{self.class.name}] Job failed and will not retry: #{exception.to_s}"
+    end
   end
 end

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

@@ -18,8 +18,8 @@
             <% end %>
           </td>
           <td><%= iteration.status.capitalize %></td>
-          <!-- <td><%= iteration.comments.count %></td> -->
-          <!-- <td><%= link_to "Diff", cmd_path(@task, iteration: @iteration.id, diff: iteration.id) %></td> -->
+          <!-- <td><%#= iteration.comments.count %></td> -->
+          <!-- <td><%#= link_to "Diff", cmd_path(@task, iteration: @iteration.id, diff: iteration.id) %></td> -->
         </tr>
       <% end %>
     </tbody>

data/lib/command_proposal/configuration.rb

@@ -10,6 +10,7 @@ module CommandProposal
       :approval_required,
       # Optional
       :proposal_callback,
+      :approval_callback,
       :success_callback,
       :failed_callback,
     )

data/lib/command_proposal/services/runner.rb

@@ -10,6 +10,31 @@ module CommandProposal
         new.execute(task.primary_iteration)
       end
 
+      def self.command(friendly_id, user, params={})
+        # Hack magic because requires are not playing well with spring
+        require "command_proposal/services/command_interpreter"
+
+        params = params.to_unsafe_h if params.is_a?(ActionController::Parameters)
+
+        iteration = ::CommandProposal::Services::CommandInterpreter.command(
+          ::CommandProposal::Task.find_by!(friendly_id: friendly_id).primary_iteration,
+          :run,
+          user,
+          { args: params }
+        )
+
+        start = Time.current
+        wait_time = 5 # seconds
+        loop do
+          sleep 0.4
+
+          break if iteration.reload.complete?
+          break if Time.current - start > wait_time
+        end
+
+        iteration
+      end
+
       def initialize
         @session = session
       end
@@ -65,7 +90,7 @@ module CommandProposal
           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
-            result = @session.eval("_ = (#{@iteration.code})").inspect # rubocop:disable Security/Eval - Eval is scary, but in this case it's exactly what we need.
+            @session.eval("_ = (#{@iteration.code})").inspect # rubocop:disable Security/Eval - Eval is scary, but in this case it's exactly what we need.
             status = :success
           rescue Exception => e # rubocop:disable Lint/RescueException - Yes, rescue full Exception so that we can catch typos in evals as well
             status = :failed
@@ -95,7 +120,7 @@ module CommandProposal
 
         $stdout = stored_stdout
         @iteration.status = status
-        @iteration.result = [output, "#{result || 'nil'}"].compact.join("\n")
+        @iteration.result = [output, result].compact.join("\n")
       end
 
       def bring_function

data/lib/command_proposal/version.rb

@@ -1,3 +1,3 @@
 module CommandProposal
-  VERSION = "1.0.7"
+  VERSION = "1.0.11"
 end

data/lib/command_proposal.rb

@@ -22,6 +22,12 @@ module CommandProposal
     @configuration = ::CommandProposal::Configuration.new
   end
 
+  def self.engine_name
+    @engine_name ||= begin
+      `rails routes | grep command_proposal_engine`[/\w*command_proposal_engine/]
+    end
+  end
+
   def self.configure
     yield(configuration)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: command_proposal
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.11
 platform: ruby
 authors:
 - Rocco Nicholls
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-14 00:00:00.000000000 Z
+date: 2021-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement