command_proposal 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cc9baadf971edd54dc7558fbec28c8f515e9fb572975705f886b18a68693b7b
-  data.tar.gz: 2793d9b73e85d8e0d509974cf9b6f7ed36517c4adbfec9a23f52bbc66d4effff
+  metadata.gz: 883775b419cb2a8279c8ba335c290a188e5952d535b3a96d4534f38102a7c680
+  data.tar.gz: d7c8d7cfb062d5863ad5e1c91311f79b295f1445f5a18bc7d643024c45a04944
 SHA512:
-  metadata.gz: b80eb953b76e09aa2dbbc62c0df2884c15833e8dd1abc4bd66141f0c6b0adc608fcbda97efb80647ec31a1d92ac20d43fda79675560815b74cd93a878a79dc5f
-  data.tar.gz: f26da392c2ed15eaf1f362d0e0bd131ac8c9a05df30390871acc56a9fb8543cb5e69c88816be1fc36cb78478797659222a0edf8e4945b948538f17b97e206579
+  metadata.gz: 885dff6a34419b84a063d9fad90991a98db1c064938414750b8b556b2ce8313e84ecefefbbb81cea8da460f71e3e24b60d2389cc1e94e7400ac63070f6bbd682
+  data.tar.gz: 5d105caabf028062646ada81f4d4004102fbdb25d395fd03840be507cf6e4a230e2f65929e85fe8d76942eda2dffb3605941bd8b9a4aef5987d56f8664bdbbc2

data/app/assets/javascripts/command_proposal/_codemirror.js

@@ -5279,7 +5279,7 @@
     }
 
     // Possibly split or suppress the update based on the presence
-    // of read-only spans in its range.
+    // of readonly spans in its range.
     var split = sawReadOnlySpans && !ignoreReadOnly && removeReadOnlyRanges(doc, change.from, change.to);
     if (split) {
       for (var i = split.length - 1; i >= 0; --i)

data/app/assets/stylesheets/command_proposal/tables.scss

@@ -68,6 +68,8 @@
   th, td {
     text-align: left;
     padding: 3px;
+
+    &.cmd-text-right { text-align: right; }
   }
   th {
     font-size: 12px;

data/app/assets/stylesheets/command_proposal/terminal.scss

@@ -18,7 +18,7 @@
   .line {
     min-height: 18px;
     counter-increment: line-count;
-    font-size: 16px;
+    font-size: 14px;
     padding-left: 5px;
     position: relative;
 
@@ -26,7 +26,7 @@
       content: "[" counter(line-count) "]>";
       position: absolute;
       left: -40px;
-      top: 3px;
+      top: 2px;
       width: 40px;
       font-size: 10px;
       vertical-align: middle;

data/app/controllers/command_proposal/runner_controller.rb

@@ -67,13 +67,18 @@ class ::CommandProposal::RunnerController < ::CommandProposal::EngineController
       duration: humanized_duration(@iteration.duration),
     }.tap do |response|
       if @iteration.started?
-        response[:endpoint] = runner_path(@task, @iteration)
+        response[:endpoint] = runner_url(@task, @iteration)
       end
       if @task.console?
         response[:result_html] = ApplicationController.render(
-          partial: "command_proposal/tasks/lines",
+          partial: "command_proposal/tasks/console_lines",
           locals: { lines: @task.lines }
         )
+      else
+        response[:result_html] = ApplicationController.render(
+          partial: "command_proposal/tasks/lines",
+          locals: { lines: @iteration.result }
+        )
       end
     end
   end

data/app/helpers/command_proposal/application_helper.rb

@@ -4,7 +4,7 @@ module CommandProposal
     include Rails.application.routes.url_helpers
     # In order to keep the regular app's routes working in the base template, we have to manually
     #   render the engine routes. Built a helper for this because it's long and nasty otherwise.
-    def cmd_path(*args)
+    def cmd_url(*args)
       return string_path(*args) if args.first.is_a?(String)
       model_names = [:tasks, :iterations, :comments, :task, :iteration, :comment]
       host = nil
@@ -27,12 +27,33 @@ module CommandProposal
       end
     end
 
+    def cmd_path(*args)
+      args.tap { |arg_list|
+        if arg_list.last.is_a?(Hash)
+          arg_list.last.merge!(only_path: true)
+        else
+          arg_list << { only_path: true }
+        end
+      }
+
+      cmd_url(*args)
+    end
+
     def string_path(*args)
       [command_proposal_engine.command_proposal_tasks_url + args.shift, args.to_param.presence].compact.join("?")
     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)
+      else
+        command_proposal_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)
       else

data/app/models/command_proposal/comment.rb

@@ -3,7 +3,7 @@
 # belongs_to :author
 # text :body
 
-require "command_proposal/service/external_belong"
+require_dependency "command_proposal/service/external_belong"
 
 class ::CommandProposal::Comment < ApplicationRecord
   self.table_name = :command_proposal_comments

data/app/models/command_proposal/iteration.rb

@@ -13,8 +13,8 @@
 
 # ADD: iteration_count?
 
-require "command_proposal/service/external_belong"
-require "command_proposal/service/json_wrapper"
+require_dependency "command_proposal/service/external_belong"
+require_dependency "command_proposal/service/json_wrapper"
 
 class ::CommandProposal::Iteration < ApplicationRecord
   self.table_name = :command_proposal_iterations

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

@@ -1,6 +1,7 @@
 module CommandProposal
   module Service
     class ProposalPresenter
+      include Rails.application.routes.url_helpers
       include ::CommandProposal::ApplicationHelper
       attr_accessor :iteration
 
@@ -19,8 +20,9 @@ module CommandProposal
       delegate :stopped_at, to: :iteration
       delegate :duration, to: :iteration
 
-      def url(host: nil)
-        cmd_path(@iteration.task, host: host)
+      def url
+        path = ::CommandProposal::Engine.routes.url_helpers.command_proposal_task_path(@iteration.task)
+        "#{base_path}#{path}"
       end
 
       def requester
@@ -34,6 +36,20 @@ module CommandProposal
       def type
         @iteration.session_type
       end
+
+      private
+
+      def base_path
+        url_opts = Rails.application.config.action_mailer.default_url_options || {}
+        url_opts.tap do |opts|
+          opts[:protocol] ||= "http"
+          opts[:host] ||= "localhost"
+          opts[:port] ||= 3000
+        end
+
+        port_str = url_opts[:host] == "localhost" ? ":#{url_opts[:port]}" : ""
+        "#{url_opts[:protocol] || 'http'}://#{url_opts[:host]}#{port_str}"
+      end
     end
   end
 end

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

@@ -0,0 +1,8 @@
+<% if lines.none? && !(skip_empty ||= false) -%><div class="line"></div><% end
+-%><% lines.each do |iteration| -%>
+  <div class="line"><%= iteration.code -%><%
+    if iteration.result.present?
+      -%><div class="result"><%= iteration.result %></div><%
+    end
+  -%></div>
+<% end -%>

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

@@ -7,7 +7,7 @@
     <% when :approved, :started %>
       <%# Closing > offset to get rid of spacing issues. %>
       <div class="cmd-console" data-task="<%= @task.id %>" data-exe-url="<%= cmd_path(@task, :task_iterations) %>"
-        ><div class="lines"><%= render partial: "lines", locals: { lines: @lines, skip_empty: true }
+        ><div class="lines"><%= render partial: "console_lines", locals: { lines: @lines, skip_empty: true }
         %></div
         ><div contenteditable="true" autofocus=true class="line cmd-entry"></div
       ></div>
@@ -26,7 +26,7 @@
       <% if @task.first_iteration.success? %>
         <p>Session closed.</p>
       <% end %>
-      <div class="cmd-console" read-only=true><%= render partial: "lines", locals: { lines: @lines } %></div>
+      <div class="cmd-console" readonly=true><%= render partial: "console_lines", locals: { lines: @lines } %></div>
     <% end %>
 
   <% else %>
@@ -38,7 +38,7 @@
     <% if @task.first_iteration.success? %>
       <p>Session closed.</p>
     <% end %>
-    <div class="cmd-console" read-only=true data-status="<%= @iteration.status %>" data-feed="<%= runner_path(@task, @iteration) %>"><%= render partial: "lines", locals: { lines: @lines } %></div>
+    <div class="cmd-console" readonly=true data-status="<%= @iteration.status %>" data-feed="<%= runner_path(@task, @iteration) %>"><%= render partial: "console_lines", locals: { lines: @lines } %></div>
 
   <% end %>
 <% end %>

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

@@ -1,54 +1,62 @@
 <%= render partial: "task_detail_table" %>
 
-<textarea class="cmd-terminal" readonly=true><%= @iteration.code %></textarea>
-
 <%= form_for @iteration, url: cmd_path(@iteration), html: { id: "edit-form-1" } do |f| %>
-  <% if @iteration.params.any? && (@iteration.pending? || @iteration.complete?) %>
+  <% if @task.approved? && @iteration.params.any? %>
     <div class="form-field">
       <% @iteration.params.each do |param_key| %>
-        <label for="iteration[args][<%= param_key %>]"><%= param_key %></label>
-        <input type="text" name="iteration[args][<%= param_key %>]" value="">
+        <label for="command_proposal_iteration[args][<%= param_key %>]"><%= param_key %></label>
+        <br>
+        <input type="text" name="command_proposal_iteration[args][<%= param_key %>]" value="">
+        <br>
       <% end %>
     </div>
   <% end %>
 
-  <% if @iteration.approved_at? %>
+  <% if @iteration.approved_at? && !params.key?(:iteration) %>
     <%= f.hidden_field :command, value: :run %>
     <%= f.submit "Execute" %>
+    <br>
   <% end %>
 <% end %>
 
-<%= form_for @iteration, url: cmd_path(@iteration), html: { id: "edit-form-2" } do |f| %>
-  <% if @iteration&.started_at? %>
-    <textarea class="cmd-terminal" readonly=true data-status="<%= @iteration.status %>" data-feed="<%= runner_path(@task, @iteration) %>"><%= @iteration&.result %></textarea>
-  <% end %>
+<% unless params.key?(:iteration) %>
+  <%= form_for @iteration, url: cmd_path(@iteration), html: { id: "edit-form-2" } do |f| %>
+    <% if current_is_author?(@iteration) %>
+
+      <% case @iteration.status&.to_sym %>
+      <% when :created, :failed, :cancelled %>
+        <% unless @iteration.approved_at? %>
+          <% if can_approve?(@iteration) %>
+              <%= f.hidden_field :command, value: :approve %>
+              <%= f.submit "Approve!" %>
+          <% else %>
+            <%= f.hidden_field :command, value: :request %>
+            <%= f.submit "Request Access" %>
+          <% end %>
+        <% end %>
+      <% when :started %>
+        <%= f.hidden_field :command, value: :cancel %>
+        <%= f.submit "CANCEL!", class: "cancel-btn", data: { confirm: "WARNING: Cancelling a command mid-process can be dangerous. Any processes that have already run will not be rolled back. Do you wish to continue?" } %>
+      <% end %>
 
-  <% if current_is_author?(@iteration) %>
+    <% elsif can_approve?(@iteration) %>
 
-    <% case @iteration.status&.to_sym %>
-    <% when :created, :failed, :cancelled %>
-      <% if can_approve?(@iteration) %>
+      <% if @iteration.approved? %>
+        <p>Approved. Ready to run.</p>
+      <% elsif @iteration.pending? %>
         <%= f.hidden_field :command, value: :approve %>
         <%= f.submit "Approve!" %>
-      <% else %>
-        <%= f.hidden_field :command, value: :request %>
-        <%= f.submit "Request Access" %>
       <% end %>
-    <% when :started %>
-      <%= f.hidden_field :command, value: :cancel %>
-      <%= f.submit "CANCEL!", class: "cancel-btn", data: { confirm: "WARNING: Cancelling a command mid-process can be dangerous. Any processes that have already run will not be rolled back. Do you wish to continue?" } %>
-    <% end %>
-
-  <% elsif can_approve?(@iteration) %>
 
-    <% if @iteration.approved? %>
-      <p>Approved. Ready to run.</p>
-    <% elsif @iteration.pending? %>
-      <%= f.hidden_field :command, value: :approve %>
-      <%= f.submit "Approve!" %>
     <% end %>
-
   <% end %>
 <% end %>
 
-<% render partial: "past_iterations_list" %>
+<% if @iteration&.started_at? %>
+  <div class="cmd-console" readonly=true data-status="<%= @iteration.status %>" data-feed="<%= runner_path(@task, @iteration) %>"><%= render partial: "lines", locals: { lines: @iteration&.result } %></div>
+<% end %>
+
+<br>
+<textarea class="cmd-terminal" readonly=true><%= @iteration.code %></textarea>
+
+<%= render partial: "past_iterations_list" %>

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

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

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

@@ -12,15 +12,11 @@
         <%= f.hidden_field :command, value: :request %>
         <%= f.submit "Request Access" %>
       <% end %>
-    <% when :approved %>
-      <p>Include this module in other commands by using <code>bring :<%= @task.friendly_id %></code> at the top of the file.</p>
     <% end %>
 
   <% elsif can_approve?(@iteration) %>
 
-    <% if @iteration.approved? %>
-      <p>Approved. Ready to include.</p>
-    <% elsif @iteration.pending? %>
+    <% if @iteration.pending? %>
       <%= f.hidden_field :command, value: :approve %>
       <%= f.submit "Approve!" %>
     <% end %>
@@ -28,6 +24,7 @@
   <% end %>
 <% end %>
 
+<p>Include this module in other commands by using <code>bring :<%= @task.friendly_id %></code> at the top of the file.</p>
 <textarea class="cmd-terminal" readonly=true><%= @iteration&.code %></textarea>
 
-<% render partial: "past_iterations_list" %>
+<%= render partial: "past_iterations_list" %>

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

@@ -1,3 +1,4 @@
+hi
 <% if @task.iterations.many? %>
   <table class="cmd-table">
     <thead>
@@ -7,9 +8,16 @@
       <!-- <th>Diff</th> -->
     </thead>
     <tbody>
+      <% primary_iteration = @task.primary_iteration %>
       <% @task.iterations.where.not(id: @iteration&.id).order(created_at: :desc).each do |iteration| %>
         <tr>
-          <td><%= link_to iteration.created_at.strftime("%b %-d, %Y at %H:%M"), cmd_path(@task, iteration: iteration.id) %></td>
+          <td>
+            <% if iteration.id == primary_iteration&.id %>
+              <%= link_to iteration.created_at.strftime("%b %-d, %Y at %H:%M"), cmd_path(@task) %>
+            <% else %>
+              <%= link_to iteration.created_at.strftime("%b %-d, %Y at %H:%M"), cmd_path(@task, iteration: iteration.id) %>
+            <% 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> -->

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

@@ -22,7 +22,7 @@
     <tbody>
       <% @iteration.args.each do |arg_k, arg_v| %>
         <tr>
-          <th><%= arg_k %></th>
+          <th class="cmd-text-right"><%= arg_k %></th>
           <td><%= arg_v %></td>
         </tr>
       <% end %>

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

@@ -2,49 +2,51 @@
 
 <% if @iteration.present? %>
   <%= form_for @iteration, url: cmd_path(@iteration) do |f| %>
-    <% @iteration.brings.each do |bring_module| %>
-      <% needs_approval_str = " -- Module needs approval before running Task" unless bring_module.approved? %>
-      <%= link_to "Module: #{bring_module.name}#{needs_approval_str}", cmd_path("#{bring_module.friendly_id}") %>
-      <br>
-    <% end %>
+    <% unless params.key?(:iteration) %>
+      <% @iteration.brings.each do |bring_module| %>
+        <% needs_approval_str = " -- Module needs approval before running Task" unless bring_module.approved? %>
+        <%= link_to "Module: #{bring_module.name}#{needs_approval_str}", cmd_path("#{bring_module.friendly_id}") %>
+        <br>
+      <% end %>
 
-    <% if @iteration&.started_at? %>
-      <textarea class="cmd-terminal" readonly=true data-status="<%= @iteration.status %>" data-feed="<%= runner_path(@task, @iteration) %>"><%= @iteration&.result %></textarea>
-    <% end %>
+      <% if current_is_author?(@iteration) %>
+
+        <% case @iteration.status&.to_sym %>
+        <% when :created, :cancelled %>
+          <% if can_approve?(@iteration) %>
+            <%= f.hidden_field :command, value: :approve %>
+            <%= f.submit "Approve!" %>
+          <% else %>
+            <%= f.hidden_field :command, value: :request %>
+            <%= f.submit "Request Access" %>
+          <% end %>
+        <% when :failed %>
+          <p>Edit task to attempt to run again.</p>
+        <% when :approved %>
+          <%= f.hidden_field :command, value: :run %>
+          <%= f.submit "Execute" %>
+        <% when :started %>
+          <%= f.hidden_field :command, value: :cancel %>
+          <%= f.submit "CANCEL!", class: "cancel-btn", data: { confirm: "WARNING: Cancelling a command mid-process can be dangerous. Any processes that have already run will not be rolled back. Do you wish to continue?" } %>
+        <% when :success %>
+          <%= f.hidden_field :command, value: :request %>
+          <%= f.submit "Request Re-Run Access" %>
+        <% end %>
 
-    <% if current_is_author?(@iteration) %>
+      <% elsif can_approve?(@iteration) %>
 
-      <% case @iteration.status&.to_sym %>
-      <% when :created, :cancelled %>
-        <% if can_approve?(@iteration) %>
+        <% if @iteration.approved? %>
+          <p>Approved. Ready to run.</p>
+        <% elsif @iteration.pending? %>
           <%= f.hidden_field :command, value: :approve %>
           <%= f.submit "Approve!" %>
-        <% else %>
-          <%= f.hidden_field :command, value: :request %>
-          <%= f.submit "Request Access" %>
         <% end %>
-      <% when :failed %>
-        <p>Edit task to attempt to run again.</p>
-      <% when :approved %>
-        <%= f.hidden_field :command, value: :run %>
-        <%= f.submit "Execute" %>
-      <% when :started %>
-        <%= f.hidden_field :command, value: :cancel %>
-        <%= f.submit "CANCEL!", class: "cancel-btn", data: { confirm: "WARNING: Cancelling a command mid-process can be dangerous. Any processes that have already run will not be rolled back. Do you wish to continue?" } %>
-      <% when :success %>
-        <%= f.hidden_field :command, value: :request %>
-        <%= f.submit "Request Re-Run Access" %>
-      <% end %>
-
-    <% elsif can_approve?(@iteration) %>
 
-      <% if @iteration.approved? %>
-        <p>Approved. Ready to run.</p>
-      <% elsif @iteration.pending? %>
-        <%= f.hidden_field :command, value: :approve %>
-        <%= f.submit "Approve!" %>
       <% end %>
+    <% end %>
 
+    <% if @iteration&.started_at? %>
+      <div class="cmd-console" readonly=true data-status="<%= @iteration.status %>" data-feed="<%= runner_path(@task, @iteration) %>"><%= render partial: "lines", locals: { lines: @iteration&.result } %></div>
     <% end %>
   <% end %>
 <% end %>

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

@@ -24,18 +24,18 @@
             Task - Batch of code that typically only needs to be executed once. Requires approval for every new run.
           <% end %>
         </p>
-        <p>
-          <%= f.radio_button :session_type, :console %>
-          <%= f.label :session_type, value: :console do %>
-            Console - Starts a session that allows line-by-line commands to be executed. Requires approval only to begin session.
-          <% end %>
-        </p>
         <p>
           <%= f.radio_button :session_type, :function %>
           <%= f.label :session_type, value: :function do %>
             Function - Reusable batch of code, can accept arguments. Only requires approval on code changes.
           <% end %>
         </p>
+        <p>
+          <%= f.radio_button :session_type, :console %>
+          <%= f.label :session_type, value: :console do %>
+            Console - Starts a session that allows line-by-line commands to be executed. Requires approval only to begin session.
+          <% end %>
+        </p>
         <p>
           <%= f.radio_button :session_type, :module %>
           <%= f.label :session_type, value: :module do %>

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

@@ -1,7 +1,8 @@
 <div class="cmd-wrapper">
-  <%= link_to "New Command", cmd_path(:new, :task, session_type: params[:filter] || :task) %> <br>
+  <%= link_to "New #{params[:filter].presence&.capitalize || 'Command'}", cmd_path(:new, :task, session_type: params[:filter] || :task) %> <br>
   <br>
-  <% ::CommandProposal::Task.session_types.each_with_index do |(session_type, _session_enum), idx| %><%=
+  <%= link_to "All", cmd_path(:tasks, current_params.except(:filter)), class: "cmd-tab #{:active unless params.key?(:filter)}"
+  %><% ::CommandProposal::Task.session_types.each_with_index do |(session_type, _session_enum), idx| %><%=
     selected = params[:filter] == session_type.to_s
     # Offset closing RB tags to fix spacing issues
     link_to session_type.capitalize, toggled_param(filter: session_type), class: "cmd-tab #{:active if selected}"

data/lib/command_proposal/services/command_interpreter.rb

@@ -25,7 +25,6 @@ module CommandProposal
         when :approve then command_approve
         when :run then command_run
         when :cancel then command_cancel
-        when :cancel then command_cancel
         when :close then command_close
         end
 

data/lib/command_proposal/services/runner.rb

@@ -8,15 +8,16 @@ module CommandProposal
         @session = session
       end
 
-      def execute(iteration, inline=false)
+      def execute(iteration)
         @iteration = iteration
-        @inline = inline
         prepare
 
         run
 
         complete
+        proposal = ::CommandProposal::Service::ProposalPresenter.new(@iteration)
         @iteration = nil
+        proposal
       end
 
       def quick_run(iteration)
@@ -49,14 +50,16 @@ module CommandProposal
         stored_stdout = $stdout
         $stdout = StringIO.new
         result = nil # Init var for scope
+        status = nil
 
         running_thread = Thread.new do
           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.
+            status = :success
           rescue Exception => e # rubocop:disable Lint/RescueException - Yes, rescue full Exception so that we can catch typos in evals as well
-            @iteration.status = :failed
+            status = :failed
 
             result = results_from_exception(e)
           end
@@ -69,7 +72,10 @@ module CommandProposal
             @iteration.update(result: $stdout.try(:string).dup)
           end
 
-          running_thread.exit if @iteration.cancelling?
+          if @iteration.cancelling?
+            running_thread.exit
+            status = :cancelled
+          end
 
           sleep 1
         end
@@ -79,6 +85,7 @@ module CommandProposal
         # Not using presence because we want to maintain other empty objects such as [] and {}
 
         $stdout = stored_stdout
+        @iteration.status = status
         @iteration.result = [output, "#{result || 'nil'}"].compact.join("\n")
       end
 
@@ -91,7 +98,7 @@ module CommandProposal
         if @iteration.cancelling? || @iteration.cancelled?
           @iteration.result += "\n\n~~~~~ CANCELLED ~~~~~"
           @iteration.status = :cancelled
-        elsif @iteration.failed?
+        elsif @iteration.status&.to_sym == :failed
           # No-op
         else
           @iteration.status = :success

data/lib/command_proposal/version.rb

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

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

@@ -34,14 +34,14 @@
 
   # Called when a command is proposed for review
   config.proposal_callback = Proc.new { |proposal|
-    # Slack.notify("#{proposal.requester} has proposed #{proposal.name}.\n<Click Here|#{proposal.url}> to view this proposal and approve.")
+    # Slack.notify("#{proposal.requester} has proposed #{proposal.name}.\n<#{proposal.url}|Click Here> to view this proposal and approve.")
   }
   # Called when a command runs and completes successfully
-  config.success_callback = Proc.new { |iteration|
-    # Slack.notify("The task #{proposal.name} has completed in #{proposal.duration}s.\n<Click Here|#{proposal.url}> to view the results.")
+  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.")
   }
   # Called when a command runs but fails to complete
-  config.failed_callback = Proc.new { |iteration|
-    # Slack.notify("The task #{proposal.name} has failed!\n<Click Here|#{proposal.url}> to see what went wrong.")
+  config.failed_callback = Proc.new { |proposal|
+    # Slack.notify("The task #{proposal.name} has failed!\n<#{proposal.url}|Click Here> to see what went wrong.")
   }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: command_proposal
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Rocco Nicholls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-26 00:00:00.000000000 Z
+date: 2021-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -116,6 +116,7 @@ files:
 - app/models/command_proposal/service/json_wrapper.rb
 - app/models/command_proposal/service/proposal_presenter.rb
 - app/models/command_proposal/task.rb
+- app/views/command_proposal/tasks/_console_lines.html.erb
 - app/views/command_proposal/tasks/_console_show.html.erb
 - app/views/command_proposal/tasks/_function_show.html.erb
 - app/views/command_proposal/tasks/_lines.html.erb