swiftlocalizer 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31f921e1c965cb474cb9de177d8052f7161d55ff
-  data.tar.gz: 25dbfcae5576d38be60826faa7c8bf1c954658ba
+  metadata.gz: 710f8b2561b1788132643c6bf77e5872e845802a
+  data.tar.gz: 8a9b26b615b832fbd2e479e721dae2d924bd6efa
 SHA512:
-  metadata.gz: 337b38d9d6e1c5a96845d6557e8ed0671d3784648b889827b12daea0da449bedc256cd1243d782571a47aeaadb879bc574856a9f6ea45b6e51bb7f48d2afa15b
-  data.tar.gz: 04449e92a87d0dd26bde6895056acfa7081252cf9cdef5e2d10e2d249f0deef086c0ba367ba897a23d4d441e7e444c8851f467c0c85bd5540f6de409c838ce81
+  metadata.gz: 4b6299457bebfbaf7a9d38144b55bc4257aa66daec4f9d4a50971425fdb29034039d8b71c6dc772e151818608516cb6d016a7a6c1b1f5a8a8e57b9fd4554672e
+  data.tar.gz: 7ef822c673d525f19f5ee04300f91aac67f551b8bae2a753afdb1c1df70c584fafcdd8933efff5946a47ffe7a0789742bf527f54ae8d06b7ee22b6db3f02f2d5

data/lib/swiftlocalizer.rb

@@ -16,12 +16,43 @@ module Swiftlocalizer
       "#{@en},#{@ja},#{@filename},#{@lineno}"
     end
 
+    def str_and_lineno
+      "#{@filename}: #{@en} #{@ja}"
+    end
+
     def to_short_s
       "#{@en} #{@ja} #{File.basename(@filename)}:#{@lineno}"
-    end    
+    end
+
+    def key
+      @en
+    end
+  end
+
+  class LocalizableString
+    def initialize(str, filename, lineno)
+      @str = str
+      @filename = filename
+      @lineno = lineno
+    end
+    attr_accessor :str, :filename, :lineno
+    def to_s
+      "#{@str},#{@filename},#{@lineno}"
+    end
+    def str_and_lineno
+      "#{@lineno}: #{@str}"
+    end
+    def to_short_s
+      "#{@str} #{File.basename(@filename)}:#{@lineno}"
+    end        
   end
 
   class Command
+
+    NSLOCALIZED_STRING_REGEX = /NSLocalizedString\("([^"]+)",\s*comment:\s*"([^"]+)"\)/
+    PRINT_REGEX = /print\("([^"]+)"\)/
+    COMMENT_REGEX = /\/\/.*$/
+    
     def self.get_localized_strings_from_file(file)
       get_localized_strings_from_lines(File.readlines(file), file)
     end
@@ -29,20 +60,57 @@ module Swiftlocalizer
     def self.get_localized_strings_from_lines(lines, file)
       strings = []
       lines.each_with_index do |line, index|
-        strings.concat(get_localized_strings_from_line(line, file, index))
+        strings.concat(get_localized_strings_from_line(line, file, index + 1))
       end
       strings
     end
-
-    def self.get_localized_strings_from_line(line, file, index)
+    
+    def self.get_localized_strings_from_line(line, file, lineno)
       strings = []
-      while line =~ /NSLocalizedString\("([^"]+)",\s*comment:\s*"([^"]+)"\)/
-        string = LocalizedString.new($1, $2, file, index)
+      while line =~ NSLOCALIZED_STRING_REGEX
+        string = LocalizedString.new($1, $2, file, lineno)
         strings << string
         line = $'
       end
       strings
     end
+
+    def self.get_localizable_strings_from_file(file)
+      get_localizable_strings_from_lines(File.readlines(file), file)
+    end
+
+    def self.get_localizable_strings_from_lines(lines, file)
+      strings = []
+      lines.each_with_index do |line, index|
+        strings.concat(get_localizable_strings_from_line(line, file, index + 1))
+      end
+      strings
+    end
+
+    def self.get_localizable_strings_from_line(line, file, lineno)
+      strings = []
+      matched = true
+      while matched 
+        if line =~ NSLOCALIZED_STRING_REGEX || line =~ PRINT_REGEX || line =~ COMMENT_REGEX
+          line = $'
+          next
+        end
+        if line =~ /"([^"]+)"/
+          if jstring?($1)
+            string = LocalizableString.new($1, file, lineno)
+            strings << string
+          end
+          line = $'
+        else
+          matched = false
+        end
+      end
+      strings      
+    end
+
+    def self.jstring?(str)
+      str.bytesize > str.size
+    end
     
     def self.run(argv)
       STDOUT.sync = true
@@ -58,7 +126,7 @@ module Swiftlocalizer
       end
       opt.on('-v', '--verbose', 'Verbose message') {|v| opts[:v] = v}
       opt.on('-n', '--dry-run', 'Message only') {|v| opts[:n] = v}
-#      opt.on('-f', '--force-import', 'Force import') {|v| opts[:f] = v}
+      opt.on('-c', '--check', 'Check localizable strings') {|v| opts[:c] = v}
       opt.parse!(argv)
       dir = ARGV.shift || '.'
       command = Command.new(opts, dir)
@@ -71,7 +139,24 @@ module Swiftlocalizer
     end
 
     def run
-      strings = scan_sources
+      if @opts[:c]
+        check_strings
+      else
+        scan_and_write
+      end
+    end
+
+    private
+    def check_strings
+      strings = scan_sources do |f|
+        Command.get_localizable_strings_from_file(f)
+      end
+    end
+    
+    def scan_and_write
+      strings = scan_sources do |f|
+        Command.get_localized_strings_from_file(f)
+      end
 
       check_duplicate(strings)
       
@@ -81,18 +166,17 @@ module Swiftlocalizer
       write_localizable_strings(strings, path, :en)
       
       path = File.join(@dir, 'ja.lproj', basename)      
-      write_localizable_strings(strings, path, :ja)
+      write_localizable_strings(strings, path, :ja)      
     end
-
-    private
+    
     def scan_sources
       puts "Scan #{@dir}"  
       strings = []
       Dir.glob(@dir + '/**/*.swift').each do |f|
         puts f
-        file_strings = Command.get_localized_strings_from_file(f)
+        file_strings = yield(f)
         puts "retrieve #{file_strings.size} strings"
-        file_strings.each{|str| puts "\t#{str.en} #{str.ja} #{str.lineno}\n"}
+        file_strings.each{|str| puts "\t#{str.str_and_lineno}\n"}
         strings.concat(file_strings)
       end
       strings
@@ -117,7 +201,7 @@ module Swiftlocalizer
         raise RuntimeError, "#{path} doesn't exist."
       end
       File.open(path, 'w') do |f|
-        strings.each do |str|
+        strings.sort_by{|a| a.key }.each do |str|
           en = str.send(:en)
           localized = str.send(sym.to_sym)
           f.puts "\"#{en}\" = \"#{localized}\";"

data/lib/swiftlocalizer/version.rb

@@ -1,3 +1,3 @@
 module Swiftlocalizer
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swiftlocalizer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - src
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-19 00:00:00.000000000 Z
+date: 2016-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler