apstrings 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2654ba9a832170ed36762b56735ed6ba7c07e19
-  data.tar.gz: ba194e889adfdcb6217d84a8f3a7d06f320d83a1
+  metadata.gz: e34ce4ce8368783b9945b8b89844ff9f2d88e66a
+  data.tar.gz: 2f61172036204cbd1802e983bd15e819bb118480
 SHA512:
-  metadata.gz: 6d284ad330632b177317620c1c7092bffe8ac1d84cc93e525eb59eef60c418f41b682b4138167a4bd6f5dc1b2df3413025a79dcddc8643712ae56e7bf2bd56d0
-  data.tar.gz: 71d4d1c27185dc11491677be60b01af6dad88e5da87edba3767dbb0ae615554162d74f2b54559940915be746b487e1aa9ebfed27335dcaa10f803e4f1565464d
+  metadata.gz: ea3c22a1ccef37b8074f9a0d7a08de3213c02910464bdca746d1f78d047d2ced13b396d49920d71ddcf3371f76be266f4c6355718033ddb8346e77f298546317
+  data.tar.gz: c97ceb1f97eb388e19be1488abb122118f597b929ad6f10c973f2727db54f12b5a7d1dc118e2e9f23330adfa22ec5b3875f98c0aa358cd55bc848d6fe1c1ac79

data/bin/apstrings

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "apstrings"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+
+$ROOT = ARGV[0]
+
+Dir::chdir($ROOT)
+files_to_validate = {"master"=> nil,"files" => []}
+Dir.glob(File.join("**", "*.bundle","**","*.strings")) { |file| 
+	p File.basename(file)
+	if File.basename(file) == "zh-Hans.strings"
+		files_to_validate["master"] = File.expand_path(file)
+	else
+		files_to_validate["files"] << File.expand_path(file) 
+	end
+ }
+
+success = true
+files_to_validate["files"].each { |file|
+	if !Apstrings::validate(file,files_to_validate["master"])
+		success = false
+	end
+ }
+
+ p success ? "Success, well done!" : "Failed: You'd better know what r u doing..."
+
+
+
+ 

data/bin/setup

@@ -4,4 +4,4 @@ IFS=$'\n\t'
 
 bundle install
 
-# Do any other automated setup that you need to do here
+# Do any other automated setup that you need to do here

data/lib/apstrings/strings_validator.rb

@@ -6,9 +6,12 @@ module Apstrings
 	class Validator
 
 		def self.validate(file,masterFile)
+			@master = nil
 			puts "apstrings: start validate  strings file  ..."
 			if nil == masterFile
 				Log::warn("No master file provided, validating file format for #{file} only ...")
+			else
+				@master = Validator::paredFile(masterFile)
 			end
 
 			valid_master, valid_file , no_missing_key  = true,true,true
@@ -82,9 +85,10 @@ module Apstrings
 			mismatchs = []
 			sf.key_values.each {
 				|e|  e.each_pair {
-					|key,value|		
+					|key,value|	
+					fixed_key = Validator::value_in_master(key)	
 					striped_value = value.gsub(/%\d\$/,'%')  # Strip numbered format placeholders , e.g. %1$@ --> %@  
-					key_variables = key.scan(variables_regex) 
+					key_variables = fixed_key.scan(variables_regex) 
 					value_variables = striped_value.scan(variables_regex) 
 					if !(key_variables.sort == value_variables.sort)
 						mismatchs << {key => value}   
@@ -99,6 +103,19 @@ module Apstrings
 			StringsParser.new(file).parse_file
 		end
 
+		def self.value_in_master(key)
+			if @master
+				value_comment = @master.to_hash[key] # 
+				if value_comment == nil
+					return key 
+				else
+					return value_comment.keys[0]
+				end
+			else
+				key
+			end
+		end
+
 	end
 	
 end

data/lib/apstrings/tester.rb

@@ -0,0 +1,27 @@
+
+require 'apstrings'
+
+
+
+$ROOT = ARGV[0]
+
+Dir::chdir($ROOT)
+files_to_validate = {"master"=> nil,"files" => []}
+Dir.glob(File.join("**", "*.bundle","**","*.strings")) { |file| 
+	p File.basename(file)
+	if File.basename(file) == "zh-Hans.strings"
+		files_to_validate["master"] = File.expand_path(file)
+	else
+		files_to_validate["files"] << File.expand_path(file) 
+	end
+ }
+
+success = true
+files_to_validate["files"].each { |file|
+	# p files_to_validate["master"].to_hash[""]
+	if !Apstrings::validate(file,files_to_validate["master"])
+		success = false
+	end
+ }
+
+ p success ? "Success, well done!" : "Failed: You'd better know what r u doing..."

data/lib/apstrings/version.rb

@@ -1,3 +1,3 @@
 module Apstrings
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apstrings
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - JasonWorking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-29 00:00:00.000000000 Z
+date: 2015-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,6 +56,7 @@ description: An easy to use Apple dot strings file parser with encoding handled.
 email:
 - 331314708@qq.com
 executables:
+- apstrings
 - console
 - setup
 extensions: []
@@ -68,7 +69,9 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- apstrings-0.2.1.gem
 - apstrings.gemspec
+- bin/apstrings
 - bin/console
 - bin/setup
 - lib/apstrings.rb
@@ -79,6 +82,7 @@ files:
 - lib/apstrings/reader.rb
 - lib/apstrings/strings_parser.rb
 - lib/apstrings/strings_validator.rb
+- lib/apstrings/tester.rb
 - lib/apstrings/version.rb
 homepage: https://github.com/JasonWorking
 licenses: