command_proposal 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 883775b419cb2a8279c8ba335c290a188e5952d535b3a96d4534f38102a7c680
-  data.tar.gz: d7c8d7cfb062d5863ad5e1c91311f79b295f1445f5a18bc7d643024c45a04944
+  metadata.gz: 0fe3241c83226bc2aebbc46b3b8deaec5886dcd6ed8dea95d53e4d84510fb9c5
+  data.tar.gz: '09e82ce7d547624f6da07c2536c0c235e4205ff70e76bc8c4e20c07dcbb818da'
 SHA512:
-  metadata.gz: 885dff6a34419b84a063d9fad90991a98db1c064938414750b8b556b2ce8313e84ecefefbbb81cea8da460f71e3e24b60d2389cc1e94e7400ac63070f6bbd682
-  data.tar.gz: 5d105caabf028062646ada81f4d4004102fbdb25d395fd03840be507cf6e4a230e2f65929e85fe8d76942eda2dffb3605941bd8b9a4aef5987d56f8664bdbbc2
+  metadata.gz: 57055fced9213819d5d0b9dfbcd3d1d28430a3f34bae8ff6b16b7b48034d68ae71e50411d5d4db90c83502fa7a1bd7ceb02e6861da8f16a558f952d16dbba7d8
+  data.tar.gz: 2288b1576b1019d3d1c937d9fa6e346e2facc4b7e58756bed2b6517fb453733c2ec256eda3dec0973c9ffff6ac5331e7b3ff7ee8d8415c241b02543737fe1209

data/README.md

@@ -59,7 +59,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/command_proposal. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/command_proposal/blob/master/CODE_OF_CONDUCT.md).
+Bug reports and pull requests are welcome on GitHub at https://github.com/rockster160/command_proposal. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/rockster160/command_proposal/blob/master/CODE_OF_CONDUCT.md).
 
 ## TODO
 
@@ -74,4 +74,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the CommandProposal project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/command_proposal/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the CommandProposal project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/rockster160/command_proposal/blob/master/CODE_OF_CONDUCT.md).

data/app/helpers/command_proposal/icons_helper.rb

@@ -7,6 +7,7 @@ module CommandProposal
         started: "cmd-icon-grey fa fa-clock-o",
         cancelling: "cmd-icon-yellow fa fa-hourglass-half",
         cancelled: "cmd-icon-yellow fa fa-stop-circle",
+        terminated: "cmd-icon-red fa fa-stop-circle",
         failed: "cmd-icon-red fa fa-times-circle",
         success: "cmd-icon-green fa fa-check-circle",
       }[status&.to_sym] || "cmd-icon-yellow fa fa-question"

data/app/models/command_proposal/iteration.rb

@@ -34,6 +34,7 @@ class ::CommandProposal::Iteration < ApplicationRecord
     cancelling: 4, # Running, but told to stop
     cancelled:  5,
     success:    6,
+    terminated: 7, # Closed via server restart
   }
 
   delegate :name, to: :task
@@ -52,13 +53,17 @@ class ::CommandProposal::Iteration < ApplicationRecord
   end
 
   def complete?
-    success? || failed? || cancelled?
+    success? || failed? || cancelled? || terminated?
   end
 
   def pending?
     created?
   end
 
+  def running?
+    started? || cancelling?
+  end
+
   def duration
     return unless started_at?
 

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

@@ -1,6 +1,11 @@
 <%= render partial: "task_detail_table" %>
 
 <%= form_for @iteration, url: cmd_path(@iteration), html: { id: "edit-form-1" } 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 %>
   <% if @task.approved? && @iteration.params.any? %>
     <div class="form-field">
       <% @iteration.params.each do |param_key| %>
@@ -24,7 +29,7 @@
     <% if current_is_author?(@iteration) %>
 
       <% case @iteration.status&.to_sym %>
-      <% when :created, :failed, :cancelled %>
+      <% when :created, :failed, :cancelled, :terminated %>
         <% unless @iteration.approved_at? %>
           <% if can_approve?(@iteration) %>
               <%= f.hidden_field :command, value: :approve %>

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

@@ -1,4 +1,3 @@
-hi
 <% if @task.iterations.many? %>
   <table class="cmd-table">
     <thead>

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

@@ -2,17 +2,17 @@
 
 <% if @iteration.present? %>
   <%= form_for @iteration, url: cmd_path(@iteration) do |f| %>
-    <% 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 %>
+    <% @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) %>
       <% if current_is_author?(@iteration) %>
 
         <% case @iteration.status&.to_sym %>
-        <% when :created, :cancelled %>
+        <% when :created, :cancelled, :terminated %>
           <% if can_approve?(@iteration) %>
             <%= f.hidden_field :command, value: :approve %>
             <%= f.submit "Approve!" %>

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

@@ -9,7 +9,7 @@
 
   <%= form_for(@task, url: cmd_path(@task)) do |f| %>
     <div class="cmd-field">
-      <%= f.text_field :name, placeholder: "Title", class: "cmd-input" %>
+      <%= f.text_field :name, placeholder: "Title", class: "cmd-input", required: true %>
     </div>
 
     <div class="cmd-field">

data/lib/command_proposal/services/command_interpreter.rb

@@ -77,6 +77,9 @@ module CommandProposal
         return if @iteration.complete?
 
         @iteration.update(status: :cancelling)
+        return if ::CommandProposal.sessions.key?("task:#{@task.id}")
+
+        ::CommandProposal::Services::ShutDown.terminate(@iteration)
       end
 
       def command_close

data/lib/command_proposal/services/runner.rb

@@ -4,6 +4,12 @@ module CommandProposal
       attr_accessor :session
       # Add expiration and things like that...
 
+      def self.execute(friendly_id)
+        task = ::CommandProposal::Task.find_by!(friendly_id: friendly_id)
+
+        new.execute(task.primary_iteration)
+      end
+
       def initialize
         @session = session
       end
@@ -20,8 +26,11 @@ module CommandProposal
         proposal
       end
 
-      def quick_run(iteration)
-        raise CommandProposal::Error, ":#{iteration.task.friendly_id} does not have approval to run." unless iteration.approved?
+      def quick_run(friendly_id)
+        task = ::CommandProposal::Task.module.find_by!(friendly_id: friendly_id)
+        iteration = task&.primary_iteration
+
+        raise CommandProposal::Error, ":#{friendly_id} does not have approval to run." unless iteration&.approved?
 
         @session.eval(iteration.code)
       end
@@ -77,7 +86,7 @@ module CommandProposal
             status = :cancelled
           end
 
-          sleep 1
+          sleep 0.4
         end
 
         output = $stdout.try(:string)
@@ -90,7 +99,7 @@ module CommandProposal
       end
 
       def bring_function
-        "def bring(*func_names); func_names.each { |f| self.quick_run(::CommandProposal::Task.module.find_by!(friendly_id: f).current_iteration) }; end"
+        "def bring(*func_names); func_names.each { |f| self.quick_run(f) }; end"
       end
 
       def complete

data/lib/command_proposal/services/shut_down.rb

@@ -0,0 +1,25 @@
+module CommandProposal
+  module Services
+    module ShutDown
+      module_function
+
+      def reset_all
+        pending = ::CommandProposal::Iteration.where(status: [:started, :cancelling])
+        pending.find_each do |iteration|
+          terminate(iteration)
+        end
+      end
+
+      def terminate(iteration)
+        return unless iteration.running?
+
+        terminated_result = iteration.result + "\n\n~~~~~ TERMINATED ~~~~~"
+        iteration.update(
+          status: :terminated,
+          result: terminated_result,
+          completed_at: Time.current
+        )
+      end
+    end
+  end
+end

data/lib/command_proposal/version.rb

@@ -4,5 +4,5 @@
 # gem push command_proposal-__.gem
 
 module CommandProposal
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

data/lib/command_proposal.rb

@@ -2,6 +2,7 @@ require "command_proposal/configuration"
 require "command_proposal/version"
 require "command_proposal/engine"
 require "command_proposal/services/runner"
+require "command_proposal/services/shut_down"
 
 module CommandProposal
   class Error < StandardError; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: command_proposal
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Rocco Nicholls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-27 00:00:00.000000000 Z
+date: 2021-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -134,6 +134,7 @@ files:
 - lib/command_proposal/engine.rb
 - lib/command_proposal/services/command_interpreter.rb
 - lib/command_proposal/services/runner.rb
+- lib/command_proposal/services/shut_down.rb
 - lib/command_proposal/version.rb
 - lib/generators/command_proposal/install/install_generator.rb
 - lib/generators/command_proposal/install/templates/initializer.rb