lost_in_translation 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b5ad5b54d21c5230363ffd5484b7ea677ab628e
-  data.tar.gz: ce901a81a874616cb4c3dd91f209592861afaf76
+  metadata.gz: 44c189e98dbaa5e2445b268a39ac3f4cafea196e
+  data.tar.gz: f13226087c1a3a69cf605528ffb8a17e6e29b420
 SHA512:
-  metadata.gz: db2cff3026ff8b913ec0149c92b735a17717f9ceb3868a1e15a7519d006ffff8ec277bd8d57adef022b989c29a6b3c8885f29385f2045a335e4d24b54f371683
-  data.tar.gz: 5a086bf90a4b44a4f928fb25ca9f4634e27010c237a1cf2aabdc1597fefb3450475f6f7695eac4b260ded0ed7678c521071c14f14dcd795762fdcb5307500673
+  metadata.gz: fe1923dd3c0f86ab2a371beb85a5014686b8b5d46313035600ca223fca81fa52f70d6a050d56da27c10c85d614c4b882f44b1747f6a4b796c303def0575f16aa
+  data.tar.gz: 26a24b2ae38876256305ba55a65c70922b96c43f4d3018f3a9a6e3eea56c8a0961d8f3500ead0564de787d2c269c9c900c557383d211a0003bd1a0d3a3502b8b

data/.rubocop.yml

@@ -0,0 +1,28 @@
+# This is the configuration used to check the rubocop source code.
+
+
+AllCops:
+  TargetRubyVersion: 2.3
+  Exclude:
+    - 'vendor/**/*'
+    - 'spec/fixtures/**/*'
+    - 'db/functional_test_data.rb'
+    - 'db/schema.rb'
+
+Lint/HandleExceptions:
+  Exclude:
+    - 'bin/rails'
+    - 'bin/rake'
+    - 'bin/rspec'
+
+Style/Encoding:
+  Enabled: true
+
+Style/NumericLiterals:
+  Enabled: false
+
+Style/RescueModifier:
+  Enabled: false
+
+Metrics/LineLength:
+  Max: 120

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in lost_in_translation.gemspec

data/README.md

@@ -65,11 +65,11 @@ In this case you can use the Rails-Console and the Class -LostInTranslation-.
 rails c
 ```
 ```
-LostInTranslationMain.interactive
+LostInTranslation.interactive
 or
-LostInTranslationMain.recent
+LostInTranslation.recent
 or
