lib/excel2local.rb in excel2local-0.1.32 vs lib/excel2local.rb in excel2local-0.2.0

@@ -2,12 +2,12 @@
 require "roo"
 
 module Excel2local
   
   def self.localize_all! (locate)
-    backup_all! locate
-    Dir["#{locate}/*.xlsx"].each { |file| 
+    backup_all! locate # делаем бекапп 
+    Dir["#{locate}/*.xlsx"].each { |file|  
       localize! "#{file}","#{locate}"
     }
   end
 
   def self.localize! (excel_file, save_place)    #excel_file - фаил с переводом 
@@ -23,34 +23,33 @@
           simbol_memory[col_index] = []
         } 
       else
         row.each_with_index { |col, col_index|    #если не первая строка
           @simbol = col if col_index == 0    #если 
-          #break if   #
-          if (col_index != 0) and (@simbol != nil ) and (col != nil)
+          if (col_index != 0) and (@simbol != nil ) and (col != nil) 
             @simbol.to_s.split(".").each_with_index { | simbol, index |
               simbol = "\'" + simbol + "\'" if [ "true", "false", "on", "off", "yes", "no" ].member?(simbol)
               if simbol != simbol_memory[col_index][index]  then
                 File.open("#{save_place}/#{File.basename(excel_file, ".xlsx")}_#{yml_file[col_index]}.yml", "a") { |file| file.print "  "*(index+1) + "#{simbol}:"   }  if @simbol.to_s.split(".").length - 1 == index
                 File.open("#{save_place}/#{File.basename(excel_file, ".xlsx")}_#{yml_file[col_index]}.yml", "a") { |file| file.puts "  "*(index+1) + "#{simbol}:"  }  if @simbol.to_s.split(".").length - 1 != index
                 index.upto(@simbol.to_s.split(".").length ) { |n| simbol_memory[col_index].delete_at(n)}
               end
               simbol_memory[col_index][index] = simbol 
             }
-            File.open("#{save_place}/#{File.basename(excel_file, ".xlsx")}_#{yml_file[col_index]}.yml", "a") { |file| file.puts "  \'#{col}\'"  }  # пишем сам символ
+            File.open("#{save_place}/#{File.basename(excel_file, ".xlsx")}_#{yml_file[col_index]}.yml", "a") { |file| file.puts "  \"#{col}\""  }  # пишем сам символ
           end
         }
       end
     }
   end
 
   def self.backup_all! (locate)
-    if (Dir["#{locate}/*.yml"][0] != nil) then
-      print "Excel2local::backup_all!   to #{locate}/backups .. "
-      Dir.mkdir("#{locate}/backups") if File.directory?("#{locate}/backups") == false
-      Dir.mkdir(dir_name = "#{locate}/backups/#{Time.now.to_i}") 
-      Dir["#{locate}/*.yml"].each { |file|
-        FileUtils.cp(file, dir_name)
+    if (Dir["#{locate}/*.yml"][0] != nil) then   # проверяем есть ла файлы для бекапа
+      print "Excel2local::backup_all!   to #{locate}/backups .. "    
+      Dir.mkdir("#{locate}/backups") if File.directory?("#{locate}/backups") == false  #  проверяем есть папка бекап, если нет создаем
+      Dir.mkdir(dir_name = "#{locate}/backups/#{Time.now.to_i}") # создаем папку для конкретного бекапа
+      Dir["#{locate}/*.yml"].each { |file| 
+        FileUtils.cp(file, dir_name)  #копируем файл
       }
       puts "Done!"
     else
       puts "nothing to backup"
     end
\ No newline at end of file