lokale 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36f4dfe95a8d5ab359a7e8e8533a0870316bbb6b
-  data.tar.gz: 3d3fa77a8ab9dbef6d5a1b65f2ef06b0e6ba83f8
+  metadata.gz: 72e68f6bb7e1876f79575ae055c261147df25727
+  data.tar.gz: 6343b1266d7b686224a0d728b4baecd8d4b6c92c
 SHA512:
-  metadata.gz: 329c3243dd0410f237bb55a650f102c10d132cf37089f6f177b51894604fd43dc62a8fe5535240f0d3f6aa9962a1ee0069f9b7bd022920e2a1d19b7813097328
-  data.tar.gz: 95eb3e99e7a0356f8efce8b51f78c37453f41dd6f3f6e786009344293247b83a4909fcc9698789a67d63414bcac80160a97766f84870f332dd4c73beeff54d73
+  metadata.gz: dc97049e348d6aedb0a8c54d112f8cbc4c963799c0ecc90227a28daf90dad03d2b9f9ca6652d58e189ad07c862c89e49beec59b5ea364ac84ab55751fc456482
+  data.tar.gz: e3a0565425d0e21b9cb2c67148489af5dc4e225afb58f671bbd9391b3fc3a957d753c54434cad8ffe5fd852845dfbcc3f606244f6559bc2aa5181eab2e87c5ef

data/README.md

@@ -32,7 +32,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/lokale.
+Bug reports and pull requests are welcome on GitHub at https://github.com/ordinec7/lokale.
 
 ## License
 

data/bin/lokale

@@ -1,6 +1,32 @@
 #!/usr/bin/env ruby
 
 require 'lokale'