-LostInTranslationMain.cleanup
+LostInTranslation.cleanup
 ```
 
 #### Yet to come

data/Rakefile

@@ -1,8 +1,10 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec
 
-import "./lib/tasks/lit.rake"
+import './lib/tasks/lit.rake'

data/lib/lost_in_translation/difference.rb

@@ -1,18 +1,20 @@
+# frozen_string_literal: true
+
 module LostInTranslation
-  def diff(root, compared, lang_1, lang_2, structure = [], max_count = 0, new_array = [])
+  def diff(root, compared, lang1, lang2, structure = [], _max_count = 0, new_array = [])
     count = 0
-    root.each_pair do |key,value|
+    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, lang_1, lang_2)
+          new_val = ask_for_translation(value, new_structure, lang1, lang2)
           new_array << new_val unless new_val.nil?
           count += 1
         end
       end
-      diff(next_root, next_compared, lang_1, lang_2, new_structure, new_array) if next_root.kind_of? Hash
+      diff(next_root, next_compared, lang1, lang2, new_structure, new_array) if next_root.is_a? Hash
     end
     new_array
   end
@@ -22,7 +24,7 @@ module LostInTranslation
   end
 
   def clean(root, compared, structure = [], new_array = [])
-    root.each_pair do |key,value|
+    root.each_pair do |key, value|
       next_root     = root[key]
       next_compared = compared.nil? ? nil : compared[key]
       new_structure = structure.dup << key
@@ -31,7 +33,7 @@ module LostInTranslation
           new_array << "#{new_structure.join('---')}-#{value}"
         end
       end
-      clean(next_root, next_compared, new_structure, new_array) if next_root.kind_of? Hash
+      clean(next_root, next_compared, new_structure, new_array) if next_root.is_a? Hash
     end
     new_array
   end

data/lib/lost_in_translation/file_functions.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 module LostInTranslation
-  def prepare_paths(path_1, path_2, post)
-    [path_1, path_2].each do |p|
+  def prepare_paths(path1, path2, post)
+    [path1, path2].each do |p|
       prepare_yaml(p, post)
     end
   end
 
-private
+  private
 
   def prepare_yaml(path, post)
     text = File.read(path)
@@ -17,31 +19,37 @@ private
       text = text.gsub(snippet.first, snippet.second)
     end
 
-    if post
-      variables = text.scan(/varyberryterry.*/)
-      variables.each do |var|
-        new_var = var.gsub(':', '')
-        new_var = new_var.gsub('varyberryterry', ': &')
-        text = text.gsub(var, new_var)
-      end
-    else
-      variables = text.scan(/: &.*/)
-      variables.each do |var|
-        new_var = var.gsub(': &', 'varyberryterry')
-        new_var += ':'
-        text = text.gsub(var, new_var)
-      end
+    text = post ? postpare(variables, text) : prepare(variables, text)
+
+    File.open(path, 'w') { |file| file.puts text }
+  end
+
+  def postpare(variables, text)
+    variables = text.scan(/varyberryterry.*/)
+    variables.each do |var|
+      new_var = var.delete(':')
+      new_var = new_var.gsub('varyberryterry', ': &')
+      text = text.gsub(var, new_var)
     end
+    text
+  end
 
-    File.open(path, "w") {|file| file.puts text }
+  def prepare(variables, text)
+    variables = text.scan(/: &.*/)
+    variables.each do |var|
+      new_var = var.gsub(': &', 'varyberryterry')
+      new_var += ':'
+      text = text.gsub(var, new_var)
+    end
+    text
   end
 
   def define_snippets
     snippets = []
-    snippets << ["<<", "a_greater_than_sign"]
-    snippets << ["*", "an_asterik_sign"]
-    snippets << ["!", "a_bang_sign"]
-    snippets << ["%", "a_percentage_sign"]
+    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

data/lib/lost_in_translation/hash.rb

@@ -1,28 +1,29 @@
+# frozen_string_literal: true
+
+#
 module LostInTranslation
   def string_to_hash(string)
     array = string.split('---')
     value = array.pop
     arr = array.reverse
-    arr[1..-1].inject({arr[0] => value}){ |memo, i| {i => memo} }
+    arr[1..-1].inject(arr[0] => value) { |memo, i| { i => memo } }
   end
 
   def merge_hash(merge_from, merge_to)
-    unless merge_from.kind_of?(String) || merge_to.kind_of?(String)
-      merged_hash = merge_to
-      first_key = merge_from.keys.first
-      if merge_to.has_key?(first_key)
-        merged_hash[first_key] = merge_hash( merge_from[first_key], merge_to[first_key] )
-      else
-        merged_hash[first_key] = merge_from[first_key]
-      end
-      merged_hash
-    end
+    return if merge_from.is_a?(String) || merge_to.is_a?(String)
+    merged_hash = merge_to
+    first_key = merge_from.keys.first
+    merged_hash[first_key] = if merge_to.key?(first_key)
+                               merge_hash(merge_from[first_key], merge_to[first_key])
+                             else
+                               merge_from[first_key]
+                             end
+    merged_hash
   end
 
-
   def sort_hash(object)
     return object unless object.is_a?(Hash)
-    hash = Hash.new
+    hash = {}
     object.each { |k, v| hash[k] = sort_hash(v) }
     sorted = hash.sort { |a, b| a[0].to_s <=> b[0].to_s }
     hash.class[sorted]

data/lib/lost_in_translation/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'lost_in_translation'
 require 'rails'
 module LostInTranslation
@@ -5,7 +7,7 @@ module LostInTranslation
     railtie_name :lost_in_translation
 
     rake_tasks do
-      load "tasks/translate.rake"
+      load 'tasks/lit.rake'
     end
   end
 end

data/lib/lost_in_translation/user_interface.rb

@@ -1,54 +1,56 @@
+# frozen_string_literal: true
+
 module LostInTranslation
-  def ask_for_permission(lang_1, lang_2, app_name)
-    system "clear"
-    puts "Comparing Locales"
+  def ask_for_permission(lang1, lang2, app_name)
+    system 'clear'
+    puts 'Comparing Locales'
     puts "Application: #{app_name}" unless app_name.nil?
-    puts "Master Locale: #{lang_1}.yml"
-    puts "Slave Locale: #{lang_2}.yml"
-    puts "Is this ok?[y/n]"
+    puts "Master Locale: #{lang1}.yml"
+    puts "Slave Locale: #{lang2}.yml"
+    puts 'Is this ok?[y/n]'
     a = STDIN.gets.chomp
     a == 'y' || a == 'Y'
   end
 
   def ask_for_languages
-    system "clear"
-    puts "What I18n-yaml files do you want to compare?"
-    lang_1 = [(print "Master (e.g. 'en'): "), STDIN.gets.chomp][1]
-    lang_2 = [(print "Slave: (e.g. 'de'): "), STDIN.gets.chomp][1]
-    [lang_1, lang_2]
+    system 'clear'
+    puts '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 ask_for_max_count
-    system "clear"
-    puts "How many do you want to edit max?"
-    max_count = [(print "Max. Count (default = 50000): "), STDIN.gets.chomp][1]
+    system 'clear'
+    puts 'How many do you want to edit max?'
+    max_count = [(print 'Max. Count (default = 50000): '), STDIN.gets.chomp][1]
     max_count
   end
 
   def ask_for_paths
-    system "clear"
-    puts "Please type in the absolute paths to the I18n-yaml file you want to compare?"
-    puts "e.g. /home/youruser/Documents/your-awesome-app/config/locales/en.yml"
-    path_1 = [(print "Master: "), STDIN.gets.chomp][1]
-    path_2 = [(print "Slave:: "), STDIN.gets.chomp][1]
-    [path_1,path_2]
+    system 'clear'
+    puts 'Please type in the absolute paths to the I18n-yaml file you want to compare?'
+    puts '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 ask_for_sorting(lang, app_name)
-    system "clear"
+  def ask_for_sorting(lang, _app_name)
+    system 'clear'
     puts "Do you want the #{lang}.yml to be sorted?"
-    puts "Alphabetically & Recursive (ASC)"
-    puts "[y/n]"
+    puts 'Alphabetically & Recursive (ASC)'
+    puts '[y/n]'
     a = STDIN.gets.chomp
     a == 'y' || a == 'Y'
   end
 
-  def ask_for_translation(value, new_structure, lang_1, lang_2)
-    system "clear"
+  def ask_for_translation(value, new_structure, lang1, lang2)
+    system 'clear'
     new_s = new_structure.join('---')
     puts "#{new_s} is missing"
-    puts "in #{lang_1}: #{value}"
-    new_val = [(print lang_2 + ": "), STDIN.gets.chomp][1]
+    puts "in #{lang1}: #{value}"
+    new_val = [(print lang2 + ': '), STDIN.gets.chomp][1]
     new_val == '' ? nil : (new_s + '---' + new_val)
   end
 end

data/lib/lost_in_translation/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LostInTranslation
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/lib/lost_in_translation/z_cleanup.rb

@@ -1,36 +1,37 @@
+# frozen_string_literal: true
+
+#
 module LostInTranslation
   def cleanup
     if defined? Rails
-      app_name = Rails.application.class.parent_name
-      lang_2, lang_1 = LostInTranslationMain.ask_for_languages
-      path_1 = "#{Rails.root}/config/locales/#{lang_1}.yml"
-      path_2 = "#{Rails.root}/config/locales/#{lang_2}.yml"
+      lang2, lang1 = LostInTranslation.ask_for_languages
+      path1 = "#{Rails.root}/config/locales/#{lang1}.yml"
+      path2 = "#{Rails.root}/config/locales/#{lang2}.yml"
     else
-      app_name = nil
-      path_2, path_1 = LostInTranslationMain.ask_for_paths
+      path2, path1 = LostInTranslation.ask_for_paths
 
-      lang_1 = LostInTranslationMain.get_locale(path_1)
-      lang_2 = LostInTranslationMain.get_locale(path_2)
+      lang1 = LostInTranslation.get_locale(path1)
+      lang2 = LostInTranslation.get_locale(path2)
     end
 
-    abort('NOPE') unless File.exist?(path_1) && File.exist?(path_2)
+    abort('NOPE') unless File.exist?(path1) && File.exist?(path2)
 
-    prepare_paths(path_1, path_2, false)
+    prepare_paths(path1, path2, false)
 
-    first = YAML.load_file(path_1)
-    second = YAML.load_file(path_2)
+    first = YAML.load_file(path1)
+    second = YAML.load_file(path2)
 
-    new_strings_array = LostInTranslationMain.clean(first[lang_1], second[lang_2], [lang_2])
+    new_strings_array = LostInTranslation.clean(first[lang1], second[lang2], [lang2])
 
     first = {}
     new_strings_array.each do |string|
-      string = string.split('---').map { |x| x == lang_2 ? x = lang_1 : x }.join('---')
-      result = LostInTranslationMain.string_to_hash(string)
-      LostInTranslationMain.merge_hash(result, first)
+      string = string.split('---').map { |x| x == lang2 ? lang1 : x }.join('---')
+      result = LostInTranslation.string_to_hash(string)
+      LostInTranslation.merge_hash(result, first)
     end
 
-    File.open(path_1, 'w') { |file| file.write(first.to_yaml) }
+    File.open(path1, 'w') { |file| file.write(first.to_yaml) }
 
-    prepare_paths(path_1, path_2, true)
+    prepare_paths(path1, path2, true)
   end
 end

data/lib/lost_in_translation/z_full_automatic.rb

@@ -1,32 +1,30 @@
 module LostInTranslation
   def full_automatic
     if defined? Rails
-      app_name = Rails.application.class.parent_name
-      lang_2, lang_1 = LostInTranslationMain.ask_for_languages
-      path_1 = "#{Rails.root}/config/locales/#{lang_1}.yml"
-      path_2 = "#{Rails.root}/config/locales/#{lang_2}.yml"
+      lang2, lang1 = LostInTranslation.ask_for_languages
+      path1 = "#{Rails.root}/config/locales/#{lang1}.yml"
+      path2 = "#{Rails.root}/config/locales/#{lang2}.yml"
     else
-      app_name = nil
-      path_2, path_1 = LostInTranslationMain.ask_for_paths
+      path2, path1 = LostInTranslation.ask_for_paths
 
-      lang_1 = LostInTranslationMain.get_locale(path_1)
-      lang_2 = LostInTranslationMain.get_locale(path_2)
+      lang1 = LostInTranslation.get_locale(path1)
+      lang2 = LostInTranslation.get_locale(path2)
     end
 
-    abort('NOPE') unless File.exist?(path_1) && File.exist?(path_2)
+    abort('NOPE') unless File.exist?(path1) && File.exist?(path2)
 
-    first = YAML.load_file(path_1)
-    second = YAML.load_file(path_2)
+    first = YAML.load_file(path1)
+    second = YAML.load_file(path2)
 
-    new_strings_array = LostInTranslationMain.clean(first[lang_1], second[lang_2], [lang_2])
+    new_strings_array = LostInTranslation.clean(first[lang1], second[lang2], [lang2])
 
     first = {}
     new_strings_array.each do |string|
-      string = string.split('---').map { |x| x == lang_2 ? x = lang_1 : x }.join('---')
-      result = LostInTranslationMain.string_to_hash(string)
-      LostInTranslationMain.merge_hash(result, first)
+      string = string.split('---').map { |x| x == lang2 ? lang1 : x }.join('---')
+      result = LostInTranslation.string_to_hash(string)
+      LostInTranslation.merge_hash(result, first)
     end
 
-    File.open(path_1, 'w') { |file| file.write(first.to_yaml) }
+    File.open(path1, 'w') { |file| file.write(first.to_yaml) }
   end
 end

data/lib/lost_in_translation/z_half_automatic.rb

@@ -1,32 +1,30 @@
 module LostInTranslation
   def half_automatic
     if defined? Rails
-      app_name = Rails.application.class.parent_name
-      lang_2, lang_1 = LostInTranslationMain.ask_for_languages
-      path_1 = "#{Rails.root}/config/locales/#{lang_1}.yml"
-      path_2 = "#{Rails.root}/config/locales/#{lang_2}.yml"
+      lang2, lang1 = LostInTranslation.ask_for_languages
+      path1 = "#{Rails.root}/config/locales/#{lang1}.yml"
+      path2 = "#{Rails.root}/config/locales/#{lang2}.yml"
     else
-      app_name = nil
-      path_2, path_1 = LostInTranslationMain.ask_for_paths
+      path2, path1 = LostInTranslation.ask_for_paths
 
-      lang_1 = LostInTranslationMain.get_locale(path_1)
-      lang_2 = LostInTranslationMain.get_locale(path_2)
+      lang1 = LostInTranslation.get_locale(path1)
+      lang2 = LostInTranslation.get_locale(path2)
     end
 
-    abort('NOPE') unless File.exist?(path_1) && File.exist?(path_2)
+    abort('NOPE') unless File.exist?(path1) && File.exist?(path2)
 
-    first = YAML.load_file(path_1)
-    second = YAML.load_file(path_2)
+    first = YAML.load_file(path1)
+    second = YAML.load_file(path2)
 
-    new_strings_array = LostInTranslationMain.clean(first[lang_1], second[lang_2], [lang_2])
+    new_strings_array = LostInTranslation.clean(first[lang1], second[lang2], [lang2])
 
     first = {}
     new_strings_array.each do |string|
-      string = string.split('---').map { |x| x == lang_2 ? x = lang_1 : x }.join('---')
-      result = LostInTranslationMain.string_to_hash(string)
-      LostInTranslationMain.merge_hash(result, first)
+      string = string.split('---').map { |x| x == lang2 ? lang1 : x }.join('---')
+      result = LostInTranslation.string_to_hash(string)
+      LostInTranslation.merge_hash(result, first)
     end
 
-    File.open(path_1, 'w') { |file| file.write(first.to_yaml) }
+    File.open(path1, 'w') { |file| file.write(first.to_yaml) }
   end
 end

data/lib/lost_in_translation/z_interactive.rb

@@ -2,41 +2,41 @@ module LostInTranslation
   def interactive
     if defined? Rails
       app_name = Rails.application.class.parent_name
-      lang_1, lang_2 = LostInTranslationMain.ask_for_languages
-      path_1 = "#{Rails.root}/config/locales/#{lang_1}.yml"
-      path_2 = "#{Rails.root}/config/locales/#{lang_2}.yml"
+      lang1, lang2 = LostInTranslation.ask_for_languages
+      path1 = "#{Rails.root}/config/locales/#{lang1}.yml"
+      path2 = "#{Rails.root}/config/locales/#{lang2}.yml"
     else
       app_name = nil
-      path_1, path_2 = LostInTranslationMain.ask_for_paths
+      path1, path2 = LostInTranslation.ask_for_paths
 
-      lang_1 = LostInTranslationMain.get_locale(path_1)
-      lang_2 = LostInTranslationMain.get_locale(path_2)
+      lang1 = LostInTranslation.get_locale(path1)
+      lang2 = LostInTranslation.get_locale(path2)
     end
 
-    abort('NOPE') unless File.exist?(path_1) && File.exist?(path_2)
-    abort('Well, in that case, forget it!') unless LostInTranslationMain.ask_for_permission(lang_1,lang_2,app_name)
+    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(path_1, path_2, true)
-    prepare_paths(path_1, path_2, false)
+    prepare_paths(path1, path2, true)
+    prepare_paths(path1, path2, false)
 
-    first = YAML.load_file(path_1)
-    second = YAML.load_file(path_2)
+    first = YAML.load_file(path1)
+    second = YAML.load_file(path2)
 
-    new_strings_array = LostInTranslationMain.diff(first[lang_1], second[lang_2], lang_1, lang_2, [lang_2])
+    new_strings_array = LostInTranslation.diff(first[lang1], second[lang2], lang1, lang2, [lang2])
 
     new_strings_array.each do |string|
-      result = LostInTranslationMain.string_to_hash(string)
-      LostInTranslationMain.merge_hash(result, second)
+      result = LostInTranslation.string_to_hash(string)
+      LostInTranslation.merge_hash(result, second)
     end
 
-    if LostInTranslationMain.ask_for_sorting(lang_1, app_name)
-      first = LostInTranslationMain.sort_hash(first)
-      File.open(path_1, 'w') { |file| file.write(first.to_yaml(line_width: -1)) }
+    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)) }
     end
 
-    second = LostInTranslationMain.sort_hash(second) if LostInTranslationMain.ask_for_sorting(lang_2, app_name)
-    File.open(path_2, 'w') { |file| file.write(second.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)) }
 
-    prepare_paths(path_1, path_2, true)
+    prepare_paths(path1, path2, true)
   end
 end

data/lib/lost_in_translation/z_recent.rb

@@ -1,38 +1,38 @@
 module LostInTranslation
   def recent
     app_name = Rails.application.class.parent_name
-    lang_1, lang_2 = LostInTranslationMain.ask_for_languages
-    path_1 = "#{Rails.root}/config/locales/#{lang_1}.yml"
-    copy_path_1 = "#{Rails.root}/config/locales/#{lang_1}_copy.yml"
-    path_2 = "#{Rails.root}/config/locales/#{lang_2}.yml"
+    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"
 
-    abort('NOPE') unless File.exist?(path_1) && File.exist?(path_2)
+    abort('NOPE') unless File.exist?(path1) && File.exist?(path2)
 
-    FileUtils.cp(path_1, copy_path_1)
-    `git checkout "#{path_1}"`
+    FileUtils.cp(path1, copy_path1)
+    `git checkout "#{path1}"`
 
-    prepare_paths(path_1, copy_path_1, false)
+    prepare_paths(path1, copy_path1, false)
 
-    first = YAML.load_file(path_1)
-    first_copy = YAML.load_file(copy_path_1)
-    second = YAML.load_file(path_2)
-    new_strings_array = LostInTranslationMain.diff(first_copy[lang_1], first[lang_1], lang_1, lang_2, [lang_1])
+    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])
 
     new_strings_array.each do |string|
-      string = string.split('---').map { |x| x == lang_1 ? x = lang_2 : x }.join('---')
-      result = LostInTranslationMain.string_to_hash(string)
-      LostInTranslationMain.merge_hash(result, second)
+      string = string.split('---').map { |x| x == lang1 ? lang2 : x }.join('---')
+      result = LostInTranslation.string_to_hash(string)
+      LostInTranslation.merge_hash(result, second)
     end
 
-    if LostInTranslationMain.ask_for_sorting(lang_1, app_name)
-      first_copy = LostInTranslationMain.sort_hash(first_copy)
-      File.open(path_1, 'w') { |file| file.write(first_copy.to_yaml) }
+    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) }
     end
 
-    second = LostInTranslationMain.sort_hash(second) if LostInTranslationMain.ask_for_sorting(lang_2, app_name)
-    File.open(path_2, 'w') { |file| file.write(second.to_yaml) }
-    prepare_paths(path_1, path_2, true)
+    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)
 
-    FileUtils.rm(copy_path_1)
+    FileUtils.rm(copy_path1)
   end
 end

data/lib/lost_in_translation.rb

@@ -1,19 +1,18 @@
-require "lost_in_translation/difference"
-require "lost_in_translation/file_functions"
-require "lost_in_translation/hash"
+require 'lost_in_translation/difference'
+require 'lost_in_translation/file_functions'
+require 'lost_in_translation/hash'
 require 'lost_in_translation/railtie' if defined?(Rails)
-require "lost_in_translation/user_interface"
-require "lost_in_translation/version"
-require "lost_in_translation/z_recent"
-require "lost_in_translation/z_interactive"
-require "lost_in_translation/z_cleanup"
-require "lost_in_translation/z_half_automatic"
-require "lost_in_translation/z_full_automatic"
+require 'lost_in_translation/user_interface'
+require 'lost_in_translation/version'
+require 'lost_in_translation/z_recent'
+require 'lost_in_translation/z_interactive'
+require 'lost_in_translation/z_cleanup'
+require 'lost_in_translation/z_half_automatic'
+require 'lost_in_translation/z_full_automatic'
 
 module LostInTranslation
-
 end
 
-class LostInTranslationMain
+class LostInTranslation
   extend LostInTranslation
 end

data/lib/tasks/lit.rake

@@ -1,41 +1,43 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require 'lost_in_translation'
 require 'fileutils'
 
 namespace :lit do
-  desc "Make the locale-yamls equal again(Interactive)"
+  desc 'Make the locale-yamls equal again(Interactive)'
   task :interactive do
-    LostInTranslationMain.interactive
+    LostInTranslation.interactive
   end
 end
 
 namespace :lit do
-  desc "Use Bing-Translator as a suggestion for translation"
+  desc 'Use Bing-Translator as a suggestion for translation'
   task :half_automatic do
     return 'to_be_done'
-    LostInTranslationMain.half_automatic
+    # LostInTranslation.half_automatic
   end
 end
 
 namespace :lit do
-  desc "Use Bing-Translator to automatically translate everything"
+  desc 'Use Bing-Translator to automatically translate everything'
   task :fully_automatic do
     return 'to_be_done'
-    LostInTranslationMain.full_automatic
+    # LostInTranslation.full_automatic
   end
 end
 
 namespace :lit do
-  desc "Cleaning out the Yaml-Closet"
+  desc 'Cleaning out the Yaml-Closet'
   task :cleanup do
-    LostInTranslationMain.cleanup
+    LostInTranslation.cleanup
   end
 end
 
 namespace :lit do
-  desc "Tranlate just your recently changed Strings(requires git)"
+  desc 'Tranlate just your recently changed Strings(requires git)'
   task :recent do
     abort('Please use this feature inside a Rails-Application') unless defined? Rails
-    LostInTranslationMain.recent
+    LostInTranslation.recent
   end
 end

data/lost_in_translation.gemspec

@@ -1,25 +1,26 @@
-# coding: utf-8
+# frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'lost_in_translation/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "lost_in_translation"
+  spec.name          = 'lost_in_translation'
   spec.version       = LostInTranslation::VERSION
-  spec.authors       = ["Datyv"]
-  spec.email         = ["yvesgoizet@gmail.com"]
+  spec.authors       = ['Datyv']
+  spec.email         = ['yvesgoizet@gmail.com']
 
-  spec.summary       = %q{A Gem to compare two locale yamls}
-  spec.description   = %q{Take two locales yamls and merge them together with different values.}
-  spec.homepage      = "https://github.com/Datyv/lost_in_translation"
-  spec.license       = "MIT"
+  spec.summary       = 'A Gem to compare two locale yamls'
+  spec.description   = 'Take two locales yamls and merge them together with different values.'
+  spec.homepage      = 'https://github.com/Datyv/lost_in_translation'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency 'bundler', '~> 1.11'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lost_in_translation
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Datyv
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-30 00:00:00.000000000 Z
+date: 2017-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,6 +61,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -103,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A Gem to compare two locale yamls