lokale 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1605552979ae04cc32ed6b6eae40be4491cb6d43
-  data.tar.gz: 240de056b27a37bd6b7fc2cf7b07a147ccc0c9b0
+  metadata.gz: 8306f8c00603bf616bf961689c9936e9a28f901a
+  data.tar.gz: e7d128b7bca1c820bfd51372a688679f1be7cf0e
 SHA512:
-  metadata.gz: 272fa81006f2b4f4cf0a0f4066e34d4926433c4998e364604dcc7701f1a0c562e93895acc3050d5d40dfd4af588e900dcebfce5fc5f939ce53b4ce709111e29f
-  data.tar.gz: c9d92c14f1cbef0bf2faa8884d10c3e63a058c9af00664c8be534137171c0375b81adf163579969db4ae866962242de00590f242c43bccf4c33ced8fcf91322a
+  metadata.gz: e257d6840e3d282a1255a77570eda0db65956dde7fb26a863befd216f6efe5393c00025463611dc4547360a35582e959664be6849258f14fcd531f7ad5085227
+  data.tar.gz: '09a4e2acce57ba98840c9b097eac20195f6df8ed8933a5547868533cc3b1c5e0469743dbbe8f0a48fbc29bc785cfb6be74627a40c35f6b8a38c03db5c4e3b47f'

data/a.sh

@@ -1,4 +1,4 @@
-rake install
+rake install:local
 cd ~/Documents/hand2hand-ios
-lokale -e
+lokale -i
 cd ~/Documents/lokale

data/lib/lokale.rb

@@ -6,38 +6,45 @@ require 'lokale/reporter'
 require 'lokale/lokalefile'
 require 'lokale/agent'
 
-class Action
-  def print(str)
-    puts str.blue
-  end
+module Lokale
+  class Action
+    def print(str)
+      puts str.blue
+    end
 
-  def perform(agent, reporter)
-    send(("perform_" + @type.to_s).to_sym, agent, reporter)
-  end
+    def perform(agent, reporter)
+      send(("perform_" + @type.to_s).to_sym, agent, reporter)
+    end
 
-  def perform_summary(agent, reporter)
-    print "Printing summary...".blue
-    reporter.print_summary
-  end
+    def perform_summary(agent, reporter)
+      print "Printing summary...".blue
+      reporter.print_summary
+    end
 
-  def perform_copy_base(agent, reporter)
-    print "Copying `en` strings files to `Base`...".blue
-    agent.copy_base
-  end
+    def perform_copy_base(agent, reporter)
+      print "Copying `en` strings files to `Base`...".blue
+      agent.copy_base
+    end
 
-  def perform_append(agent, reporter)
-    print "Appending new macro calls to localization files...".blue
-    agent.append_new_macro_calls
-  end
+    def perform_append(agent, reporter)
+      print "Appending new macro calls to localization files...".blue
+      agent.append_new_macro_calls
+    end
 
-  def perform_export(agent, reporter)
-    print "Preparing xliff files with new localized strings...".blue
-    agent.export_xliffs
-  end
+    def perform_export(agent, reporter)
+      print "Preparing xliff files with new localized strings...".blue
+      agent.export_xliffs
+    end
+
+    def perform_import(agent, reporter)
+      print "Attempting to import new strings...".blue
+      agent.try_to_import
+    end
 
-  def perform_import(agent, reporter)
-    print "Attempting to import new strings...".blue
-    agent.try_to_import
+    def perform_create_config(agent, reporter)
+      print "Creating config file...".blue
+      Config.get.create_default_file
+    end
   end
 end
 
@@ -67,7 +74,16 @@ module Lokale
 
     def read_config
       Config.init
-      Config.get.read_lokalefile(@project_path)
+      Config.get.project_path = @project_path
+      Config.get.project_name = @project_name
+
+      begin
+        Config.get.read_lokalefile
+      rescue Exception => e
+        puts "Error reading config file".red
+        puts e
+        exit
+      end
     end
 
     def init_workers

data/lib/lokale/agent.rb

@@ -3,6 +3,7 @@ require "lokale/colorize"
 require "lokale/util"
 require "lokale/model"
 require "xliffle"
+require "xliffer"
 require "set"
 
 
@@ -28,6 +29,7 @@ module Lokale
 
   class LString
     def write_format
+      note = @note || "(no comment)"
       "/* #{note} */\n\"#{key}\" = \"#{str}\";\n"
     end
 
@@ -35,6 +37,14 @@ module Lokale
       "\"#{key}\" = \"#{str}\";"
     end
 
+    def self.from_xliff_string(s, lang)
+      str = LString.new(s.id, s.target, s.note, lang)
+      str.source = s.source
+      str
+    end
+
+
+
     attr_accessor :source
 
     def for_export(lang)
@@ -130,37 +140,40 @@ module Lokale
     end
 
     def try_to_import
+      @importer.import_strings(self, @writer)
     end
   end
 
   class Writer 
     def find_append_point(content)
-      ignore_after = content =~ /^\s*?\/\/\s*?\n\s*?\/\/\s*?MARK/
-      string_regexp = /".*?"\s*=\s*".*?"\s*;\s*\n/
+      ignore_after = (content =~ /^\s*?\/\/\s*?\n\s*?\/\/\s*?MARK/) || Float::INFINITY
+      string_regexp = /^".*?"\s*=\s*".*"\s*;/
 
-      append_at = content.match(string_regexp).end(0) - 1
+      append_at = content.match(string_regexp).end(0)
       return if append_at.nil?
       next_try = append_at
       while next_try < ignore_after
         append_at = next_try
-        next_try = content.match(string_regexp, next_try).end(0) - 1
+        next_match = content.match(string_regexp, next_try)
+        break if next_match.nil?
+        next_try = next_match.end(0)
       end
 
-      append_at - 1
+      append_at
     end
 
     def append_new_strings(lstrings, file)
       content = file.content
 
-      puts "Appending #{lstrings.size} new strings to file #{file.lang}/#{file.full_name}".blue
+      puts "Appending #{lstrings.size} new strings to file #{file.lang}/#{file.full_name}:"
       lstrings.each { |ls| puts ls.pretty }
       puts
 
       append_at = find_append_point(content)
-      data_to_append = "\n" + lstrings.map { |ls| ls.write_format }.join("\n")
+      data_to_append = "\n\n" + lstrings.map { |ls| ls.write_format }.join("\n").chomp("\n")
 
       content.insert(append_at, data_to_append)
-      File.write(file.path, content)
+      file.write(content)
     end
   end
 
@@ -207,7 +220,8 @@ module Lokale
     def export(diffs)
       # puts "Exporting stuff"
       diffs.each do |d|
-        puts "Writing xliff for `#{d.lang}` language. Missing strings count: #{d.missing_strings.values.map { |e| e.size }.reduce(:+)}"
+        missing_count = d.missing_strings.values.map { |e| e.size }.reduce(:+)
+        puts "Writing xliff for `#{d.lang}` language. Missing strings count: #{missing_count}"
 
         xliffle = Xliffle.new
         d.missing_strings.each do |lfile, strings|
@@ -217,14 +231,83 @@ module Lokale
           end
         end
 
-        file_name = "#{d.lang}.xliff"
+        file_name = xliff_name(d.lang)
         File.write(file_name, xliffle.to_xliff)
       end
     end
+
+    def xliff_name(lang)
+      date = Time.now.strftime("%d.%m.%y")
+      "export.#{date}.#{lang}.xliff"
+    end
   end
 
   class Importer
-    def look_for_strings(root_path)
+    class Diff
+      attr_accessor :name, :lang, :lstrings
+
+      def self.from_file(xliff_path)
+        begin
+          xliff = XLIFFer::XLIFF.new(File.open(xliff_path))  
+        rescue Exception => e
+          puts "Failed to parse `#{xliff_path}` file."
+        end
+
+        diffs = []
+
+        xliff.files.each do |f|
+          next if f.target_language == Config.get.main_lang
+          next if f.source_language != Config.get.main_lang 
+
+          diff = Diff.new
+          diff.name = f.original
+          diff.lang = f.target_language
+          diff.lstrings = f.strings
+            .map { |s| LString.from_xliff_string(s, f.target_language) }
+            .delete_if { |ls| ls.target.nil? }
+          next if diff.lstrings.empty?
+
+          diffs << diff
+        end
+        diffs
+      end
+    end
+
+    def import_strings(agent, writer)
+      xliff_paths = agent.proj_files
+        .select { |f| f =~ /\.xliff$/ }
+        .delete_if { |f| f =~ /export/ }
+        # .select { |f| puts "select #{f}, #{f =~ /\.xliff^/}"; f =~ /\.xliff^/ }
+        # .delete_if { |f| puts "delete #{f}, #{f =~ /export/}"; f =~ /export/ }
+        
+      return if xliff_paths.empty?
+      diffs = xliff_paths.flat_map { |p| Diff.from_file(p) }
+      diffs.each do |d|
+        lf = file_for_diff(d, agent.lfiles)
+        next if lf.nil?
+
+        content = lf.content
+        strings_to_append = []
+
+        d.lstrings.each do |ls|
+          string_regexp = /^\s*?"#{ls.key}"\s*?=\s*?"(.*?)";/
+          if content =~ string_regexp
+            if $1 != ls.str
+              puts "#{lf.lang}/#{lf.full_name} update \"#{ls.key.blue}\": \"#{$1}\" -> \"#{ls.str.blue}\""
+              content.sub! string_regexp, "\"#{ls.key}\" = \"#{ls.str}\";"
+            end
+          else
+            strings_to_append << ls
+          end
+        end
+
+        lf.write content        
+        writer.append_new_strings(strings_to_append, lf) unless strings_to_append.empty?
+      end
+    end
+
+    def file_for_diff(diff, all_lfiles)
+      all_lfiles.select { |lf| lf.full_name == diff.name && lf.lang == diff.lang }.sample
     end
   end
 end

data/lib/lokale/config.rb

@@ -2,66 +2,74 @@
 require "optparse"
 require "lokale/util"
 
-class Action
-  attr_accessor :type, :arg
-
-  def initialize(type)
-    @type = type
+module Lokale
+  class Action
+    attr_accessor :type, :arg
+
+    def initialize(type)
+      @type = type
+    end
+
+    def self.summary;          Action.new(:summary)         end
+    def self.copy_base;        Action.new(:copy_base)       end
+    def self.append;           Action.new(:append)          end  
+    def self.export;           Action.new(:export)          end  
+    def self.import;           Action.new(:import)          end  
+    def self.create_config;    Action.new(:create_config)   end  
   end
 
-  def self.summary;     Action.new(:summary)        end
-  def self.copy_base;   Action.new(:copy_base)      end
-  def self.append;      Action.new(:append)         end  
-  def self.export;      Action.new(:export)         end  
-  def self.import;      Action.new(:import)         end  
-end
+  class Config
+    attr_accessor :actions
+    attr_accessor :project_path, :project_name
 
-class Config
-  attr_accessor :actions
+    def self.init 
+      return unless @config.nil?
 
-  def self.init 
-    return unless @config.nil?
+      actions = []
 
-    actions = []
+      OptionParser.new do |opts|
+        opts.banner = "Usage: lokale [-bsh]"
 
-    OptionParser.new do |opts|
-      opts.banner = "Usage: lokale [-bsh]"
+        opts.on("-b", "--copy-base", "Copies 'en' localization files to 'Base'") do |n|
+          actions << Action.copy_base
+        end
 
-      opts.on("-b", "--copy-base", "Copies 'en' localization files to 'Base'") do |n|
-        actions << Action.copy_base
-      end
+        opts.on("-s", "--summary", "Prints project summary") do |n|
+          actions << Action.summary
+        end
 
-      opts.on("-s", "--summary", "Prints project summary") do |n|
-        actions << Action.summary
-      end
+        opts.on("-a", "--append", "Appends new strings to english localization file") do |n|
+          actions << Action.append
+        end
 
-      opts.on("-a", "--append", "Appends new strings to english localization file") do |n|
-        actions << Action.append
-      end
+        opts.on("-e", "--export", "Creates xliff files with missing localization") do |n|
+          actions << Action.export
+        end
 
-      opts.on("-e", "--export", "Creates xliff files with missing localization") do |n|
-        actions << Action.export
-      end
+        opts.on("-i", "--import", "Looks for xliffs in project dir and imports whatever possible") do |n|
+          actions << Action.import
+        end
 
-      opts.on("-i", "--import", "Looks for xliffs in project dir and imports whatever possible") do |n|
-        actions << Action.import
-      end
+        opts.on("-f", "--create-config-file", "Create default `.lokale` config file") do |n|
+          actions << Action.create_config
+        end
 
-      opts.on("-h", "--help", "Prints this help") do
-        puts opts
-        exit
-      end
-    end.parse!
+        opts.on("-h", "--help", "Prints this help") do
+          puts opts
+          exit
+        end
+      end.parse!
 
-    actions << Action.summary if actions.empty? 
+      actions << Action.summary if actions.empty? 
 
-    @config = Config.new
-    @config.actions = actions
-  end
+      @config = Config.new
+      @config.actions = actions
+    end
 
