command_proposal 1.0.4 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d0b2ef7f0cf5f9044adaab75cb1b28b762086ff77ce659d461b976dd0533e3d
-  data.tar.gz: c4c50205f7e2260a9d7659e7c6938808366c07aa00f0e85511fd1269de768e95
+  metadata.gz: 36c34ec1bf4f4ad80708120c0f2add544b8bb576c1087fc34b0ea7bc537c07ae
+  data.tar.gz: 86877f325b5eb60d7949d6145304229a1da644a87109b8fc8fdf0961a5b484cb
 SHA512:
-  metadata.gz: 9ee3a6d919ea22545e62488fc0291d476b168b26412433288b6acde185d96bba8e4f9df313d13596faf508f7faabcea1d5d8539e7794a47d897eb117d4fe70e1
-  data.tar.gz: faca82d2f612e2a0ec8b78ac09655d794b9e04b108b93b075b2097aff0dd0959dc75c21410fa7a6be4d71fac93f52428d0e497298a66c71b4b7caa6d6930329a
+  metadata.gz: 642066c9c9c36200f1ee0873b8017c501aa3950a4d880d94ef5adfd959841775ea74c4beeedc96f9212e346ea067868f8c33656524e962c9cae8d33d17ae4565
+  data.tar.gz: 8d4bc91c68b050bbd6d79433aa5aaadd824e00ebdb7e2fe9c73a54fff31f339fa3b248f88b0dcaec259492c3319406a731b7561e6aceaaa25fd1a099c94cc59e

data/app/controllers/command_proposal/iterations_controller.rb

@@ -48,7 +48,7 @@ class ::CommandProposal::IterationsController < ::CommandProposal::EngineControl
     begin
       alter_command if params.dig(:command_proposal_iteration, :command).present?
     rescue ::CommandProposal::Services::CommandInterpreter::Error => e
-      return redirect_to cmd_path(:tasks, :error), alert: e.message
+      return redirect_to cmd_path(:error, :tasks), alert: e.message
     end
 
     sleep 0.2

data/app/helpers/command_proposal/application_helper.rb

@@ -21,9 +21,13 @@ module CommandProposal
       args << { host: host, port: nil } if host.present?
 
       begin
-        command_proposal_engine.url_for(args.compact)
+        engine.url_for(args.compact)
       rescue NoMethodError => e
