lost_in_translation 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64cafc716734b1378b969b9d6b11c948e05053aa
-  data.tar.gz: 5bfcc42177ec56cb73c8d1329957f1b003efc424
+  metadata.gz: f0faf76dd6e900232f9339662f1ee88e430bc3f0
+  data.tar.gz: bd0843ca90fcfcb4433d98befe7f889775ba9662
 SHA512:
-  metadata.gz: eb67dec3972f76e8f50dda2011aec216999eeb09c5907f3dae34582e12b07809636e6500aefb65d8e98c509e0c4a65ffc34362e83784240028b14cd503057d50
-  data.tar.gz: e2753025ed52be2e51081a8122a6c86865b3f47ceb66b01e8ac73c64ce33cf1d990de451d7fef017ae1afd34c12fe68c49c9b5251906407a5fa08d602f3cdb13
+  metadata.gz: b28e288ea6fe416352196ce74b9084466fcba9a8b5be27ecf12afb0eab374c63b5a949d81c2612e0195a1cddab8640dfae2932dc984721fbc14f65d0e0005a2e
+  data.tar.gz: c95b7867c1948d916d8f2c11e5ae995acb2045dc213fb3c6c2d9c1254691f087cb1f06e42d3156f75da25b6ee57d1f28e16c862cd2f5a9eed6635975cf49f703

data/.gitignore

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

data/lib/lost_in_translation.rb

@@ -17,6 +17,14 @@ module LostInTranslation
   def self.root
     File.dirname __dir__
   end
+
+  def self.tmp_paths
+    tmp_paths = {}
+    tmp_paths[:copy] = "#{root}/tmp/tmp_master_copy.yml"
+    tmp_paths[:master] = "#{root}/tmp/tmp_master.yml"
+    tmp_paths[:slave] = "#{root}/tmp/tmp_slave.yml"
+    tmp_paths
+  end
 end
 
 #

data/lib/lost_in_translation/file_functions.rb

@@ -2,15 +2,11 @@
 
 #
 module LostInTranslation
-  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
+  def self.prepare_for_edit(options = {})
+    paths = copy_paths
+    FileUtils.cp(options[:master], paths[:master]) if options[:master]
+    FileUtils.cp(options[:slave], paths[:slave]) if options[:slave]
+    FileUtils.cp(options[:copy], paths[:copy]) if options[:copy]
   end
 
   def self.prepare_paths(paths = [])
@@ -32,10 +28,16 @@ module LostInTranslation
     snippets << ['!', 'a_bang_sign']
     snippets << ['%', 'a_percentage_sign']
     snippets << ['a_bang_sign \'', '\'a_bang_sign']
-    # snippets << ["&", "this_and_snippet_variable"]
     snippets
   end
 
+  def reset_tmp_files
+    paths = copy_paths
+    paths.each_value do |path|
+      File.open(path, 'w') { |file| file.write('') }
+    end
+  end
+
   private
 
   def self.prepare_yaml(path, post)

data/lib/lost_in_translation/user_interface.rb

@@ -8,7 +8,11 @@ module LostInTranslation
     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[:path] = defined?(Rails) ? "#{Rails.root}/config/locales/#{file[:lang]}.yml" : ask_for_path
+    unless File.exist?(file[:path])
+      log "File #{file[:path]} not found!"
+      file[:path] = ask_for_path
+    end
     file[:app_name] = Rails&.application&.class&.parent_name
     file
   end
@@ -63,11 +67,11 @@ module LostInTranslation
 
   private
 
-  def self.ask_for_path(file)
+  def self.ask_for_path
     log
-    log 'Please type in the absolute paths your locales?'
-    log 'e.g. /home/youruser/Documents/your-awesome-app/config/locales'
+    log 'Please type in the absolute path your locale?'
+    log 'e.g. /home/youruser/Documents/your-awesome-app/config/locales/de.yml'
     path = [(print '# '), Readline.readline()][1]
-    "#{path}/#{file[:lang]}.yml"
+    path
   end
 end

data/lib/lost_in_translation/version.rb

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

data/lib/lost_in_translation/z_cleanup.rb

@@ -9,14 +9,16 @@ module LostInTranslation
     log '!!! WARNING!!! This deletes the differences!!! Make a BACKUP!!! !!!'
     @master = ask_for_file(true) # lang path app_name
     @slave = ask_for_file(false)
+    paths = copy_paths
 
     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]])
-    prepare_paths([@master[:copy_path], @slave[:copy_path]])
+    prepare_for_edit(master: @master[:path], slave: @slave[:path])
 
-    master_file = YAML.load_file(@master[:copy_path])
-    slave_file = YAML.load_file(@slave[:copy_path])
+    prepare_paths([paths[:master], paths[:slave]])
+
+    master_file = YAML.load_file(paths[:master])
+    slave_file = YAML.load_file(paths[:slave])
 
     new_strings_array = diff(master_file[@master[:lang]], slave_file[@slave[:lang]], @master[:lang],
                              @slave[:lang], [@slave[:lang]], [], mode: 'clean')
