Change some paths

Author: Ilya N. Zykin

kit/base/common_paths.rb

@@ -1,10 +1,10 @@
 class DeployKit
   def kit_templates_path
-    '__TEMPLATES__'
+    "__ENV__/#{ app_env }/__TEMPLATES__"
   end
 
   def kit_configs_path
-    '__ENV__'
+    "__ENV__/#{ app_env }/__SETTINGS__"
   end
 
   # COMMON PATHS

kit/base/configs.rb

@@ -5,9 +5,9 @@ def config
 
   def configs_load!
     ::Config.load_and_set_settings('')
-    puts "#{ ::KIT_ROOT }/#{ kit_configs_path }/#{ app_env }/*.yml"
+    puts "#{ ::KIT_ROOT }/#{ kit_configs_path }/*.yml"
 
-    Dir["#{ ::KIT_ROOT }/#{ kit_configs_path }/#{ app_env }/*.yml"].each do |settings_file|
+    Dir["#{ ::KIT_ROOT }/#{ kit_configs_path }/*.yml"].each do |settings_file|
       ::Settings.add_source!(settings_file)
       puts ('Settings: LOAD FILE => `' + settings_file + '`').light_cyan
     end

kit/base/template_upload.rb

@@ -1,14 +1,11 @@
 class DeployKit
   def template_upload from, to, params = {}
-    tmpl_file = ::KIT_ROOT + "/#{ kit_templates_path }/#{ app_env }/#{ from }"
-
-    unless File.exist? tmpl_file
-      return log_output "File: #{ tmpl_file } doesn't exist"
-    end
-
+    tmpl_file = ::KIT_ROOT + "/#{ kit_templates_path }/#{ from }"
+    return log_output "File: #{ tmpl_file } doesn't exist" unless File.exist? tmpl_file
     namespace = OpenStruct.new(params.merge({kit: self, config: config}))
-    erb       = File.read ::KIT_ROOT + "/#{ kit_templates_path }/#{ app_env }/#{ from }"
-    res       = ERB.new(erb).result(namespace.instance_eval { binding })
+
+    erb = File.read tmpl_file
+    res = ERB.new(erb).result(namespace.instance_eval { binding })
 
     log_output(res)