+require 'lokale/find_dir'
+require 'lokale/colorize'
+require 'lokale/options'
+
+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?
+	puts "Found git repository (#{git_path}) does not contain an Xcode project."
+	exit
+end
+
+
+settings = Settings.get
+settings.actions.each do |s|
+	puts s
+	puts s.type
+	puts s.arg
+	puts s.precedence
+end
+
+puts "Analyzing Xcode project '#{xcode_project}'".green
 
 macros = [
     Lokale::Macro.new("NSLocalizedString", /NSLocalizedString\("(.+?)",\s*comment:\s*"(.*?)"\)/), 
@@ -9,7 +35,6 @@ macros = [
     #LocalizationMacro.new("ObjC Table String", /NSLocalizedStringFromTableInBundle\((.*?),/)
 ]
 
-puts Dir.pwd
 agent = Lokale::Agent.new(Dir.pwd, macros)
 reporter = Lokale::Reporter.new(agent)
 reporter.print_summary

data/lib/lokale/colorize.rb

@@ -0,0 +1,25 @@
+class String
+def black;          "\e[30m#{self}\e[0m" end
+def red;            "\e[31m#{self}\e[0m" end
+def green;          "\e[32m#{self}\e[0m" end
+def brown;          "\e[33m#{self}\e[0m" end
+def blue;           "\e[34m#{self}\e[0m" end
+def magenta;        "\e[35m#{self}\e[0m" end
+def cyan;           "\e[36m#{self}\e[0m" end
+def gray;           "\e[37m#{self}\e[0m" end
+
+def bg_black;       "\e[40m#{self}\e[0m" end
+def bg_red;         "\e[41m#{self}\e[0m" end
+def bg_green;       "\e[42m#{self}\e[0m" end
+def bg_brown;       "\e[43m#{self}\e[0m" end
+def bg_blue;        "\e[44m#{self}\e[0m" end
+def bg_magenta;     "\e[45m#{self}\e[0m" end
+def bg_cyan;        "\e[46m#{self}\e[0m" end
+def bg_gray;        "\e[47m#{self}\e[0m" end
+
+def bold;           "\e[1m#{self}\e[22m" end
+def italic;         "\e[3m#{self}\e[23m" end
+def underline;      "\e[4m#{self}\e[24m" end
+def blink;          "\e[5m#{self}\e[25m" end
+def reverse_color;  "\e[7m#{self}\e[27m" end
+end

data/lib/lokale/find_dir.rb

@@ -0,0 +1,39 @@
+# Script: Find the current git repository
+# Based on https://github.com/mojombo/grit/pull/178 by https://github.com/derricks
+
+
+# Returns true if the given path represents a root directory (/ or C:/)
+def root_directory?(file_path)
+  # Implementation inspired by http://stackoverflow.com/a/4969416:
+  # Does file + ".." resolve to the same directory as file_path?
+  File.directory?(file_path) && 
+    File.expand_path(file_path) == File.expand_path(File.join(file_path, '..'))
+end
+
+# Returns the git root directory given a path inside the repo. Returns nil if
+# the path is not in a git repo.
+def find_git_repo(start_path = '.')
+  raise NoSuchPathError unless File.exists?(start_path)
+
+  current_path = File.expand_path(start_path)
+
+  # for clarity: set to an explicit nil and then just return whatever
+  # the current value of this variable is (nil or otherwise)
+  return_path = nil
+
+  until root_directory?(current_path)
+    if File.exists?(File.join(current_path, '.git'))   
+      # done
+      return_path = current_path
+      break
+    else
+      # go up a directory and try again
+      current_path = File.dirname(current_path)
+    end
+  end
+  return_path
+end
+
+def xcode_project_name(path)
+  Dir.glob("#{path}/**/**") { |file| return $1 if file =~ /\/(.+?)\.(?:xcodeproj|xcworkspace)$/ }
+end

data/lib/lokale/options.rb

@@ -0,0 +1,46 @@
+
+require "optparse"
+
+
+
+  Action = Struct.new("Action", :type, :arg, :precedence)
+
+  class Settings
+    attr_reader :actions
+
+    def self.get 
+      actions = []
+
+      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("-s", "--summary", "Prints project summary") do |n|
+          actions << Action.new(:summary, nil, 100)
+        end
+
+        opts.on("-h", "--help", "Prints this help") do
+          puts opts
+          exit
+        end
+      end.parse!
+
+      if actions.empty? 
+        actions.sort_by! { |e| e.precedence }
+      else 
+        actions.sort_by! { |e| e.precedence }
+      end
+
+      Settings.new(actions)
+    end
+
+    def initialize(actions)
+      @actions = actions
+    end
+  end
+
+
+

data/lib/lokale/version.rb

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

data/lib/lokale.rb

@@ -1,4 +1,5 @@
-# require "lokale/version"
+require "lokale/version"
+require "lokale/colorize"
 require "set"
 
 class String
@@ -22,9 +23,9 @@ class String
   end
 end
 
-module Lokale 
 
-  class LocalizedString    
+module Lokale 
+  class LString
     attr_accessor :key, :str, :note, :target
 
     def initialize(key, str, note, target)
@@ -33,13 +34,13 @@ module Lokale
 
     def self.strings_from_file(file_path, lang)
       regex = /(?:\/* (.+) *\/.*\n)?"(.+)" *= *"(.+)";/
-      File.read(file_path).scan(regex).map { |m| LocalizedString.new(m[1], m[2], m[0], lang) }
+      File.read(file_path).scan(regex).map { |m| LString.new(m[1], m[2], m[0], lang) }
     end
   end
 
   #
 
-  class LocalizationFile
+  class LFile
     attr_reader :path, :lang, :name, :type
     def initialize(file_path)
       @path = file_path
@@ -54,7 +55,7 @@ module Lokale
 
     def self.try_to_read(file_path)
       return nil unless file_path.localization_file?
-      LocalizationFile.new(file_path)
+      LFile.new(file_path)
     end
 
     def inspect 
@@ -68,7 +69,7 @@ module Lokale
     def parsed
       return @parsed unless @parsed.nil?
       @parsed = case type
-        when "strings"      then LocalizedString.strings_from_file(@path, @lang)
+        when "strings"      then LString.strings_from_file(@path, @lang)
         when "stringsdict"  then []
         else nil
       end      
@@ -144,7 +145,7 @@ module Lokale
 
     def get_localization_files
       return @lfiles unless @lfiles.nil?
-      @lfiles = proj_files.map { |file| LocalizationFile.try_to_read(file) }.compact
+      @lfiles = proj_files.map { |file| LFile.try_to_read(file) }.compact
     end
 
     def find_all_localization_calls
@@ -224,9 +225,10 @@ module Lokale
       end
 
       if repeats_repot.empty? 
-        puts "Repeats not found."
+        puts "Repeats not found.".green
         puts
       else
+        puts "Found repeats in strings files.".red
         puts repeats_repot
         puts
       end
@@ -236,29 +238,28 @@ module Lokale
       diferences_repot = ""
 
       @agent.lfiles.group_by { |f| f.full_name }.each do |file_name, files|
-        base_lang = files.select { |f| f.lang == "Base" }.first.nil? ? "en" : "Base"
+        base_lang = files.any? { |f| f.lang == "Base" } ? "Base" : "en"
         files = files.select { |f| f.lang != base_lang }
         all_keys = files.map(&:keys).compact.map(&:to_set)
         next if all_keys.empty?
-        shared_keys = all_keys.reduce(:&)
-        all_keys.map! { |ks| ks - shared_keys }
+        united_keys = all_keys.reduce(:|)
+        all_keys.map! { |ks| united_keys - ks }
         next if all_keys.map(&:length).reduce(:+).zero?
 
-        diferences_repot << "Excess keys in file \"#{file_name}\":\n"
-        all_keys.zip(files) do |excess_keys, lfile|
-          next if excess_keys.size.zero?
-          diferences_repot << "* #{lfile.lang}: #{excess_keys.size} key(s).\n"
-          excess_keys.each { |k| diferences_repot << "#{k}\n" }
+        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"
+          missing_keys.each { |k| diferences_repot << "#{k}\n" }
         end
         diferences_repot << "\n"
       end
 
       if diferences_repot.empty? 
-        puts "Localization files are full."
+        puts "Localization files are full.".green
         puts
       else
-        puts "Localization files are not full."
-        puts
+        puts "Localization files are not full.".red
         puts diferences_repot
         puts
       end

data/lokale.gemspec

@@ -2,6 +2,7 @@
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "lokale/version"
+require "lokale/colorize"
 
 Gem::Specification.new do |spec|
   spec.name          = "lokale"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lokale
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Anton Onizhuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-18 00:00:00.000000000 Z
+date: 2017-10-20 00:00:00.000000000 Z
 dependencies: []
 description: Write a longer description or delete this line.
 email:
@@ -27,6 +27,9 @@ files:
 - bin/lokale
 - bin/setup
 - lib/lokale.rb
+- lib/lokale/colorize.rb
+- lib/lokale/find_dir.rb
+- lib/lokale/options.rb
 - lib/lokale/version.rb
 - lokale.gemspec
 homepage: