command_proposal 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a04686b93a2ae3d6583de7e04ea894d5a57076dec286cbb9897ccb1ae2740a10
-  data.tar.gz: 1fae20a33afea09026f2c4ea195370a9fcc58a0b62a27dae1da930dd6260e755
+  metadata.gz: 31a6d83b17c11473a1b540ed85ee8d9f9eb18e7c0e19e2a5ba3d5dec32ecec48
+  data.tar.gz: 8c98bf481ccb61042260928daf5f2b89783b9cdb577db44ff5ce6c9ddd264579
 SHA512:
-  metadata.gz: ba73213cb6457ff53adc8990eed6b2787d9fe92577b63da6538d195ed41969d77e9591c77176da00698526c63a65ae95e25f9bf6b1424a3f8601fa439b0cd6a5
-  data.tar.gz: 1a5c1661b379c469f6bbf47d544b66be9d91fc417adc067dcc7126db4c17279b75017a6f2245f083b5b250b2de3e93a05e54d0068aff1e86607d56f4c934fdd0
+  metadata.gz: 0c70f51608c1d81770bf4cbe084f445da6a1aac249243e8c05ebb8fca375ef21c33d9b7bb118085d60853b483480675c4ed723ed9fd5074067fd1d12d6fc990e
+  data.tar.gz: ec49a4f24e8384a56fb24add427e26b56df0b414fb3916830b414440f92a97a6183762696f7e995f0a12baab224c7176ac1cc0a43610b1200b3ad6db9240eb0f

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
 

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/lib/command_proposal/configuration.rb

@@ -26,6 +26,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

@@ -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.6'
+  VERSION = "1.0.7"
 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.7
 platform: ruby
 authors:
 - Rocco Nicholls
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-01 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: []