application.rb in jets-3.0.0

- old
+ new

@@ -20,10 +20,11 @@
 
   def configs!
     load_environments_config
     load_db_config
     set_iam_policy # relies on dependent values, must be called afterwards
+    set_time_zone
     normalize_env_vars!
   end
 
   # After the mimimal template gets build, we need to reload it for the full stack
   # creation. This allows us to reference IAM policies configs that depend on the
@@ -62,11 +63,11 @@
   #
   def parse_project_name
     return ENV['JETS_PROJECT_NAME'] if ENV['JETS_PROJECT_NAME'] # override
 
     lines = IO.readlines("#{Jets.root}/config/application.rb")
-    project_name_line = lines.find { |l| l =~ /config\.project_name.*=/ }
+    project_name_line = lines.find { |l| l =~ /config\.project_name.*=/ && l !~ /^\s+#/ }
     project_name_line.gsub(/.*=/,'').strip.gsub(/["']/,'') # project_name
   end
 
   def load_default_config
     @config = default_config # sets Jets.config.project_name by calling parse_project_name
@@ -173,11 +174,17 @@
 
     config.project_namespace = Jets.project_namespace
   end
 
   def set_iam_policy
-    config.iam_policy ||= self.class.default_iam_policy
+    config.iam_policy ||= []
+    config.default_iam_policy ||= self.class.default_iam_policy
+    config.iam_policy = config.default_iam_policy | config.iam_policy
     config.managed_policy_definitions ||= [] # default empty
+  end
+
+  def set_time_zone
+    Time.zone_default = Time.find_zone!(config.time_zone)
   end
 
   # It is pretty easy to attempt to set environment variables without
   # the correct AWS Environment.Variables path struture.
   # Auto-fix it for convenience.