command_proposal 1.0.5 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1095c2b3d7207326a44dd3474916e7d3ce51008c95fd2005e30fa7a2b535d729
-  data.tar.gz: e96c62233dbab18e5cc6c8cb33d53bb1fbe8f9b6bd8012b660cb0cfe834dd764
+  metadata.gz: 5ae6c3b31f79557ffddfc4cc86435547b0523e204ff618d88160b4b7caa16da7
+  data.tar.gz: e2fdfb9505a9c10815f5503a3db917ef63b019b83a2f86b4f5d5dd30e704a8c1
 SHA512:
-  metadata.gz: 7c862c39b1e7349cbd286c457d858ad8fb101f0ed723afaaf9e3ababa8187cec993a0e53339d898e0a7b2a38488c510bf443b02f78b58c6108354862979d0f55
-  data.tar.gz: 8b552be1f3e06b6d2292a4ea30dab48cdb71c99b32a3493d5ef636b283add4d736d8b8917c1c6c43630bbd5a5e039d5fa93b9c45175565ecc3e0327927c5f8aa
+  metadata.gz: 7199f95ffb1a7f26b8c58f96bc7d249d2d9429b7104fba4016aedcc3fcf0a355ea6748de16a7e136d0ab5c2bd927df14c173e5a84439b49993500031abd43601
+  data.tar.gz: 3d9c1bf0cbfa570679e8d149402278cfb34a453368ea8e5da72744ec93043ef199cfe92eac2233f91d692f4aa8a7d882245a15bc6c132271dd4438616a41a711

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,28 @@ 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 ||= send(::CommandProposal.engine_name)
     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/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/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/_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,
     )
@@ -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.5'
+  VERSION = "1.0.9"
 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

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.5
+  version: 1.0.9
 platform: ruby
 authors:
 - Rocco Nicholls
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-31 00:00:00.000000000 Z
+date: 2021-09-14 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
@@ -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: []