-        raise "Error generating route! Please make sure `config.action_mailer.default_url_options` are set."
+        if e.message.match?(/\_(url|path)\'/)
+          raise e
+        else
+          raise "Error generating route! Please make sure `config.action_mailer.default_url_options` are set."
+        end
       end
     end
 
@@ -40,24 +44,31 @@ module CommandProposal
     end
 
     def string_path(*args)
-      [command_proposal_engine.command_proposal_tasks_url + args.shift, args.to_param.presence].compact.join("?")
+      [engine.command_proposal_tasks_url + args.shift, args.to_param.presence].compact.join("?")
+    end
+
+    def engine
+      @engine ||= begin
+        name = `rails routes | grep command_proposal_engine`[/\w*command_proposal_engine/]
+        send(name)
+      end
     end
 
     # Runner controller doesn't map to a model, so needs special handling
     def runner_path(task, iteration=nil)
       if iteration.present?
-        command_proposal_engine.command_proposal_task_runner_path(task, iteration)
+        engine.command_proposal_task_runner_path(task, iteration)
       else
-        command_proposal_engine.command_proposal_task_runner_index_path(task)
+        engine.command_proposal_task_runner_index_path(task)
       end
     end
 
     # Runner controller doesn't map to a model, so needs special handling
     def runner_url(task, iteration=nil)
       if iteration.present?
-        command_proposal_engine.command_proposal_task_runner_url(task, iteration)
+        engine.command_proposal_task_runner_url(task, iteration)
       else
-        command_proposal_engine.command_proposal_task_runner_index_url(task)
+        engine.command_proposal_task_runner_index_url(task)
       end
     end
   end

data/app/models/command_proposal/iteration.rb

@@ -42,7 +42,7 @@ class ::CommandProposal::Iteration < ApplicationRecord
   delegate :session_type, to: :task
 
   def params
-    code.scan(/params\[[:\"\'](.*?)[\'\"]?\]/).flatten
+    code.scan(/params\[[:\"\'](.*?)[\'\"]?\]/).flatten.uniq
   end
 
   def brings

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

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

data/lib/command_proposal/configuration.rb

@@ -10,6 +10,7 @@ module CommandProposal
       :approval_required,
       # Optional
       :proposal_callback,
+      :approval_callback,
       :success_callback,
       :failed_callback,
     )
@@ -26,6 +27,7 @@ module CommandProposal
 
       # Optional
       @proposal_callback = nil
+      @approval_callback = nil
       @success_callback = nil
       @failed_callback = nil
     end

data/lib/command_proposal/services/command_interpreter.rb

@@ -56,6 +56,8 @@ module CommandProposal
         check_can_command? && check_can_approve?
 
         @iteration.update(status: :approved, approver: @user, approved_at: Time.current)
+        proposal = ::CommandProposal::Service::ProposalPresenter.new(@iteration)
+        ::CommandProposal.configuration.approval_callback&.call(proposal)
       end
 
       def command_run
@@ -86,7 +88,11 @@ module CommandProposal
         check_can_command?
         return unless @iteration.task.console?
 
-        @task.first_iteration.update(status: :success, completed_at: Time.current)
+        if ::CommandProposal.sessions.key?("task:#{@task.id}")
+          @task.first_iteration.update(status: :success, completed_at: Time.current)
+        else
+          @task.first_iteration.update(status: :terminated, completed_at: Time.current)
+        end
         ::CommandProposal.sessions.delete("task:#{@task.id}")
       end
 

data/lib/command_proposal/services/runner.rb

@@ -125,7 +125,8 @@ module CommandProposal
 
       def results_from_exception(exc)
         klass = exc.class
-        msg = exc.try(:message) || exc.try(:body) || exc.to_s
+        # Dup to avoid frozen string errors
+        msg = (exc.try(:message) || exc.try(:body) || exc.to_s).dup
         # Remove proposal context
         msg.gsub!(/ for \#\<CommandProposal.*/, "")
         msg.gsub!(/(::)?CommandProposal::Services::Runner(::)?/, "")
@@ -142,7 +143,7 @@ module CommandProposal
 
         eval_trace = backtrace.select { |row| row.include?("(eval)") }.presence || []
         eval_trace = eval_trace.map do |row|
-          eval_row_number = row[/\(eval\)\:\d+/].to_s[7..-1]
+          eval_row_number = row[/\(eval\)\:\d+/].to_s.dup[7..-1]
           next if eval_row_number.blank?
 
           error_line = @iteration.code.split("\n")[eval_row_number.to_i - 1]

data/lib/command_proposal/version.rb

@@ -1,8 +1,3 @@
-# gem build command_proposal.gemspec
-# gam "Built version __ of gem."
-# gpo
-# gem push command_proposal-__.gem
-
 module CommandProposal
-  VERSION = '1.0.4'
+  VERSION = "1.0.8"
 end

data/lib/generators/command_proposal/install/templates/initializer.rb

@@ -43,6 +43,10 @@
   config.proposal_callback = Proc.new { |proposal|
     # Slack.notify("#{proposal.requester} has proposed #{proposal.name}.\n<#{proposal.url}|Click Here> to view this proposal and approve.")
   }
+  # Called when a command is approved
+  config.approval_callback = Proc.new { |proposal|
+    # Slack.notify("The task #{proposal.name} has been approved and is now ready to run.\n<#{proposal.url}|Click Here> to view.")
+  }
   # Called when a command runs and completes successfully
   config.success_callback = Proc.new { |proposal|
     # Slack.notify("The task #{proposal.name} has completed in #{proposal.duration}s.\n<#{proposal.url}|Click Here> to view the results.")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: command_proposal
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.8
 platform: ruby
 authors:
 - Rocco Nicholls
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-28 00:00:00.000000000 Z
+date: 2021-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -147,7 +147,7 @@ metadata:
   homepage_uri: https://github.com/Rockster160/command_proposal
   source_code_uri: https://github.com/Rockster160/command_proposal
   changelog_uri: https://github.com/Rockster160/command_proposal/blob/master/README.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -162,8 +162,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Gives the ability to run approved commands through a UI in your browser
 test_files: []