lost_in_translation 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 070feed0b28c42b519ad16f3b90b40236e2be6f7
-  data.tar.gz: 918e49b028b84dce8f84cb450e0dad92367e1602
+  metadata.gz: 64cafc716734b1378b969b9d6b11c948e05053aa
+  data.tar.gz: 5bfcc42177ec56cb73c8d1329957f1b003efc424
 SHA512:
-  metadata.gz: dd7d97c00384a3517e2275dfe8e76aae3a33f482130d59b5c6ad916b163532c40ae72e3779950c4221e23c0404b53eda330fea3fb82f749294558ce469541839
-  data.tar.gz: afe55294df201e9cd9452e655ec5910333a79381e2b367d30ab737e9c65ad7143c4bee467efd6128aa84502e4ccf2bd1657a1b5d77d1868d63f3af058bbb96c6
+  metadata.gz: eb67dec3972f76e8f50dda2011aec216999eeb09c5907f3dae34582e12b07809636e6500aefb65d8e98c509e0c4a65ffc34362e83784240028b14cd503057d50
+  data.tar.gz: e2753025ed52be2e51081a8122a6c86865b3f47ceb66b01e8ac73c64ce33cf1d990de451d7fef017ae1afd34c12fe68c49c9b5251906407a5fa08d602f3cdb13

data/.gitignore

@@ -6,4 +6,4 @@
 /doc/
 /pkg/
 /spec/reports/
-/tmp/*
+/tmp/*.yml

data/lib/lost_in_translation.rb

@@ -14,6 +14,9 @@ require 'lost_in_translation/z_full_automatic'
 
 #
 module LostInTranslation
+  def self.root
+    File.dirname __dir__
+  end
 end
 
 #

data/lib/lost_in_translation/difference.rb

@@ -2,40 +2,40 @@
 
 #
 module LostInTranslation
-  def self.diff(root, compared, lang1, lang2, structure = [], _max_count = 0, new_array = [])
-    count = 0
+  def self.diff(root, compared, lang1, lang2, structure = [], new_array = [], options = {})
+    @slave_file = options[:slave_file]
+    @mode = options[:mode] # replace, clean, count
+    @diff_count = options[:diff_count]
+    @diff_counter = options[:diff_counter]
     root.each_pair do |key, value|
       next_root     = root[key]
       next_compared = compared.nil? ? nil : compared[key]
       new_structure = structure.dup << key
-      if value.is_a? String
-        if compared.nil? || compared[key].nil?
-          new_val = ask_for_translation(value, new_structure, lang1, lang2)
+      if value.is_a?(String) && (compared.nil? || compared[key].nil?)
+        @diff_counter += 1
+        if @mode == 'replace' && value_missing(options[:slave_file], new_structure)
+          new_val = ask_for_translation(value, new_structure, lang1, lang2, @diff_count, @diff_counter)
+          return new_array if new_val.present? && new_val.end_with?('exit')
           new_array << new_val unless new_val.nil?
-          count += 1
+        elsif @mode == 'clean'
+          new_array << "#{new_structure.join('---')}---#{value}"
         end
       end
-      diff(next_root, next_compared, lang1, lang2, new_structure, new_array) if next_root.is_a? Hash
+      if next_root.is_a? Hash
+        diff(next_root, next_compared, lang1, lang2, new_structure, new_array,
+             diff_counter: @diff_counter, diff_count: @diff_count, mode: @mode, slave_file: @slave_file)
+      end
     end
-    new_array
+    @mode == 'count' ? @diff_counter : new_array
   end
 
-  def self.get_locale(path)
-    path.split('/').last.split('.').first unless path.empty?
+  def self.value_missing(slave_file, structure)
+    return true if slave_file.blank?
+    puts structure
+    false
   end
 
-  def self.clean(root, compared, structure = [], new_array = [])
-    root.each_pair do |key, value|
-      next_root     = root[key]
-      next_compared = compared.nil? ? nil : compared[key]
-      new_structure = structure.dup << key
-      if value.is_a? String
-        unless compared.nil? || compared[key].nil?
-          new_array << "#{new_structure.join('---')}-#{value}"
-        end
-      end
-      clean(next_root, next_compared, new_structure, new_array) if next_root.is_a? Hash
-    end
-    new_array
+  def self.get_locale(path)
+    path.split('/').last.split('.').first unless path.empty?
   end
 end

data/lib/lost_in_translation/file_functions.rb

@@ -2,10 +2,38 @@
 
 #
 module LostInTranslation
-  def self.prepare_paths(path1, path2, post)
-    [path1, path2].each do |p|
-      prepare_yaml(p, post)
+  def self.prepare_for_edit(paths = [])
+    copy_path = "#{root}/tmp"
+    path_array = []
+    paths.each_with_index do |p, i|
+      path = "#{copy_path}/tmp_file#{i}.yml"
+      FileUtils.cp(p, path)
+      path_array << path
     end
+    path_array
+  end
+
+  def self.prepare_paths(paths = [])
+    paths.each do |p|
+      prepare_yaml(p, false)
+    end
+  end
+
+  def self.postpare_paths(paths = [])
+    paths.each do |p|
+      prepare_yaml(p, true)
+    end
+  end
+
+  def self.define_snippets
+    snippets = []
+    snippets << ['<<', 'a_greater_than_sign']
+    snippets << ['*', 'an_asterik_sign']
+    snippets << ['!', 'a_bang_sign']
+    snippets << ['%', 'a_percentage_sign']
+    snippets << ['a_bang_sign \'', '\'a_bang_sign']
+    # snippets << ["&", "this_and_snippet_variable"]
+    snippets
   end
 
   private
@@ -20,8 +48,6 @@ module LostInTranslation
       text = text.gsub(snippet.first, snippet.second)
     end
     text = post ? postpare(snippets, text) : prepare(snippets, text)
-    text = add_single_quotes(text) if post
-    text = text.gsub(': !,', ": '!,'") if post
 
     File.open(path, 'w') { |file| file.puts text }
   end
@@ -33,6 +59,12 @@ module LostInTranslation
       new_var = new_var.gsub('varyberryterry', ': &')
       text = text.gsub(var, new_var)
     end
+    text = add_single_quotes(text)
+    text = text.gsub(': !,', ": ! ','")
+    text = text.gsub('\'!', '! \'')
+    text = text.gsub(/---\n/, '')
+    text = text.gsub('!&hellip;', "! '&hellip;'")
+    text = text.gsub('!:distance_in_words', "! ':distance_in_words'")
     text
   end
 
@@ -65,15 +97,4 @@ module LostInTranslation
     arr[1] = arr[1].gsub("\'! ", "! \'")
     return arr.join(': ')
   end
-
-  def self.define_snippets
-    snippets = []
-    snippets << ['<<', 'a_greater_than_sign']
-    snippets << ['*', 'an_asterik_sign']
-    snippets << ['!', 'a_bang_sign']
-    snippets << ['%', 'a_percentage_sign']
-    snippets << ['a_bang_sign \'', '\'a_bang_sign']
-    # snippets << ["&", "this_and_snippet_variable"]
-    snippets
-  end
 end

data/lib/lost_in_translation/hash.rb

@@ -11,7 +11,6 @@ module LostInTranslation
 
   def self.merge_hash(merge_from, merge_to)
     return if merge_from.is_a?(String) || merge_to.is_a?(String)
-    pp merge_to
     merged_hash = merge_to
     first_key = merge_from.keys.first
     merged_hash[first_key] = if merge_to.key?(first_key)

data/lib/lost_in_translation/user_interface.rb

@@ -2,54 +2,50 @@
 
 #
 module LostInTranslation
-  def self.ask_for_permission(lang1, lang2, app_name)
+  require 'readline'
+
+  def self.ask_for_file(master)
+    text = master ? "# Master (e.g. 'en'): " : "# Slave: (e.g. 'de'): "
+    file = {}
+    file[:lang] = [(print text), Readline.readline()][1]
+    file[:path] = defined?(Rails) ? "#{Rails.root}/config/locales/#{file[:lang]}.yml" : ask_for_path(file)
+    file[:app_name] = Rails&.application&.class&.parent_name
+    file
+  end
+
+  def self.ask_for_permission(lang1, lang2, app_name, count)
     log
     log 'Comparing Locales'
     log "Application: #{app_name}" unless app_name.nil?
     log "Master Locale: #{lang1}.yml"
     log "Slave Locale: #{lang2}.yml"
-    a = [(print "# Is this ok?[Y/n]: "), STDIN.gets.chomp][1]
+    log "Difference: #{count} Entries"
+    a = [(print "# Wanna do it? [Y/n]: "), Readline.readline()][1]
     a == 'y' || a == 'Y' || a == ''
   end
 
-  def self.ask_for_languages
-    log
-    log 'What I18n-yaml files do you want to compare?'
-    lang1 = [(print "# Master (e.g. 'en'): "), STDIN.gets.chomp][1]
-    lang2 = [(print "# Slave: (e.g. 'de'): "), STDIN.gets.chomp][1]
-    [lang1, lang2]
-  end
-
-  def self.ask_for_max_count
-    log
-    log 'How many do you want to edit max?'
-    max_count = [(print '# Max. Count (default = 50000): '), STDIN.gets.chomp][1]
-    max_count
-  end
-
-  def self.ask_for_paths
-    log
-    log 'Please type in the absolute paths to the I18n-yaml file you want to compare?'
-    log 'e.g. /home/youruser/Documents/your-awesome-app/config/locales/en.yml'
-    path1 = [(print '# Master: '), STDIN.gets.chomp][1]
-    path2 = [(print '# Slave:: '), STDIN.gets.chomp][1]
-    [path1, path2]
-  end
-
   def self.ask_for_sorting(lang, _app_name)
     log
     log "Do you want the #{lang}.yml to be sorted?"
     log 'Alphabetically & Recursive (ASC)'
-    a = [(print "# [Y/n]: "), STDIN.gets.chomp][1]
+    a = [(print "# [Y/n]: "), Readline.readline()][1]
     a == 'y' || a == 'Y' || a == ''
   end
 
-  def self.ask_for_translation(value, new_structure, lang1, lang2)
+  def self.ask_for_translation(value, new_structure, lang1, lang2, diff_count, diff_counter)
+    system 'clear'
     log
+    log "#{diff_counter} / #{diff_count}"
     new_s = new_structure.join('---')
     log "#{new_s} is missing"
-    log "in #{lang1}: #{value}"
-    new_val = [(print '# ' + lang2 + ': '), STDIN.gets.chomp][1]
+
+    snippets = LostInTranslation.define_snippets.reverse
+    snippets.each do |snippet|
+      value = value.gsub(snippet.second, snippet.first)
+    end
+
+    puts "# In #{lang1.upcase}: #{value}"
+    new_val = [(print '# ' + lang2 + ': '), Readline.readline()][1]
     new_val == '' ? nil : (new_s + '---' + new_val)
   end
 
@@ -64,4 +60,14 @@ module LostInTranslation
       puts '# ' + str + fill + ' #'
     end
   end
+
+  private
+
+  def self.ask_for_path(file)
+    log
+    log 'Please type in the absolute paths your locales?'
+    log 'e.g. /home/youruser/Documents/your-awesome-app/config/locales'
+    path = [(print '# '), Readline.readline()][1]
+    "#{path}/#{file[:lang]}.yml"
+  end
 end

data/lib/lost_in_translation/version.rb

@@ -2,5 +2,5 @@
 
 #
 module LostInTranslation
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end

data/lib/lost_in_translation/z_cleanup.rb

@@ -3,36 +3,33 @@
 #
 module LostInTranslation
   def self.cleanup
-    if defined? Rails
-      lang2, lang1 = LostInTranslation.ask_for_languages
-      path1 = "#{Rails.root}/config/locales/#{lang1}.yml"
-      path2 = "#{Rails.root}/config/locales/#{lang2}.yml"
-    else
-      path2, path1 = LostInTranslation.ask_for_paths
-
-      lang1 = LostInTranslation.get_locale(path1)
-      lang2 = LostInTranslation.get_locale(path2)
-    end
+    system 'clear'
+    log
+    log 'What I18n-yaml files do you want to compare?'
+    log '!!! WARNING!!! This deletes the differences!!! Make a BACKUP!!! !!!'
+    @master = ask_for_file(true) # lang path app_name
+    @slave = ask_for_file(false)
 
-    abort('NOPE') unless File.exist?(path1) && File.exist?(path2)
+    raise 'Invalid Filepaths' unless File.exist?(@master[:path]) && File.exist?(@slave[:path])
 
-    prepare_paths(path1, path2, true)
-    prepare_paths(path1, path2, false)
+    @master[:copy_path], @slave[:copy_path] = prepare_for_edit([@master[:path], @slave[:path]])
+    prepare_paths([@master[:copy_path], @slave[:copy_path]])
 
-    first = YAML.load_file(path1)
-    second = YAML.load_file(path2)
+    master_file = YAML.load_file(@master[:copy_path])
+    slave_file = YAML.load_file(@slave[:copy_path])
 
-    new_strings_array = LostInTranslation.clean(first[lang1], second[lang2], [lang2])
+    new_strings_array = diff(master_file[@master[:lang]], slave_file[@slave[:lang]], @master[:lang],
+                             @slave[:lang], [@slave[:lang]], [], mode: 'clean')
 
-    first = {}
+    master_file = {}
     new_strings_array.each do |string|
-      string = string.split('---').map { |x| x == lang2 ? lang1 : x }.join('---')
-      result = LostInTranslation.string_to_hash(string)
-      LostInTranslation.merge_hash(result, first)
+      string = string.split('---').map { |x| x == @slave[:lang] ? @master[:lang] : x }.join('---')
+      result = string_to_hash(string)
+      merge_hash(result, master_file)
     end
 
-    File.open(path1, 'w') { |file| file.write(first.to_yaml) }
+    File.open(@master[:path], 'w') { |file| file.write(master_file.to_yaml) }
 
-    prepare_paths(path1, path2, true)
+    postpare_paths([@master[:path], @slave[:lang]])
   end
 end

data/lib/lost_in_translation/z_interactive.rb

@@ -4,43 +4,50 @@
 module LostInTranslation
   def self.interactive
     system 'clear'
-    if defined? Rails
-      app_name = Rails.application.class.parent_name
-      lang1, lang2 = LostInTranslation.ask_for_languages
-      path1 = "#{Rails.root}/config/locales/#{lang1}.yml"
-      path2 = "#{Rails.root}/config/locales/#{lang2}.yml"
-    else
-      app_name = nil
-      path1, path2 = LostInTranslation.ask_for_paths
-
-      lang1 = LostInTranslation.get_locale(path1)
-      lang2 = LostInTranslation.get_locale(path2)
-    end
+    log
+    log 'What I18n-yaml files do you want to compare?'
+    @master = ask_for_file(true) # lang path app_name
+    @slave = ask_for_file(false)
+
+    raise 'Invalid Filepaths' unless File.exist?(@master[:path]) && File.exist?(@slave[:path])
+
+    @master[:copy_path], @slave[:copy_path] = prepare_for_edit([@master[:path], @slave[:path]])
 
-    abort('NOPE') unless File.exist?(path1) && File.exist?(path2)
-    abort('Well, in that case, forget it!') unless LostInTranslation.ask_for_permission(lang1, lang2, app_name)
+    prepare_paths([@master[:copy_path], @slave[:copy_path]])
 
-    prepare_paths(path1, path2, true)
-    prepare_paths(path1, path2, false)
+    master_file = YAML.load_file(@master[:copy_path])
+    slave_file = YAML.load_file(@slave[:copy_path])
 
-    first = YAML.load_file(path1)
-    second = YAML.load_file(path2)
+    count = diff(master_file[@master[:lang]], slave_file[@slave[:lang]], @master[:lang],
+                 @slave[:lang], [@slave[:lang]], [], mode: 'count')
 
-    new_strings_array = LostInTranslation.diff(first[lang1], second[lang2], lang1, lang2, [lang2])
+    unless ask_for_permission(@master[:lang], @slave[:lang], @master[:app_name], count)
+      abort('Well, in that case, forget it!')
+    end
+
+    new_strings_array = diff(master_file[@master[:lang]], slave_file[@slave[:lang]], @master[:lang],
+                             @slave[:lang], [@slave[:lang]], [], diff_count: count, mode: 'replace')
 
     new_strings_array.each do |string|
-      result = LostInTranslation.string_to_hash(string)
-      LostInTranslation.merge_hash(result, second)
+      result = string_to_hash(string)
+      merge_hash(result, slave_file)
     end
 
-    if LostInTranslation.ask_for_sorting(lang1, app_name)
-      first = LostInTranslation.sort_hash(first)
-      File.open(path1, 'w') { |file| file.write(first.to_yaml(line_width: -1)) }
+    sorted = false
+
+    if ask_for_sorting(@master[:lang], @master[:app_name])
+      master_file = sort_hash(master_file)
+      File.open(@master[:copy_path], 'w') { |file| file.write(master_file.to_yaml(line_width: -1)) }
+      sorted = true
     end
+    slave_file = sort_hash(slave_file) if ask_for_sorting(@slave[:lang], @slave[:app_name])
+    File.open(@slave[:copy_path], 'w') { |file| file.write(slave_file.to_yaml(line_width: -1)) }
 
-    second = LostInTranslation.sort_hash(second) if LostInTranslation.ask_for_sorting(lang2, app_name)
-    File.open(path2, 'w') { |file| file.write(second.to_yaml(line_width: -1)) }
+    postpare_paths([@master[:copy_path], @slave[:copy_path]])
 
-    prepare_paths(path1, path2, true)
+    FileUtils.cp(@master[:copy_path], @master[:path]) if sorted
+    FileUtils.cp(@slave[:copy_path], @slave[:path])
+    FileUtils.rm(@master[:copy_path])
+    FileUtils.rm(@slave[:copy_path])
   end
 end

data/lib/lost_in_translation/z_recent.rb

@@ -2,40 +2,57 @@
 
 module LostInTranslation
   def self.recent
-    app_name = Rails.application.class.parent_name
-    lang1, lang2 = LostInTranslation.ask_for_languages
-    path1 = "#{Rails.root}/config/locales/#{lang1}.yml"
-    copy_path1 = "#{Rails.root}/config/locales/#{lang1}_copy.yml"
-    path2 = "#{Rails.root}/config/locales/#{lang2}.yml"
+    system 'clear'
+    log
+    log 'What I18n-yaml files do you want to compare?'
+    @master = ask_for_file(true) # lang path app_name
+    @slave = ask_for_file(false)
+    @copy = { path: "#{Rails.root}/config/locales/#{@master[:lang]}_copy.yml" }
 
-    abort('NOPE') unless File.exist?(path1) && File.exist?(path2)
+    raise 'Invalid Filepaths' unless File.exist?(@master[:path]) && File.exist?(@slave[:path])
 
-    FileUtils.cp(path1, copy_path1)
-    `git checkout "#{path1}"`
+    FileUtils.cp(@master[:path], @copy[:path])
+    `git checkout "#{@master[:path]}"`
 
-    prepare_paths(path1, copy_path1, true)
-    prepare_paths(path1, copy_path1, false)
+    @master[:copy_path], @slave[:copy_path], @copy[:copy_path] = prepare_for_edit([@master[:path], @slave[:path], @copy[:path]])
+    FileUtils.mv(@copy[:path], @master[:path])
 
-    first = YAML.load_file(path1)
-    first_copy = YAML.load_file(copy_path1)
-    second = YAML.load_file(path2)
-    new_strings_array = LostInTranslation.diff(first_copy[lang1], first[lang1], lang1, lang2, [lang1])
+    prepare_paths([@master[:copy_path], @slave[:copy_path], @copy[:copy_path]])
+
+    master_file = YAML.load_file(@master[:copy_path])
+    master_copy_file = YAML.load_file(@copy[:copy_path])
+    slave_file = YAML.load_file(@slave[:copy_path])
+
+    count = diff(master_copy_file[@master[:lang]], master_file[@master[:lang]], @master[:lang],
+                 @slave[:lang], [@slave[:lang]], [], mode: 'count')
+
+    abort('Well, in that case, forget it!') unless ask_for_permission(@master[:lang], @slave[:lang], @master[:app_name], count)
+
+    new_strings_array = diff(master_copy_file[@master[:lang]], master_file[@master[:lang]], @master[:lang], @slave[:lang], [@slave[:lang]], [],
+                             diff_counter: 0, diff_count: count, mode: 'replace', slave_file: slave_file)
 
     new_strings_array.each do |string|
-      string = string.split('---').map { |x| x == lang1 ? lang2 : x }.join('---')
-      result = LostInTranslation.string_to_hash(string)
-      LostInTranslation.merge_hash(result, second)
+      result = string_to_hash(string)
+      merge_hash(result, slave_file)
     end
 
-    if LostInTranslation.ask_for_sorting(lang1, app_name)
-      first_copy = LostInTranslation.sort_hash(first_copy)
-      File.open(path1, 'w') { |file| file.write(first_copy.to_yaml) }
+    sorted = false
+
+    if ask_for_sorting(@master[:lang], @master[:app_name])
+      master_file = sort_hash(master_file)
+      File.open(@master[:copy_path], 'w') { |file| file.write(master_file.to_yaml(line_width: -1)) }
+      sorted = true
     end
 
-    second = LostInTranslation.sort_hash(second) if LostInTranslation.ask_for_sorting(lang2, app_name)
-    File.open(path2, 'w') { |file| file.write(second.to_yaml) }
-    prepare_paths(path1, path2, true)
+    slave_file = sort_hash(slave_file) if ask_for_sorting(@slave[:lang], @slave[:app_name])
+    File.open(@slave[:copy_path], 'w') { |file| file.write(slave_file.to_yaml(line_width: -1)) }
+
+    postpare_paths([@master[:copy_path], @slave[:copy_path]])
 
-    FileUtils.rm(copy_path1)
+    FileUtils.cp(@master[:copy_path], @master[:path]) if sorted
+    FileUtils.cp(@slave[:copy_path], @slave[:path])
+    FileUtils.rm(@master[:copy_path])
+    FileUtils.rm(@slave[:copy_path])
+    FileUtils.rm(@copy[:copy_path])
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lost_in_translation
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Datyv
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-22 00:00:00.000000000 Z
+date: 2017-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler