lokale 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72e68f6bb7e1876f79575ae055c261147df25727
-  data.tar.gz: 6343b1266d7b686224a0d728b4baecd8d4b6c92c
+  metadata.gz: 28a49cbbd5450645fa6067b0fd096191bb7a1760
+  data.tar.gz: 578fbe40eee917b39badc508ad62a5b63d748b9d
 SHA512:
-  metadata.gz: dc97049e348d6aedb0a8c54d112f8cbc4c963799c0ecc90227a28daf90dad03d2b9f9ca6652d58e189ad07c862c89e49beec59b5ea364ac84ab55751fc456482
-  data.tar.gz: e3a0565425d0e21b9cb2c67148489af5dc4e225afb58f671bbd9391b3fc3a957d753c54434cad8ffe5fd852845dfbcc3f606244f6559bc2aa5181eab2e87c5ef
+  metadata.gz: d8bcfbc01c0144b33d804a0b0d60b1b9224ffcb1b87af2730f4cf27f86ddb2e5eca0f032dcd6486279c2bfbdeb3506cea4661bdd5445fdc74372723357594c73
+  data.tar.gz: 063b8a079d93f1189f9d261896d818472d0b6d193c80a044f2d70810e8426f758b4e0676678b8703433a2506b0c6edc343804e927fd2917021d4718e4712b4c7

data/bin/lokale

@@ -5,36 +5,60 @@ require 'lokale/find_dir'
 require 'lokale/colorize'
 require 'lokale/options'
 
+Settings.init
+
 git_path = find_git_repo
 if git_path.nil? 
 	puts "Could not find any git repository."
 	exit
 end
 
-xcode_project = xcode_project_name(git_path)
-if xcode_project.nil?
+project_name = xcode_project_name(git_path)
+if project_name.nil?
 	puts "Found git repository (#{git_path}) does not contain an Xcode project."
 	exit
 end
 
+puts "Target Xcode project: '#{project_name}'".green
 
-settings = Settings.get
-settings.actions.each do |s|
-	puts s
-	puts s.type
-	puts s.arg
-	puts s.precedence
+########################################################################################
+
+class Action
+	def perform(agent, reporter)
+		send(("perform_" + @type.to_s).to_sym, agent, reporter)
+	end
+
+	def perform_summary(agent, reporter)
+		puts "Printing summary".blue
+		reporter.print_summary
+	end
+
+	def perform_copy_base(agent, reporter)
+		puts "Copying `en` strings files to `Base`".blue
+		agent.copy_base
+		puts
+	end
+
+	def perform_append(agent, reporter)
+
+	end
 end
 
-puts "Analyzing Xcode project '#{xcode_project}'".green
+
+
+settings = Settings.get
 
 macros = [
-    Lokale::Macro.new("NSLocalizedString", /NSLocalizedString\("(.+?)",\s*comment:\s*"(.*?)"\)/), 
-    Lokale::Macro.new("PluralString", /String.localizedPlural\("(.+?)"/),
+    Lokale::Macro.new("NSLocalizedString", /NSLocalizedString\("(.+?)",\s*comment:\s*"(.*?)"\)/, "Localizable.strings"), 
+    Lokale::Macro.new("PluralString", /String.localizedPlural\("(.+?)"/, nil),
     #LocalizationMacro.new("ObjC String", /NSLocalizedString\("(.*)",\s*(.*)\)/),
     #LocalizationMacro.new("ObjC Table String", /NSLocalizedStringFromTableInBundle\((.*?),/)
 ]
 
-agent = Lokale::Agent.new(Dir.pwd, macros)
+agent = Lokale::Agent.new(git_path, macros)
 reporter = Lokale::Reporter.new(agent)
-reporter.print_summary
+
+
+settings.actions.each do |action|
+	action.perform(agent, reporter)
+end

data/lib/lokale/options.rb

@@ -1,46 +1,70 @@
 
 require "optparse"
 
+class Action
+  attr_reader :type, :arg, :precedence
+  def initialize(type, arg, precedence)
+    @type = type; @arg = arg; @precedence = precedence
+  end
 
+  def self.summary
+    Action.new(:summary, nil, 10)
+  end
+  def self.copy_base
+    Action.new(:copy_base, nil, 50)
+  end
+  def self.append
+    Action.new(:append, nil, 60)
+  end
+end
 
-  Action = Struct.new("Action", :type, :arg, :precedence)
-
-  class Settings
-    attr_reader :actions
+class Settings
+  attr_reader :actions
 
-    def self.get 
-      actions = []
+  def self.init 
+    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.new(:copy_base, nil, 10)
-        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.new(:summary, nil, 100)
-        end
+      opts.on("-s", "--summary", "Prints project summary") do |n|
+        actions << Action.summary
+      end
 
-        opts.on("-h", "--help", "Prints this help") do
-          puts opts
-          exit
-        end
-      end.parse!
+      opts.on("-a", "--append", "Appends new strings to english localization file") do |n|
+        actions << Action.append
+      end
 
-      if actions.empty? 
-        actions.sort_by! { |e| e.precedence }
-      else 
-        actions.sort_by! { |e| e.precedence }
+      opts.on("-h", "--help", "Prints this help") do
+        puts opts
+        exit
       end
+    end.parse!
+
 
-      Settings.new(actions)
-    end
 
-    def initialize(actions)
-      @actions = actions
+    if actions.empty? 
+      actions << Action.summary
+    else 
+      actions.sort_by! { |e| -e.precedence }
     end
+
+    @shared_settings = Settings.new(actions)
+  end
+
+  def self.get
+    init if @shared_settings.nil?
+    @shared_settings
+  end
+
+  def initialize(actions)
+    @actions = actions
   end
+end
 
 
 

data/lib/lokale/version.rb

@@ -1,3 +1,3 @@
 module Lokale
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/lokale.rb

@@ -92,16 +92,22 @@ module Lokale
       return nil if parsed.nil?
       parsed.map(&:key)
     end
+
+     
+    def strings_file?
+      @type == "strings" || @type == "stringsdict"
+    end
   end
 
   #
 
   class Macro
-    attr_reader :regex, :found_strings, :name
+    attr_reader :regex, :found_strings, :name, :file_name
 
-    def initialize(name, regex)
+    def initialize(name, regex, file_name)
       @name = name
       @regex = regex
+      @file_name = file_name
       clear_calls
     end 
 
@@ -140,7 +146,11 @@ module Lokale
     end
 
     def proj_files 
-      Dir.glob("#{@proj_path}/**/**")
+      if block_given?
+        Dir.glob("#{@proj_path}/**/**") { |f| yield f }
+      else
+        Dir.glob("#{@proj_path}/**/**")
+      end
     end
 
     def get_localization_files
@@ -152,7 +162,7 @@ module Lokale
       @macros.each { |m| m.clear_calls }
 
       @sfiles_proceeded = 0
-      proj_files.each do |file| 
+      proj_files do |file| 
         next unless file.source_file?        
 
         file_content = File.read(file)
@@ -160,6 +170,21 @@ module Lokale
         @sfiles_proceeded += 1
       end
     end
+
+    def copy_base
+      en_files = @lfiles.group_by { |f| f.lang }["en"].select { |f| f.strings_file? }
+      base_files = @lfiles.group_by { |f| f.lang }["Base"].select { |f| f.strings_file? }
+
+      en_files.each do |en|
+        base = base_files.select { |f| f.full_name == en.full_name }.sample
+        next if base.nil?
+        IO.copy_stream(en.path, base.path)
+      end
+    end
+
+    def append_new_macro_calls
+
+    end
   end
 
   #
@@ -185,7 +210,6 @@ module Lokale
       puts
     end
 
-
     def print_files_table
       languages = @agent.lfiles.map { |e| e.lang }.to_set.to_a
       files = @agent.lfiles.map { |e| e.full_name }.to_set.to_a
@@ -249,7 +273,7 @@ module Lokale
         diferences_repot << "Missing keys in file \"#{file_name}\":\n"
         all_keys.zip(files) do |missing_keys, lfile|
           next if missing_keys.size.zero?
-          diferences_repot << "* #{lfile.lang} - #{missing_keys.size} key(s):\n"
+          diferences_repot << "*".red + " #{lfile.lang} - #{missing_keys.size} key(s):\n"
           missing_keys.each { |k| diferences_repot << "#{k}\n" }
         end
         diferences_repot << "\n"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lokale
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Anton Onizhuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-20 00:00:00.000000000 Z
+date: 2017-10-25 00:00:00.000000000 Z
 dependencies: []
 description: Write a longer description or delete this line.
 email:
@@ -18,7 +18,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -42,17 +42,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Lokale is a small tool that inspects localization of Xcode projects.