command_proposal 1.0.6 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a04686b93a2ae3d6583de7e04ea894d5a57076dec286cbb9897ccb1ae2740a10
-  data.tar.gz: 1fae20a33afea09026f2c4ea195370a9fcc58a0b62a27dae1da930dd6260e755
+  metadata.gz: ab98adfd455b086e6e9837ebabb3461fadfe73e95060b7061e61e05c4eae374a
+  data.tar.gz: 8449a6b67001d913bd5cf8a9e89bb8a3fe730dc384449fb51957a8eb018c53af
 SHA512:
-  metadata.gz: ba73213cb6457ff53adc8990eed6b2787d9fe92577b63da6538d195ed41969d77e9591c77176da00698526c63a65ae95e25f9bf6b1424a3f8601fa439b0cd6a5
-  data.tar.gz: 1a5c1661b379c469f6bbf47d544b66be9d91fc417adc067dcc7126db4c17279b75017a6f2245f083b5b250b2de3e93a05e54d0068aff1e86607d56f4c934fdd0
+  metadata.gz: 277d11f925f481a5c5a8f53a4f17dce9725305964f04473cebd92693f0684335e5d77161966186444f29e5fcb113571feb029662bb4b3d82a7182bee38ea89ff
+  data.tar.gz: 02c2e3f743f0dd76bbabe43c3fe0f22d332af4d03a5d9561ee1a459e62f185b515f8961ee8a2f96d3ce0424c1153f10769759daed07f38441c8d41abe4eb4f4b

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

@@ -19,13 +19,15 @@ module CommandProposal
         end
       }
       args << { host: host, port: nil } if host.present?
-      # args << {host: nil}
 
       begin
         engine.url_for(args.compact)
       rescue NoMethodError => e
-        puts "\e[33m[LOGIT]#{e.inspect}\e[0m"
-        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
 
@@ -46,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/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

data/lib/command_proposal/services/runner.rb

@@ -10,6 +10,15 @@ module CommandProposal
         new.execute(task.primary_iteration)
       end
 
+      def self.command(friendly_id, user, params={})
+        ::CommandProposal::Services::CommandInterpreter.command(
+          ::CommandProposal::Task.find_by!(friendly_id: friendly_id).primary_iteration,
+          :run,
+          user,
+          params.except(:action, :controller)
+        )
+      end
+
       def initialize
         @session = session
       end
@@ -125,7 +134,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 +152,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.6'
+  VERSION = "1.0.10"
 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.6
+  version: 1.0.10
 platform: ruby
 authors:
 - Rocco Nicholls
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-01 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
@@ -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: []