@@ -30,6 +32,7 @@ module LostInTranslation
 
     File.open(@master[:path], 'w') { |file| file.write(master_file.to_yaml) }
 
-    postpare_paths([@master[:path], @slave[:lang]])
+    postpare_paths([@master[:path], @slave[:path]])
+    reset_tmp_files
   end
 end

data/lib/lost_in_translation/z_interactive.rb

@@ -8,15 +8,16 @@ module LostInTranslation
     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]])
+    paths = copy_paths
+
+    prepare_for_edit(master: @master[:path], slave: @slave[:path])
 
-    prepare_paths([@master[:copy_path], @slave[:copy_path]])
+    prepare_paths([paths[:master], paths[:slave]])
 
-    master_file = YAML.load_file(@master[:copy_path])
-    slave_file = YAML.load_file(@slave[:copy_path])
+    master_file = YAML.load_file(paths[:master])
+    slave_file = YAML.load_file(paths[:slave])
 
     count = diff(master_file[@master[:lang]], slave_file[@slave[:lang]], @master[:lang],
                  @slave[:lang], [@slave[:lang]], [], mode: 'count')
@@ -37,17 +38,16 @@ module LostInTranslation
 
     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)) }
+      File.open(paths[:master], '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)) }
+    File.open(paths[:slave], 'w') { |file| file.write(slave_file.to_yaml(line_width: -1)) }
 
-    postpare_paths([@master[:copy_path], @slave[:copy_path]])
+    postpare_paths([paths[:master], paths[:slave]])
 
-    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.cp(paths[:master], @master[:path]) if sorted
+    FileUtils.cp(paths[:slave], @slave[:path])
+    reset_tmp_files
   end
 end

data/lib/lost_in_translation/z_recent.rb

@@ -8,20 +8,21 @@ module LostInTranslation
     @master = ask_for_file(true) # lang path app_name
     @slave = ask_for_file(false)
     @copy = { path: "#{Rails.root}/config/locales/#{@master[:lang]}_copy.yml" }
+    paths = copy_paths
 
     raise 'Invalid Filepaths' unless File.exist?(@master[:path]) && File.exist?(@slave[:path])
 
-    FileUtils.cp(@master[:path], @copy[:path])
+    FileUtils.cp(@master[:path], paths[:copy])
     `git checkout "#{@master[:path]}"`
 
-    @master[:copy_path], @slave[:copy_path], @copy[:copy_path] = prepare_for_edit([@master[:path], @slave[:path], @copy[:path]])
+    prepare_for_edit(master: @master[:path], slave: @slave[:path])
     FileUtils.mv(@copy[:path], @master[:path])
 
-    prepare_paths([@master[:copy_path], @slave[:copy_path], @copy[:copy_path]])
+    prepare_paths([paths[:master], paths[:slave], paths[:copy]])
 
-    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])
+    master_file = YAML.load_file(paths[:master])
+    master_copy_file = YAML.load_file(paths[:copy])
+    slave_file = YAML.load_file(paths[:slave])
 
     count = diff(master_copy_file[@master[:lang]], master_file[@master[:lang]], @master[:lang],
                  @slave[:lang], [@slave[:lang]], [], mode: 'count')
@@ -40,19 +41,17 @@ module LostInTranslation
 
     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)) }
+      File.open(paths[:master], '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)) }
+    File.open(paths[:slave], 'w') { |file| file.write(slave_file.to_yaml(line_width: -1)) }
 
-    postpare_paths([@master[:copy_path], @slave[:copy_path]])
+    postpare_paths([paths[:master], paths[:slave]])
 
-    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])
+    FileUtils.cp(paths[:master], @master[:path]) if sorted
+    FileUtils.cp(paths[:slave], @slave[:path])
+    reset_tmp_files
   end
 end

data/lib/tasks/lit.rake

@@ -30,7 +30,8 @@ end
 namespace :lit do
   desc 'Cleaning out the Yaml-Closet'
   task :cleanup do
-    LostInTranslation.cleanup
+    return 'to_be_done'
+    # LostInTranslation.cleanup
   end
 end
 

data/lost_in_translation.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
+  spec.require_paths = ['lib', 'tmp', 'spec']
 
   spec.add_development_dependency 'bundler', '~> 1.11'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lost_in_translation
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Datyv
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-19 00:00:00.000000000 Z
+date: 2017-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,6 +84,9 @@ files:
 - lib/lost_in_translation/z_recent.rb
 - lib/tasks/lit.rake
 - lost_in_translation.gemspec
+- tmp/tmp_master.yml
+- tmp/tmp_master_copy.yml
+- tmp/tmp_slave.yml
 homepage: https://github.com/Datyv/lost_in_translation
 licenses:
 - MIT
@@ -92,6 +95,8 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
+- tmp
+- spec
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="