set engine args in template.yaml directly

Colby Swandale · Colby Swandale · commit f7c860f9136f · 2020-09-26T23:22:44.000+10:00
diff --git a/app/code_executor.rb b/app/code_executor.rb
@@ -42,14 +42,8 @@ def ruby_bin_path
   end
 
   def ruby_args
-    return "" if disable_args?
+    return engine_args if engine_args?
 
-    args = ["--disable-did_you_mean"]
-
-    unless rubygems_required?
-      args << "--disable-gems"
-    end
-
-    args.join(" ")
+    "--disable-did_you_mean --disable-gems"
   end
 end
diff --git a/app/helper.rb b/app/helper.rb
@@ -3,15 +3,15 @@ def ruby_bin_path
     ENV["RUBY_BIN"] || `which ruby`.strip
   end
   
-  def rubygems_required?
-    ENV["RUBYGEMS_REQUIRED"] && !ENV["RUBYGEMS_REQUIRED"].empty? 
+  def engine_args?
+    !engine_args.nil?
   end
-  
-  def disable_args?
-    ENV["DISBALE_RUBY_ARGS"] && !ENV["DISBALE_RUBY_ARGS"].empty?
+
+  def engine_args
+    ENV["ENGINE_ARGS"]
   end
 
   def minimal_execution?
-    ENV["MINIMAL_EXECUTION"] && !ENV["DISBALE_RUBY_ARGS"].empty?
+    ENV["MINIMAL_EXECUTION"] && !ENV["MINIMAL_EXECUTION"].empty?
   end
 end
diff --git a/template.yaml b/template.yaml
@@ -145,7 +145,8 @@ Resources:
         - !Ref JRuby
       Environment:
         Variables:
-          RUBYGEMS_REQUIRED: "true"
+          ENGINE_ARGS: "--dev --disable-did_you_mean"
+          MINIMAL_EXECUTION: "true"
       Events:
         HTTP:
           Type: Api
@@ -166,7 +167,7 @@ Resources:
         - !Ref MRuby
       Environment:
         Variables:
-          DISBALE_RUBY_ARGS: "true"
+          ENGINE_ARGS: ""
           MINIMAL_EXECUTION: "true"
       Events:
         HTTP:
@@ -188,7 +189,7 @@ Resources:
         - !Ref MRubyDev
       Environment:
         Variables:
-          DISBALE_RUBY_ARGS: "true"
+          ENGINE_ARGS: ""
           MINIMAL_EXECUTION: "true"
       Events:
         HTTP:
@@ -205,7 +206,7 @@ Resources:
         - !Ref ArtichokeRuby
       Environment:
         Variables:
-          DISBALE_RUBY_ARGS: "true"
+          ENGINE_ARGS: ""
           MINIMAL_EXECUTION: "true"
       Events:
         HTTPDev:
