Added projects. Part 3

classes/db.rb

@@ -121,9 +121,9 @@ class DBase
 
   def proj_create(proj_name, proj_descr)
     @error = nil
-    data = Projects.where(projname: project_name).first
+    data = Projects.where(projname: proj_name).first
     if data.nil?
-      id = Projects.insert(projname: project_name, descr: description, public: 1)
+      id = Projects.insert(projname: proj_name, descr: proj_descr, public: 1)
       @last_id = id
     else
       @error = "Данный проект уже существует"

classes/projects.rb

@@ -48,22 +48,27 @@ class ProjectsActions
         @error = "Проект с таким именем уже существует: #{project_name}"
         ret_val = 1
       else
-        Dir.mkdir(fname)
         created = false
-        PROJECTS_STRUCTURE.each_pair do |key, value|
-          new_path = File.join(fname, value)
-          Dir.mkdir(new_path)
-        end
-        if File.exist?(configuration)
-          conf_path = File.join(@path, PROJECTS_STRUCTURE[:CONFIGS], project_name)
-          FileUtils.cp(configuration, conf_path)
-          @error = @db.proj_create(project_name, description)
-          if @error.nil?
-            created = true
+        begin
+          Dir.mkdir(fname)
+          PROJECTS_STRUCTURE.each_pair do |key, value|
+            new_path = File.join(fname, value)
+            Dir.mkdir(new_path)
           end
-        else
+          if File.exist?(configuration)
+            conf_path = File.join(fname, PROJECTS_STRUCTURE[:CONFIGS], "#{project_name}.cfg")
+            FileUtils.cp(configuration, conf_path)
+            @error = @db.proj_create(project_name, description)
+            if @error.nil?
+              created = true
+            end
+          else
+            ret_val = 1
+            @error = "Конфигурация #{configuration} не существует"
+          end
+        rescue => e
           ret_val = 1
-          @error = "Конфигурация #{configuration} не существует"
+          @error = e.message
         end
         unless created
           FileUtils.rm_rf(fname, secure: true)