-  def self.get
-    init if @config.nil?
-    @config
+    def self.get
+      init if @config.nil?
+      @config
+    end
   end
 end
 

data/lib/lokale/lokalefile.rb

@@ -2,7 +2,8 @@
 require "lokale/config"
 require "lokale/model"
 
-DEFAULT_LOKALEFILE = <<FILE
+module Lokale
+  DEFAULT_LOKALEFILE = <<FILE
 
 add_macro "NSLocalizedString" do |m|
   m.localization_file = "Localizable.strings"
@@ -21,78 +22,80 @@ main_language "en"
 base_language "Base"
 
 FILE
+end
 
+module Lokale
+  class Config 
+    def read_lokalefile
+      if File.file? lokalefile_path 
+        read_config_from_file(lokalefile_path)
+      else
+        read_default_config
+      end
+    end
 
-class Config 
-  def read_lokalefile(project_path)
-    lokalefile_path = File.join(project_path, ".lokale")
+    def read_default_config
+      reset_config
+      instance_eval(DEFAULT_LOKALEFILE)
+    end
 
-    if File.file? lokalefile_path 
-      read_config_from_file(lokalefile_path)
-    else
-      read_default_config
+    def read_config_from_file(file_path)
+      content = File.read(file_path)
+      reset_config
+      instance_eval(content)
+      fill_defaults
     end
-  end
 
-  def read_default_config
-    reset_config
-    instance_eval(DEFAULT_LOKALEFILE)
-  end
+    def create_default_file
+      if File.file? lokalefile_path 
+        puts "Config file `#{lokalefile_path.blue}` already exists."
+      else
+        File.write(lokalefile_path, DEFAULT_LOKALEFILE)
+        puts "Created config file at `#{lokalefile_path.blue}`"
+      end
+      
+    end
 
-  def read_config_from_file(file_path)
-    content = File.read(file_path)
-    reset_config
-    instance_eval(content)
-    fill_defaults
-  end
-end
+    def lokalefile_path
+      File.join(@project_path, ".lokale") 
+    end
 
 
-class Config 
 
-  attr_reader :macros
-  attr_reader :main_lang, :base_lang
+    attr_reader :macros
+    attr_reader :main_lang, :base_lang
 
-  def reset_config 
-    @macros = nil
-    @main_lang = nil
-    @base_lang = nil  
-  end
+    def reset_config 
+      @macros = nil
+      @main_lang = nil
+      @base_lang = nil  
+    end
 
-  def fill_defaults
-    default = Config.new
-    default.read_default_config
+    def fill_defaults
+      default = Config.new
+      default.read_default_config
 
-    @macros ||= default.macros
-    @main_lang ||= default.main_lang
-    @base_lang ||= default.base_lang
-  end
+      @macros ||= default.macros
+      @main_lang ||= default.main_lang
+      @base_lang ||= default.base_lang
+    end
 
-  private
+    private
 
-  def add_macro(name)
-    macro = Lokale::Macro.new(name)
-    yield macro
-    @macros ||= []
-    @macros << macro
-  end
-  
-  def main_language(l)
-    @main_lang = l
-  end
+    def add_macro(name)
+      macro = Lokale::Macro.new(name)
+      yield macro
+      @macros ||= []
+      @macros << macro
+    end
+    
+    def main_language(l)
+      @main_lang = l
+    end
 
-  def base_language(l)
-    @base_lang = l
+    def base_language(l)
+      @base_lang = l
+    end
   end
 end
 
-
-def test 
-  Config.get.read_lokalefile File.dirname(__FILE__)
-  p Config.get.macros
-  p Config.get.main_lang
-  p Config.get.base_lang
-end
-
-# test
-

data/lib/lokale/model.rb

@@ -67,6 +67,10 @@ module Lokale
     	File.read(@path)
     end
 
+    def write(content)
+    	File.write(@path, content)
+    end
+
     def parsed
       return @parsed unless @parsed.nil?
       @parsed = case type

data/lib/lokale/version.rb

@@ -1,3 +1,3 @@
 module Lokale
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lokale.gemspec

@@ -32,5 +32,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency 'xliffle', '0.2.2'
-
+  spec.add_runtime_dependency 'xliffer', '1.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lokale
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Anton Onizhuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-18 00:00:00.000000000 Z
+date: 2017-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xliffle
@@ -24,6 +24,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.2.2
+- !ruby/object:Gem::Dependency
+  name: xliffer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.3
 description: Write a longer description or delete this line.
 email:
 - anton.onizhuk@gmail.com